From ee5fd18b648c691f1a666d898f62efcdfe040b2f Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Mon, 4 Mar 2013 17:44:55 +0800
Subject: [PATCH] =?UTF-8?q?highlighting=20fixed=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/orbitdesktop.js          | 17 +++++++++++++++--
 .../desktop/journal_pages/_form.html.erb        |  5 +----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index cc47a507..12f194b1 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -395,8 +395,21 @@ var orbitDesktop = function(dom){
               
             // })
           }
-          $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
-          dom.addClass('thmc1 thmtxt active');
+          // $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
+          // dom.addClass('thmc1 thmtxt active');
+          o.highlight_sub_menu_item(dom);
+    }
+    this.highlight_sub_menu_item = function(no){
+      $('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
+      var dom;
+      if(typeof no == "number"){
+        dom = $('*[content-type=menu] a').eq(no);
+        dom.addClass('thmc1 thmtxt active');
+      }else if(typeof no == "object"){
+        dom = no;
+        dom.addClass('thmc1 thmtxt active');
+      }
+      return dom;
     }
 
   this.initializeDesktop = function(target,url,cache){ //this is for initializing main desktops that are sections and tiles
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 9163cc23..f8cdae36 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
@@ -222,10 +222,7 @@
 </script>
 
 <script>
-
-
    var get_html = function(old_id,new_id){
-    return ("<%= escape_javascript(add_attribute 'form_file', f, :writing_journal_files) %>").replace(old_id, new_id)
+    return ("<%= escape_javascript(add_attribute 'form_file', f, :writing_journal_files) %>").replace(old_id, new_id);
    }
-
 </script>