From 2ead5417339ca6b6889b9c27834e7021203ed252 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 1 Mar 2013 14:45:20 +0800
Subject: [PATCH] =?UTF-8?q?url=20handling=20modified..=20tinyscrollbar=20m?=
 =?UTF-8?q?odified=E2=80=A6=20star=20checkbox=20fixed..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/orbitdesktop.js              | 13 +++++++++++--
 .../desktop/journal_pages_helper.rb                 |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 9ed399ae..a7d22686 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -159,11 +159,20 @@ var orbitDesktop = function(dom){
 
     $("body").on("click","*[ajax-remote]",function(){
       var $e = $(this);
+      var t = $e.attr("ajax-remote");
+      var classes_to_toggle = $e.attr("toggle-onclick");
+      if(classes_to_toggle){
+          $e.toggleClass(classes_to_toggle);
+        }
+      if(t == "false"){
+        return false;
+      }
       var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : "");
       var ca = $e.attr("content-holder");
       var a = function(){
+
         $.ajax({
-            type : $e.attr("ajax-remote"),
+            type : t,
             url : $e.attr("href"),
             success : function(data){
             if(typeof data == "string"){
@@ -300,7 +309,7 @@ var orbitDesktop = function(dom){
     $("div[container=true] div.overview").html(temp_div.html());
     o.tinyscrollbar_ext({
       main : ".tinycanvas",
-      fill : base_width * total_columns
+      fill : base_width * (total_columns++) + 250
     })
     
   }
diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
index bdddd92e..3013c4a0 100644
--- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
+++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
@@ -11,8 +11,8 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
   def marker
     content_tag :div,
      :class => "list_item_action"
-      content_tag(:a, "", :class => "icon-check-empty") + \
-      content_tag(:a, "", :class => "icon-star-empty")
+      content_tag(:a, "",:href=>"", :class => "icon-check-empty", "toggle-onclick"=>"icon-check-empty icon-check", "ajax-remote"=>"false") + \
+      content_tag(:a, "",:href=>"", :class => "icon-star-empty", "toggle-onclick"=>"icon-star-empty icon-star", "ajax-remote"=>"false")
   end
 
   def content publication, view