Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config

Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

@@ -27,7 +27,15 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
     categorys.each do |c|
       data << {
         category: c.title,
-        link: "http://#{request.host_with_port}#{panel_announcement_back_end_bulletin_category_get_bulletins_json_path(c)}"
+        # this is a json format
+        # link: "http://#{request.host_with_port}#{panel_announcement_back_end_bulletin_category_get_bulletins_json_path(c)}"
+        # remember to uncommand a rule in route.rb, too
+        link: "#{url_for( :action => "index",
+                          :controller => "panel/announcement/front_end/bulletins",
+                          :format => :rss,
+                          :only_path => false,
+                          :inner=>true,
+                          :category_id => c )}"
       }
     end
 

vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -1,10 +1,10 @@
 class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
-  
+
   def initialize
     super
     @app_title = 'announcement'
   end
-  
+
   # GET /bulletins
   # GET /bulletins.xml
   def index_bulletins_by_unit
@@ -14,14 +14,15 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def index
-    @item = Page.find(params[:page_id])
-  
-  	if @item.frontend_data_count
-  		@page_num = @item.frontend_data_count
-  	else
-  		@page_num = 15
-  	end
-    @frontend_style = @item.frontend_style
+    @item = Page.find(params[:page_id]) rescue nil
+    if @item
+      if @item.frontend_data_count
+        @page_num = @item.frontend_data_count
+      else
+        @page_num = 15
+      end
+      @frontend_style = @item.frontend_style
+    end
 
     @page = Page.find(params[:page_id]) rescue nil
     if  !params[:search_query].blank?
@@ -54,9 +55,9 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
       end
       impressionist(@tag) if @tag
     end
-	  
+
   end
-  
+
   def show
     @page = Page.find(params[:page_id]) rescue nil
     if params[:preview] == "true"
@@ -71,22 +72,22 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
           render :text => "<div class='alert alert-error'>#{t('sys.can_not_display_due_to_no_context')}</div>".html_safe 
         end
       else
-         render :nothing => true, :status => 403
+        render :nothing => true, :status => 403
       end
     end
 
   end
-  
+
   def preview_content
     @bulletin = Bulletin.find params[:id] rescue nil
     @bulletin = Preview.find(params[:id]).get_virtual_object if @bulletin.nil?
     get_categorys
   end
-  
+
   protected
-  
+
   def get_categorys
     @bulletin_categorys = BulletinCategory.all
   end
-  
+
 end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_approve.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in banner-preview" id="bulletin-<%=bulletin.id%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("modal.preview") %></h3>
+    <h3><%= t(:preview) %></h3>
   </div>
   <div class="modal-body">
     <p class="bulletin_slideshow">
@@ -19,7 +19,7 @@
   <div class="modal-footer">
 		
 		<%= form_for bulletin, :url => panel_announcement_back_end_bulletin_approve_path(bulletin),:method => :post, :html => {:class => 'clear'} do |f| %>
-		<%= f.label :approval_stat, t('approval_stat') %>
+		<%= f.label :approval_stat, t('approval.stat') %>
 			<%= content_tag :label,:class => "radio inline" do -%>
 				<%= f.radio_button :is_checked, true , {:class => 'privacy'} %> 
 				<%= t('approval.pass') %>
@@ -34,7 +34,7 @@
 			<%= f.submit t(:submit_approval),:class=>"btn"%>
 		<% end %>
 
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
   	<script type="text/javascript" src="/static/kernel.js"></script>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/_modal_list.html.erb

@@ -22,7 +22,7 @@
 		<divl>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
   	<script type="text/javascript" src="/static/kernel.js"></script>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb

@@ -22,7 +22,7 @@
 		<divl>
   </div>
   <div class="modal-footer">
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
   	<script type="text/javascript" src="/static/kernel.js"></script>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb

@@ -18,11 +18,4 @@
 		  <% end %>
 		<% end %>
 	</div>
-	
-	<div id="widget-title">
-		<%= f.label :display %>
-		<%= f.radio_button :display, "List" %>List
-		<%= f.radio_button :display, "Picture" %>Picture
-		<br />顯示方式是設定在前台頁面時，資訊所呈現的樣式
-	</div>
 </div>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb

@@ -50,7 +50,7 @@
 
 				<% end -%>
 				<% if show_delete_link(bulletin) %>
