From e244493b55a75122eeb9bc15ffa17292154b7d4c Mon Sep 17 00:00:00 2001
From: unknown <Spen@Spen-VAIO.(none)>
Date: Mon, 28 Jan 2013 16:19:36 +0800
Subject: [PATCH] member plugin edit

---
 .../back_end/page_contexts_controller.rb      |  6 ++-
 .../back_end/page_contexts/_form.html.erb     |  1 +
 .../page_contexts/_page_context.html.erb      |  2 +-
 .../front_end/writing_books_controller.rb     | 30 +++++++++++++++
 .../app/models/book_paper_type.rb             |  4 --
 .../writing_books/_paper_type_qe.html.erb     |  2 +-
 .../back_end/writing_books/index.html.erb     |  1 +
 .../front_end/writing_books/index.html.erb    | 27 +++++++++++++
 .../front_end/writing_books/show.html.erb     | 37 ++++++++++++++++++
 .../front_end/honors_controller.rb            | 28 ++++++++++++++
 .../front_end/honors/index.html.erb           | 27 +++++++++++++
 .../front_end/honors/show.html.erb            | 15 ++++++++
 .../front_end/writing_journals_controller.rb  | 31 +++++++++++++++
 .../back_end/writing_journals/index.html.erb  |  1 +
 .../front_end/writing_journals/index.html.erb | 27 +++++++++++++
 .../front_end/writing_journals/show.html.erb  | 38 +++++++++++++++++++
 .../front_end/writing_patents_controller.rb   | 29 ++++++++++++++
 .../back_end/writing_patents/index.html.erb   |  1 +
 .../front_end/writing_patents/index.html.erb  | 27 +++++++++++++
 .../front_end/writing_patents/show.html.erb   | 31 +++++++++++++++
 .../front_end/projects_controller.rb          | 28 ++++++++++++++
 .../front_end/projects/index.html.erb         | 27 +++++++++++++
 .../front_end/projects/show.html.erb          | 34 +++++++++++++++++
 .../front_end/researchs_controller.rb         | 27 +++++++++++++
 .../front_end/researchs/index.html.erb        | 27 +++++++++++++
 .../front_end/researchs/show.html.erb         | 29 ++++++++++++++
 .../front_end/writing_seminars_controller.rb  | 31 +++++++++++++++
 .../front_end/writing_seminars/index.html.erb | 26 +++++++++++++
 .../front_end/writing_seminars/show.html.erb  | 36 ++++++++++++++++++
 29 files changed, 623 insertions(+), 7 deletions(-)
 create mode 100644 vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb
 create mode 100644 vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb
 create mode 100644 vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb
 create mode 100644 vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb
 create mode 100644 vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb
 create mode 100644 vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb
 create mode 100644 vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb
 create mode 100644 vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb
 create mode 100644 vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb
 create mode 100644 vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb
 create mode 100644 vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb
 create mode 100644 vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb
 create mode 100644 vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb
 create mode 100644 vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb
 create mode 100644 vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb
 create mode 100644 vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb
 create mode 100644 vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb
 create mode 100644 vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb
 create mode 100644 vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/front_end/writing_seminars_controller.rb
 create mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/index.html.erb
 create mode 100644 vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/show.html.erb

diff --git a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
index facbebb4..53822782 100644
--- a/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
+++ b/vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
@@ -96,7 +96,11 @@ class Panel::PageContent::BackEnd::PageContextsController < OrbitBackendControll
 			@create_page_context.save		
 		end
 		
-        format.html { redirect_to(panel_page_content_back_end_page_contexts_url, :notice => t('page_content.update_page_content_success')) }
+		if !params[:page].blank?
+          format.html { redirect_to(panel_page_content_back_end_page_contexts_url(:page =>params[:page]), :notice => t('page_content.update_page_content_success')) }
+        else
+		  format.html { redirect_to(panel_page_content_back_end_page_contexts_url, :notice => t('page_content.update_page_content_success')) }
+		end
 		format.js  { render 'toggle_enable' }
         format.xml  { head :ok }
       else
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
index f10615f3..726c34e4 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb
@@ -37,6 +37,7 @@
 </div>
 
 <div class="form-actions">
