From 52789fa03210a5bf4b86a3c828c0e8e4495d563b Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 6 Mar 2013 11:32:53 +0800
Subject: [PATCH] all none fixed

---
 .../desktop/conference_pages/_form.html.erb            |  3 ++-
 .../personal_journal/desktop/journal_pages.js          | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
index 53cdf8b8..d7243b6e 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
@@ -1,6 +1,7 @@
 <div class="toolbar hh1">
   <div class="fn_g hp">
-    <%= f.submit t("save"), name: "commit", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
+    <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %>
+    <!-- class: bt-cancle can't be remove -->
     <% if not @writing_conference.new_record? %>
       <%= submit_tag t("cancel"), :type => "button", "callback-method"=>"cancelpaper", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %>
     <% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
index 77674627..e19e7d2a 100644
--- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
+++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
@@ -227,6 +227,16 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
         break;
     }
   }
+   this.initializeJournalPapers.allnone = function(d,o){
+    switch(o.attr("href")){
+      case "all":
+        $("div.overview a.icon-check-empty").removeClass("icon-check-empty").addClass("icon-check");
+      break;
+      case "none":
+        $("div.overview a.icon-check").removeClass("icon-check").addClass("icon-check-empty");
+      break;
+    }
+   }
 };