From 874819266d6e54121d6901f3371f83320a2b3f50 Mon Sep 17 00:00:00 2001
From: devin chen <devin@rulingcom.com>
Date: Thu, 2 May 2013 14:02:41 +0800
Subject: [PATCH] minor update

---
 app/assets/Archive/javascripts/desktop.js          |  2 +-
 app/assets/Archive/javascripts/orbitdesktop.js     |  9 +++++++--
 .../stylesheets/desktop/desktop-component.css      |  2 +-
 .../stylesheets/desktop/desktop-component.scss     |  2 +-
 .../Archive/stylesheets/desktop/desktop-main.css   |  2 +-
 .../Archive/stylesheets/desktop/desktop-main.scss  |  2 +-
 app/views/desktop/index.html.erb                   |  6 ++++++
 app/views/desktop/settings/themes.html.erb         |  4 ++--
 .../desktop/journal_pages/_form.html.erb           | 14 +++++++-------
 9 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/app/assets/Archive/javascripts/desktop.js b/app/assets/Archive/javascripts/desktop.js
index be81ab5ed..ff5a54d72 100644
--- a/app/assets/Archive/javascripts/desktop.js
+++ b/app/assets/Archive/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/Archive/javascripts/orbitdesktop.js b/app/assets/Archive/javascripts/orbitdesktop.js
index 06d254d43..fbcf74899 100755
--- a/app/assets/Archive/javascripts/orbitdesktop.js
+++ b/app/assets/Archive/javascripts/orbitdesktop.js
@@ -849,7 +849,7 @@ var orbitDesktop = function(dom){
                 if(i == 1){
                   $column = $('<div class="g_col g_col_w1"></div>');
                 }
-                var $newelement = $('<div class="element w1 h1 hp vp thmc2">'+$(this).html()+'</div>');
+                var $newelement = $('<div class="element w1 h1 thmc2">'+$(this).html()+'</div>');
                 $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 = $('<div class="element w1 h1 hp vp thmc2" data-category="'+app.data_category+'" data-content="'+app.data_content+'"><span class="tile thmc2"></span><a href="'+app._id+'" class="appicon"><img src="'+o.iconPath+app.data_content+'.png" alt="" onclick="return false;"></a><h1 class="appname thmtxt">'+app.title+'</h1></div>');
+            $app = $('<div class="element w1 h1 thmc2" data-category="'+app.data_category+'" data-content="'+app.data_content+'"><span class="tile thmc2"></span><a href="'+app._id+'" class="appicon"><img src="'+o.iconPath+app.data_content+'.png" alt="" onclick="return false;"></a><h1 class="appname thmtxt">'+app.title+'</h1></div>');
             if( count > 4 ){
               count = 1, colindex+=1;
               $('#app_list').append('<div class="g_col g_col_w1 col'+ colindex +'"/>');
diff --git a/app/assets/Archive/stylesheets/desktop/desktop-component.css b/app/assets/Archive/stylesheets/desktop/desktop-component.css
index ce66cf836..c18b2b5b3 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-component.css
+++ b/app/assets/Archive/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/Archive/stylesheets/desktop/desktop-component.scss b/app/assets/Archive/stylesheets/desktop/desktop-component.scss
index 62858fbdc..61b09495e 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-component.scss
+++ b/app/assets/Archive/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/Archive/stylesheets/desktop/desktop-main.css b/app/assets/Archive/stylesheets/desktop/desktop-main.css
index 523e99f63..f1d42a54f 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-main.css
+++ b/app/assets/Archive/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/Archive/stylesheets/desktop/desktop-main.scss b/app/assets/Archive/stylesheets/desktop/desktop-main.scss
index d08476464..932c96956 100644
--- a/app/assets/Archive/stylesheets/desktop/desktop-main.scss
+++ b/app/assets/Archive/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);
 </script>
 
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 @@
 <div class="s_tab stb_h">
 	<ul>
-		<li><a href="#st1" class="hh1 hp thmtxt thmc2">Select Theme</a></li>
-		<li><a href="#st2" class="hh1 hp admtxt admbg">Custom Theme</a></li>
+		<li><a href="#st1" class="hh1 hp thmtxt thmc2">Themes</a></li>
+		<li><a href="#st2" class="hh1 hp admtxt admbg">Theme Color</a></li>
 		<li><a href="#st3" class="hh1 hp admtxt admbg">Wallpaper</a></li>
 	</ul>
 </div>
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 @@
             </li>
 
             <li class="s_grid_row">
-            <%= 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"%>
             </li>
 
             <li class="s_grid_row">
-            <%= 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"%>
             </li>
 
             <li class="s_grid_row">
-            <%= 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"%>
             </li>
             <li class="s_grid_row">
             <%= 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"%>
             <label class="s_grid_1 s_grid" for="">共</label>
-            <%= 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"%>
             </li>
           </ul>
         </div>
@@ -171,7 +171,7 @@
     </select>
     </li>
     <li class="s_grid_row">
-    <%= 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"%>
     </li>
           </ul>
         </div>