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

app/helpers/admin/items_helper.rb

@@ -12,13 +12,13 @@ module Admin::ItemsHelper
       end
       ret << "<li id='#{node.id}' class='#{no_nested}'>"
       # ret << "<i class='icons-moves'></i>"
-      ret << "<div class='with_action'><i class='icons-moves'></i>"
+      ret << "<div class='with_action'><i class='icons-cplus'></i>"
       ret << (link_to node.title, dest, :class => 'js_history')
       ret << "<div class='quick-edit hide'>"
       ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')
       ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page')
       ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page')
-      ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
+      ret << (link_to t(:delete_), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history')
       ret << "</div>"
       ret << "</div>"
       ret << render_children(node)

app/helpers/application_helper.rb

@@ -44,13 +44,6 @@ module ApplicationHelper
     User.find(session[:guest_user_id].nil? ? session[:guest_user_id] = create_guest_user.id : session[:guest_user_id])
   end
 
-
-
-
-  def colorize_in_use_locale(locale)
-    @site_in_use_locales.include?(locale)? 'green' : 'red'
-  end
-  
   def flash_messages
     return unless messages = flash.keys.select{|k| FLASH_NOTICE_KEYS.include?(k)}
     formatted_messages = messages.map do |type|      
@@ -183,6 +176,7 @@ module ApplicationHelper
     unless edit 
       stylesheets << "<link href='/assets/bootstrap-orbit.css' rel='stylesheet' type='text/css' />\n"
       stylesheets << "<link href='/assets/style.css' rel='stylesheet' type='text/css' />\n"
+      stylesheets << "<link href='/assets/icons.css' rel='stylesheet' type='text/css' />\n"
     end
     stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
     stylesheets << "<link href='/assets/bootstrap.css' rel='stylesheet' type='text/css' />\n"

app/helpers/attribute_fields_helper.rb

@@ -228,7 +228,7 @@ protected
     temp_field_name =  get_basic_field_name_base + '[temp]'
     add_more = content_tag :div,:class=> 'controls' do
       content_tag :span,:class=> 'help-block' do
-        content = link_to (content_tag :i,I18n.t("admin.infos.add"),:class=>"icon-plus-sign"),"#",:class=>'addinput'
+        content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus-sign"),"#",:class=>'addinput'
         content << hidden_field_tag("#{temp_field_name}[count]",@attribute_value.add_more_counter ,:class=>"list_count")
         content << hidden_field_tag("#{temp_field_name}[count]",get_basic_field_name_base,:class=>"field_name")
         content

app/helpers/attribute_values_helper.rb

@@ -33,7 +33,7 @@ module AttributeValuesHelper
     end
     year_str = ""
       unless date.year == 1912
-        m_year = (date.year - 1912).abs.to_s + I18n.t("admin.infos.date.minguo_calendar.year")
+        m_year = (date.year - 1912).abs.to_s + I18n.t("date.minguo_calendar.year")
         year_str = minguo_format_year(m_year)
       end
       get_minguo_year + minguo_m_y_d_time
@@ -42,15 +42,15 @@ module AttributeValuesHelper
   def get_minguo_year
     date = get_date
     m_year = (date.year - 1911).abs
-    year_end = I18n.t("admin.infos.date.minguo_calendar.year")
+    year_end = I18n.t("date.minguo_calendar.year")
       case 
         when date.year <1912
-          I18n.t("admin.infos.date.minguo_calendar.before") + (m_year+1).to_s + year_end
+          I18n.t("date.minguo_calendar.before") + (m_year+1).to_s + year_end
         when  date.year ==1912
-          I18n.t("admin.infos.date.minguo_calendar.first_year") 
+          I18n.t("date.minguo_calendar.first_year") 
         when date.year >1912
-          I18n.t("admin.infos.date.minguo_calendar.after")+ (m_year).to_s + year_end
-    end # of case tw_claendar year
+          I18n.t("date.minguo_calendar.after")+ (m_year).to_s + year_end
+    end # of case tw_calendar year
   end
 
   def minguo_m_y_d_time
@@ -61,7 +61,7 @@ module AttributeValuesHelper
         when 'format2' #  Y/M/D
           date.strftime(" %m/%d")
         when 'format3' #  Y/M
-          date.strftime(" %m#{I18n.t("admin.infos.date.minguo_calendar.month")}")
+          date.strftime(" %m#{I18n.t("date.minguo_calendar.month")}")
         when 'format4' #  Y
           ''
       end # of  case 
@@ -71,11 +71,11 @@ module AttributeValuesHelper
     case I18n.locale
     when :zh_tw
       case 
-        when self.attribute_field["typeC"]["claendar"] == "west_claendar"
+        when self.attribute_field["typeC"]["calendar"] == "west_calendar"
           show_west_calender(from_to)
-        when self.attribute_field["typeC"]["claendar"] == "tw_claendar"
+        when self.attribute_field["typeC"]["calendar"] == "tw_calendar"
           show_minguo_calendar(from_to)
-      end #case self.attribute_field["typeC"]["claendar"]
+      end #case self.attribute_field["typeC"]["calendar"]
     when :en
       show_west_calender(from_to)
     end

app/helpers/desktop/co_author_relations_helper.rb

@@ -0,0 +1,2 @@
+module Desktop::CoAuthorRelationsHelper
+end

app/helpers/desktop/journal_lists_helper.rb

@@ -0,0 +1,2 @@
+module Desktop::JournalListsHelper
+end