-					<li class="dropdown"><%= link_to t(:delete), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
+					<li class="dropdown"><%= link_to t(:delete_), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
 				<% end %>
 				<% if show_approval_link(bulletin) %>
 					<li><%= link_to t(:approval_), panel_announcement_back_end_bulletin_approval_preview_path(bulletin),:class => 'preview_trigger' %></li><%#= #TODO add ancher so user can quick access into that part %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb

@@ -4,7 +4,7 @@
         
             <div class="modal-header">
                 <a class="close" data-dismiss="modal">×</a>
-                <h3><%= (@bulletin_file.new_record? ? 'Add File' : 'Edit File') %></h3>
+                <h3><%= (@bulletin_file.new_record? ? t(:add) : t(:edit)) %></h3>
             </div>
             <div class="modal-body form-horizontal">
 				<div class="control-group">
@@ -16,7 +16,7 @@
 				<%= f.fields_for :title_translations do |f| %>
 				  <% @site_valid_locales.each do |locale| %>
 					<div class="control-group">
-						<label for="file-<%= locale %>" class="control-label">Name <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<label for="file-<%= locale %>" class="control-label"><%= t(:name) %> <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
 						<div class="controls">
 						<%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge", :value => (@bulletin_file.title_translations[locale] rescue nil)  %>
 						</div>
@@ -27,7 +27,7 @@
 				<%= f.fields_for :description_translations do |f| %>
 				  <% @site_valid_locales.each do |locale| %>
 					<div class="control-group">
-						<label for="file-<%= locale %>" class="control-label">Description <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
+						<label for="file-<%= locale %>" class="control-label"><%= t(:description) %> <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
 						<div class="controls">
 						<%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge", :value => (@bulletin_file.description_translations[locale] rescue nil) %>
 						</div>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb

@@ -4,11 +4,11 @@
     
 	<div class="modal-header">
 	  <a class="close" data-dismiss="modal">×</a>
-	  <h3><%= (@bulletin_link.new_record? ? 'Add Link' : 'Edit Link') %></h3>
+	  <h3><%= (@bulletin_link.new_record? ? t(:add) : t(:edit)) %></h3>
 	</div>
 	<div class="modal-body form-horizontal">
 	  <div class="control-group">
-	    <label for="http" class="control-label">URL</label>
+	    <label for="http" class="control-label"><%= t(:url) %></label>
 	    <div class="controls">
 			<%= f.text_field :url %>
 	  </div>
@@ -17,7 +17,7 @@
 	<%= f.fields_for :title_translations do |f| %>
 		<% @site_valid_locales.each do |locale| %>
 			<div class="control-group">
-				<%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+				<%= label_tag "link-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 				<div class="controls">
 					<%#= f.text_field locale, :class => 'input-xxlarge' %>
 					<%= f.text_field locale, :class => 'control-label', :value => (@bulletin_link.title_translations[locale] rescue nil) %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb

@@ -18,13 +18,13 @@
 
 			<span class="action">
 			<% if bulletin_file.new_record? %>
-			  <a href="#" class="delete"><%= t(:delete) %></a>
+			  <a href="#" class="delete"><%= t(:delete_) %></a>
 			<% else %>	
 			  <%= f.hidden_field :id %>
 				<% if bulletin_file.is_built_in? %>
 					<a href="#" class="switch" id="<%= bulletin_file.id %>"></a>
 				<% else %>
-					<a href="#" class="remove_existing_record"><%= t(:delete) %></a>
+					<a href="#" class="remove_existing_record"><%= t(:delete_) %></a>
 					<%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
 				<% end %>
 			<% end %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -11,7 +11,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Upload pictures" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-picture icons-white"></i><%= t('nccu.picture') %></h3>
+			<h3 class="widget-title"><i class="icons-pictures"></i><%= t('nccu.picture') %></h3>
 			<div class="widget-content clear">
 				<div class="control-group">
            <!-- <img class="pull-left upload-picture" src="/assets/default-img.png" /> -->
@@ -32,7 +32,7 @@
 					<br> -->
 					<% if @bulletin.image.file %>
 					  <%= f.check_box :remove_image %>
-					  <%= t(:delete_file) %>
+					  <%= t('delete.file') %>
 					<% end %>
 					</div>
 				</div>
@@ -43,7 +43,7 @@
 			<div class="widget-action clear">
 				<a href="#" class="action"><i title="Set the announcement to start and end dates" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-calendar icons-white"></i><%= t('nccu.date') %></h3>
