Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml

app/views/admin/ad_banners/_ad_banner_tab.html.erb

@@ -2,26 +2,26 @@
 <% if at_least_module_manager || sub_manager?(ad_banner_tab)%>
 	<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
 		<div class="adbanner-setup well">
-			<!--<p><%#= t("admin.ad.banner_best_size") %>：</p>-->
-			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+			<!--<p><%#= t("ad.banner_best_size") %>：</p>-->
+			<%= f.label :ad_fx, t('ad.ab_fx') %>
 			<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
-			<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
-			<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+			<%= f.label :transition_sec, t('ad.transition_sec') %>
+			<%= f.text_field :transition_sec,:placeholder=>t('ad.sec_place_holder'),:class=> "span3" %> <%= t("ad.trans_unit_sec") %>
 			<%if  at_least_module_manager%>
-				<%= f.label :best_size, t('admin.ad.best_size') %>
+				<%= f.label :best_size, t('ad.best_size') %>
 				<%= f.text_field :best_size %> Ex: 500px x 300px
 			<% end -%>
 			<br>
-			<%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
+			<%= f.submit t("ad.update_banner"), :class => 'btn' %>
 			<%= f.submit t("cancel"),:type=>'reset', :class => 'btn'  %>
 		</div>
 	<% end -%>
 <% end -%>
-		<h3><%= t("admin.ad.picture_list")%></h3>
+		<h3><%= t("ad.picture_list")%></h3>
 		<div class="adbanner-list">
 			<%if  (at_least_module_manager || ad_banner_tab.cur_user_is_sub_manager_of(:edit) )%>
 				<%=  content_tag :div ,:class=>'adbanner-action' do%>
-					<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
+					<%= link_to t("ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
 					<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.id) , :class=>'preview_trigger btn btn-success'%>
 				<% end -%>
 			<% end -%>
@@ -30,7 +30,7 @@
 			</ul>
 			 <% if at_least_module_manager  %>
 				<%= show_ad_banner_permission_link ad_banner_tab%>
-				<%= link_to	t('admin.ad.delete_banner'),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
+				<%= link_to	t(:delete),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
 			<% end -%>
 
 			<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>

app/views/admin/ad_banners/_ad_image_update.html.erb

@@ -1,7 +1,7 @@
 <li class="span3">
 			<%= image_tag ad_image.file rescue nil%> 
 			<p>
-				<%= ad_image.display? ? "[#{t('admin.ad.showing')}]" : "[#{t('admin.ad.not_showing')}]" %>
+				<%= ad_image.display? ? "[#{t('ad.showing')}]" : "[#{t('ad.not_showing')}]" %>
 				<%= "#{ad_image.post_date ||'NeedReset'  }~#{ad_image.unpost_date || 'NeedReset'}" %>
 			</p>
                   <%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %>

app/views/admin/ad_banners/_modal_ad_banner_form.html.erb

@@ -4,33 +4,33 @@
 
 	<div class="modal-header">
 		<a class="close" data-dismiss="modal">×</a>
-		<h3><%= t("admin.ad.new_banner") %></h3>
+		<h3><%= t('new.banner') %></h3>
 	</div>
 	
 	<div class="modal-body form-horizontal">
 		<div class="control-group">
-			<%= f.label :title,t('admin.ad.title'),:class => "control-label"  %>
+			<%= f.label :title, t(:title),:class => "control-label"  %>
 			<div class="controls">
 				<%= f.text_field :title %>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<%= f.label :transition_sec, t('admin.ad.transition_sec'),:class => "control-label" %>
+			<%= f.label :transition_sec, t('ad.transition_sec'),:class => "control-label" %>
 			<div class="controls">
-				<%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
+				<%= f.text_field :transition_sec %> <%= t("ad.trans_unit_sec") %>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<%= f.label :best_size, t('admin.ad.best_size'),:class => "control-label" %>
+			<%= f.label :best_size, t('ad.best_size'),:class => "control-label" %>
 			<div class="controls">
 				<%= f.text_field :best_size %> Ex: 500px x 300px
 			</div>
 		</div>
 		
 		<div class="control-group">
-			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+			<%= f.label :ad_fx, t('ad.ab_fx') %>
 			<div class="controls">
 				<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
 			</div>

app/views/admin/ad_banners/index.html.erb

@@ -22,7 +22,7 @@
 			<% end -%>
 		<% end -%>
 		
-		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if  at_least_module_manager%>
+		<%= content_tag :li,link_to(t('new.banner'),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if  at_least_module_manager%>
 		
 	</ul>
 	

app/views/admin/ad_images/_form.html.erb

@@ -19,7 +19,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> Date</h3>
+              <h3 class="widget-title"><i class="icons-calendar icons-white"></i><%= t('nccu.date') %></h3>
               <div class="widget-content clear">
                   <div id="calendarRange">
                       <div class="input-append">
@@ -36,8 +36,8 @@
                       today = today.format('isoDate');
                       var state = false;
                       var arr = state ? "▼" : "▲"
-											var start_date = <%= @ad_image.post_date.nil?? 'today' : "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'" %>;
-											var end_date = <%= @ad_image.unpost_date.nil?? 'today' : "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'" %>;
+											var start_date = <%= (@ad_image.post_date.nil?? 'today' : "'#{@ad_image.post_date.strftime('%Y / %m / %d')}'").html_safe %>;
+											var end_date = <%= (@ad_image.unpost_date.nil?? 'today' : "'#{@ad_image.unpost_date.strftime('%Y / %m / %d')}'").html_safe %>;
                       //calendarRange
                       $('#calendarRange .showDate').html(start_date+" - "+end_date);
                       $('#calendarRange .calendarInput').val(start_date+" - "+end_date);
@@ -73,7 +73,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>Picture</h3>
+        <h3 class="widget-title"><i class="icons-picture icons-white"></i><%= t('nccu.picture') %></h3>
         <div class="widget-content clear">         
           <div class="control-group">
             <div  class="upload-picture">
@@ -81,7 +81,7 @@
               <%= image_tag @ad_image.file rescue ''%>
             </div>
             <% if !@ad_image.ad_banner.best_size.empty?%>
-              <span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) %>
+              <span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) %>
               </span>
               <% end -%>
             <div class="controls file-upload input-prepend">
@@ -101,7 +101,7 @@
 					<div class="widget-action clear">
 						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Upload pictures"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-star-thin icons-white"></i>Type</h3>
+					<h3 class="widget-title"><i class="icons-star-thin icons-white"></i><%= t(:type) %></h3>
 					<div class="widget-content clear">
 						<%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
 					</div>
@@ -111,7 +111,7 @@
 					<div class="widget-action clear">
 						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Set the range time"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-time icons-white"></i>FEQ</h3>
+					<h3 class="widget-title"><i class="icons-time icons-white"></i><%= t(:frequency) %></h3>
 					<div class="widget-content clear">
 						 <%= f.text_field :weight ,:class=> 'span3',:placeholder=>"在套圖中出現次數 1次請輸入1" %>
 					</div>
@@ -121,7 +121,7 @@
 					<div class="widget-action clear">
 						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="Add a reference link"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-link icons-white"></i>Link</h3>
+					<h3 class="widget-title"><i class="icons-link icons-white"></i><%= t(:link) %></h3>
 					<div class="widget-content clear">
 						<%= f.text_field :out_link ,:class=> 'span3',:placeholder => "輸入連結"%>
 					</div>
@@ -167,4 +167,4 @@
 			</div>
 			<!--Post End-->
 		</form>
-	</div>
+	</div>

app/views/admin/app_auths/index.html.erb

@@ -5,18 +5,18 @@
 <div class="main_list">
 	<%= flash_messages %>
 	<div class="button_bar up">
-		<%  #link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%  #link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>
 	<table>
 		<thead>
 			<tr>
-				 <td><%= t('admin.app.title') %></td>
-		      <td><%= t('admin.app.description') %></td>
-		      <td><%= t('admin.app.use_status') %></td>
-		      <td><%= t('admin.app.autdor') %></td>
-		      <td><%= t('admin.app.organization') %></td>
-		      <td><%= t('admin.app.version') %></td>
-					<td class="action"><%= t('admin.action') %></td>
+				 <td><%= t(:title) %></td>
+		      <td><%= t(:description) %></td>
+		      <td><%= t(:use_status) %></td>
+		      <td><%= t(:author) %></td>
+		      <td><%= t(:organization) %></td>
+		      <td><%= t(:version) %></td>
+					<td class="action"><%= t(:action) %></td>
 			</tr>
 		</thead>
 		<tbody>
@@ -47,6 +47,6 @@
 		</tbody>
 	</table>
 	<div class="button_bar">
-		<%# link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%# link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>	
 </div>

app/views/admin/asset_categories/_asset_category.html.erb

@@ -5,8 +5,8 @@
 			<div class="quick-edit">
 				<ul class="nav nav-pills hide">
 