+	<%= hidden_field_tag 'page', params[:page] if !params[:page].blank? %>
 	<%= f.submit t('submit'), :class=>'btn btn-primary' %>
 	<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
 </div>
diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
index ea526a79..1b4c3d90 100644
--- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
+++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
@@ -5,7 +5,7 @@
 		<div class="quick-edit">
 			<ul class="nav nav-pills hide">
 				<%if is_manager? || is_admin? ||  page_context.authed_users(:edit).include?(current_user)%>
-				<li><%= link_to t(:edit), edit_panel_page_content_back_end_page_context_path(page_context) %></li>
+				<li><%= link_to t(:edit), edit_panel_page_content_back_end_page_context_path(page_context, :page => params[:page]) %></li>
 				<%if (is_manager? || is_admin?) %>
 					<li><%=show_page_context_edit_auth_link page_context%></li>
 				<% end%>
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb
new file mode 100644
index 00000000..ff8f70d7
--- /dev/null
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb
@@ -0,0 +1,30 @@
+class Panel::PersonalBook::FrontEnd::WritingBooksController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_book'
+  end
+  
+
+  def index
+	
+	@writing_books = WritingBook.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /writing_books/1
+  # GET /writing_books/1.xml
+  def show
+    @writing_book = WritingBook.find(params[:id])
+	
+	@book_author_types = ( !@writing_book.book_author_types.blank? ? @writing_book.book_author_types.collect{|x| x.title}.join(', ') : nil)
+  
+  end
+  
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+  end
+  
+end
diff --git a/vendor/built_in_modules/personal_book/app/models/book_paper_type.rb b/vendor/built_in_modules/personal_book/app/models/book_paper_type.rb
index e74b6392..86d1ec02 100644
--- a/vendor/built_in_modules/personal_book/app/models/book_paper_type.rb
+++ b/vendor/built_in_modules/personal_book/app/models/book_paper_type.rb
@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 class BookPaperType < WritingBookCategory
   
   field :title, localize: true
-
-  has_and_belongs_to_many :writing_books
   
 end
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb
index 8b1d7498..c21f4851 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_paper_type_qe.html.erb
@@ -19,7 +19,7 @@
 					<div class="control-group">
 						<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 						<div class="controls">
-							<%= f.text_field locale, :class => 'control-label', :value => (@set_author_type.title_translations[locale] rescue nil) %>
+							<%= f.text_field locale, :class => 'control-label', :value => (@set_paper_type.title_translations[locale] rescue nil) %>
 						</div>
 					</div>
 				<% end %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb
index 83d7cff7..4595afbc 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb
@@ -15,6 +15,7 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_book_back_end_writing_book_setting_path, :class => 'btn btn-primary pull-right' %>
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path, :class => 'btn btn-primary pull-right' %>
 	<div id="writing_book_pagination" class="paginationFixed">
 	<%= paginate @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb
new file mode 100644
index 00000000..0eec32ca
--- /dev/null
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/index.html.erb
@@ -0,0 +1,27 @@
+<% # encoding: utf-8 %>
+
+<%= flash_messages %>
+
+<h1><%= t('writing_book.list_writing_book') %></h1>
+
+
+	<table>
+	  <tr>
+		<th><%= t(:year) %></th>
+		<th><%= t(:title) %></th>
+	  </tr>
+
+	<% @writing_books.each do |post| %>
+	  <tr>
+		<td><%= post.year %></td>
+		<td>
+		<%= link_to post.create_link , panel_personal_book_front_end_writing_book_path(post) %>
+		</td>
+	  </tr>
+	  
+	<% end %>
+	
+	</table>
+
+
+<%= paginate @writing_books, :params => {:inner => false}%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb
new file mode 100644
index 00000000..94167db9
--- /dev/null
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/writing_books/show.html.erb
@@ -0,0 +1,37 @@
+<% # encoding: utf-8 %>
+
+<table>
+<caption> <%= t("writing_book") %> </caption>
+<tbody>
+<tr><th><%= t("writing_book.year")%></th><td><%= @writing_book.year %></td></tr>
+<tr><th><%= t("writing_book.language")%></th><td><%= @writing_book.language %></td></tr>
+<tr><th><%= t("writing_book.paper_title")%></th><td><%= @writing_book.paper_title %></td></tr>
+<tr><th><%= t("writing_book.book_title")%></th><td><%= @writing_book.book_title %></td></tr>
+<tr><th><%= t("writing_book.book_paper_type")%></th><td><%= @writing_book.book_paper_type.title if !@writing_book.book_paper_type.blank? %></td></tr>
+<tr><th><%= t("writing_book.book_author_types")%></th><td><%= @book_author_types %></td></tr>
+<tr><th><%= t("writing_book.extracted_chapters")%></th><td><%= @writing_book.extracted_chapters %></td></tr>
+<tr><th><%= t("writing_book.publisher")%></th><td><%= @writing_book.publisher %></td></tr>
+<tr><th><%= t("writing_book.editor")%></th><td><%= @writing_book.editor %></td></tr>
+<tr><th><%= t("writing_book.publish_date")%></th><td><%= @writing_book.publish_date %></td></tr>
+<tr><th><%= t("writing_book.pages")%></th><td><%= @writing_book.pages %></td></tr>
+<tr><th><%= t("writing_book.isbn")%></th><td><%= @writing_book.isbn %></td></tr>
+<tr><th><%= t("writing_book.publication_date")%></th><td><%= @writing_book.publication_date %></td></tr>
+<tr><th><%= t("writing_book.url")%></th><td><%= link_to t(:url), @writing_book.url, {:target => '_blank', :title => @writing_book.book_title} if !@writing_book.url.blank? %></td></tr>
+<tr><th><%= t("writing_book.note")%></th><td><%= @writing_book.note %></td></tr>
+<tr><th><%= t("writing_book.authors")%></th><td><%= "#{User.from_id(@writing_book.create_user_id).name rescue ''},#{@writing_book.authors rescue ''}"%></td></tr>
+<tr><th><%= t("writing_book.files")%></th>
+<td>
+<% if @writing_book.writing_book_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @writing_book.writing_book_files.each do | wjfile | %>
+					<%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+					<% end %>
+			</div>
+		</div>
+	<% end %>
+</td>
+</tr>
+</tbody>
+</table>
diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb
new file mode 100644
index 00000000..0668606b
--- /dev/null
+++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/front_end/honors_controller.rb
@@ -0,0 +1,28 @@
+class Panel::PersonalHonor::FrontEnd::HonorsController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_honor'
+  end
+  
+
+  def index
+	
+	@honors = Honor.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /honors/1
+  # GET /honors/1.xml
+  def show
+    @honor = Honor.find(params[:id])
+  
+  end
+  
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+  end
+  
+end
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb
new file mode 100644
index 00000000..fc035079
--- /dev/null
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/index.html.erb
@@ -0,0 +1,27 @@
+<% # encoding: utf-8 %>
+
+<%= flash_messages %>
+
+<h1><%= t('honor.list_honor') %></h1>
+
+
+	<table>
+	  <tr>
+		<th><%= t(:year) %></th>
+		<th><%= t(:award_name) %></th>
+	  </tr>
+
+	<% @honors.each do |post| %>
+	  <tr>
+		<td><%= post.year %></td>
+		<td>
+		<%= link_to post.award_name , panel_personal_honor_front_end_honor_path(post) %>
+		</td>
+	  </tr>
+	  
+	<% end %>
+	
+	</table>
+
+
+<%= paginate @honors, :params => {:inner => false}%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb
new file mode 100644
index 00000000..f4b64855
--- /dev/null
+++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/honors/show.html.erb
@@ -0,0 +1,15 @@
+<% # encoding: utf-8 %>
+
+<table>
+<caption> <%= t("honor") %> </caption>
+<tbody>
+<tr><th><%= t("honor.category")%></th><td><%= @honor.honor_category.title if @honor.honor_category %></td></tr>
+<tr><th><%= t("honor.year")%></th><td><%= @honor.year %></td></tr>
+<tr><th><%= t("honor.language")%></th><td><%= @honor.language %></td></tr>
+<tr><th><%= t("honor.award_name")%></th><td><%= @honor.award_name %></td></tr>
+<tr><th><%= t("honor.awarding_unit")%></th><td><%= @honor.awarding_unit %></td></tr>
+<tr><th><%= t("honor.url")%></th><td><%= link_to t(:url), @honor.url, {:target => '_blank', :title => @honor.award_name} if !@honor.url.blank? %></td></tr>
+<tr><th><%= t("honor.note")%></th><td><%= @honor.note %></td></tr>
+<tr><th><%= t("honor.authors")%></th><td><%= User.from_id(@honor.create_user_id).name rescue '' %></td></tr>
+</tbody>
+</table>
diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb
new file mode 100644
index 00000000..8b339075
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/front_end/writing_journals_controller.rb
@@ -0,0 +1,31 @@
+class Panel::PersonalJournal::FrontEnd::WritingJournalsController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_journal'
+  end
+  
+
+  def index
+	
+	@writing_journals = WritingJournal.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /writing_journals/1
+  # GET /writing_journals/1.xml
+  def show
+    @writing_journal = WritingJournal.find(params[:id])
+	
+	@journal_level_types = ( !@writing_journal.journal_level_types.blank? ? @writing_journal.journal_level_types.collect{|x| x.title}.join(', ') : nil)
+	@journal_author_types = ( !@writing_journal.journal_author_types.blank? ? @writing_journal.journal_author_types.collect{|x| x.title}.join(', ') : nil)
+  
+  end
+  
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+  end
+  
+end
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb
index 1cb2e879..7323d470 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb
@@ -15,6 +15,7 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_journal_back_end_writing_journal_setting_path, :class => 'btn btn-primary pull-right' %>
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path, :class => 'btn btn-primary pull-right' %>
 	<div id="writing_journal_pagination" class="paginationFixed">
 	<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb
new file mode 100644
index 00000000..8a1cd598
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/index.html.erb
@@ -0,0 +1,27 @@
+<% # encoding: utf-8 %>
+
+<%= flash_messages %>
+
+<h1><%= t('writing_journal.list_writing_journal') %></h1>
+
+
+	<table>
+	  <tr>
+		<th><%= t(:year) %></th>
+		<th><%= t(:title) %></th>
+	  </tr>
+
+	<% @writing_journals.each do |post| %>
+	  <tr>
+		<td><%= post.year %></td>
+		<td>
+		<%= link_to post.create_link , panel_personal_journal_front_end_writing_journal_path(post) %>
+		</td>
+	  </tr>
+	  
+	<% end %>
+	
+	</table>
+
+
+<%= paginate @writing_journals, :params => {:inner => false}%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb
new file mode 100644
index 00000000..febe0be4
--- /dev/null
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/writing_journals/show.html.erb
@@ -0,0 +1,38 @@
+<% # encoding: utf-8 %>
+
+<table>
+<caption> <%= t("writing_journal") %> </caption>
+<tbody>
+<tr><th><%= t("writing_journal.year")%></th><td><%= @writing_journal.year %></td></tr>
+<tr><th><%= t("writing_journal.language")%></th><td><%= @writing_journal.language %></td></tr>
+<tr><th><%= t("writing_journal.paper_title")%></th><td><%= @writing_journal.paper_title %></td></tr>
+<tr><th><%= t("writing_journal.journal_title")%></th><td><%= @writing_journal.journal_title %></td></tr>
+<tr><th><%= t("writing_journal.journal_paper_type")%></th><td><%= @writing_journal.journal_paper_type.title if @writing_journal.journal_paper_type %></td></tr>
+<tr><th><%= t("writing_journal.journal_level_types")%></th><td><%= @journal_level_types %></td></tr>
+<tr><th><%= t("writing_journal.journal_author_types")%></th><td><%= @journal_author_types %></td></tr>
+<tr><th><%= t("writing_journal.isbn")%></th><td><%= @writing_journal.isbn %></td></tr>
+<tr><th><%= t("writing_journal.vol_no")%></th><td><%= @writing_journal.vol_no %></td></tr>
+<tr><th><%= t("writing_journal.issue_no")%></th><td><%= @writing_journal.issue_no %></td></tr>
+<tr><th><%= t("writing_journal.form_to")%></th><td><%= "#{@writing_journal.form_to_start} ~ #{@writing_journal.form_to_end}" %></td></tr>
+<tr><th><%= t("writing_journal.total_pages")%></th><td><%= @writing_journal.total_pages %></td></tr>
+<tr><th><%= t("writing_journal.abstract")%></th><td><%= @writing_journal.abstract %></td></tr>
+<tr><th><%= t("writing_journal.publication_date")%></th><td><%= @writing_journal.publication_date %></td></tr>
+<tr><th><%= t("writing_journal.url")%></th><td><%= link_to t(:url), @writing_journal.url, {:target => '_blank', :title => @writing_journal.journal_title} if !@writing_journal.url.blank? %></td></tr>
+<tr><th><%= t("writing_journal.note")%></th><td><%= @writing_journal.note %></td></tr>
+<tr><th><%= t("writing_journal.authors")%></th><td><%= "#{User.from_id(@writing_journal.create_user_id).name rescue ''},#{@writing_journal.authors rescue ''}"%></td></tr>
+<tr><th><%= t("writing_journal.files")%></th>
+<td>
+<% if @writing_journal.writing_journal_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @writing_journal.writing_journal_files.each do | wjfile | %>
+					<%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+					<% end %>
+			</div>
+		</div>
+	<% end %>
+</td>
+</tr>
+</tbody>
+</table>
diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb
new file mode 100644
index 00000000..f7349341
--- /dev/null
+++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/front_end/writing_patents_controller.rb
@@ -0,0 +1,29 @@
+class Panel::PersonalPatent::FrontEnd::WritingPatentsController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_patent'
+  end
+  
+
+  def index
+	
+	@writing_patents = WritingPatent.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /writing_patents/1
+  # GET /writing_patents/1.xml
+  def show
+  
+    @writing_patent = WritingPatent.find(params[:id])
+  
+  end
+  
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'personal_patent'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+  end
+  
+end
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb
index bc9a626c..30fa6a11 100644
--- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb
@@ -15,6 +15,7 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
+	<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_patent_back_end_writing_patent_setting_path, :class => 'btn btn-primary pull-right' %>
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path, :class => 'btn btn-primary pull-right' %>
 	<div id="writing_patent_pagination" class="paginationFixed">
 	<%= paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb
new file mode 100644
index 00000000..446d3d03
--- /dev/null
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/index.html.erb
@@ -0,0 +1,27 @@
+<% # encoding: utf-8 %>
+
+<%= flash_messages %>
+
+<h1><%= t('writing_patent.list_writing_patent') %></h1>
+
+
+	<table>
+	  <tr>
+		<th><%= t(:year) %></th>
+		<th><%= t(:title) %></th>
+	  </tr>
+
+	<% @writing_patents.each do |post| %>
+	  <tr>
+		<td><%= post.year %></td>
+		<td>
+		<%= link_to post.patent_title , panel_personal_patent_front_end_writing_patent_path(post) %>
+		</td>
+	  </tr>
+	  
+	<% end %>
+	
+	</table>
+
+
+<%= paginate @writing_patents, :params => {:inner => false}%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb
new file mode 100644
index 00000000..018ebed0
--- /dev/null
+++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/writing_patents/show.html.erb
@@ -0,0 +1,31 @@
+<% # encoding: utf-8 %>
+
+<table>
+<caption> <%= t("writing_patent") %> </caption>
+<tbody>
+<tr><th><%= t("writing_patent.year")%></th><td><%= @writing_patent.year %></td></tr>
+<tr><th><%= t("writing_patent.language")%></th><td><%= @writing_patent.language %></td></tr>
+<tr><th><%= t("writing_patent.patent_title")%></th><td><%= @writing_patent.patent_title %></td></tr>
+<tr><th><%= t("writing_patent.category")%></th><td><%= @writing_patent.writing_patent_category.title if @writing_patent.writing_patent_category %></td></tr>
+<tr><th><%= t("writing_patent.patent_no")%></th><td><%= @writing_patent.patent_no %></td></tr>
+<tr><th><%= t("writing_patent.patent_country")%></th><td><%= @writing_patent.patent_country %></td></tr>
+<tr><th><%= t("writing_patent.publish_date")%></th><td><%= @writing_patent.publish_date %></td></tr>
+<tr><th><%= t("writing_patent.url")%></th><td><%= link_to t(:url), @writing_patent.url, {:target => '_blank', :title => @writing_patent.patent_title} if !@writing_patent.url.blank? %></td></tr>
+<tr><th><%= t("writing_patent.note")%></th><td><%= @writing_patent.note %></td></tr>
+<tr><th><%= t("writing_patent.authors")%></th><td><%= "#{User.from_id(@writing_patent.create_user_id).name rescue ''},#{@writing_patent.authors rescue ''}"%></td></tr>
+<tr><th><%= t("writing_patent.files")%></th>
+<td>
+<% if @writing_patent.writing_patent_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @writing_patent.writing_patent_files.each do | wjfile | %>
+					<%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+					<% end %>
+			</div>
+		</div>
+	<% end %>
+</td>
+</tr>
+</tbody>
+</table>
diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb
new file mode 100644
index 00000000..285222d0
--- /dev/null
+++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/front_end/projects_controller.rb
@@ -0,0 +1,28 @@
+class Panel::PersonalProject::FrontEnd::ProjectsController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_project'
+  end
+  
+
+  def index
+	
+	@projects = Project.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /writing_journals/1
+  # GET /writing_journals/1.xml
+  def show
+    @project = Project.find(params[:id])
+  
+  end
+  
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'personal_project'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+  end
+  
+end
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb
new file mode 100644
index 00000000..52ca2b16
--- /dev/null
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/index.html.erb
@@ -0,0 +1,27 @@
+<% # encoding: utf-8 %>
+
+<%= flash_messages %>
+
+<h1><%= t('project.list_project') %></h1>
+
+
+	<table>
+	  <tr>
+		<th><%= t(:year) %></th>
+		<th><%= t(:title) %></th>
+	  </tr>
+
+	<% @projects.each do |post| %>
+	  <tr>
+		<td><%= post.year %></td>
+		<td>
+		<%= link_to post.project_title , panel_personal_project_front_end_project_path(post) %>
+		</td>
+	  </tr>
+	  
+	<% end %>
+	
+	</table>
+
+
+<%= paginate @projects, :params => {:inner => false}%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb
new file mode 100644
index 00000000..7a56673e
--- /dev/null
+++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/projects/show.html.erb
@@ -0,0 +1,34 @@
+<% # encoding: utf-8 %>
+
+<table>
+<caption> <%= t("project") %> </caption>
+<tbody>
+<tr><th><%= t("project.year")%></th><td><%= @project.year %></td></tr>
+<tr><th><%= t("project.language")%></th><td><%= @project.language %></td></tr>
+<tr><th><%= t("project.project_title")%></th><td><%= @project.project_title %></td></tr>
+<tr><th><%= t("project.job_title")%></th><td><%= @project.job_title %></td></tr>
+<tr><th><%= t("project.category")%></th><td><%= @project.project_category.title if @project.project_category %></td></tr>
+<tr><th><%= t("project.participator")%></th><td><%= @project.participator %></td></tr>
+<tr><th><%= t("project.unit")%></th><td><%= @project.unit %></td></tr>
+<tr><th><%= t("project.abstract")%></th><td><%= @project.abstract %></td></tr>
+<tr><th><%= t("project.period_start_date")%></th><td><%= @project.period_start_date %></td></tr>
+<tr><th><%= t("project.period_end_date")%></th><td><%= @project.period_end_date %></td></tr>
+<tr><th><%= t("project.url")%></th><td><%= link_to t(:url), @project.url, {:target => '_blank', :title => @project.title} if !@project.url.blank? %></td></tr>
+<tr><th><%= t("project.note")%></th><td><%= @project.note %></td></tr>
+<tr><th><%= t("project.authors")%></th><td><%= "#{User.from_id(@project.create_user_id).name rescue ''},#{@project.authors rescue ''}"%></td></tr>
+<tr><th><%= t("project.files")%></th>
+<td>
+<% if @project.project_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @project.project_files.each do | wjfile | %>
+					<%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+					<% end %>
+			</div>
+		</div>
+	<% end %>
+</td>
+</tr>
+</tbody>
+</table>
diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb
new file mode 100644
index 00000000..02e6b093
--- /dev/null
+++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/front_end/researchs_controller.rb
@@ -0,0 +1,27 @@
+class Panel::PersonalResearch::FrontEnd::ResearchsController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_research'
+  end
+  
+
+  def index
+	
+	@researchs = Research.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /researchs/1
+  # GET /researchs/1.xml
+  def show
+    @research = Research.find(params[:id])
+  end
+  
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'personal_journal'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+  end
+  
+end
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb
new file mode 100644
index 00000000..ed166461
--- /dev/null
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/index.html.erb
@@ -0,0 +1,27 @@
+<% # encoding: utf-8 %>
+
+<%= flash_messages %>
+
+<h1><%= t('research.list_research') %></h1>
+
+
+	<table>
+	  <tr>
+		<th><%= t(:year) %></th>
+		<th><%= t(:title) %></th>
+	  </tr>
+
+	<% @researchs.each do |post| %>
+	  <tr>
+		<td><%= post.year %></td>
+		<td>
+		<%= link_to post.research_title , panel_personal_research_front_end_research_path(post) %>
+		</td>
+	  </tr>
+	  
+	<% end %>
+	
+	</table>
+
+
+<%= paginate @researchs, :params => {:inner => false}%>
\ No newline at end of file
diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb
new file mode 100644
index 00000000..940c119d
--- /dev/null
+++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/researchs/show.html.erb
@@ -0,0 +1,29 @@
+<% # encoding: utf-8 %>
+
+<table>
+<caption> <%= t("research") %> </caption>
+<tbody>
+<tr><th><%= t("research.year")%></th><td><%= @research.year %></td></tr>
+<tr><th><%= t("research.language")%></th><td><%= @research.language %></td></tr>
+<tr><th><%= t("research.research_title")%></th><td><%= @research.research_title %></td></tr>
+<tr><th><%= t("research.extracted_chapters")%></th><td><%= @research.extracted_chapters %></td></tr>
+<tr><th><%= t("research.publish_date")%></th><td><%= @research.publish_date %></td></tr>
+<tr><th><%= t("research.url")%></th><td><%= link_to t(:url), @research.url, {:target => '_blank', :title => @research.journal_title} if !@research.url.blank? %></td></tr>
+<tr><th><%= t("research.note")%></th><td><%= @research.note %></td></tr>
+<tr><th><%= t("research.authors")%></th><td><%= "#{User.from_id(@research.create_user_id).name rescue ''},#{@research.authors rescue ''}"%></td></tr>
+<tr><th><%= t("research.files")%></th>
+<td>
+<% if @research.research_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @research.research_files.each do | wjfile | %>
+					<%= link_to wjfile.title, wjfile.file.url, {:target => '_blank', :title => wjfile.title} if wjfile.file.file %>
+					<% end %>
+			</div>
+		</div>
+	<% end %>
+</td>
+</tr>
+</tbody>
+</table>
diff --git a/vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/front_end/writing_seminars_controller.rb b/vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/front_end/writing_seminars_controller.rb
new file mode 100644
index 00000000..ba6daf70
--- /dev/null
+++ b/vendor/built_in_modules/personal_seminar/app/controllers/panel/personal_seminar/front_end/writing_seminars_controller.rb
@@ -0,0 +1,31 @@
+class Panel::PersonalSeminar::FrontEnd::WritingSeminarsController < OrbitWidgetController
+
+  def initialize
+    super
+    @app_title = 'personal_seminar'
+  end
+  
+
+  def index
+	
+	@writing_seminars = WritingSeminar.desc(:year).page(params[:page]).per(10)
+	
+  end
+
+  # GET /writing_seminars/1
+  # GET /writing_seminars/1.xml
+  def show
+    @writing_seminar = WritingSeminar.find(params[:id])
+	
+	@seminar_paper_types = ( !@writing_seminar.seminar_paper_types.blank? ? @writing_seminar.seminar_paper_types.collect{|x| x.title}.join(', ') : nil)
+	@seminar_author_types = ( !@writing_seminar.seminar_author_types.blank? ? @writing_seminar.seminar_author_types.collect{|x| x.title}.join(', ') : nil)
+  
+  end
+  
+  
+  def get_tags
+  	module_app = ModuleApp.first(:conditions => {:key => 'personal_seminar'})
+  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
+  end
+  
+end
diff --git a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/index.html.erb b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/index.html.erb
new file mode 100644
index 00000000..17c994d5
--- /dev/null
+++ b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/index.html.erb
@@ -0,0 +1,26 @@
+<% # encoding: utf-8 %>
+
+<%= flash_messages %>
+
+<h1><%= t('writing_seminar.list_writing_seminar') %></h1>
+
+
+	<table>
+	  <tr>
+		<th><%= t(:year) %></th>
+		<th><%= t(:title) %></th>
+	  </tr>
+
+	<% @writing_seminars.each do |post| %>
+	  <tr>
+		<td><%= post.year %></td>
+		<td>
+		<%= link_to post.create_link , panel_personal_seminar_front_end_writing_seminar_path(post) %>
+		</td>
+	  </tr>
+	  
+	<% end %>
+	
+	</table>
+
+<%= paginate @writing_seminars, :params => {:inner => false}%>
diff --git a/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/show.html.erb b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/show.html.erb
new file mode 100644
index 00000000..2bcf9b23
--- /dev/null
+++ b/vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/front_end/writing_seminars/show.html.erb
@@ -0,0 +1,36 @@
+<% # encoding: utf-8 %>
+
+<table>
+<caption> <%= t("writing_seminar") %> </caption>
+<tbody>
+<tr><th><%= t("writing_seminar.year")%></th><td><%= @writing_seminar.year %></td></tr>
+<tr><th><%= t("writing_seminar.language")%></th><td><%= @writing_seminar.language %></td></tr>
+<tr><th><%= t("writing_seminar.paper_title")%></th><td><%= @writing_seminar.paper_title %></td></tr>
+<tr><th><%= t("writing_seminar.seminar_title")%></th><td><%= @writing_seminar.seminar_title %></td></tr>
+<tr><th><%= t("writing_seminar.seminar_paper_types")%></th><td><%= @seminar_paper_types %></td></tr>
+<tr><th><%= t("writing_seminar.seminar_author_types")%></th><td><%= @seminar_author_types %></td></tr>
+<tr><th><%= t("writing_seminar.location")%></th><td><%= @writing_seminar.location %></td></tr>
+<tr><th><%= t("writing_seminar.sponsor")%></th><td><%= @writing_seminar.sponsor %></td></tr>
+<tr><th><%= t("writing_seminar.period_start_date")%></th><td><%= @writing_seminar.period_start_date %></td></tr>
+<tr><th><%= t("writing_seminar.period_end_date")%></th><td><%= @writing_seminar.period_end_date %></td></tr>
+<tr><th><%= t("writing_seminar.abstract")%></th><td><%= @writing_seminar.abstract %></td></tr>
+<tr><th><%= t("writing_seminar.publication_date")%></th><td><%= @writing_seminar.publication_date %></td></tr>
+<tr><th><%= t("writing_seminar.url")%></th><td><%= link_to t(:url), @writing_seminar.url, {:target => '_blank', :title => @writing_seminar.seminar_title} if !@writing_seminar.url.blank? %></td></tr>
+<tr><th><%= t("writing_seminar.note")%></th><td><%= @writing_seminar.note %></td></tr>
+<tr><th><%= t("writing_seminar.authors")%></th><td><%= "#{User.from_id(@writing_seminar.create_user_id).name rescue ''},#{@writing_seminar.authors rescue ''}"%></td></tr>
+<tr><th><%= t("writing_seminar.files")%></th>
+<td>
+<% if @writing_seminar.writing_seminar_files.size > 0 %>
+		<div>
+			<i class="icons-paperclip"></i>
+			<div class="showFile">
+					<% @writing_seminar.writing_seminar_files.each do | wsfile | %>
+					<%= link_to wsfile.title, wsfile.file.url, {:target => '_blank', :title => wsfile.title} if wsfile.file.file %>
+					<% end %>
+			</div>
+		</div>
+	<% end %>
+</td>
+</tr>
+</tbody>
+</table>