+			<h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date) %></h3>
 				<div class="widget-content clear">
 				<div class="control-group">
 					<label class="control-label"><%= t(:start) %></label>
@@ -65,7 +65,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-star-thin icons-white"></i><%= t(:status) %></h3>
+			<h3 class="widget-title"><i class="icons-star-thin"></i><%= t(:status) %></h3>
 			<div class="widget-content clear">
 				<div class="controls">
 				<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -89,7 +89,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Rejected Report" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= t('approval.stat') %></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= t('approval.stat') %></h3>
 				<div class="widget-content clear form-horizontal">
 					<%= @bulletin.not_checked_reason rescue t("rejected_reason_empty") %>
 				</div>
@@ -99,7 +99,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= t('nccu.tags') %></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= t('nccu.tags') %></h3>
 				<div class="widget-content clear form-horizontal">
 					<p>
 						<% @tags.each do |tag| %>
@@ -186,7 +186,7 @@
 					<div class="widget-action clear">
 						<a class="action"><i title="Add a reference link" class="icon-exclamation-sign icon-white tip"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-link icons-white"></i><%= t(:link) %></h3>
+					<h3 class="widget-title"><i class="icons-link"></i><%= t(:link) %></h3>
 					<div class="widget-content">
 					
 					<div id='bulletin_links' class="bulletin_links_block">
@@ -230,7 +230,7 @@
 					<div class="widget-action clear">
 						<a class="action"><i title="Added to the file" class="icon-exclamation-sign icon-white tip"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-paperclip icons-white"></i><%= t('nccu.file') %></h3>
+					<h3 class="widget-title"><i class="icons-paperclip"></i><%= t('nccu.file') %></h3>
 					<div class="widget-content">
 						
 					<div id='bulletin_files' class="bulletin_files_block">

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_modal_preview.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in banner-preview" id="bulletin-<%=bulletin.id%>" style="width:1024px;height:500px;margin-left:-512px">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("modal.preview") %></h3>
+    <h3><%= t(:preview) %></h3>
   </div>
   <div class="modal-body">
     <p class="bulletin_slideshow">
@@ -20,7 +20,7 @@
   <div class="modal-footer">
     
   
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
     <script type="text/javascript" src="/static/kernel.js"></script>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb

@@ -16,7 +16,7 @@
 				    <br>
 				    <% if bulletin.image.file %>
 					   <%= f.check_box :remove_image %>
-					   <%= t(:delete_file) %>
+					   <%= t('delete.file') %>
 				    <% end %>
                 </div>
             </div>

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder

@@ -1,13 +1,13 @@
 xml.instruct! :xml, :version => "1.0" 
 xml.rss :version => "2.0" do
   xml.channel do
-  	if @current_category
-			xml.title @current_category.title_translations[I18n.locale.to_s]
-		else
-			xml.title t('announcement.announcement')
-		end
+    if @current_category
+      xml.title @current_category.title_translations[I18n.locale.to_s]
+    else
+      xml.title t('announcement.announcement')
+    end
     xml.link url_for(:action=>"index", :controller=>"panel/announcement/front_end/bulletins",:format=> :rss,:only_path=>false,:inner=>true)
-    
+
     for bulletin in @bulletins
       xml.item do
         xml.title bulletin.title_translations[I18n.locale.to_s]
@@ -18,4 +18,4 @@ xml.rss :version => "2.0" do
       end
     end
   end
-end
+end

vendor/built_in_modules/announcement/config/routes.rb

@@ -6,7 +6,7 @@ Rails.application.routes.draw do
         match 'approval_setting' => "approvals#setting" ,:as => :approval_setting,:via => :get
         match 'approval_setting' => "approvals#update_setting" ,:as => :approval_setting,:via => :post
         match 'approval_setting' => "approvals#user_list" ,:as => :approval_user_list,:via => :put
-        #match 'get_bulletins_json' => "bulletins#get_bulletins_json" ,:as => :bulletins_json_list,:via => :get
+
         resources :bulletins do
           match "approve/:bulletin_id"  => "approvals#preview_and_approve",:as => :approval_preview,:via => :put
           match "approve/:bulletin_id"  => "approvals#approve",:as => :approve,:via => :post
@@ -29,7 +29,9 @@ Rails.application.routes.draw do
           collection do
             get 'get_categorys_json'
           end
