From 8948ccca25bca2fd793fed76c49036057ae925a7 Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Fri, 6 Jul 2012 16:09:26 +0800
Subject: [PATCH] little changes

---
 Gemfile.lock                           | 15 +++++++++++++++
 app/assets/javascripts/orbitdesktop.js | 26 ++++++++++++++------------
 app/assets/stylesheets/desktopmain.css |  9 +++++++--
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 65c9dbe8..afec15c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,18 @@
+GIT
+  remote: git://github.com/amatsuda/kaminari.git
+  revision: 82a38e07db1ca1598c8daf073a8f6be22ae714d6
+  specs:
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+
+PATH
+  remote: vendor/impressionist
+  specs:
+    impressionist (1.1.1)
+      httpclient (~> 2.2)
+      nokogiri (~> 1.5)
+
 GEM
   remote: http://rubygems.org/
   specs:
diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 0d809f5e..9bd7bf07 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -986,18 +986,18 @@ var orbitDesktop = function(dom){
 					.addClass('op00', 500);
 
 				
-				$("#journal_p div.toolbar ul#journal_selection_options a").click(function(){
+				$("#journal_selection_options a").click(function(){
 					switch($(this).attr("href")){
 						case "all":
-							$("#journal_p div#paper_list a.item_check_status").addClass("checked");
+							$(".list_item_action > .icon-check-empty").switchClass("icon-check-empty","icon-check",0);
 							break;
 						case "none":
-							$("#journal_p div#paper_list a.item_check_status").removeClass("checked");
+							$(".list_item_action > .icon-check").switchClass("icon-check","icon-check-empty",0);
 							break;
 					}
 					return false;
 				})
-				$("#journal_p div.toolbar ul#journal_view_selection a").click(function(){
+				$("#journal_view_selection a").click(function(){
 					switch($(this).attr("href")){
 						case "journal":
 						journalview();
@@ -1018,11 +1018,13 @@ var orbitDesktop = function(dom){
 
 			var bindSecondaryHandlers = function(){
 				$("#journal_p div#paper_list a").click(function(){
-					if($(this).hasClass("item_check_status")){
-						$(this).toggleClass("checked");
-					}else if($(this).hasClass("icon-star")){
+					if($(this).hasClass("icon-check-empty")){
+						$(this).switchClass("icon-check-empty","icon-check",0);
+					} else if($(this).hasClass("icon-check")) {
+						$(this).switchClass("icon-check","icon-check-empty",0);
+					} else if($(this).hasClass("icon-star")){
 						$(this).removeClass("icon-star").addClass("icon-star-empty");
-					}else if($(this).hasClass("icon-star-empty")){
+					} else if($(this).hasClass("icon-star-empty")){
 						$(this).removeClass("icon-star-empty").addClass("icon-star");
 					}
 					return false;
@@ -1036,7 +1038,7 @@ var orbitDesktop = function(dom){
 						li;
 					$.each(journalData,function(i,journal){
 						$.each(journal.papers,function(j,paper){
-							li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="item_check_status"><span class="icon-ok"></span></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div><div class="list_t_des">'+paper.title+'</div></li>');
+							li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div><div class="list_t_des">'+paper.title+'</div></li>');
 							column.find("ul").append(li);
 							if(counter%5==0){
 								$("#journal_p div#paper_list div.overview").append(column);
@@ -1056,7 +1058,7 @@ var orbitDesktop = function(dom){
 						li;
 					$.each(journalData,function(i,journal){
 						$.each(journal.papers,function(j,paper){
-							li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="item_check_status"><span class="icon-ok"></span></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.keywords+'</div></li>');
+							li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.keywords+'</div></li>');
 							column.find("ul").append(li);
 							if(counter%5==0){
 								$("#journal_p div#paper_list div.overview").append(column);
@@ -1076,7 +1078,7 @@ var orbitDesktop = function(dom){
 						li;
 					$.each(journalData,function(i,journal){
 						$.each(journal.papers,function(j,paper){
-							li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="item_check_status"><span class="icon-ok"></span></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div></li>');
+							li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div></li>');
 							column.find("ul").append(li);
 							if(counter%5==0){
 								$("#journal_p div#paper_list div.overview").append(column);
@@ -1095,7 +1097,7 @@ var orbitDesktop = function(dom){
 						li;
 					$.each(journalData,function(i,journal){
 						$.each(journal.papers,function(j,paper){
-							li = $('<li class="list_t_item"  style="height:auto;"><div class="list_item_action"><a href="" class="item_check_status"><span class="icon-ok"></span></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.abstract+paper.abstract+'</div></li>');
+							li = $('<li class="list_t_item"  style="height:auto;"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.abstract+paper.abstract+'</div></li>');
 							column.find("ul").append(li);
 							$("#journal_p div#paper_list div.overview").append(column);
 							column = $('<div class="g_col list_t"><ul></ul></div>');
diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index cf355384..8f591e1f 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -619,7 +619,13 @@ a:focus { outline: none; }
 	margin-bottom: 10px;
 	color: #333;
 }
-.list_t_des { font-size: 13px; color: #999; font-family: Arial; margin-bottom: 10px; }
+.list_t_des { 
+	font-size: 13px;
+	line-height: 1.5em;
+	color: #999;
+	font-family: Arial, sans-serif;
+	margin-bottom: 10px;
+}
 
 /* Connection Page */
 #connection_setting { height: 492px; }
@@ -689,7 +695,6 @@ a:focus { outline: none; }
 .list_item_action .icon-star { color: #faa732; font-size: 20px; }
 .list_item_action .icon-check-empty { color: #999; font-size: 20px; }
 .list_item_action .icon-check { color: #333; font-size: 20px; }
-.item_check_status:hover .icon-ok, .item_check_status.checked .icon-ok { visibility: visible; }
 
 /* Journal Paper Add */
 #paper_add .s_grid_con {