-						<li><%= link_to t('asset_category.edit'), edit_admin_asset_category_path(asset_category), :remote => true %></li>
-						<li><%= link_to t('asset_category.delete'), admin_asset_category_path(asset_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %></li>
+						<li><%= link_to t(:edit), edit_admin_asset_category_path(asset_category), :remote => true %></li>
+						<li><%= link_to t(:delete), admin_asset_category_path(asset_category), :confirm => t(:sure?), :method => :delete, :remote => true %></li>
 					
 				</ul>
 			</div>

app/views/admin/asset_categories/index.html.erb

@@ -7,7 +7,7 @@
 			<table class="table main-list">	
 				<thead>
 					<tr>
-						<th class="span2"><%= t('asset_category.key') %></th>
+						<th class="span2"><%= t(:key) %></th>
 						<% @site_valid_locales.each do |locale| %>
 						<th class="span2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
 						<% end %>

app/views/admin/assets/_edit.html.erb

@@ -1,5 +1,5 @@
 <div id='pop_up_content' class="main2">
-	<h1><%= t('editing_asset') %></h1>
+	<h1><%= t('editing.asset') %></h1>
 
 	<%= flash_messages %>
 
@@ -11,7 +11,7 @@
     		<%= link_back %>
 				<%= f.submit t(:edit) %>
 			<% else %>
-				<a id='ajax_form_submit' class="btn btn-primary"><%= t(:update) %></a>
+				<a id='ajax_form_submit' class="btn btn-primary"><%= t(:update_) %></a>
 			<% end %>
 	  </div>
 	<% end %>

app/views/admin/assets/_form.html.erb

@@ -1,5 +1,5 @@
 <div class="control-group">
-    <label for="title" class="control-label"><%= t 'admin.title' %></label>
+    <label for="title" class="control-label"><%= t :title %></label>
     <div class="controls">
         <%= f.fields_for :title_translations do |f| %>
           <% @site_valid_locales.each do |locale| %>
@@ -14,13 +14,13 @@
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label"><%= f.label :category, t('admin.category') %></label>
+    <label class="control-label"><%= f.label :category, t(:category) %></label>
     <div class="controls">
         <%= f.select :asset_category_id, @asset_categories.collect{|t| [ t.title, t.id ]}, {}, :class => "input-large" %>
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label"><%= t 'admin.tags' %></label>
+    <label class="control-label"><%= t :tags %></label>
     <div class="controls">
         <% @tags.each do |tag| %>
             <%= content_tag :label, :class => "checkbox inline" do -%>
@@ -32,7 +32,7 @@
     </div>
 </div>
 <div class="control-group">
-    <label class="control-label"><%= f.label :data, t('admin.data') %></label>
+    <label class="control-label"><%= f.label :data, t(:data) %></label>
     <div class="controls">
         <%= f.file_field :data, :class => 'upload' %>
     </div>

app/views/admin/assets/_new.html.erb

@@ -1,5 +1,5 @@
 <div id='pop_up_content' class="main2">
-	<h1><%= t('admin.new_asset') %></h1>
+	<h1><%= t('new.asset') %></h1>
 
 	<%= flash_messages %>
 
@@ -7,7 +7,7 @@
 	  <%= f.error_messages %>
 	  <%= render :partial => "form", :locals => { :f => f } %>
 	  <div class="button_bar">
-				<a id='ajax_form_submit' class="btn btn-primary"><%= t(:create) %></a>
+				<a id='ajax_form_submit' class="btn btn-primary"><%= t(:create_) %></a>
 	  </div>
 	<% end %>
 </div>

app/views/admin/assets/_sort_headers.html.erb

@@ -1,7 +1,7 @@
 <%= render_sort_bar(true, delete_admin_assets_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
- ['title', 'title','span4', 'admin.title'],
-													['description', 'description', 'span1-2', 'admin.data'],
-													['intro', 'intro', 'span1-2', 'admin.file_type'],
-													['intro', 'intro', 'span1-2', 'admin.file_length'],
-													['intro', 'intro', 'span1-2', 'admin.description'],
-													['intro', 'intro', 'span1-2', 'admin.tags']).html_safe %>
+ ['title', 'title','span4', :title],
+													['description', 'description', 'span1-2', :data],
+													['intro', 'intro', 'span1-2', :type],
+													['intro', 'intro', 'span1-2', :size],
+													['intro', 'intro', 'span1-2', :description],
+													['intro', 'intro', 'span1-2', :tags]).html_safe %>

app/views/admin/assets/create.html.erb

@@ -1 +1,25 @@
-<%= @asset.data.url %>#<%= show_all_fields(@asset, 'title') %>#<%= show_all_fields(@asset, 'description') %>
+<% if !request.xhr? %>
+<textarea>
+<% end %>
+var returnurl = "<%= @asset.data.url %>";
+var returntitle = "<%= show_all_fields(@asset, 'title') %>";
+var returndescription = "<%= show_all_fields(@asset, 'description') %>";
+var win = tinyMCEPopup.getWindowArg("window");
+win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = returnurl;
+if(win.document.getElementById(tinyMCEPopup.getWindowArg("alt")))
+	win.document.getElementById(tinyMCEPopup.getWindowArg("alt")).value = returndescription;
+ 
+win.document.getElementById(tinyMCEPopup.getWindowArg("title")).value = returntitle;
+  if (typeof(win.ImageDialog) != "undefined") {
+            // we are, so update image dimensions...
+            if (win.ImageDialog.getImageData)
+                win.ImageDialog.getImageData();
+
+            // ... and preview if necessary
+            if (win.ImageDialog.showPreviewImage)
+                win.ImageDialog.showPreviewImage(returnurl);
+        }
+tinyMCEPopup.close();
+<% if !request.xhr? %>
+</textarea>
+<% end %>

app/views/admin/assets/edit.html.erb

@@ -1,7 +1,7 @@
 <% content_for :secondary do %>
 <div class="assets_setup">
   <ul class="list">
-	<li><%= link_to t(:new_asset, :scope => :admin), new_admin_asset_path, :remote => true, :class => 'button positive' %></li>
+	<li><%= link_to t('new.asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %></li>
   </ul>
 </div>
 <% end -%>

app/views/admin/assets/file_upload.html.erb

@@ -7,12 +7,12 @@
 <body onload="tinyMCEPopup.executeOnLoad('init();')">
 <%= form_for :asset, :url => admin_assets_path(:uploader => true), :html => {:id => 'ajaxForm', :multipart => true } do |f| %>
     <div class="modal-header">
-        <h3><%= t 'admin.file_upload' %></h3>
+        <h3><%= t 'file.upload' %></h3>
     </div>
     <label class="control-label error" id="dyn_error"></label>
     <div class="modal-body form-horizontal">
         <div class="control-group">
-            <label for="title" class="control-label error"><%= t 'admin.title' %></label>
+            <label for="title" class="control-label error"><%= t :title %></label>
             <div class="controls">
                 <%= f.fields_for :title_translations do |f| %>
                     <div>
@@ -29,7 +29,7 @@
             </div>
         </div>
         <div class="control-group">
-            <label for="description" class="control-label error"><%= t 'admin.description' %></label>
+            <label for="description" class="control-label error"><%= t :description %></label>
             <div class="controls">
                 <%= f.fields_for :description_translations do |f| %>
                     <div>
@@ -46,7 +46,7 @@
             </div>
         </div>
         <div class="control-group">
-            <%#= f.label :data, t('admin.data'), :class => "control-label" %>
+            <%#= f.label :data, t(:data), :class => "control-label" %>
             <div class="controls">
                 <%= f.file_field :data, :class => 'upload' %>
             </div>
@@ -54,7 +54,8 @@
     </div>
     <div style="position: absolute; width: 100%; bottom: 0;">
         <div class="modal-footer">
-            <a id='ajax_form_submit' class="btn btn-primary"><%= t(:create) %></a>
+            <!-- <a id='ajax_form_submit' class="btn btn-primary"><#%= t(:create) %></a> -->
+             <input type="submit" value="<%= t(:create_) %>" class="btn btn-primary" />
         </div>
     </div>
 

app/views/admin/assets/index.html.erb

@@ -17,7 +17,7 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_asset_path, :remote => true, :class => 'btn btn-primary pull-right' %>
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_admin_asset_path, :remote => true, :class => 'btn btn-primary pull-right' %>
 	<div id="asset_pagination" class="paginationFixed">
 		<%= paginate @assets, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]}, :remote => true %>
 	</div>

app/views/admin/assets/new.html.erb

@@ -1,7 +1,7 @@
 <% content_for :secondary do %>
 <div class="assets_setup">
   <ul class="list"> 