-          match "get_bulletins_json/" => "bulletin_categorys#get_bulletins_json", :as => :get_bulletins_json
+          # if want to use json
+          # please uncommand below line 
+          # match "get_bulletins_json/" => "bulletin_categorys#get_bulletins_json", :as => :get_bulletins_json
         end
 
         resources :bulletin_links, :controller => 'bulletin_links' do

vendor/built_in_modules/announcement/init.rb

@@ -77,4 +77,4 @@ module Announcement
                             :available_for => [:manager]
     end
   end
-end
+end

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-star-thin icons-white"></i>Status</h3>
+			<h3 class="widget-title"><i class="icons-star-thin"></i>Status</h3>
 			<div class="widget-content clear">
 				<div class="controls">
 					<%= f.check_box :is_top %><%= t('top') %>
@@ -24,7 +24,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 				<%= check_box_tag 'archive_file[tag_ids][]', tag.id, @archive_file.tag_ids.include?(tag.id)%>

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb

@@ -4,7 +4,7 @@
     <div id="imgholder">
 <ul class="breadcrumb">
 	<li><span>Home</span><span class="divider">/</span></li>
-	<li><span><%= t('admin.orbit_gallery') %></span><span class="divider">/</span></li>
+	<li><span><%= t(:gallery) %></span><span class="divider">/</span></li>
 	<li class="text-blue"><%= t('gallery.edit') %></li>
 </ul>
 <ul class="nav nav-tabs">

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/edit_album.html.erb

@@ -1,6 +1,6 @@
 <ul class="breadcrumb">
 	<li><span>Home</span><span class="divider">/</span></li>
-	<li><span><%= t('admin.orbit_gallery') %></span><span class="divider">/</span></li>
+	<li><span><%= t(:gallery) %></span><span class="divider">/</span></li>
 	<li class="text-blue"><%= t('gallery.edit') %></li>
 </ul>
 <ul class="nav nav-tabs">

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_modal_preview.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in banner-preview" id="page_context-<%=page_context.id%>" style="width:1024px;height:500px;margin-left:-512px">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("modal.preview") %></h3>
+    <h3><%= t(:preview) %></h3>
   </div>
   <div class="modal-body">
     <p class="page_context_slideshow">
@@ -20,7 +20,7 @@
   <div class="modal-footer">
     
   
