From d651669d5c7f8ad19fb16529d3e33085ada98ef2 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 16 Apr 2013 16:17:37 +0800
Subject: [PATCH] tiny scrollbar update

---
 app/assets/javascripts/orbitdesktop.js                      | 6 +++---
 app/views/desktop/index.html.erb                            | 3 +--
 .../desktop/conference_co_authors_controller.rb             | 2 +-
 .../desktop/conference_pages_controller.rb                  | 2 +-
 .../personal_conference/desktop/conference_window.html.erb  | 1 +
 .../stylesheets/personal_journal/desktop/journal_pages.css  | 3 +++
 .../desktop/journal_co_authors_controller.rb                | 2 +-
 .../personal_journal/desktop/journal_pages_controller.rb    | 2 +-
 .../panel/personal_journal/desktop/journal_window.html.erb  | 2 ++
 9 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css

diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 9f2599b03..26f67fb92 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -579,12 +579,12 @@ var orbitDesktop = function(dom){
           $(o.contentHolder).html(o.desktopData[o.currentface]);
           try{
             if(!customload){
-              o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
+              o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
             }else{
               if(submenuitem)
-                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"));
+                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]"),o.desktopData[o.currentface]);
                 else
-                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
+                  o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),o.desktopData[o.currentface]);
               }
             }catch(EX){}
           cache = true;
diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index 642ab1126..071648ae8 100644
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -97,5 +97,4 @@
   var od = new orbitDesktop("#ajax_container");
   o.notify("Welcome "+o.currentUsername+"!!","alert",3);
 </script>
-<%= javascript_include_tag "personal_journal" %>
-<%= javascript_include_tag "personal_conference" %>
+
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb
index 2eec83f62..72487985d 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_co_authors_controller.rb
@@ -5,7 +5,7 @@ class Panel::PersonalConference::Desktop::ConferenceCoAuthorsController < Applic
     @conference_co_authors = ConferenceCoAuthor.where(name_id: current_user.id).asc(:co_author)
     @conference_co_author_relations = ConferenceCoAuthorRelation.all
 
-    @conference_co_authors = @conference_co_authors.page(page).per(50)
+    @conference_co_authors = @conference_co_authors.page(page).per(40)
 
     respond_to do |format|
       format.html { render :layout => false}
diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
index a711dd1b1..7f3603aaf 100644
--- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
+++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb
@@ -104,7 +104,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio
       ]
     end
 
-    @conference_lists = all_conference_lists.uniq
+    @conference_lists = all_conference_lists
 
     respond_to do |format|
       format.html { render :layout => false}
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
index e854164c6..8f3be405b 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
@@ -1,3 +1,4 @@
+<%= javascript_include_tag "personal_conference" %>
 <div id="conference_p">
  <div id="content">
   <div id="header" class="hh2">
diff --git a/vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css b/vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css
new file mode 100644
index 000000000..9945848e4
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/assets/stylesheets/personal_journal/desktop/journal_pages.css
@@ -0,0 +1,3 @@
+/* css test*/
+
+#harry { font-size: 10px;}
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb
index aa3db5412..01a320a1e 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_co_authors_controller.rb
@@ -5,7 +5,7 @@ class Panel::PersonalJournal::Desktop::JournalCoAuthorsController < ApplicationC
     @journal_co_authors = JournalCoAuthor.where(name_id: current_user.id).asc(:co_author)
     @journal_co_author_relations = JournalCoAuthorRelation.all
 
-    @journal_co_authors = @journal_co_authors.page(page).per(50)
+    @journal_co_authors = @journal_co_authors.page(page).per(40)
 
     respond_to do |format|
       format.html { render :layout => false}
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
index e2c301d2e..59481481d 100644
--- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
@@ -115,7 +115,7 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr
        end]
     end
 
-    @journal_lists = all_journal_lists.uniq
+    @journal_lists = all_journal_lists
 
     respond_to do |format|
       format.html { render :layout => false}
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
index f8e789f02..a5eb7bad9 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
@@ -1,3 +1,5 @@
+<%= javascript_include_tag "personal_journal" %>
+<%= stylesheet_link_tag "personal_journal" %>
 <div id="journal_p">
   <div id="content">
     <div id="header" class="hh2">