-	<li><%= link_to t(:new_asset, :scope => :admin), new_admin_asset_path, :remote => true, :class => 'button positive' %></li>
+	<li><%= link_to t('new.asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %></li>
   </ul>
 </div>
 <% end -%>

app/views/admin/attributes/_attribute_field.html.erb

@@ -9,7 +9,6 @@
 	  <% end %>
 	<% end %>
   <td class='select_type'>
-
     <ul>
       <li>markup<%= f.select :markup, LIST[:markups].keys, {}, {:style => "width:90px"} %> </li>
       <li>markup_value<%= f.text_field :markup_value,:size=>50 %></li>
@@ -22,12 +21,9 @@
       <li>neutral_for<%= f.select :neutral_for, VALID_LOCALES, {}, {:style => "width:90px"} %> </li>
     <!--  
       <li><%#= attribute_field[:markup].eql?('select') ? nil : "style='display:none'"%> </li>
-      <li><%#= t('admin.options') %>: <%#= f.text_field :markup_value%></li>
+      <li><%#= t(:options) %>: <%#= f.text_field :markup_value%></li>
     -->
     </ul>
-    
-
-    
   </td>
   <td class="action">
 		<% if attribute_field.new_record? %>

app/views/admin/attributes/index.html.erb

@@ -4,13 +4,13 @@
 
 <div class="main_list">
 	<div class="button_bar up">
-		<%= link_to t("admin.new_#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
+		<%= link_to t("new.#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
 	</div>
 	<table>
 		<thead>
 		<tr>
-			<td class="<%= @attribute_type %>s"><%= t("admin.#{@attribute_type}") %></td>
-			<td class="action"><%= t('admin.action') %></td>
+			<td class="<%= @attribute_type %>s"><%= t("#{@attribute_type}") %></td>
+			<td class="action"><%= t(:action) %></td>
 		</tr>
 		</thead>
 		<tbody>
@@ -34,6 +34,6 @@
 		</tbody>	
 	</table>
 	<div class="button_bar">
-		<%= link_to t("admin.new_#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
+		<%= link_to t("new.#{@attribute_type}"), eval("new_admin_#{@attribute_type}_path"), :class => 'new' %>
 	</div>
 </div>

app/views/admin/components/_user_role_management.html.erb

@@ -1,21 +1,21 @@
 <div id="open_for_all_user">
-	<h1><%= t("admin.user_role.auth.all_member") %></h1>
+	<h1><%= t("auth.all_member") %></h1>
 	<%= form_tag(submit_url) do %>
-	<%= check_box_tag 'auth_all',true,(auth.all rescue true)  %><%= submit_tag t("admin.user_role.auth.all_member") %><br/>
+	<%= check_box_tag 'auth_all',true,(auth.all rescue true)  %><%= submit_tag t("auth.all_member") %><br/>
 	<% end %>
 </div>
 
 <div id="user_role_management">
-	<h1><%= t("admin.user_role.auth.user") %></h1>
+	<h1><%= t(:user) %></h1>
 	<%= form_tag(submit_url) do %>
 		<%= collection_select(:new,:role, Role.all, :id, :key, :prompt => true) %>
-		<%= submit_tag  t("admin.user_role.auth.by_role") %><br/>
+		<%= submit_tag  t("auth.by_role") %><br/>
 		<%= collection_select(:new,:sub_role, SubRole.all, :id, :key, :prompt => true) %>
-		<%= submit_tag  t("admin.user_role.auth.by_sub_role") %><br/>
+		<%= submit_tag  t("auth.by_sub_role") %><br/>
 		<%= collection_select(:new,:privilege_user, User.all, :id, :name, :prompt => true) %>	
-		<%= submit_tag  t("admin.user_role.auth.add_to_privilege_list") %><br/>
+		<%= submit_tag  t("auth.add_to_privilege_list") %><br/>
 		<%= collection_select(:new,:blocked_user, User.all, :id, :name, :prompt => true) %>
-		<%= submit_tag  t("admin.user_role.auth.add_to_block_list") %><br/>
+		<%= submit_tag  t("auth.add_to_block_list") %><br/>
 	<% end %>
 	<% unless auth.nil? %>
 		<% auth.roles.each do |role| %>

app/views/admin/dashboards/index.html.erb

@@ -111,7 +111,7 @@
         </div>
     </div>
     <div class="item element">
-        <h3><i class="icons-asset"></i><a href=""><%= t(:file) %></a></a></h3>
+        <h3><i class="icons-asset"></i><a href=""><%= t(:file_) %></a></a></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_file) %></span>3,422</p>
             <table class="table table-striped">

app/views/admin/designs/_form.html.erb

@@ -1,24 +1,22 @@
 <%= form_for @design, :url => admin_design_path(@design), :html => {:class => 'form-horizontal'}, :remote => true do |f| %>
   <%= f.error_messages %>
   <div class="control-group">
-		<%= f.label :title, t('admin.title'), :class => "control-label" %>
+		<%= f.label :title, t(:title), :class => "control-label" %>
     <div class="controls">
 			<%= f.text_field :title %>
     </div>
   </div>
   <div class="control-group">
-		<%= f.label :author, t('admin.author'), :class => "control-label" %>
+		<%= f.label :author, t(:author), :class => "control-label" %>
     <div class="controls">
 			<%= f.text_field :author %>
     </div>
   </div>
   <div class="control-group">
-		<%= f.label :intro, t('admin.intro'), :class => "control-label" %>
+		<%= f.label :intro, t(:intro), :class => "control-label" %>
     <div class="controls">
 			<%= f.text_field :intro %>
     </div>
   </div>
     <%= f.submit t('update') %>
 <% end %>
-
-

app/views/admin/designs/_images.html.erb

@@ -21,7 +21,7 @@
   <%= form_for :image, :url => upload_image_admin_design_path, :html => {:id => 'ajaxForm', :class => 'form-horizontal'}, :method => :post do |f| %>
     <div class="modal-body">
       <div class="control-group">
-        <%= f.label :image, t('admin.image'), :class => "control-label" %>
+        <%= f.label :image, t(:image), :class => "control-label" %>
         <div class="controls">
           <%= f.file_field :file %>
         </div>

app/views/admin/designs/_new.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t('admin.new_design') %></h1>
+<h1><%= t('new.design') %></h1>
 
 <%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %>
   <%= f.error_messages %>

app/views/admin/designs/_sort_headers.html.erb

@@ -1,4 +1,4 @@
 <%= render_sort_bar(true, delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]),
- ['title', 'title','span7', 'admin.title'],
-													['author', 'author', 'span2', 'admin.author'],
-													['intro', 'intro', 'span2', 'admin.intro']).html_safe %>
+ ['title', 'title','span7', :title],
+													['author', 'author', 'span2', :author],
+													['intro', 'intro', 'span2', :intro]).html_safe %>

app/views/admin/designs/edit.html.erb

@@ -1,8 +1,8 @@
 <% content_for :side_bar do %>
-	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
-<h1><%= t('admin.editing_design') %></h1>
+<h1><%= t('editing.design') %></h1>
 
 <ul class="nav nav-tabs" id="myTab">
   <li class="active"><a href="#info" data-toggle="tab"><%= t('design.info') %></a></li>
@@ -40,4 +40,4 @@
     <div class="tab-pane" id="<%= dom_id js %>"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => js} %></div>
   <% end %>
   <div class="tab-pane" id="images"><%= render :partial => 'images' %></div>
-</div>
+</div>

app/views/admin/designs/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <%= render 'filter' %>
@@ -8,5 +8,5 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('admin.add'), new_admin_design_path, :class => 'btn btn-primary pull-right' %>
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_admin_design_path, :class => 'btn btn-primary pull-right' %>
 </div>

app/views/admin/designs/new.html.erb

@@ -2,7 +2,7 @@
 	<%= render 'admin/sites/side_bar' %>
 <% end %>
 
-<h1><%= t('admin.new_design') %></h1>
+<h1><%= t('new.design') %></h1>
 
 <%= form_for :design, :url => admin_designs_path, :html => {:multipart => true} do |f| %>
   <%= f.error_messages %>

app/views/admin/infos/_form.html.erb

@@ -1,10 +1,10 @@
 <div class="attributes_block <%= @class %>">
-	<h2><%= t("admin.#{@attribute_type}") %></h2>
+	<h2><%= t("#{@attribute_type}") %></h2>
 	<div class="info_input">
 		<table border="0" cellspacing="0" cellpadding="0">
 			<thead class="list_head">
 				<tr>
-					<td><%= t('admin.key') %></td>
+					<td><%= t(:key) %></td>
 					<% @site_valid_locales.each do |locale| %>
 			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 			    <% end %>
@@ -36,7 +36,7 @@
 					<% @site_valid_locales.each do |locale| %>
 			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 			    <% end %>
-					<td><%= t('admin.type')%></td>
+					<td><%= t(:type)%></td>
 					<td>&nbsp;</td>
 				</tr>
 			</thead>

app/views/admin/links/_edit.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t('admin.editing_link') %></h1>
+<h1><%= t('editing.link') %></h1>
 
 <%= flash_messages %>
 
@@ -7,6 +7,6 @@
   <%= render :partial => "admin/links/form", :locals => { :f => f } %>
   
   <p>
-    <%= f.submit t(:update) %> <%= link_back %>
+    <%= f.submit t(:update_) %> <%= link_back %>
   </p>
 <% end %>

app/views/admin/links/_form.html.erb

@@ -1,26 +1,59 @@
 <%= f.error_messages %>
-<%= f.hidden_field :parent, :value => @item.parent.id %>
+<%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
 
-<p>
-<%= f.label :name, "Name" %>
-<%= f.text_field :name, :class => 'text' %>
-</p>
+<div class="control-group">
+  <%= f.label :name, t(:name), :class => 'control-label' %>
+  <div class="controls">
+    <%= f.text_field :name, :class => 'text input-xlarge' %>
+    <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+  </div>
+</div>
 
 <%= f.fields_for :title_translations do |f| %>
   <% @site_valid_locales.each do |locale| %>
-    <p>
-			<%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %>
-			<%= f.text_field locale, :value => (@item.title_translations[locale] rescue nil) %>
-		</p>
+    <div class="control-group">
+      <%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field locale, :class => 'text input-xlarge', :value => (@item.title_translations[locale] rescue nil) %>
+        <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+      </div>
+    </div>
   <% end %>
 <% end %>
 
-<p>
-<%= f.label :is_published, t('admin.is_published') %>
-<%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No
-</p>
+<div class="control-group">
+  <%= f.label :is_published, "#{t(:is_published)} ?", :class => 'control-label' %>
+  <div class="controls">
+    <label class="radio">
+      <%= f.radio_button :is_published, true %>
+            Yes
+        </label>
+    <label class="radio">
+      <%= f.radio_button :is_published, false %>
+      No
+        </label> 
+    <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+  </div>
+</div>
 
-<p>
-<%= f.label :url, "URL" %>
-<%= f.text_field :url %>
-</p>
+<div class="control-group">
+  <%= f.label :menu_enabled_for, "#{t(:menu_enabled_for)}:", :class => 'control-label' %>
+  <div class="controls">
+    <% @site_valid_locales.each do |valid_locale| %>
+    <label class="checkbox">
+      <%= check_box_tag 'link[menu_enabled_for][]', valid_locale, (@item.menu_enabled_for.nil? ? true : @item.menu_enabled_for.include?(valid_locale)) %>
+      <%= I18nVariable.from_locale(valid_locale) %>
+        </label>
+    <% end %>
+    <%= hidden_field_tag 'link[menu_enabled_for][]', '' %>
+    <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+  </div>
+</div>
+
+<div class="control-group">
+  <%= f.label :url, "#{t(:url)}:", :class => 'control-label' %>
+  <div class="controls">
+    <%= f.text_field :url, :class => 'text input-xlarge', :value => (@item.url rescue nil) %>
+    <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+  </div>
+</div>

app/views/admin/links/_new.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t('admin.new_link') %></h1>
+<h1><%= t('new.link') %></h1>
 
 <%= flash_messages %>
 
@@ -7,7 +7,7 @@
   <%= render :partial => "admin/links/form", :locals => { :f => f } %>
   
   <p>
-    <%= f.submit t(:create) %> <%= link_back %>
+    <%= f.submit t(:create_) %> <%= link_back %>
   </p>
   
 <% end %>

app/views/admin/links/_show.html.erb

@@ -1,24 +1,37 @@
 <%= flash_messages %>
-<p>
-  <b><%= t('admin.name') %></b>
-  <%= @item.name %>
-</p>
+
+<div class="control-group">
+  <label class="control-label"><%= t(:url) %></label>
+  <div class="controls">
+    <%= @item.name %>
+    <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+  </div>
+</div>
 
 <% @site_valid_locales.each do |locale| %>