-    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+    <a href="#" class="btn" data-dismiss="modal"><%= t(:close) %></a>
   </div>
   <div>
     <script type="text/javascript" src="/static/kernel.js"></script>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :author_type ,t("personal_book.author_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :author_type ,t("personal_book.author_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @author_types.each do |author_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -27,7 +27,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_book.writing_book_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_book_back_end_writing_book_path(writing_book) %></li>
-			<li><%= link_to t('delete'), panel_personal_book_back_end_writing_book_path(writing_book), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_book_back_end_writing_book_path(writing_book), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :author_type ,t("personal_book.author_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :author_type ,t("personal_book.author_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @author_types.each do |author_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -27,7 +27,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_writing_book.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_book.writing_book_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_book_plugin_writing_book_path(writing_book) %></li>
-			<li><%= link_to t('delete'), panel_personal_book_plugin_writing_book_path(writing_book), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_book_plugin_writing_book_path(writing_book), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_book/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || diploma.diploma_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_diploma_back_end_diploma_path(diploma) %></li>
-			<li><%= link_to t('delete'), panel_personal_diploma_back_end_diploma_path(diploma), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_diploma_back_end_diploma_path(diploma), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_diploma.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || diploma.diploma_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_diploma_plugin_diploma_path(diploma) %></li>
-			<li><%= link_to t('delete'), panel_personal_diploma_plugin_diploma_path(diploma), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_diploma_plugin_diploma_path(diploma), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_diploma/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || experience.experience_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_experience_back_end_experience_path(experience) %></li>
-			<li><%= link_to t('delete'), panel_personal_experience_back_end_experience_path(experience), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_experience_back_end_experience_path(experience), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_experience.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || experience.experience_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_experience_plugin_experience_path(experience) %></li>
-			<li><%= link_to t('delete'), panel_personal_experience_plugin_experience_path(experience), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_experience_plugin_experience_path(experience), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_experience/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || honor.honor_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_honor_back_end_honor_path(honor) %></li>
-			<li><%= link_to t('delete'), panel_personal_honor_back_end_honor_path(honor), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_honor_back_end_honor_path(honor), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/honors/_honor.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || honor.honor_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_honor_plugin_honor_path(honor) %></li>
-			<li><%= link_to t('delete'), panel_personal_honor_plugin_honor_path(honor), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_honor_plugin_honor_path(honor), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_honor/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

@@ -35,9 +35,26 @@ class WritingJournal
   accepts_nested_attributes_for :writing_journal_files, :allow_destroy => true
   after_save :save_writing_journal_files
   before_validation :add_http
+  before_save :save_co_author
   validates :paper_title, :at_least_one => true
   validates :url, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix, :unless => Proc.new{self.url.blank?}
 
+  def save_co_author
+    authors_list = authors.split(",").map{|n| n.strip.gsub(/\s+/," ")}.reject{|n| n.empty? }
+    if new_record?
+      current_user = create_user_id
+    else
+      current_user = update_user_id
+    end
+
+    authors_db = CoAuthor.where(:name_id => current_user).map(&:co_author)
+    authors_list.delete(User.find(current_user).name)
+    authors_list = authors_list.delete_if{|author| authors_db.include?author}
+    authors_list.each do |author|
+      CoAuthor.new(:co_author => author, :name_id => current_user).save
+    end
+  end
+
   def self.search( category_id = nil )
     if category_id.to_s.size > 0
       find(:all, :conditions => {writing_journal_category_id: category_id}).desc( :is_top, :title )

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i class="icon-cog icon-white tip" data-original-title="Setting"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icon-book icons-white"></i><%= f.label :abstract, t("personal_journal.abstract") %></h3>
+			<h3 class="widget-title"><i class="icon-book"></i><%= f.label :abstract, t("personal_journal.abstract") %></h3>
 			<div class="widget-content clear form-horizontal">
 				<%= f.text_area :abstract, :size => "60x3" %>
 			</div>
@@ -20,7 +20,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i class="icon-cog icon-white tip" data-original-title="Setting"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icon-book icons-white"></i><%= f.label :abstract, t("personal_journal.note") %></h3>
+			<h3 class="widget-title"><i class="icon-book"></i><%= f.label :abstract, t("personal_journal.note") %></h3>
 			<div class="widget-content clear form-horizontal">
 				<%= f.text_area :note, :size => "60x3" %>
 			</div>
@@ -31,7 +31,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_writing_journal.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_journal.writing_journal_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_journal_back_end_writing_journal_path(writing_journal) %></li>
-			<li><%= link_to t('delete'), panel_personal_journal_back_end_writing_journal_path(writing_journal), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_journal_back_end_writing_journal_path(writing_journal), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :level_type ,t("personal_journal.level_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :level_type ,t("personal_journal.level_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @level_types.each do |level_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -26,7 +26,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :author_type ,t("personal_journal.author_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :author_type ,t("personal_journal.author_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @author_types.each do |author_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -43,7 +43,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/writing_journals/_writing_journal.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_journal.writing_journal_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_journal_plugin_writing_journal_path(writing_journal) %></li>
-			<li><%= link_to t('delete'), panel_personal_journal_plugin_writing_journal_path(writing_journal), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_journal_plugin_writing_journal_path(writing_journal), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_journal/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_lab.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || lab.lab_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_lab_back_end_lab_path(lab) %></li>
-			<li><%= link_to t('delete'), panel_personal_lab_back_end_lab_path(lab), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_lab_back_end_lab_path(lab), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/labs/_lab.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || lab.lab_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_lab_plugin_lab_path(lab) %></li>
-			<li><%= link_to t('delete'), panel_personal_lab_plugin_lab_path(lab), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_lab_plugin_lab_path(lab), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_lab/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_patent.writing_patent_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_patent_back_end_writing_patent_path(writing_patent) %></li>
-			<li><%= link_to t('delete'), panel_personal_patent_back_end_writing_patent_path(writing_patent), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_patent_back_end_writing_patent_path(writing_patent), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_patent.writing_patent_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_patent_plugin_writing_patent_path(writing_patent) %></li>
-			<li><%= link_to t('delete'), panel_personal_patent_plugin_writing_patent_path(writing_patent), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_patent_plugin_writing_patent_path(writing_patent), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_patent/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || project.project_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_project_back_end_project_path(project) %></li>
-			<li><%= link_to t('delete'), panel_personal_project_back_end_project_path(project), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_project_back_end_project_path(project), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/projects/_project.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || project.project_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_project_plugin_project_path(project) %></li>
-			<li><%= link_to t('delete'), panel_personal_project_plugin_project_path(project), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_project_plugin_project_path(project), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_project/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_research.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || research.research_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_research_back_end_research_path(research) %></li>
-			<li><%= link_to t('delete'), panel_personal_research_back_end_research_path(research), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_research_back_end_research_path(research), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/researchs/_research.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || research.research_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_research_plugin_research_path(research) %></li>
-			<li><%= link_to t('delete'), panel_personal_research_plugin_research_path(research), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_research_plugin_research_path(research), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_research/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :paper_type ,t("personal_seminar.paper_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :paper_type ,t("personal_seminar.paper_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @paper_types.each do |paper_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -26,7 +26,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :author_type ,t("personal_seminar.author_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :author_type ,t("personal_seminar.author_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @author_types.each do |author_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -43,7 +43,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/back_end/writing_seminars/_writing_seminar.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_seminar.writing_seminar_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_seminar_back_end_writing_seminar_path(writing_seminar) %></li>
-			<li><%= link_to t('delete'), panel_personal_seminar_back_end_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_seminar_back_end_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_form.html.erb

@@ -10,7 +10,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :paper_type ,t("personal_seminar.paper_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :paper_type ,t("personal_seminar.paper_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @paper_types.each do |paper_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -26,7 +26,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= f.label :author_type ,t("personal_seminar.author_type")%></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= f.label :author_type ,t("personal_seminar.author_type")%></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @author_types.each do |author_type| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -43,7 +43,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i>Tags</h3>
+			<h3 class="widget-title"><i class="icons-tag"></i>Tags</h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/personal_seminar/app/views/panel/personal_seminar/plugin/writing_seminars/_writing_seminar.html.erb

@@ -11,7 +11,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || writing_seminar.writing_seminar_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_personal_seminar_plugin_writing_seminar_path(writing_seminar) %></li>
-			<li><%= link_to t('delete'), panel_personal_seminar_plugin_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_personal_seminar_plugin_writing_seminar_path(writing_seminar), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>

vendor/built_in_modules/personal_seminar/init.rb

@@ -16,7 +16,7 @@ end
 #             :active_for_controllers=> ['news_bulletins', '/panel/news/back_end/tags', 'news_bulletin_categorys', 'news_approvals'],
 #             :active_for_ob_auths_object => ['NewsBulletinCategory'],
 #             :head_link => panel_news_back_end_news_bulletins_path  ,
-#             :head_label=> I18n.t('admin.news')
+#             :head_label=> I18n.t(:news)
 
 #   context_link :link=>new_panel_news_back_end_news_bulletin_path ,
 #                       :priority=>1,:label=>I18n.t('announcement.add_new'),

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb

@@ -11,7 +11,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting the announcement state" class="icon-exclamation-sign icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-star-thin icons-white"></i><%= t(:status) %></h3>
+			<h3 class="widget-title"><i class="icons-star-thin"></i><%= t(:status) %></h3>
 			<div class="widget-content clear">
 				<div class="controls">
 					<%= content_tag :label,:class => "checkbox inline" do -%>
@@ -34,7 +34,7 @@
 			<div class="widget-action clear">
 				<a class="action"><i title="Setting" class="icon-cog icon-white tip"></i></a>
 			</div>
-			<h3 class="widget-title"><i class="icons-tag icons-white"></i><%= t('nccu.tags') %></h3>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= t('nccu.tags') %></h3>
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_web_link.html.erb

@@ -26,7 +26,7 @@
 		<ul class="nav nav-pills hide">
 			<%if at_least_module_manager || web_link.web_link_category.cur_user_is_sub_manager_of(:edit)%>
 			<li><%= link_to t('edit'), edit_panel_web_resource_back_end_web_link_path(web_link) %></li>
-			<li><%= link_to t('delete'), panel_web_resource_back_end_web_link_path(web_link), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
+			<li><%= link_to t(:delete_), panel_web_resource_back_end_web_link_path(web_link), :confirm => t('sure?'), :method => :delete, :remote => true %></li>
 			<% end -%>
 		</ul>
 	</div>