diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 948b88bba..c06fc1bb0 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -287,7 +287,7 @@ var orbitDesktop = function(dom){ this.layout_data = function(h){ var $e; - var column_container,layout, base_width , no_of_entries, pagination_link , pagination_variable; + var column_container,layout, base_width , no_of_entries = 0, pagination_link , pagination_variable; o.paging = true; this.layout_data.generate_layout_html = function(l){ $e = $("
"); @@ -305,32 +305,36 @@ var orbitDesktop = function(dom){ no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4); var height_percentage = 100/no_of_entries; var entries = column_container.find("li[item=true]"),x = 0; - entries.each(function(i,li){ - if(x == 0){ - column = $("
0){ $("div#app_manager #seperator").show(); + var i = 0; + var $column; searchArray.each(function(){ + i++; + if(i == 1){ + $column = $("
"); + } var $newelement = $(''); - $("div#app_manager .search_result").prepend($newelement); + $column.append($newelement); + if(i == 4){ + $("div#app_manager .search_result").append($column); + i = 0; + } }) + if(i != 0){ + $("div#app_manager .search_result").append($column); + } } }else{$("div#app_manager #seperator").hide();$("div#app_manager .search_result").empty();} }).blur(function(){$(this).val("Search");}); diff --git a/app/assets/stylesheets/desktop/desktop-main.css b/app/assets/stylesheets/desktop/desktop-main.css index 7517a3c30..d917679d7 100644 --- a/app/assets/stylesheets/desktop/desktop-main.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -436,7 +436,7 @@ a:focus { outline: none; } .search_result{ float: left; margin-right: 24px; - max-width: 340px; + /*max-width: 340px;*/ } .g_sep { width: 11px; border-left: solid 1px #fff; } diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb index 26c695831..42bc5011f 100644 --- a/app/views/desktop/app_manager.html.erb +++ b/app/views/desktop/app_manager.html.erb @@ -10,7 +10,7 @@
-
+
diff --git a/app/views/desktop/books.html.erb b/app/views/desktop/books.html.erb index f8303ad03..22640c027 100644 --- a/app/views/desktop/books.html.erb +++ b/app/views/desktop/books.html.erb @@ -13,7 +13,7 @@
    -
  • List
  • +
  • List
  • Add/Edit
  • Books
  • Co-Authors
  • diff --git a/app/views/desktop/books/list.html.erb b/app/views/desktop/books/list.html.erb index b459a6601..d410e57b0 100644 --- a/app/views/desktop/books/list.html.erb +++ b/app/views/desktop/books/list.html.erb @@ -65,11 +65,8 @@
-
-
-
-
+ +
-
-
\ No newline at end of file + diff --git a/app/views/layouts/desktop.html.erb b/app/views/layouts/desktop.html.erb index a4f36b8c4..0993aa6d3 100644 --- a/app/views/layouts/desktop.html.erb +++ b/app/views/layouts/desktop.html.erb @@ -3,7 +3,7 @@