From 4c8701c63fe579cce72219db052839322a99e8ad Mon Sep 17 00:00:00 2001
From: Manson Wang <manson@rulingcom.com>
Date: Mon, 10 Feb 2014 18:36:25 +0800
Subject: [PATCH] ntu_mb

---
 app/models/writing_journal.rb                             | 2 ++
 app/views/panel/personal_journal/plugin/_profile.html.erb | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/writing_journal.rb b/app/models/writing_journal.rb
index 415198b..15cfde7 100644
--- a/app/models/writing_journal.rb
+++ b/app/models/writing_journal.rb
@@ -97,6 +97,8 @@ class WritingJournal
     if !self.publication_date.nil?
       pd = self.publication_date.strftime("%Y-%m-%d").split('-')
       title << pd[0]
+    elsif !self.year.blank?
+      title << self.year
     end
     title << self.paper_title if self.paper_title.present?
     title << self.journal_title if self.journal_title.present?
diff --git a/app/views/panel/personal_journal/plugin/_profile.html.erb b/app/views/panel/personal_journal/plugin/_profile.html.erb
index 9fa216d..25f1ee3 100644
--- a/app/views/panel/personal_journal/plugin/_profile.html.erb
+++ b/app/views/panel/personal_journal/plugin/_profile.html.erb
@@ -77,17 +77,16 @@
   </tbody>
 </table>
 
-<% if is_admin? %>
 <div class="bottomnav clearfix">
 	<div class="action pull-right">
-    <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_journal_back_end_personal_journal_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
-		<%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.sync_data'), admin_import_data_sync_journal_paper_data_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_journal_back_end_personal_journal_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %>
+        <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
 	</div>
 	<div class="pagination pagination-centered">
 		<%= paginate @writing_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
 	</div>
 </div>
-<% end %>
 
 <div id="dialog" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="Delete item" aria-hidden="true">
   <div class="modal-header">