-  <p>
-		<b><%= "#{t('admin.title')} #{locale}" %></b>
-	  <%= @item.title_translations[locale] if @item.title %>
-  </p>
+  <div class="control-group">
+    <label class="control-label"><%= t(:title) %></label>
+    <div class="controls">
+      <%= @item.title_translations[locale] if @item.title %>
+      <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+    </div>
+  </div>
 <% end %>
 
-<p>
-  <b><%= t('admin.is_published') %></b>
-  <%= @item.is_published.to_s %>
-</p>
+<div class="control-group">
+  <label class="control-label"><%= t(:is_published) %></label>
+  <div class="controls">
+    <%= @item.is_published.to_s %>
+    <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+  </div>
+</div>
 
-<p>
-  <b><%= t('admin.url') %></b>
-  <%= @item.url %>
-</p>
+<div class="control-group">
+  <label class="control-label"><%= t(:url) %></label>
+  <div class="controls">
+    <%= @item.url %>
+    <!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
+  </div>
+</div>
 
 <%= link_to t(:edit), edit_admin_link_path(@item), :class => 'nav' %>

app/views/admin/module_apps/edit.html.erb

@@ -5,26 +5,26 @@
 
 <div id="manager_management">
 	<dl id="manager">
-		<dt><%= t("admin.user_role.auth.manager") %></ht>
+		<dt><%= t(:manager) %></ht>
 		<% @module_app.managers.each do |manager| %>
 			<dd><%= manager.user.name %>  <%= get_auth_by(manager) %> <%= link_to '[X]',remove_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:manager) && manager.user != current_user %> </dd>
 		<% end %>
 		<dd>
 			<%= form_tag(assign_manager_admin_module_app_path) do %>
 				<%= collection_select(:manager,:id, User.all, :id, :name, :prompt => true,:disabled  => !if_permit_to_assign(:manager))%>
-				<%= submit_tag t("admin.user_role.auth.add_manager") %>
+				<%= submit_tag t("auth.add_manager") %>
 			<% end %>
 		</dd>
 	</dl>
 	<dl id="sub_manager">
-		<dt><%#= t("admin.user_role.auth.sub_manager") %></ht>
+		<dt><%#= t(:sub_manager) %></ht>
 		<%# @module_app.sub_managers.each do |manager| %>
 			<dd><%#= manager.user.name %>  <%#= get_auth_by(manager) %><%#= link_to '[X]',remove_sub_manager_admin_module_app_path(@module_app,manager),:method => :delete if if_permit_to_delete(:sub_manager) && manager.user != current_user %> </dd>
 		<%# end %>
 		<dd>
 			<%#= form_tag(assign_sub_manager_admin_module_app_path) do %>
 			<%#= collection_select(:sub_manager,:id, User.all, :id, :name, :prompt => true,:disabled  => !if_permit_to_assign(:sub_manager))%>
-				<%#= submit_tag t("admin.user_role.auth.add_sub_manager") %>
+				<%#= submit_tag t("auth.add_sub_manager") %>
 			<%# end %>
 		</dd>
 	</dl>

app/views/admin/module_apps_new_interface/_modal_list.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in" id="module_app-<%=module_app.id%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("admin.user_role.auth.manager") %></h3>
+    <h3><%= t(:manager) %></h3>
   </div>
   <div class="modal-body">
 		<div class="clear">

app/views/admin/module_apps_new_interface/setting.html.erb

@@ -6,7 +6,6 @@
 	<%= javascript_include_tag "inc/search"  %>
 	<%= javascript_include_tag "inc/modal-preview"  %>
 <% end %>
-<%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
 <%= form_tag('', :remote => true,:class => "prevent_enter_submit_form")  %>
 <div class="subnav clear">
     <ul class="nav nav-pills filter pull-left">
@@ -19,16 +18,16 @@
 
         </li>
     </ul>
-		<%= link_to t("admin.user_role.auth.manager"), admin_module_app_manager_auth_show_path , :class=>'preview_trigger btn btn-success pull-right'%>	
+		<%= link_to t(:manager), admin_module_app_manager_auth_show_path , :class=>'preview_trigger btn btn-success pull-right'%>	
 
 </div>
-<%#= label_tag :role, t("admin.roles") %>
+<%#= label_tag :role, t(:roles) %>
 <div class="clear">
 <%= content_tag :div do -%>
 	<% form_tag admin_module_app_manager_auth_proc_path  do %>
             <%= render :partial =>  "layouts/users_checkbox_ary"  %>
 	<div class="form-actions form-fixed pagination-right">
-	<%= submit_tag "Update", :class => 'btn btn-primary' %>
+	<%= submit_tag t(:update_), :class => 'btn btn-primary' %>
 	</div>
 	<% end -%>
 <% end -%>

app/views/admin/object_auths/index.html.erb

@@ -5,13 +5,13 @@
 <div class="main_list">
 	<%= flash_messages %>
 	<div class="button_bar up">
-		<%  #link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%  #link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>
 	<table>
 		<thead>
 			<tr>
-				 <td><%= t('admin.object_auth.title') %></td>
-		      <td><%= t('admin.object_auth.obj_type') %></td>
+				 <td><%= t(:title) %></td>
+		      <td><%= t(:type) %></td>
 		      
 			</tr>
 		</thead>
@@ -34,6 +34,6 @@
 		</tbody>
 	</table>
 	<div class="button_bar">
-		<%# link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%# link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>	
 </div>

app/views/admin/object_auths_new_interface/_modal_list.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in" id="ob_auth-<%=ob_auth.id%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("admin.object_auth.list_title_of_users",:auth_title => ob_auth.title) %></h3>
+    <h3><%= t("object_auth.list_title_of_users") %></h3>
   </div>
   <div class="modal-body">
 		<div class="clear">

app/views/admin/object_auths_new_interface/setting.html.erb

@@ -6,7 +6,6 @@
 	<%= javascript_include_tag "inc/search"  %>
 	<%= javascript_include_tag "inc/modal-preview"  %>
 <% end %>
-<%#= label_tag :fact_check_setting, t("announcement.bulletin.fact_check_setting") %>
 <%= form_tag('', :remote => true,:class => "prevent_enter_submit_form")  %>
 <div class="subnav clear">
     <ul class="nav nav-pills filter pull-left">
@@ -20,16 +19,17 @@
 
         </li>
     </ul>
-		<%= link_to t("admin.object_auth.list_title_of_users",:auth_title => @ob_auth.title), admin_object_auth_ob_auth_show_path , :class=>'preview_trigger btn btn-success pull-right'%>	
+		<%= link_to t("object_auth.list_title_of_users"), admin_object_auth_ob_auth_show_path(:app_key=>@module_app.key), :class=>'preview_trigger btn btn-success pull-right'%>	
 
 </div>
-<%#= label_tag :role, t("admin.roles") %>
+<%#= label_tag :role, t(:roles) %>
 <div class="clear">
 <%= content_tag :div do -%>
-	<% form_tag admin_object_auth_ob_auth_path  do %>
+	<% form_tag admin_object_auth_ob_auth_url  do %>
               <%= render :partial =>  "layouts/users_checkbox_ary"  %>
               <div class="form-actions form-fixed pagination-right">
-	<%= submit_tag "Update", :class => 'btn btn-primary' %>
+      <%= hidden_field_tag 'app_key', @module_app.key %>
+	<%= submit_tag t(:update_), :class => 'btn btn-primary' %>
 	</div>
 	<% end -%>
 <% end -%>
@@ -45,13 +45,8 @@ $(document).ready(function() {
 		}
 	});
    
-	$('#category_id').change(function() {
-		$.ajax({
-			type: 'GET',
-			dataType: "script",
-			url:$(this).parents("from").attr("href"),
-			data:$(this).parents("form").serialize()
-		});
+	$('#ob_auth_id').change(function() {
+          window.location.href = "/admin/object_auths/"+$(this).val()+"/new_interface?app_key="+$("#app_key").val();
 	});
 });
 </script>

app/views/admin/page_parts/_edit.html.erb

@@ -2,7 +2,7 @@
 	
 	<% LIST[:page_part_kinds].each do |kind| %>
 		<%= f.radio_button :kind, kind, :class => 'part_kind' %>
-		<%= t(kind, :scope => 'admin.page_part_kinds') %>
+		<%= t(kind, :scope => 'page_part_kinds') %>
 	<% end %>
 	
 	<% LIST[:page_part_kinds].each do |kind| %>
@@ -12,6 +12,6 @@
 	<% end %>
 	
   <p>
-    <%= f.submit t(:update) %> <%= link_back %>
+    <%= f.submit t(:update_) %> <%= link_back %>
   </p>
 <% end %>

app/views/admin/page_parts/_module_widget.html.erb

@@ -2,7 +2,7 @@
 	<%= f.fields_for :title_translations do |f| %>
   <% @site_valid_locales.each do |locale| %>
     <p>
-			<%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %>
+			<%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}" %>
 			<%= f.text_field locale, :value => (@part.title_translations[locale] rescue nil) %>
 		</p>
   <% end %>

app/views/admin/pages/_edit.html.erb

@@ -1,6 +1,6 @@
 <%= flash_messages %>
 <div id="poststuff">
-	<h1><%= t('admin.editing_page') %></h1>
+	<h1><%= t('editing.page') %></h1>
 	<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form-horizontal edit_page' }  do |f| %>
 		<%= render :partial => "form", :locals => { :f => f } %>
 		<div class="form-actions">

app/views/admin/pages/_form.html.erb

@@ -2,7 +2,7 @@
 <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
 
 <div class="control-group">
-	<%= f.label :name, t('admin.name'), :class => 'control-label' %>
+	<%= f.label :name, t(:name), :class => 'control-label' %>
 	<div class="controls">
 		<%= f.text_field :name, :class => 'text input-xlarge' %>
 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
@@ -12,7 +12,7 @@
 <%= f.fields_for :title_translations do |f| %>
 	<% @site_valid_locales.each do |locale| %>
 		<div class="control-group">
