diff --git a/.gitignore b/.gitignore index 1b808faab..d72a48344 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,20 @@ !.gitignore -Gemfile.lock .bundle -db/*.sqlite3 -log/*.log -tmp/**/* -public/uploads/**/* -uploads/**/* -public/panel/**/* -public/index.html .DS_Store -solr/data/**/* -*.swp -*.pid -*.lck -public/assets -config/application.rb - .rvmrc -app/assets/javascripts/.DS_Store +Gemfile.lock +db/*.sqlite3 +log/*.log +public/assets +public/index.html +public/panel/**/* +public/uploads/**/* solr +tmp/**/* +uploads/**/* + +*.swp +*.pid +*.lck \ No newline at end of file diff --git a/Gemfile b/Gemfile index e752dc356..37fdd201b 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'exception_notification' # Send error trace gem 'execjs' gem 'jquery-rails', '2.1.4' gem 'jquery-ui-rails' -gem "select2-rails" +gem "select2-rails", '3.3.1' gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' # gem "memcached", "~> 1.4.3" diff --git a/app/assets/fonts/desktop/FontAwesome.otf b/app/assets/fonts/desktop/FontAwesome.otf new file mode 100755 index 000000000..64049bf2e Binary files /dev/null and b/app/assets/fonts/desktop/FontAwesome.otf differ diff --git a/app/assets/fonts/desktop/fontawesome-webfont.eot b/app/assets/fonts/desktop/fontawesome-webfont.eot index 89070c1e6..7d81019e4 100755 Binary files a/app/assets/fonts/desktop/fontawesome-webfont.eot and b/app/assets/fonts/desktop/fontawesome-webfont.eot differ diff --git a/app/assets/fonts/desktop/fontawesome-webfont.svg b/app/assets/fonts/desktop/fontawesome-webfont.svg index 1245f92c2..ba0afe5ef 100755 --- a/app/assets/fonts/desktop/fontawesome-webfont.svg +++ b/app/assets/fonts/desktop/fontawesome-webfont.svg @@ -3,253 +3,282 @@ \ No newline at end of file diff --git a/app/assets/fonts/desktop/fontawesome-webfont.ttf b/app/assets/fonts/desktop/fontawesome-webfont.ttf index c17e9f8d1..d46172476 100755 Binary files a/app/assets/fonts/desktop/fontawesome-webfont.ttf and b/app/assets/fonts/desktop/fontawesome-webfont.ttf differ diff --git a/app/assets/fonts/desktop/fontawesome-webfont.woff b/app/assets/fonts/desktop/fontawesome-webfont.woff index 09f2469a1..3c89ae09b 100755 Binary files a/app/assets/fonts/desktop/fontawesome-webfont.woff and b/app/assets/fonts/desktop/fontawesome-webfont.woff differ diff --git a/app/assets/images/desktop/select2/select2.png b/app/assets/images/desktop/select2/select2.png new file mode 100755 index 000000000..1d804ffb9 Binary files /dev/null and b/app/assets/images/desktop/select2/select2.png differ diff --git a/app/assets/images/desktop/select2/select2x2.png b/app/assets/images/desktop/select2/select2x2.png new file mode 100755 index 000000000..4bdd5c961 Binary files /dev/null and b/app/assets/images/desktop/select2/select2x2.png differ diff --git a/app/assets/images/desktop/select2/spinner.gif b/app/assets/images/desktop/select2/spinner.gif new file mode 100755 index 000000000..5b33f7e54 Binary files /dev/null and b/app/assets/images/desktop/select2/spinner.gif differ diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index c06fc1bb0..75273d61f 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -223,7 +223,7 @@ var orbitDesktop = function(dom){ $(window).resize(function(){ var ww = $(window).width(); $("img#thmbackground").attr({"width":ww}); - if( $('.tinycanvas').length > 0 ){ $('.tinycanvas').tinyscrollbar_update(); } + if( $('.tinycanvas').length > 0 ){ $('.tinycanvas').tinyscrollbar_update('relative'); } if($(o.contentHolder).find("div.app_frame").length > 0){ $(o.contentHolder).find("div.app_frame").each(function(){ var app_holder_height = $(this).height() - 72; @@ -286,9 +286,10 @@ var orbitDesktop = function(dom){ }; this.layout_data = function(h){ - var $e; - var column_container,layout, base_width , no_of_entries = 0, pagination_link , pagination_variable; + var $e; + var column_container,layout, base_width, total_width, gutter, no_of_entries = 0, pagination_link, pagination_variable; o.paging = true; + gutter = (!isNaN(gutter)) ? gutter : 12; this.layout_data.generate_layout_html = function(l){ $e = $("
"); $e.html(l); @@ -300,6 +301,7 @@ var orbitDesktop = function(dom){ total_columns++; temp_div.append(column_container.html()); var entries = []; + total_width = "auto"; break; case "datalist": no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4); @@ -308,37 +310,35 @@ var orbitDesktop = function(dom){ if(entries.length != 0){ entries.each(function(i,li){ if(x == 0){ - column = $("