diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index be81ab5ed..ff5a54d72 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -16,4 +16,4 @@ //= require orbitdesktop //= require jquery.gridster //= require desktop/books_pages -//= require select2 +//= require select2 \ No newline at end of file diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 06d254d43..fbcf74899 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -849,7 +849,7 @@ var orbitDesktop = function(dom){ if(i == 1){ $column = $('
'); } - var $newelement = $('
'+$(this).html()+'
'); + var $newelement = $('
'+$(this).html()+'
'); $column.append($newelement); if(i == 4){ $result.append($column); @@ -899,6 +899,11 @@ var orbitDesktop = function(dom){ }); return false; }); + $(window).on('keydown', function(){ + if($('#searchbox').val() == 'Search'){ + $('#searchbox').focus(); + } + }); o.appname_substr('#group_wrapper .element'); o.simple_switch(); } @@ -910,7 +915,7 @@ var orbitDesktop = function(dom){ $.each(apps,function(i,app){ var $app; count++; - $app = $('

'+app.title+'

'); + $app = $('

'+app.title+'

'); if( count > 4 ){ count = 1, colindex+=1; $('#app_list').append('
'); diff --git a/app/assets/stylesheets/desktop/desktop-component.css b/app/assets/stylesheets/desktop/desktop-component.css index ce66cf836..c18b2b5b3 100644 --- a/app/assets/stylesheets/desktop/desktop-component.css +++ b/app/assets/stylesheets/desktop/desktop-component.css @@ -319,7 +319,7 @@ -moz-transition: left 0.3s ease; transition: left 0.3s ease; } .s_switch .s_switch_switcher input[type=checkbox]:checked + .s_switch_toggle { - left: 32px; } + left: 30px; } /* tool bar */ .toolbar { diff --git a/app/assets/stylesheets/desktop/desktop-component.scss b/app/assets/stylesheets/desktop/desktop-component.scss index 62858fbdc..61b09495e 100644 --- a/app/assets/stylesheets/desktop/desktop-component.scss +++ b/app/assets/stylesheets/desktop/desktop-component.scss @@ -309,7 +309,7 @@ @include transition-type(left,0.3); } &:checked + .s_switch_toggle { - left: 32px; + left: 30px; } } } diff --git a/app/assets/stylesheets/desktop/desktop-main.css b/app/assets/stylesheets/desktop/desktop-main.css index 523e99f63..f1d42a54f 100644 --- a/app/assets/stylesheets/desktop/desktop-main.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -468,7 +468,7 @@ a.admtxt.admbg2:hover { height: 60px; margin: 0 auto; position: relative; } - [data-sizex="1"] .appicon { + [data-sizex="1"] .appicon, .w1.h1 .appicon { margin-top: 24px; } #sections .appicon { width: 30px; diff --git a/app/assets/stylesheets/desktop/desktop-main.scss b/app/assets/stylesheets/desktop/desktop-main.scss index d08476464..932c96956 100644 --- a/app/assets/stylesheets/desktop/desktop-main.scss +++ b/app/assets/stylesheets/desktop/desktop-main.scss @@ -442,7 +442,7 @@ a.admtxt.admbg2:hover { margin: 0 auto; position: relative; - [data-sizex="1"] & { + [data-sizex="1"] &, .w1.h1 & { margin-top: 24px; } #sections & { diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 25ddf6089..c5e141d4e 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -95,6 +95,12 @@ orbitDesktop.prototype.currentUsername = "<%= @currentusername %>"; //uselessfunction(); var od = new orbitDesktop("#ajax_container"); + if($.browser.msie){ + if($.browser.version < 9){ + $.fx.off = true; + o.notify("We turn off the animation (javascript) for you, but still you can turn it on",10); + } + } o.notify("Welcome "+o.currentUsername+"!!","alert",3); diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb index f3fe933a7..c7bbc7971 100644 --- a/app/views/desktop/settings/themes.html.erb +++ b/app/views/desktop/settings/themes.html.erb @@ -1,7 +1,7 @@
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb index 18d0c5811..9980f6e75 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb @@ -76,23 +76,23 @@
  • - <%= label_tag("", t("personal_journal.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_8 s_grid"%> + <%= label_tag("", t("personal_journal.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", class: "s_grid_8 s_grid"%>
  • - <%= label_tag("", t("personal_journal.vol_no"), class: "s_grid_4 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_8 s_grid"%> + <%= label_tag("", t("personal_journal.vol_no"), class: "s_grid_4 s_grid") %><%= f.text_field :vol_no, size: "20", class: "s_grid_8 s_grid"%>
  • - <%= label_tag("", t("personal_journal.issue_no"), class: "s_grid_4 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_8 s_grid"%> + <%= label_tag("", t("personal_journal.issue_no"), class: "s_grid_4 s_grid") %><%= f.text_field :issue_no, size: "20", class: "s_grid_8 s_grid"%>
  • <%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_4 s_grid") %> - <%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_2 s_grid"%> + <%= f.text_field :form_to_start, size: "10", class: "s_grid_2 s_grid"%> <%= label_tag("", t("personal_journal.to"), class: "s_grid_1 s_grid") %> - <%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_2 s_grid"%> + <%= f.text_field :form_to_end, size: "10", class: "s_grid_2 s_grid"%> - <%= f.text_field :total_pages, size: "20", placeholder:"20", class: "s_grid_2 s_grid"%> + <%= f.text_field :total_pages, size: "20", class: "s_grid_2 s_grid"%>
  • @@ -171,7 +171,7 @@
  • - <%= label_tag("", t("personal_journal.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%> + <%= label_tag("", t("personal_journal.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>