-			<%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+			<%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
 			<div class="controls">
 				<%= f.text_field locale, :class => 'text input-xlarge', :value => (@item.title_translations[locale] rescue nil) %>
 				<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
@@ -22,21 +22,21 @@
 <% end %>
 
 <div class="control-group">
-	<%= f.label :name, t('admin.design_name'), :class => 'control-label' %>
+	<%= f.label :name, t(:template_name), :class => 'control-label' %>
 	<div class="controls">
 		<%= f.collection_select :design, @designs, :id, :title, {:selected => @design.id}, {:rel => admin_pages_path} %>
 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 	</div>
 </div>
 <div class="control-group">
-	<%= f.label :name, t('admin.theme'), :class => 'control-label' %>
+	<%= f.label :name, t(:theme), :class => 'control-label' %>
 	<div class="controls">
 		<%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %>
 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 	</div>
 </div>
 <div class="control-group">
-	<%= f.label :name, t('admin.module_app'), :class => 'control-label' %>
+	<%= f.label :name, t(:module), :class => 'control-label' %>
 	<div class="controls">
 		<%= render :partial => "app_selector", :locals => { :f => f } %>
 		<span id="app_page_url">
@@ -64,7 +64,7 @@
 	</div>
 </div>
 <div class="control-group">
-	<%= f.label :is_published, "#{t('admin.is_published')} ?", :class => 'control-label' %>
+	<%= f.label :is_published, "#{t(:is_published)} ?", :class => 'control-label' %>
 	<div class="controls">
 		<label class="radio">
 			<%= f.radio_button :is_published, true %>
@@ -78,7 +78,7 @@
 	</div>
 </div>
 <div class="control-group">
-	<%= f.label :menu_enabled_for, "#{t('admin.menu_enabled_for')}:", :class => 'control-label' %>
+	<%= f.label :menu_enabled_for, "#{t(:menu_enabled_for)}:", :class => 'control-label' %>
 	<div class="controls">
 		<% @site_valid_locales.each do |valid_locale| %>
 		<label class="checkbox">
@@ -92,7 +92,7 @@
 </div>
 
 <div class="control-group">
-	<%= f.label :enabled_for, "#{t('admin.enabled_for')}:", :class => 'control-label' %>
+	<%= f.label :enabled_for, "#{t(:enabled_for)}:", :class => 'control-label' %>
 	<div class="controls">
 		<% @site_valid_locales.each do |valid_locale| %>
 		<label class="checkbox">

app/views/admin/pages/_new.html.erb

@@ -1,6 +1,6 @@
 <%= flash_messages %>
 <div id="poststuff">
-	<h1><%= t('admin.new_page') %></h1>
+	<h1><%= t('new.page') %></h1>
 	<%= form_for @item, :url => admin_pages_path, :html => { :class => 'form-horizontal edit_page' }  do |f| %>
 		<%= render :partial => "form", :locals => { :f => f } %>
 		<div class="form-actions">

app/views/admin/plugins/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.user'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-member', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

app/views/admin/purchases/index.html.erb

@@ -1,12 +1,12 @@
 <div class="main2">
-	<h1><%= t('admin.list_puchases') %></h1>
+	<h1><%= t('list.puchase') %></h1>
 	<table>
 		<thead>
 			<tr>
-				<td><%= t('admin.title') %></td>
-				<td><%= t('admin.intro') %></td>
-				<td><%= t('admin.author') %></td>
-				<td><%= t('admin.action') %></td>
+				<td><%= t(:title) %></td>
+				<td><%= t(:intro) %></td>
+				<td><%= t(:author) %></td>
+				<td><%= t(:action) %></td>
 			</tr>
 		</thead>
 		<%# @purchases.each do |purchase| %>

app/views/admin/roles/_form.html.erb

@@ -1,11 +1,11 @@
 <div class="attributes_block <%= @class %>">
-	<h2><%= t("admin.#{@attribute_type}") %></h2>
+	<h2><%= t("#{@attribute_type}") %></h2>
 	<hr>
 	<div class="info_input">
 		<table border="0" cellspacing="0" cellpadding="0">
 			<thead class="list_head">
 				<tr>
-					<td><%= t('admin.key') %></td>
+					<td><%= t(:key) %></td>
 					<% @site_valid_locales.each do |locale| %>
 			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 			    <% end %>

app/views/admin/roles/_sub_role.html.erb

@@ -2,7 +2,7 @@
 	<table border="0" cellspacing="0" cellpadding="0">
 		<thead class="list_head">
 			<tr>
-				<td><%= t('admin.key') %></td>
+				<td><%= t(:key) %></td>
 				<% @site_valid_locales.each do |locale| %>
 		      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 		    <% end %>
@@ -25,12 +25,12 @@
 			<table class="sub_role_attributes" border="0" cellspacing="0" cellpadding="0">
 				<thead class="list_head">
 					<tr>
-						<td><%= t('admin.key') %></td>
-						<td><%= t('admin.multilingual') %></td>
+						<td><%= t(:key) %></td>
+						<td><%= t(:multilingual) %></td>
 						<% @site_valid_locales.each do |locale| %>
 				      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 				    <% end %>
-						<td><%= t('admin.type')%></td>
+						<td><%= t(:type)%></td>
 						<td>&nbsp;</td>
 					</tr>
 				</thead>

app/views/admin/sites/_registration.html.erb

@@ -1,7 +1,7 @@
 <% if @site && @site.registered? %>
 <%# if @site %>
 	<div class="bought_btn">
-		<%= t('admin.registered') %>
+		<%= t(:registered) %>
 	</div>
 <% else %>
     <div class="buy_btn">

app/views/admin/sites/_side_bar.html.erb

