From a183ac60410ee33609e6f65c26e15a37f452c680 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Wed, 9 Jan 2013 10:57:52 +0800
Subject: [PATCH] fixed journal type page

---
 app/assets/javascripts/desktop.js                         | 3 +--
 .../personal_journal/app/assets/javascripts/desktop.js    | 8 ++++++++
 .../app/assets/javascripts/personal_journal/.gitkeep      | 0
 .../panel/personal_journal/desktop/journal_p.html.erb     | 2 +-
 .../journal_type.html.erb}                                | 0
 vendor/built_in_modules/personal_journal/config/routes.rb | 2 +-
 6 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js
 delete mode 100644 vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/.gitkeep
 rename vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/{journal_lists/index.html.erb => journal_pages/journal_type.html.erb} (100%)

diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js
index a0fad151..df73f9e0 100644
--- a/app/assets/javascripts/desktop.js
+++ b/app/assets/javascripts/desktop.js
@@ -14,6 +14,5 @@
 //= require orbitdesktopAPI
 //= require orbitTimeline
 //= require orbitdesktop
-//= require desktop/journal_pages
 //= require desktop/seminar_pages
-//= require desktop/books_pages
\ No newline at end of file
+//= require desktop/books_pages
diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js
new file mode 100644
index 00000000..85982324
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/desktop.js
@@ -0,0 +1,8 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require desktop/journal_pages
+
diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/.gitkeep b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb
index 44248371..87255b06 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_p.html.erb
@@ -15,7 +15,7 @@
           <ul id='setting_left_nav'>
             <li><a href="<%= panel_personal_journal_desktop_journal_pages_path %>" callback-method="list" load="true" class="hh2 w2 hp thmc1 thmtxt xx" onclick='return false;'>List</a></li>
             <li><a href="<%= new_panel_personal_journal_desktop_journal_page_path %>" callback-method="addpaper" custom-load="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
-            <li><a href="" callback-method="journal" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
+            <li><a href="<%= panel_personal_journal_desktop_journal_type_path %>" callback-method="journal" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
             <li><a href="<%= panel_personal_journal_desktop_co_authors_path %>" class="admtxt hh2 w2 hp" callback-method="coauthor" custom-load="coauthor" onclick='return false;'>Co-Authors</a></li>
             <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags &amp; Keywords</a></li>
             <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Analysis</a></li>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_lists/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
similarity index 100%
rename from vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_lists/index.html.erb
rename to vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
diff --git a/vendor/built_in_modules/personal_journal/config/routes.rb b/vendor/built_in_modules/personal_journal/config/routes.rb
index 8e170854..a92ee50c 100644
--- a/vendor/built_in_modules/personal_journal/config/routes.rb
+++ b/vendor/built_in_modules/personal_journal/config/routes.rb
@@ -4,8 +4,8 @@ Rails.application.routes.draw do
       namespace :desktop do
         match 'journal_p'=>'journal_p#journal_p'
         match 'get_journals_json' => 'journal_pages#get_journals_json'
+        match 'journal_type' => 'journal_pages#journal_type'
         resources :journal_pages, except: :show
-        resources :journal_lists, only: :index
         resources :co_authors, except: :show
         resources :co_author_relations, except: :show
       end