From 7d288b4160298915b47e541e41d1ecbfe2aed3c3 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Mon, 5 Aug 2013 19:03:24 +0800
Subject: [PATCH] some changes in file selection

---
 .../panel/personal_book/desktop/personal_books_helper.rb | 6 +++---
 .../personal_book/desktop/personal_books/index.html.erb  | 5 ++---
 .../personal_diploma/desktop/personal_diplomas_helper.rb | 8 ++++----
 .../desktop/personal_diplomas/index.html.erb             | 6 ++----
 .../desktop/personal_experiences/index.html.erb          | 9 ++++-----
 .../personal_honor/desktop/personal_honors_helper.rb     | 4 +++-
 .../desktop/personal_honors/index.html.erb               | 5 +----
 7 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb b/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
index 5823dc3aa..6ccf4faaf 100644
--- a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
+++ b/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
@@ -25,14 +25,14 @@ module Panel::PersonalBook::Desktop::PersonalBooksHelper
 
   def content publication, view
     case view
-    when "conference_title"
+    when "book_title"
       des = content_tag(:div, publication.book_title,
         :class => "list_t_des")
     when "keywords"
       des = content_tag(:div, publication.keywords,
         :class => "list_t_des")
-    when "abstract"
-      des = content_tag(:div, publication.abstract,
+    when "publisher"
+      des = content_tag(:div, publication.publisher,
         :class => "list_t_des")
     when "file"
       des = content_tag(:div, link_publication_file(publication),
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
index acadcd981..c60e3743b 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
@@ -41,11 +41,10 @@
     <div class="sdm_t hh1">View</div>
     <div class="admbg sdm_o">
       <ul id="journal_view_selection">
-        <li><%= link_to "Journal", panel_personal_book_desktop_personal_books_path + "?view=book_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Title", panel_personal_book_desktop_personal_books_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "Title", panel_personal_book_desktop_personal_books_path + "?view=book_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
         <li><%= link_to "File", panel_personal_book_desktop_personal_books_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
         <li><%= link_to "Keywords", panel_personal_book_desktop_personal_books_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Abstract", panel_personal_book_desktop_personal_books_path + "?view=abstract", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "Publisher", panel_personal_book_desktop_personal_books_path + "?view=publisher", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
       </ul>
     </div>
   </div>
diff --git a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb b/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
index 1a8455d89..da5f24a91 100644
--- a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
+++ b/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
@@ -25,14 +25,14 @@ module Panel::PersonalDiploma::Desktop::PersonalDiplomasHelper
 
   def content publication, view
     case view
-    when "diploma_title"
-      des = content_tag(:div, publication.diploma_title,
+    when "school_name"
+      des = content_tag(:div, publication.school_name,
         :class => "list_t_des")
     when "keywords"
       des = content_tag(:div, publication.keywords,
         :class => "list_t_des")
-    when "abstract"
-      des = content_tag(:div, publication.abstract,
+    when "department"
+      des = content_tag(:div, publication.department,
         :class => "list_t_des")
     when "file"
       des = content_tag(:div, link_publication_file(publication),
diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb
index 9e06d3420..676d01408 100644
--- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb
+++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb
@@ -41,11 +41,9 @@
     <div class="sdm_t hh1">View</div>
     <div class="admbg sdm_o">
       <ul id="journal_view_selection">
-        <li><%= link_to "Journal", panel_personal_diploma_desktop_personal_diplomas_path + "?view=diploma_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Title", panel_personal_diploma_desktop_personal_diplomas_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "File", panel_personal_diploma_desktop_personal_diplomas_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "School Name", panel_personal_diploma_desktop_personal_diplomas_path + "?view=school_name", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
         <li><%= link_to "Keywords", panel_personal_diploma_desktop_personal_diplomas_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Abstract", panel_personal_diploma_desktop_personal_diplomas_path + "?view=abstract", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "Department", panel_personal_diploma_desktop_personal_diplomas_path + "?view=department", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
       </ul>
     </div>
   </div>
diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb
index b7c351f5d..21caee33f 100644
--- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb
+++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb
@@ -41,11 +41,10 @@
     <div class="sdm_t hh1">View</div>
     <div class="admbg sdm_o">
       <ul id="journal_view_selection">
-        <li><%= link_to "Journal", panel_personal_experience_desktop_personal_experiences_path + "?view=organizationt_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Title", panel_personal_experience_desktop_personal_experiences_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "File", panel_personal_experience_desktop_personal_experiences_path + "?view=job_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Keywords", panel_personal_experience_desktop_personal_experiences_path + "?view=department", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Abstract", panel_personal_experience_desktop_personal_experiences_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "Organization Title", panel_personal_experience_desktop_personal_experiences_path + "?view=organizationt_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "Job Title", panel_personal_experience_desktop_personal_experiences_path + "?view=job_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "department", panel_personal_experience_desktop_personal_experiences_path + "?view=department", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "file", panel_personal_experience_desktop_personal_experiences_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
       </ul>
     </div>
   </div>
diff --git a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb b/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
index 380ba1711..1114d7aa1 100644
--- a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
+++ b/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
@@ -28,7 +28,9 @@ module Panel::PersonalHonor::Desktop::PersonalHonorsHelper
     when "award_name"
       des = content_tag(:div, publication.award_name,
         :class => "list_t_des")
-    
+    when "keywords"
+      des = content_tag(:div, publication.keywords,
+        :class => "list_t_des")
     end
 
     content_tag(:div, publication.award_name,
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb
index 990302ab1..924e82ab6 100644
--- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb
@@ -41,11 +41,8 @@
     <div class="sdm_t hh1">View</div>
     <div class="admbg sdm_o">
       <ul id="journal_view_selection">
-        <li><%= link_to "Journal", panel_personal_honor_desktop_personal_honors_path + "?view=book_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Title", panel_personal_honor_desktop_personal_honors_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "File", panel_personal_honor_desktop_personal_honors_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
+        <li><%= link_to "Award", panel_personal_honor_desktop_personal_honors_path + "?view=award_name", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
         <li><%= link_to "Keywords", panel_personal_honor_desktop_personal_honors_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
-        <li><%= link_to "Abstract", panel_personal_honor_desktop_personal_honors_path + "?view=abstract", :class => "hp hh1 admtxt", "ajax-remote" =>  "get" %></li>
       </ul>
     </div>
   </div>