@@ -1,17 +1,17 @@
 <%= content_tag :li, :class => active_for_controllers('sites') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + content_tag(:span, t('admin.site_settings')), admin_site_site_info_path(@site) %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %>
 
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('sites')) do -%>
-		<%= content_tag :li, link_to(t('admin.site_info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
-		<%#= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
-		<%#= content_tag :li, link_to(t('admin.site_language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
-		<%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
-		<%#= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
-		<%= content_tag :li, link_to(t('site_map'), admin_site_sitemap_path(@site)), :class => active_for_action('sites', 'sitemap') %>
+		<%= content_tag :li, link_to(t('site.info'), admin_site_site_info_path(@site)), :class => active_for_action('sites', 'site_info') %>
+		<%#= content_tag :li, link_to(t(:system_info), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
+		<%#= content_tag :li, link_to(t('site.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
+		<%= content_tag :li, link_to(t('mail.setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
+		<%#= content_tag :li, link_to(t(:theme), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
+		<%= content_tag :li, link_to(t('sitemap'), admin_site_sitemap_path(@site)), :class => active_for_action('sites', 'sitemap') %>
 	<% end -%>
 
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('designs') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + content_tag(:span, t('admin.design')), admin_designs_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + content_tag(:span, t(:template)), admin_designs_path %>
 <% end -%>

app/views/admin/sites/_update.html.erb

@@ -1,10 +1,10 @@
 <%# if @site.up_to_date? %>
 <% if true %>
 	<div class="bought_btn">
-		<%= t('admin.up_to_date') %>
+		<%= t(:up_to_date) %>
 	</div>
 <% else %>
 	<div class="buy_btn">
-		<%= link_to t(:update), site_update_path %>
+		<%= link_to t(:update_), site_update_path %>
 	</div>
 <% end %>

app/views/admin/sites/language.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 language.html.erb

app/views/admin/sites/mail_setting.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <div id="poststuff">
@@ -9,56 +9,56 @@
 			<%= f.fields_for :site_settings, @site['site_settings'] do |f| %>
 			<div class="form-horizontal">
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_address' %></label>
+					<label class="control-label"><%= t 'mail.address' %></label>
 					<div class="controls">
 						<%= f.text_field :address, :value => (@site['site_settings']['address'] rescue nil) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 					</div>
 				</div>
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_port' %></label>
+					<label class="control-label"><%= t 'mail.port' %></label>
 					<div class="controls">
 						<%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 					</div>
 				</div>
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_domain' %></label>
+					<label class="control-label"><%= t 'mail.domain' %></label>
 					<div class="controls">
 						<%= f.text_field :domain, :value => (@site['site_settings']['domain'] rescue nil) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 					</div>
 				</div>
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_authentication' %></label>
+					<label class="control-label"><%= t 'mail.authentication' %></label>
 					<div class="controls">
 						<%= f.text_field :authentication, :value => (@site['site_settings']['authentication'] rescue nil) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 					</div>
 				</div>
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_user_name' %></label>
+					<label class="control-label"><%= t 'mail.user_name' %></label>
 					<div class="controls">
 						<%= f.text_field :user_name, :value => (@site['site_settings']['user_name'] rescue nil) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 					</div>
 				</div>
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_password' %></label>
+					<label class="control-label"><%= t 'mail.password' %></label>
 					<div class="controls">
 						<%= f.text_field :password, :value => (@site['site_settings']['password'] rescue nil) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 					</div>
 				</div>
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_tls' %></label>
+					<label class="control-label"><%= t 'mail.tls' %></label>
 					<div class="controls">
 						<%= f.check_box :tls, :checked => (@site['site_settings']['tls'].eql?('1') rescue false) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 					</div>
 				</div>
 				<div class="control-group">
-					<label class="control-label"><%= t 'admin.mail_enable_starttls_auto' %></label>
+					<label class="control-label"><%= t 'mail.enable_starttls_auto' %></label>
 					<div class="controls">
 						<%= f.check_box 'enable_starttls_auto', :checked => (@site['site_settings']['enable_starttls_auto'].eql?('1') rescue false) %>
 						<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->

app/views/admin/sites/site_info.html.erb

@@ -1,7 +1,7 @@
 <% # encoding: utf-8 %>
 
 <% content_for :side_bar do %>
-	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <div id="poststuff">
@@ -18,63 +18,63 @@
 				<div class="control-group" style="margin-bottom: 0;">
 					<div class="controls">
 						<label class="checkbox">
-							<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
+							<%= f.check_box :title_always_on %> <%= t :always_display_title %>
 		            	</label>
 					</div>
 				</div>
 				<% @site_valid_locales.each do |locale|%>
 					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.site_title' %></label>
+							<label class="control-label"><%= t 'site.title' %></label>
 							<div class="controls">
 								<%= f.fields_for :title_translations do |f| %>
 									<%= f.text_field locale, :class => "input-xxlarge", :value => (@site.title_translations[locale] rescue nil) %>
 								<% end %>
-								<p class="help-block"><%= (t 'admin.site_title_help').html_safe %></p>
+								<p class="help-block"><%= (t 'site.title_help').html_safe %></p>
 							</div>
 						</div>
 					<% end %>
 				<% end %>
 				<div class="control-group">
-					<label class="control-label"><%= t 'search.site_search' %></label>
+					<label class="control-label"><%= t 'site.search' %></label>
 						<div class="controls">
 							<%= text_field_tag 'site[search][domains]',(@site.search["domains"] rescue nil), {:class => "input-xxlarge" ,:placeholder => t("search.domains") }%>
 							<%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"]  rescue nil),{ :class => "input-xxlarge"  ,:placeholder => t("search.sitesearch") }%>
-							<p class="help-block"><%= (t 'search.site_setting_help').html_safe %></p>
+							<p class="help-block"><%= (t 'site.search_help').html_safe %></p>
 					</div>
 				</div>
 
 				<% @site_valid_locales.each do |locale|%>
 					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.site_keywords' %></label>
+							<label class="control-label"><%= t 'site.keywords' %></label>
 							<div class="controls">
 								<%= f.fields_for :keywords do |f| %>
 									<%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.keywords(locale) rescue nil) %>
 								<% end %>
-								<p class="help-block"><%= (t 'admin.site_keywords_help').html_safe %></p>
+								<p class="help-block"><%= (t 'site.keywords_help').html_safe %></p>
 							</div>
 						</div>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.site_description' %></label>
+							<label class="control-label"><%= t 'site.description' %></label>
 							<div class="controls">
 								<%= f.fields_for :description do |f| %>
 									<%= f.text_area locale, :class => "input-xxlarge textarea-height-s", :value => (@site.description(locale) rescue nil) %>
 								<% end %>
-								<p class="help-block"><%= (t 'admin.site_description_help').html_safe %></p>
+								<p class="help-block"><%= (t 'site.description_help').html_safe %></p>
 							</div>
 						</div>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.site_footer' %></label>
+							<label class="control-label"><%= t 'site.footer' %></label>
 							<div class="controls">
 								<%= f.fields_for :footer_translations do |f| %>
 									<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.footer_translations[locale] rescue nil) %>
 								<% end %>
-								<p class="help-block"><%= (t 'admin.site_footer_help').html_safe %></p>
+								<p class="help-block"><%= (t 'site.footer_help').html_safe %></p>
 							</div>
 						</div>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.site_sub_menu' %></label>
+							<label class="control-label"><%= t 'site.sub_menu' %></label>
 							<div class="controls">
 								<%= f.fields_for :sub_menu_translations do |f| %>
 									<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge", :value => (@site.sub_menu_translations[locale] rescue nil) %>
@@ -82,7 +82,7 @@
 							</div>
 						</div>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.default_image' %></label>
+							<label class="control-label"><%= t 'site.default_image' %></label>
 							<div class="controls">
 								<%= f.file_field :default_image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
 								<span id='fu' class="file-name"></span>

app/views/admin/sites/sitemap.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 

app/views/admin/sites/system_info.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 system_info.html.erb

app/views/admin/sites/ui_theme.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('admin.site_settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 ui_theme.html.erb

app/views/admin/tags/_add.html.erb

@@ -3,5 +3,5 @@
 	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
 	<% end %>
 	<%= f.hidden_field :module_app_id, :value => @module_app_id %>
-	<%= f.submit %>
+	<%= f.submit t(:add) %>
 <% end %>

app/views/admin/tags/_form.html.erb

@@ -3,5 +3,5 @@
 	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
 	<% end %>
 	<%= f.hidden_field :module_app_id, :value => tag.module_app_id %>
-	<%= f.submit %>
+	<%= f.submit t(:update_) %>
 <% end %>

app/views/admin/translations/_action_bar.html.erb

@@ -1 +0,0 @@
-<a href="#" class="edit"><%= t(:edit) %></a> | <a href="#" class="hide"><%= t(:hide) %></a>

app/views/admin/translations/_edit_language.html.erb

@@ -1,16 +0,0 @@
-<table>
-  <tr>
-    <th><%= t('admin.key') %></th>
-    <% @site_valid_locales.each do |locale| %>
-      <th style="color:<%= colorize_in_use_locale(locale) %>"><%= locale %></th>
-    <% end %>
-  </tr>
-  <% @language_i18n_variables.each do |var| %>
-    <tr>
-      <td><%= var.key %></td>
-      <% @site_valid_locales.each do |locale| %>
-        <td><%= text_field_tag "i18n_variables[#{var.id}][#{locale}]", var[locale] %></td>
-      <% end %>
-    </tr>    
-  <% end %>
-</table>

app/views/admin/translations/_edit_user_attribute_model.html.erb

@@ -1,34 +0,0 @@
-<% @vars =  @i18n_variables.inject([]) do |result, var|
-  result << var if var.parent_id.to_s.eql?(edit_user_attribute_model.id.to_s)
-  result
-end %>
-
-<fieldset>
-  <legend>
-    <%= edit_user_attribute_model.key %>
-    <%#= render :partial => 'action_bar' %>
-  </legend> 
-  <table>
-    <tr>
-      <th><%= t('admin.key') %></th>
-      <% @site_valid_locales.each do |locale| %>
-        <th style="color:<%= colorize_in_use_locale(locale) %>"><%= locale %></th>
-      <% end %>
-    </tr>
-    <tr>
-      <td><%= edit_user_attribute_model.key %></td>
-      <% @site_valid_locales.each do |locale| %>
-        <td><%= text_field_tag "i18n_variables[#{edit_user_attribute_model.id}][#{locale}]", edit_user_attribute_model[locale] %></td>
-      <% end %>
-    </tr>    
-
-    <% @vars.each do |var| %>
-      <tr>
-        <td><%= var.key %></td>
-        <% @site_valid_locales.each do |locale| %>
-          <td><%= text_field_tag "i18n_variables[#{var.id}][#{locale}]", var[locale] %></td>
-        <% end %>
-      </tr>    
-    <% end %>
-  </table>
-</fieldset>

app/views/admin/translations/_language.html.erb

@@ -1,16 +0,0 @@
-<table>
-  <tr>
-    <th><%= t('admin.key') %></th>
-    <% @site_valid_locales.each do |locale| %>
-      <th style="color:<%= colorize_in_use_locale(locale) %>"><%= locale %></th>
-    <% end %>
-  </tr>
-  <% @language_i18n_variables.each do |var| %>
-    <tr>
-      <td><%= var.key %></td>
-      <% @site_valid_locales.each do |locale| %>
-        <td><%= var[locale] %></td>
-      <% end %>
-    </tr>    
-  <% end %>
-</table>

app/views/admin/translations/_user_attribute_model.html.erb

@@ -1,34 +0,0 @@
-<% @vars =  @i18n_variables.inject([]) do |result, var|
-  result << var if var.parent_id.to_s.eql?(user_attribute_model.id.to_s)
-  result
-end %>
-
-<fieldset>
-  <legend>
-    <%= user_attribute_model.key %>
-    <%#= render :partial => 'action_bar' %>
-  </legend> 
-  <table>
-    <tr>
-      <th><%= t('admin.key') %></th>
-      <% @site_valid_locales.each do |locale| %>
-        <th style="color:<%= colorize_in_use_locale(locale) %>"><%= locale %></th>
-      <% end %>
-    </tr>
-    <tr>
-      <td><%= user_attribute_model.key %></td>
-      <% @site_valid_locales.each do |locale| %>
-        <td><%= user_attribute_model[locale] %></td>
-      <% end %>
-    </tr>    
-
-    <% @vars.each do |var| %>
-      <tr>
-        <td><%= var.key %></td>
-        <% @site_valid_locales.each do |locale| %>
-          <td><%= var[locale] %></td>
-        <% end %>
-      </tr>    
-    <% end %>
-  </table>
-</fieldset>

app/views/admin/translations/edit.html.erb

@@ -1,39 +0,0 @@
-<div class="main2">
-<%= form_tag admin_translation_path('all'), :method => :put do %>
-  <% if @language_i18n_variables.size > 0 %>
-    <fieldset>
-      <legend>
-        <%= t('admin.language') %>
-        <%#= render :partial => 'action_bar' %>
-      </legend> 
-      <div><%= render :partial => 'edit_language' %></div>
-    </fieldset>
-  <% end %>
-
-  <% if @info_i18n_variables.size > 0 %>
-    <fieldset>
-      <legend>
-        <%= t('admin.user_info') %>
-        <%#= render :partial => 'action_bar' %>
-      </legend> 
-      <div><%= render :partial => 'edit_user_attribute_model', :collection => @info_i18n_variables %></div>
-    </fieldset>
-  <% end %>
-
-  <% if @role_i18n_variables.size > 0 %>
-    <fieldset>
-      <legend>
-        <%= t('admin.user_role') %>
-        <%#= render :partial => 'action_bar' %>
-      </legend> 
-      <div><%= render :partial => 'edit_user_attribute_model', :collection => @role_i18n_variables %></div>
-    </fieldset>
-  <% end %>
-  
-	<div class="button_bar">
-		<%= link_back %>
-		<%= submit_tag t('update')  %>
-	</div>
-  
-<% end %>
-</div>

app/views/admin/translations/index.html.erb

@@ -1,72 +0,0 @@
-<div class="main2">
-<% content_for :secondary do %>
-<div class="translations_setup">
-  <h1><%= t('admin.setup_translations') %></h1>
-  <ul class="list">
-    <li><%= link_to t(:edit), edit_admin_translation_path('all'), :class => 'button positive' %></li>
-    <li>
-      <%= t('admin.add_language') %>:
-      <%= form_tag admin_translation_path('add'), :method => :put do %>
-        <%= text_field_tag 'language', '', :style => "width:100px" %>
-        <%= submit_tag t(:add) %>
-      <% end %>
-    </li>
-    <li>
-      <%= t('admin.enable_language') %>:
-      <%= form_tag admin_translation_path('enable'), :method => :put do %>
-        <%= select_tag 'enable_language', options_for_select(@site_valid_locales - @site_in_use_locales), :style => "width:100px" %>
-        <%= submit_tag t(:enable) %>
-      <% end %>
-    </li>
-    <li>
-      <%= t('admin.disable_language') %>:
-      <%= form_tag admin_translation_path('disable'), :method => :put do %>
-        <%= select_tag 'disable_language', options_for_select(@site_in_use_locales), :style => "width:100px" %>
-        <%= submit_tag t(:disable) %>
-      <% end %>
-    </li>
-    <li>
-      <%= t('admin.delete_language') %>:
-      <%= form_tag admin_translation_path('delete'), :method => :put do %>
-        <%= select_tag 'delete_language', options_for_select(@site_valid_locales), :style => "width:100px" %>
-        <%= submit_tag t(:delete), :confirm => t('sure?') %>
-      <% end %>
-    </li>
-  </ul>
-</div>
-<% end -%>
-
-<% if @language_i18n_variables.size > 0 %>
-  <fieldset>
-    <legend>
-      <%= t('admin.language') %>
-      <%#= render :partial => 'action_bar' %>
-    </legend> 
-    <div><%= render :partial => 'language' %></div>
-  </fieldset>
-<% end %>
-
-<% if @info_i18n_variables.size > 0 %>
-  <fieldset>
-    <legend>
-      <%= t('admin.user_info') %>
-      <%#= render :partial => 'action_bar' %>
-    </legend> 
-    <div><%= render :partial => 'user_attribute_model', :collection => @user_info_model_i18n_variables %></div>
-  </fieldset>
-<% end %>
-
-<% if @role_i18n_variables.size > 0 %>
-  <fieldset>
-    <legend>
-      <%= t('admin.user_role') %>
-      <%#= render :partial => 'action_bar' %>
-    </legend> 
-    <div><%= render :partial => 'user_attribute_model', :collection => @user_role_model_i18n_variables %></div>
-  </fieldset>
-<% end %>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "translation_page" %>
-<% end -%>
-</div>

app/views/admin/users/_form.html.erb

@@ -7,15 +7,15 @@
  	<%= file_field_tag 'file' %>
  	<%= hidden_field_tag :avatar_cache %>
 	<label>
-	<span><%= t('admin.email') %>：</span>
-	<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+	<span><%= t(:email) %>：</span>
+	<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
 	</label>
 	<label>
     <%= f.check_box :admin %>
-	<span><%= t('admin.admin') %>：</span>
+	<span><%= t(:admin) %>：</span>
 	</label>
 	<label>
-	<span><%= t('admin.role') %>：</span>
+	<span><%= t(:role) %>：</span>
 	<%= f.select :role_id, @roles.sort_by{|role| role.key }.collect {|role| [ role.title, role.id ]}, :selected => (@user.role_id || Role.get_role_from_key('student')) %>
 	</label>
 </div>

app/views/admin/users/_info.html.erb

@@ -5,7 +5,7 @@
 		<table border="0" cellspacing="0" cellpadding="0">
 			<thead class="list_head">
 				<tr>
-					<td><%= t("admin.key") %></td>
+					<td><%= t(:key) %></td>
 					<% @site_valid_locales.each do |locale| %>
 		        	<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 		      		<% end %>

app/views/admin/users/_show_attribute.html.erb

@@ -1,7 +1,7 @@
 <div class="info_input">
 	<table border="0" cellspacing="0" cellpadding="0">
 		<thead class="list_head">
-			<td><%= t("admin.key") %></td>
+			<td><%= t(:key) %></td>
 			<% @site_valid_locales.each do |locale| %>
 			<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 			<% end %>

app/views/admin/users/_side_bar.html.erb

@@ -2,10 +2,10 @@
 	<input id="user_search" name="user[username]" size="30" type="text" />
 </div>
 <div class="member_setup <%= @class %>">
-	<h1><%= t('admin.setup_member') %></h1>
+	<h1><%= t(:setup_member) %></h1>
 	<ul class="list">
-		<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
-		<li class="set_2"><%= link_to content_tag(:span, t('admin.list_roles')), admin_roles_path %></li>
-		<li class="set_3"><%= link_to content_tag(:span, t('admin.list_infos')), admin_infos_path %></li>
+		<li class="set_1"><%= link_to content_tag(:span, t('list.user')), admin_users_path %></li>
+		<li class="set_2"><%= link_to content_tag(:span, t('list.role')), admin_roles_path %></li>
+		<li class="set_3"><%= link_to content_tag(:span, t('list.info')), admin_infos_path %></li>
 	</ul>	
 </div>

app/views/admin/users/_sub_role.html.erb

@@ -4,7 +4,7 @@
 		<table border="0" cellspacing="0" cellpadding="0">
 			<thead class="list_head">
 				<tr>
-					<td><%= t("admin.key") %></td>
+					<td><%= t(:key) %></td>
 					<% @site_valid_locales.each do |locale| %>
 					<td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 					<% end %>

app/views/admin/users/index.html.erb

@@ -5,16 +5,16 @@
 <div class="main_list clear">
 	<%= flash_messages %>
 	<div class="button_bar up">
-		<%= link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>
 	<table>
 		<thead>
 			<tr>
-				<td class="roles"><%= t('admin.role') %></td>
-				<td class="name"><%= t('admin.name') %></td>
-				<td class="email"><%= t('admin.email') %></td>
-				<td class="admin"><%= t('admin.admin') %></td>
-				<td class="action"><%= t('admin.action') %></td>
+				<td class="roles"><%= t(:role) %></td>
+				<td class="name"><%= t(:name) %></td>
+				<td class="email"><%= t(:email) %></td>
+				<td class="admin"><%= t(:admin) %></td>
+				<td class="action"><%= t(:action) %></td>
 			</tr>
 		</thead>
 		<tbody>
@@ -37,6 +37,6 @@
 		</tbody>
 	</table>
 	<div class="button_bar">
-		<%= link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %>
+		<%= link_to t('new.user'), new_admin_user_path, :class => 'new' %>
 	</div>	
 </div>

app/views/admin/users_new_interface/_form.html.erb

@@ -11,7 +11,7 @@
       </div>
       <label>
     <%= f.check_box :admin %>
-  <span><%= t('admin.admin') %>：</span>
+  <span><%= t(:admin) %>：</span>
   </label>
   </div>
 

app/views/admin/users_new_interface/_infos.html.erb

@@ -1,4 +1,4 @@
-  <!--<span><%#= t('admin.email') %>：</span> -->
-  <%#= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+  <!--<span><%#= t(:email) %>：</span> -->
+  <%#= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
 
 <%=render :partial=>"info",:collection=>Info.all%>

app/views/desktop/journal_pages/list.html.erb

@@ -61,6 +61,18 @@
 			</ul>
 		</div>
 	</div>
+	<div class="hh2 hp sdm">
+		<div class="sdm_t hh2" id='ns'>New Share</div>
+		<div class="admbg sdm_o">
+			<ul>
+				<li><a class="hp hh2 admtxt remote_url" href="<%= panel_personal_journal_plugin_writing_journals_path %>">Full</a></li>
+				<li><a class="hp hh2 admtxt" href="">Abstract</a></li>
+				<li><a class="hp hh2 admtxt" href="">Friends</a></li>
+				<li><a class="hp hh2 admtxt" href="">Private</a></li>
+				<li><a class="hp hh2 admtxt" href="">Group</a></li>
+			</ul>
+		</div>
+	</div>
 	<div class="hh2 hp sdm">
 		<div class="sdm_t hh2"><span class="icon-question-sign"></span></div>
 	</div>
@@ -72,4 +84,19 @@
 		
 		</div>
 	</div>
-</div>
+</div>
+Panel::PersonalJournal::Plugin::WritingJournals
+<script type="text/javascript">
+orbitDesktop.prototype.bindItems = function(){
+	var bindHandlers = function(){
+
+	}
+	$(".remote_url").click(function(){
+		$(".overview").load($(this).attr("href"),function(){
+			bindHandlers();
+		})
+		return false;
+	})
+}
+o.bindItems();
+</script>

app/views/desktop_widgets/upload.html.erb

@@ -0,0 +1,12 @@
+<h4>Upload Widget Package </h4>
+<div class="main2">
+	<%= form_tag '',:multipart => true,:action=>"post" do |f| %>
+
+	<p>
+	<%= file_field :desktop_widget,:package_file %>
+	</p>
+	<%= submit_tag  %>
+
+	<% end %>
+
+</div>

app/views/devise/sessions/new.html.erb

@@ -3,11 +3,11 @@
 	<h3><%= t(:login) %></h3>
 </div>
 <div id="container" class="sign-in">
-	<%= form_for :user, :url => user_session_path, :html => {:class => 'user_new form-horizontal'} do |f| %>
+	<%= form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'user_new form-horizontal'} do |f| %>
 		<div class="content">
 			 <% flash.each do |key, msg| %>
 		    <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
-		  <% end%>
+		  <% end %>
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">

app/views/layouts/_drop_down_menu.html.erb

@@ -1,10 +1,9 @@
 <ul id="orblist">
-	<li><%= link_to t('homepage'), root_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.item'), admin_items_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.asset'), admin_assets_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.member'), admin_users_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:homepage), root_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:item), admin_items_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:template), admin_designs_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:purchase), admin_purchases_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:asset), admin_assets_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:member), admin_users_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:site_), admin_sites_path, :class => 'orblink' %></li>
 </ul>

app/views/layouts/_orbit_bar.html.erb

@@ -5,18 +5,18 @@
 			    <% if !current_user.nil?  %>
 			    <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
 			    <ul class="dropdown-menu">
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t('admin.dashboard'), admin_dashboards_path %></li>
+							<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t(:dashboard_), admin_dashboards_path %></li>
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.new_admin.user'), admin_users_new_interface_index_path %></li>
 
-			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t('admin.content') %></li>
-							<li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %></li>
-							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %></li>
+			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
+							<li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>
+							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
 							<%if (is_admin? rescue false)%>
 			        <li class="divider"></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t('admin.structure'), admin_items_path %></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %></li>
+							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t(:structure), admin_items_path %></li>
+							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('site.settings'), admin_site_site_info_path(@site) %></li>
 							<% end -%>
-			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t('admin.add_item') %></li>
+			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t(:add_item) %></li>
 			    </ul>
 			    <% else %>
 			    	<a class="brand dropdown-toggle" data-toggle="dropdown" href="/">Orbit</a>
@@ -90,7 +90,7 @@
 									<li>
 										<div class="input-prepend">
 											<span class="add-on"><i class="icon-user"></i></span>
-											<%= f.text_field :nccu_ldap_uid, :class => 'span2', :placeholder => t('nccu_c.nccu_ldap_uid'), :size => 16 %>
+											<%= f.text_field :email, :class => 'span2', :placeholder => t(:email), :size => 16 %>
 										</div>
 									</li>
 									<li>

app/views/layouts/_side_bar_content.html.erb

@@ -14,7 +14,7 @@
     <%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") )if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index')if (is_manager? rescue nil) %>
     <%= content_tag :li, link_to((t('announcement.bulletin.approval_setting') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting')  if (is_manager? rescue nil) %>
-    <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %>
+    <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %>
 
   <% end -%>
 
@@ -46,14 +46,14 @@
 
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banners') do -%>
+<%= content_tag :li, :class => active_for_controllers('ad_banners', 'ad_images') ||active_for_ob_auths_object("AdBanner") ||active_for_app_auth('ad_banner') do -%>
   <%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.ad_banner')), admin_ad_banners_path %>
 
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images') ) do -%>
     <%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
     <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
     <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-  <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "ad_banners"}))), :class => active_for_app_auth('ad_banners')  if (is_admin? rescue nil) %>
+  <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "ad_banner"}))), :class => active_for_app_auth('ad_banners')  if (is_admin? rescue nil) %>
   <% end -%>
 <% end %>
 
@@ -65,7 +65,7 @@
     <%= content_tag :li, link_to((t('announcement.add_new') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') if (is_manager? rescue nil)%>
     <%= content_tag :li, link_to((t('announcement.categories') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_web_link_categorys_path), :class => (active_for_action('web_link_categorys', 'index') || active_for_ob_auths_object("WebLinkCategory")) if (is_manager? rescue nil)%>
     <%= content_tag :li, link_to((t('announcement.tags') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') if (is_manager? rescue nil)%>
-    <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "web_resource"}))), :class => active_for_app_auth('web_resource')  if (is_admin? rescue nil) %>
+    <%= content_tag :li, link_to((t('admin.module.authorization') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "web_resource"}))), :class => active_for_app_auth('web_resource')  if (is_admin? rescue nil) %>
   <% end -%>
 <% end -%>
 
@@ -81,7 +81,7 @@
   <% end -%>
 <% end %>
 
-<%= content_tag :li, :class => active_for_controllers('archive_files', 'tags', 'archive_file_categorys') do -%>
+<%= content_tag :li, :class => active_for_controllers('archive_files', 'panel/archive/back_end/tags', 'archive_file_categorys') do -%>
   <%= link_to content_tag(:i, nil, :class => 'icons-asset') + content_tag(:span, t('admin.archive')), panel_archive_back_end_archive_files_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('archive_files', 'tags', 'archive_file_categorys')) do -%>
     <%= content_tag :li, link_to((t('admin.all_articles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, panel_archive_back_end_archive_files_path), :class => active_for_action('archive_file', 'index') %>
@@ -91,14 +91,14 @@
   <% end -%>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('cals') || active_for_app_auth("calendar") do -%>
+<%= content_tag :li, :class => active_for_controllers('cals','panel/calendar/back_end/tags') || active_for_app_auth("calendar") do -%>
   <%= link_to content_tag(:i, nil, :class => 'icons-calendar') + content_tag(:span, t('admin.calendar')), panel_calendar_back_end_cals_path %>
   <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('cals','calendar_categories') ) do -%>
     <%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
     <%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
     <%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
-  <%= content_tag :li, link_to((t('calendar.calendars') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_calendar_back_end_cal_path), :class => active_for_action('cals','new') %>
-  <%#= content_tag :li, link_to(t('gallery.tags'), panel_gallery_back_end_tags_path), :class => active_for_action('/panel/gallery/back_end/tags', 'index') %>
+  <%= content_tag :li, link_to((t('admin.calendars') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_panel_calendar_back_end_cal_path), :class => active_for_action('cals','new') %>
+  <%= content_tag :li, link_to(t('admin.tags'), panel_calendar_back_end_tags_path), :class => active_for_action('/panel/calendar/back_end/tags', 'index') %>
   <%#= content_tag :li, link_to(t('admin.module.authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "gallery"}))), :class => active_for_app_auth('gallery')  if (is_admin? rescue nil) %>
   <% end -%>
 <% end %>

app/views/layouts/panel.html.erb

@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>R4</title>
-  <link rel="shortcut icon" href="/favicon.ico">
-  <%= yield :page_specific_link %>
-  <%= stylesheet_link_tag "application" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tag %>
-</head>
-<body>
-<div id="container">
-  
-    <div id="banner_link" style='text-align:right'>
-    <ul class="hmenu">
-      <li>
-        <%= render 'layouts/lang_menu' %>
-      </li>
-      <%= render 'devise/menu/login_items' %>
-    </ul>
-  </div>
-    
-  <div id="header">
-      
-      <h1>RulingSite Panel</h1>
-      
-      <ul id="nav">
-          <li><%= link_to t('panel.home'), root_path %></li>
-          <li><%= link_to t('panel.user'), panel_users_path %></li>
-     </ul>
-  </div>
-
-  <div class="content">
-    <div class="main"><%= yield %></div>
-  	<div class="secondary"><%= yield :secondary %></div>
-  	<div class="tertiary"><%= yield :tertiary %></div>
-  </div>
-  
-  <div id="footer">
-      <p>Rulingcom</p>
-  </div>
-</div>
-<%= yield :page_specific_javascript %>
-</body>
-</html>

app/views/shared/_privilege_user.html.erb

@@ -1,6 +1,6 @@
 <div class="checkblock">
   <div class="for_unit" style="display:none;"> <%= user.cache_dept[I18n.locale.to_s]  rescue ''%></div>
-    <%= content_tag :div,:data=>{'original-title'=>t('announcement.bulletin.approval_setting_window_title'),:content => (user.cache_dept[I18n.locale.to_s] rescue '')},:class=>"checkbox clear" do %>
+    <%= content_tag :div,:data=>{'original-title' => t(:title),:content => (user.cache_dept[I18n.locale.to_s] rescue '')},:class=>"checkbox clear" do %>
       <div class="check-icon">
         </div>
           <div class='member-avatar'>

app/views/shared/preview/_modal_preview.html.erb

@@ -0,0 +1,47 @@
+<div class="modal hide fade in banner-preview" id="<%= @preview_obj.id %>">
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3><%= t("modal.preview") %></h3>
+  </div>
+  <div class="modal-body">
+    <p class="">
+      <iframe src=<%= @preview_obj.get_preview_link %> style="width:1024px;height:300px" >
+
+        </iframe>
+  
+      <%# preview_block_ad_images_helper(news_bulletin).each do |ad_image| -%>
+        <%#= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => news_bulletin.transition_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || news_bulletin.context || " ")) %>
+      <%# end -%>
+    </p>
+  </div>
+  <div class="modal-footer">
+    
+    <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
+  </div>
+  <div>
+    <script type="text/javascript" src="/static/kernel.js"></script>
+    <script type="text/javascript">
+      $(document).ready(function() {
+  
+      // $("#news_bulletin-<%#=news_bulletin.title.dehumanize%>").on("show", function () {
+      //      $("#news_bulletin-<%#=news_bulletin.title.dehumanize%>").find(".news_bulletin_slideshow").cycle({delay: -1000, fx: "<%#= news_bulletin.ad_fx.nil?? "fade": news_bulletin.ad_fx %>", timeoutFn: getTimeout });
+      // });
+    $(".modal").on("hidden", function () {
+    $("#show_preview").remove();
+      });
+      
+      $("iframe").load(function(){
+          // Get the body element
+          var frameBody = $("iframe").contents().find("body");
+
+          // Get all links inside the BODY tag
+          $('a', frameBody).click(function(e){
+                  //Disable all default actions       
+                  e.preventDefault();
+          });
+          $('input', frameBody).attr("disabled", true);
+      });
+    });
+    </script>
+  </div>
+</div>

app/views/shared/preview/after_create.js.erb

@@ -0,0 +1 @@
+window.location = "<%= @info[:redirect_url]%>";

app/views/shared/preview/preview.html.erb

@@ -0,0 +1,12 @@
+<% if !request.xhr? %>
+<textarea>
+<% end %>
+$('#show_preview').html('<%=escape_javascript(render :partial=>"/shared/preview/modal_preview") %>');
+var start_modal_with_id = "<%= @preview_obj.id %>"; 
+$("#"+start_modal_with_id).css("width","1050px");
+$("#"+start_modal_with_id).css("height","768px");
+$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");
+$("#"+start_modal_with_id).modal();
+<% if !request.xhr? %>
+</textarea>
+<% end %>

app/views/shared/preview/preview.js.erb

@@ -0,0 +1,6 @@
+$('#show_preview').html('<%=escape_javascript(render :partial=>"/shared/preview/modal_preview") %>');
+var start_modal_with_id = "<%= @preview_obj.id %>"; 
+$("#"+start_modal_with_id).css("width","1050px");
+$("#"+start_modal_with_id).css("height","768px");
+$("#"+start_modal_with_id).css("margin","-270px 0 0 -550px");
+$("#"+start_modal_with_id).modal();