diff --git a/Gemfile.lock b/Gemfile.lock index cd992049..beb6db38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM ruby2ruby (~> 1.2) ruport (~> 1.6) sass (~> 3.0) - bson (1.6.1) + bson (1.6.4) bson_ext (1.6.1) bson (~> 1.6.1) builder (3.0.0) @@ -130,18 +130,18 @@ GEM mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) - mongo (1.6.1) - bson (~> 1.6.1) + mongo (1.6.2) + bson (~> 1.6.2) mongo_session_store-rails3 (3.0.5) actionpack (>= 3.0) mongo - mongoid (2.4.6) + mongoid (2.4.12) activemodel (~> 3.1) - mongo (~> 1.3) + mongo (<= 1.6.2) tzinfo (~> 0.3.22) mongoid-tree (0.7.0) mongoid (~> 2.0) - multi_json (1.1.0) + multi_json (1.3.6) mysql2 (0.3.11) mysql2 (0.3.11-x86-mingw32) net-ldap (0.3.1) @@ -301,7 +301,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) + tzinfo (0.3.33) uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) diff --git a/app/assets/javascripts/bulletin_form.js.erb b/app/assets/javascripts/bulletin_form.js.erb index 18e8e375..902f815d 100644 --- a/app/assets/javascripts/bulletin_form.js.erb +++ b/app/assets/javascripts/bulletin_form.js.erb @@ -10,7 +10,7 @@ $('.bulletin_files_block a.delete').live('click', function(){ }); $(document).on('click', '.action a.remove_existing_record', function(){ - if(confirm("<%= I18n.t('announcement.sure?')%>")){ + if(confirm("<%= I18n.t(:sure?)%>")){ $(this).next('.should_destroy').attr('value', 1); $("tr#" + $(this).prev().attr('value')).hide(); } diff --git a/app/assets/javascripts/inc/ajax_setting.js b/app/assets/javascripts/inc/ajax_setting.js index c23a73bf..d2f183f0 100644 --- a/app/assets/javascripts/inc/ajax_setting.js +++ b/app/assets/javascripts/inc/ajax_setting.js @@ -1,7 +1,7 @@ -jQuery(document).ajaxStart(function(){ - $('').appendTo('body'); -}); +// jQuery(document).ajaxStart(function(){ +// $('').appendTo('body'); +// }); -jQuery(document).ajaxComplete(function(){ - $("#sys_modal").hide().remove(); -}); +// jQuery(document).ajaxComplete(function(){ +// $("#sys_modal").hide().remove(); +// }); diff --git a/app/assets/javascripts/lib/contenteditable.js.erb b/app/assets/javascripts/lib/contenteditable.js.erb index 40c19dd3..9d35acbe 100644 --- a/app/assets/javascripts/lib/contenteditable.js.erb +++ b/app/assets/javascripts/lib/contenteditable.js.erb @@ -40,11 +40,11 @@ $(".nav-tabs").find(".icons-pencil").click(function(){ data: { body: content_holder.html() }, success: function(json) { $(selector).attr("contenteditable",false) - alert("<%= I18n.t('admin.contenteditable.update_done') %>"); + alert("<%= I18n.t('update.success_') %>"); //content_holder.effect('highlight', {'color': '#0f0'}, 3000); }, error: function() { - alert("<%= I18n.t('admin.contenteditable.update_failed') %>"); + alert("<%= I18n.t('update.fail') %>"); //content_holder.effect('highlight', {'color': '#f00'}, 3000); content_holder.html(content); } diff --git a/app/assets/javascripts/news_bulletin_form.js.erb b/app/assets/javascripts/news_bulletin_form.js.erb index 092bbfff..2a96e6be 100644 --- a/app/assets/javascripts/news_bulletin_form.js.erb +++ b/app/assets/javascripts/news_bulletin_form.js.erb @@ -11,7 +11,7 @@ $('.news_bulletin_files_block a.delete').live('click', function(){ }); $(document).on('click', '.action a.remove_existing_record', function(){ - if(confirm("<%= I18n.t('news.sure?')%>")){ + if(confirm("<%= I18n.t(:sure?)%>")){ $(this).next('.should_destroy').attr('value', 1); $("tr#" + $(this).prev().attr('value')).hide(); } diff --git a/app/controllers/admin/ad_images_controller.rb b/app/controllers/admin/ad_images_controller.rb index e3cef303..e4749ade 100644 --- a/app/controllers/admin/ad_images_controller.rb +++ b/app/controllers/admin/ad_images_controller.rb @@ -41,7 +41,7 @@ class Admin::AdImagesController < OrbitBackendController @ad_banner = AdBanner.find params[:ad_banner_id] @ad_image = @ad_banner.ad_images.find params[:id] if @ad_image.destroy - flash[:notice] = t('admin.success_destroy_ad_image') + flash[:notice] = t('ad.success_destroy_ad_image') redirect_to admin_ad_banner_path @ad_banner end end diff --git a/app/controllers/admin/asset_categories_controller.rb b/app/controllers/admin/asset_categories_controller.rb index 9ce6bb48..d406543b 100644 --- a/app/controllers/admin/asset_categories_controller.rb +++ b/app/controllers/admin/asset_categories_controller.rb @@ -25,7 +25,7 @@ class Admin::AssetCategoriesController < OrbitBackendController respond_to do |format| if @asset_category.save - format.html { redirect_to(admin_asset_categories_url, :notice => t('announcement.create_asset_category_success')) } + format.html { redirect_to(admin_asset_categories_url, :notice => t('create.success.asset_category')) } format.js else format.html { render :action => "new" } @@ -41,8 +41,8 @@ class Admin::AssetCategoriesController < OrbitBackendController respond_to do |format| if @asset_category.update_attributes(params[:asset_category]) - # format.html { redirect_to(panel_announcement_back_end_asset_category_url(@asset_category), :notice => t('asset_category.update_asset_category_success')) } - # format.html { redirect_to(panel_announcement_back_end_asset_categories_url, :notice => t('asset_category.update_asset_category_success')) } + # format.html { redirect_to(panel_announcement_back_end_asset_category_url(@asset_category), :notice => t('create.success')) } + # format.html { redirect_to(panel_announcement_back_end_asset_categories_url, :notice => t('create.success')) } # format.xml { head :ok } format.js else diff --git a/app/controllers/admin/assets_controller.rb b/app/controllers/admin/assets_controller.rb index aa82583f..77c52ffa 100644 --- a/app/controllers/admin/assets_controller.rb +++ b/app/controllers/admin/assets_controller.rb @@ -44,7 +44,7 @@ class Admin::AssetsController < OrbitBackendController # render :json=>{"url"=>@asset.data.url,"title"=>"xxx","desc"=>"sss"}.to_json render :layout=>false else - flash[:error] = t(:create_fail) + flash[:error] = t('create.fail') @asset_categories = AssetCategory.all @tags = AssetTag.all respond_to do |format| @@ -67,7 +67,7 @@ class Admin::AssetsController < OrbitBackendController format.js { render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil} } end else - flash[:error] = t(:update_fail) + flash[:error] = t('update.fail') @asset_categories = AssetCategory.all @tags = AssetTag.all respond_to do |format| diff --git a/app/controllers/admin/items_controller.rb b/app/controllers/admin/items_controller.rb index 1ea40640..e028ab68 100644 --- a/app/controllers/admin/items_controller.rb +++ b/app/controllers/admin/items_controller.rb @@ -4,7 +4,6 @@ class Admin::ItemsController < ApplicationController before_filter :authenticate_user! before_filter :find_parent_item - before_filter :find_snippets, :only => :index before_filter :is_admin? before_filter :set_current_item @@ -22,10 +21,4 @@ class Admin::ItemsController < ApplicationController render :nothing => true end - protected - - def find_snippets - @snippets = Snippet.where( { :parent_id => @parent_item.id } ) rescue nil - end - end diff --git a/app/controllers/admin/links_controller.rb b/app/controllers/admin/links_controller.rb index c233c18f..7c7b4030 100644 --- a/app/controllers/admin/links_controller.rb +++ b/app/controllers/admin/links_controller.rb @@ -23,7 +23,7 @@ class Admin::LinksController < ApplicationController @item = Link.new(params[:link]) if @item.save - flash.now[:notice] = t('admin.create_success_link') + flash.now[:notice] = t('create.success.link') respond_to do |format| format.html { redirect_to admin_link_url(@item) @@ -31,7 +31,7 @@ class Admin::LinksController < ApplicationController format.js {} end else - flash.now[:error] = t('admin.create_error_link') + flash.now[:error] = t('create.error.link') render :action => "new" end end @@ -40,7 +40,7 @@ class Admin::LinksController < ApplicationController @item = Link.find(params[:id]) if @item.update_attributes(params[:link]) - flash.now[:notice] = t('admin.update_success_link') + flash.now[:notice] = t('update.success.link') respond_to do |format| format.html { redirect_to admin_link_url(@item) @@ -48,7 +48,7 @@ class Admin::LinksController < ApplicationController format.js {} end else - flash.now[:error] = t('admin.update_error_link') + flash.now[:error] = t('update.error.link') render :action => "edit" end end diff --git a/app/controllers/admin/module_apps_controller.rb b/app/controllers/admin/module_apps_controller.rb index 0c90f854..bf3661c8 100644 --- a/app/controllers/admin/module_apps_controller.rb +++ b/app/controllers/admin/module_apps_controller.rb @@ -58,14 +58,14 @@ class Admin::ModuleAppsController < ApplicationController def assign_sub_manager unless @assign_to_user.nil? || @assign_to_user.admin? if @module_app.assign_sub_manager(@assign_to_user,current_user) - flash[:notice] = t('admin.app_auth.assigning_manager.add_sub_manager_ok') + flash[:notice] = t('app_auth.assigning_manager.add_manager_ok') else - flash[:notice] = t('admin.app_auth.assigning_manager.add_sub_manager_fail') + flash[:notice] = t('app_auth.assigning_manager.add_manager_fail') end else - flash[:notice] = t('admin.app_auth.assigning_manager.failed_no_user') + flash[:notice] = t('app_auth.failed_no_user') end - flash[:notice] = t('admin.app_auth.can_not_add_this_user') + flash[:notice] = t('app_auth.can_not_add_this_user') redirect_to :action => "edit" end @@ -73,14 +73,14 @@ class Admin::ModuleAppsController < ApplicationController def assign_manager unless @assign_to_user.nil? || @assign_to_user.admin? if @module_app.assign_manager(@assign_to_user,current_user) - flash[:notice] = t('admin.app_auth.assigning_sub_manager.add_manager_ok') + flash[:notice] = t('app_auth.assigning_sub_manager.add_sub_manager_ok') else - flash[:notice] = t('admin.app_auth.assigning_sub_manager.add_manager_fail') + flash[:notice] = t('app_auth.assigning_sub_manager.add_sub_manager_fail') end else - flash[:notice] = t('admin.app_auth.assigning_sub_manager.failed_no_user') + flash[:notice] = t('app_auth.failed_no_user') end - flash[:notice] = t('admin.app_auth.can_not_add_this_user') + flash[:notice] = t('app_auth.can_not_add_this_user') redirect_to :action => "edit" end @@ -88,9 +88,9 @@ class Admin::ModuleAppsController < ApplicationController def remove_manager @app_manager = AppManager.find(params[:app_manager_id]) if @module_app.remove_manager(@app_manager.user) - flash[:notice] = t('admin.app_auth.delete_manager.success') + flash[:notice] = t('app_auth.delete_manager.success') else - flash[:notice] = t('admin.app_auth.delete_manager.fail') + flash[:notice] = t('app_auth.delete_manager.fail') end redirect_to :action => "edit" end @@ -99,9 +99,9 @@ class Admin::ModuleAppsController < ApplicationController def remove_sub_manager @app_sub_manager = AppManager.find(params[:app_sub_manager_id]) if @module_app.remove_sub_manager(@app_sub_manager.user) - flash[:notice] = t('admin.app_auth.delete_sub_manager.success') + flash[:notice] = t('app_auth.delete_sub_manager.success') else - flash[:notice] = t('admin.app_auth.delete_sub_manager.fail') + flash[:notice] = t('app_auth.delete_sub_manager.fail') end redirect_to :action => "edit" end @@ -115,7 +115,7 @@ class Admin::ModuleAppsController < ApplicationController return end #user is not permited to do that - flash[:notice] = t('admin.app_auth.operation_not_permitted') + flash[:notice] = t('app_auth.operation_not_permitted') render :nothing => true, :status => 403 end @@ -127,7 +127,7 @@ class Admin::ModuleAppsController < ApplicationController return end #user is not permited to do that - flash[:notice] = t('admin.app_auth.operation_not_permitted') + flash[:notice] = t('app_auth.operation_not_permitted') render :nothing => true, :status => 403 end diff --git a/app/controllers/admin/module_apps_new_interface_controller.rb b/app/controllers/admin/module_apps_new_interface_controller.rb index ab6dceee..31718624 100644 --- a/app/controllers/admin/module_apps_new_interface_controller.rb +++ b/app/controllers/admin/module_apps_new_interface_controller.rb @@ -25,9 +25,9 @@ class Admin::ModuleAppsNewInterfaceController < OrbitBackendController def update_setting module_app = update_setting_by_params if module_app.save! - flash[:notice] = t("admin.object_auth.update_done") + flash[:notice] = t('update.success_') else - flash[:notice] = t("admin.object_auth.update_failed") + flash[:notice] = t('update.fail') end end diff --git a/app/controllers/admin/object_auths_controller.rb b/app/controllers/admin/object_auths_controller.rb index b89a4fe6..dab659b4 100644 --- a/app/controllers/admin/object_auths_controller.rb +++ b/app/controllers/admin/object_auths_controller.rb @@ -30,7 +30,7 @@ class Admin::ObjectAuthsController < ApplicationController if @object_auth.save redirect_to edit_admin_object_auth_path(@object_auth) else - flash[:error] = t('admin.object.a_object_must_have_only_one_object_auth_profile_for_each_action') + flash[:error] = t('object.a_object_must_have_only_one_object_auth_profile_for_each_action') redirect_to (:back) end end diff --git a/app/controllers/admin/object_auths_new_interface_controller.rb b/app/controllers/admin/object_auths_new_interface_controller.rb index ac06602a..7728834d 100644 --- a/app/controllers/admin/object_auths_new_interface_controller.rb +++ b/app/controllers/admin/object_auths_new_interface_controller.rb @@ -18,9 +18,9 @@ class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController def update_setting ob_auth = update_setting_by_params if ob_auth.save! - flash[:notice] = t("admin.object_auth.update_done") + flash[:notice] = t('update.success_') else - flash[:notice] = t("admin.object_auth.update_failed") + flash[:notice] = t('update.fail') end end diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb index 17065bce..793f8637 100644 --- a/app/controllers/admin/page_parts_controller.rb +++ b/app/controllers/admin/page_parts_controller.rb @@ -47,7 +47,7 @@ class Admin::PagePartsController < ApplicationController @part = PagePart.find(params[:id]) if @part.update_attributes(params[:page_part]) set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu') - flash.now[:notice] = t('admin.update_success_content') + flash.now[:notice] = t('update.success.content') if @part.page.name == 'home' expire_page '/' diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb index 5fc6cb77..f24b0526 100644 --- a/app/controllers/admin/pages_controller.rb +++ b/app/controllers/admin/pages_controller.rb @@ -56,7 +56,7 @@ class Admin::PagesController < ApplicationController end if @item.save - flash.now[:notice] = t('admin.create_success_page') + flash.now[:notice] = t('create.success.page') respond_to do |format| format.html { redirect_to admin_page_url(@item) @@ -64,7 +64,7 @@ class Admin::PagesController < ApplicationController format.js {} end else - flash.now[:error] = t('admin.create_error_page') + flash.now[:error] = t('create.error.page') @apps = ModuleApp.all @designs = Design.all.entries @design = Design.first @@ -80,7 +80,7 @@ class Admin::PagesController < ApplicationController end if @item.update_attributes(params[:page]) - flash[:notice] = t('admin.update_success_page') + flash[:notice] = t('update.success.page') respond_to do |format| format.html { redirect_to admin_page_url(@item) diff --git a/app/controllers/admin/translations_controller.rb b/app/controllers/admin/translations_controller.rb deleted file mode 100644 index 54da8762..00000000 --- a/app/controllers/admin/translations_controller.rb +++ /dev/null @@ -1,81 +0,0 @@ -class Admin::TranslationsController < ApplicationController - - layout "admin" - before_filter :authenticate_user! - before_filter :is_admin? - - def index - set_variables - end - - def edit - set_variables - end - - # Update either the i18n_variables or the languages - def update - begin - case params[:id] - # Update the i18n_variables - when 'all' - params[:i18n_variables].each do |id, var| - i18n_variable = I18nVariable.find(id) - i18n_variable.update_attributes(var) - end - # Add a language - when 'add' - site = Site.find(session[:site]) - if !site.valid_locales.include?(params[:language]) - site.valid_locales << params[:language] - site.save - I18nVariable.create({:key => params[:language], :document_class => 'language'}) - end - # Enable a language - when 'enable' - site = Site.find(session[:site]) - if !site.in_use_locales.include?(params[:enable_language]) - site.in_use_locales << params[:enable_language] - site.save - end - # Disable a language - when 'disable' - site = Site.find(session[:site]) - if site.in_use_locales.include?(params[:disable_language]) - site.in_use_locales.delete(params[:disable_language]) - site.save - end - # Delete a language and the corresponding i18n_variables - when 'delete' - site = Site.find(session[:site]) - site.in_use_locales.delete(params[:delete_language]) - site.valid_locales.delete(params[:delete_language]) - site.save - I18nVariable.destroy_all(:conditions => {:document_class => 'language', :key => params[:delete_language]}) - end - redirect_to admin_translations_url - rescue - set_variables - render :action => :edit - end - end - - protected - - # Get the i18n_variables and languages - def set_variables - @i18n_variables = I18nVariable.all.entries - @language_i18n_variables = @i18n_variables.inject([]) do |result, var| - result << var if var.document_class.eql?('language') - result - end - @role_i18n_variables = @i18n_variables.inject([]) do |result, var| - result << var if var.document_class.eql?('Role') - result - end - @info_i18n_variables = @i18n_variables.inject([]) do |result, var| - result << var if var.document_class.eql?('UserInfoModel') - result - end - end - -end diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index ef44cfc1..e0c8a8f9 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -22,7 +22,7 @@ class Admin::UsersController < ApplicationController puts params.to_yaml @user = User.new(params[:user]) if @user.save - flash[:notice] = t('admin.create_success_user') + flash[:notice] = t('create.success.user') redirect_to :action => :index else render :action => :new @@ -42,10 +42,10 @@ class Admin::UsersController < ApplicationController @user.avatar = params[:file] if params[:file] if @user.id.to_s.eql?(session['warden.user.user.key'][1].to_s) && @user.admin != params[:user][:admin].to_i.to_b - flash.now[:error] = t('admin.cant_revoke_self_admin') + flash.now[:error] = t(:cant_revoke_self_admin) end if !flash[:error] && @user.update_attributes(params[:user]) - flash[:notice] = t('admin.update_success_user') + flash[:notice] = t('update.success.user') redirect_to :action => :index else get_info_and_roles @@ -55,7 +55,7 @@ class Admin::UsersController < ApplicationController def destroy if params[:id].eql?(session['warden.user.user.key'][1].to_s) - flash[:error] = t('admin.cant_delete_self') + flash[:error] = t(:cant_delete_self) else @user = User.find(params[:id]) @user.destroy diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 74274eeb..e8a3b65c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -61,7 +61,7 @@ class ApplicationController < ActionController::Base if is_admin? true else - flash[:error] = t("admin.access.denied.not_admin") + flash[:error] = t("access.denied.not_admin") auth_failed_in_backend end end @@ -70,7 +70,7 @@ class ApplicationController < ActionController::Base if is_manager? true else - flash[:error] = t("admin.access.denied.app.not_manager") + flash[:error] = t("access.denied.app.not_manager") auth_failed_in_backend end end @@ -79,7 +79,7 @@ class ApplicationController < ActionController::Base if (@module_app.sub_managing_users.include?(current_user) || is_manager?) true else - flash[:error] = t("admin.access.denied.app.not_sub_manager") + flash[:error] = t("access.denied.app.not_sub_manager") auth_failed_in_backend end end @@ -88,13 +88,13 @@ class ApplicationController < ActionController::Base if (@module_app.app_auth.auth_users.include?(current_user) || for_app_sub_manager ) true else - flash[:error] = t("admin.access.denied.app.not_authed_user") + flash[:error] = t("access.denied.app.not_authed_user") auth_failed_in_backend end end def check_object_premission(obj,title) - flash[:error] = t("admin.access.denied.object") + flash[:error] = t("access.denied.object") auth_failed_in_backend unless (obj.get_object_auth_by_title(title).auth_users.include?(current_user) || is_manager? || is_admin? ) end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index b2fbc997..fcb523dc 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -11,7 +11,7 @@ class SessionsController < Devise::SessionsController result = false ldap_filter = "(uid=#{login_uid})" if /@rulingcom.com$/.match(login_uid).nil? - MiddleSiteConnection.establish + # MiddleSiteConnection.establish NccuLdapConnection.establish if ($nccu_ldap_connection.bind rescue false) diff --git a/app/helpers/admin/ad_banner_helper.rb b/app/helpers/admin/ad_banner_helper.rb index ecba9b3b..feb3f6a6 100644 --- a/app/helpers/admin/ad_banner_helper.rb +++ b/app/helpers/admin/ad_banner_helper.rb @@ -22,8 +22,8 @@ module Admin::AdBannerHelper ad_banner.object_auths.new(title: type ).save oa = ad_banner.get_object_auth_by_title(type) end -# link_to t('announcement.bulletin.cate_auth'), edit_admin_object_auth_path(oa) - link_to t('admin.ad.cate_auth'),admin_object_auth_ob_auth_path(oa),:class => "btn btn-warning" +# link_to t(:category_auth), edit_admin_object_auth_path(oa) + link_to t(:category_auth),admin_object_auth_ob_auth_path(oa),:class => "btn btn-warning" end diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb index f5b8589a..3e91f7a3 100644 --- a/app/helpers/admin/item_helper.rb +++ b/app/helpers/admin/item_helper.rb @@ -16,8 +16,8 @@ module Admin::ItemHelper ret << (link_to node.title, dest, :class => 'js_history') ret << "
" ret << (link_to t('admin.edit'), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page') - ret << (link_to t('admin.new_page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page') - ret << (link_to t('admin.new_link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page') + ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page') + ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page') ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history') ret << "
" ret << "" diff --git a/app/helpers/admin/module_app_helper.rb b/app/helpers/admin/module_app_helper.rb index 3ac82364..b041786f 100644 --- a/app/helpers/admin/module_app_helper.rb +++ b/app/helpers/admin/module_app_helper.rb @@ -15,6 +15,6 @@ module Admin::ModuleAppHelper def get_auth_by(manager_obj) showing_name = manager_obj.rule_creator==current_user ? t('me') : manager_obj.rule_creator.name - t("admin.user_role.auth.auth_by",:user_display_name => showing_name) + t("auth.auth_by",:user_display_name => showing_name) end end diff --git a/app/helpers/admin/page_content_helper.rb b/app/helpers/admin/page_content_helper.rb index 9f2b22e0..7c893774 100644 --- a/app/helpers/admin/page_content_helper.rb +++ b/app/helpers/admin/page_content_helper.rb @@ -11,8 +11,8 @@ include ActionView::Helpers::UrlHelper page_context.object_auths.new(title: type ).save rescue oa = page_context.get_object_auth_by_title(type) end -# link_to t('announcement.bulletin.cate_auth'), edit_admin_object_auth_path(oa) - link_to t('admin.page_context.ob_auth.edit'),admin_object_auth_ob_auth_path(oa) +# link_to t(:category_auth), edit_admin_object_auth_path(oa) + link_to t(:category_auth),admin_object_auth_ob_auth_path(oa) end end \ No newline at end of file diff --git a/app/helpers/admin/web_link_helper.rb b/app/helpers/admin/web_link_helper.rb index 0498f31b..2890eb51 100644 --- a/app/helpers/admin/web_link_helper.rb +++ b/app/helpers/admin/web_link_helper.rb @@ -6,6 +6,6 @@ module Admin::WebLinkHelper web_link.object_auths.new(title: type ).save oa = web_link.get_object_auth_by_title(type) end - link_to t('web_resource.cate_auth'),admin_object_auth_ob_auth_path(oa) + link_to t(:category_auth),admin_object_auth_ob_auth_path(oa) end end \ No newline at end of file diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index 3bc4d31b..23f49cbf 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -43,7 +43,7 @@ module OrbitBackendHelper end def show_toggle_archive_btn(object) - object.disable ? t("object_disable.change_to_false") : t("object_disable.change_to_true") + object.disable ? t(:disable) : t(:enable) end end \ No newline at end of file diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index d65a17e0..257b1571 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/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| -%>
- - <%= f.label :ad_fx, t('admin.ad.ab_fx') %> + + <%= 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 -%>
- <%= 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' %>
<% end -%> <% end -%> -

<%= t("admin.ad.picture_list")%>

+

<%= t("ad.picture_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 @@ <% 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('ad.delete_banner'),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" } %> diff --git a/app/views/admin/ad_banners/_ad_image_update.html.erb b/app/views/admin/ad_banners/_ad_image_update.html.erb index 0b4277a0..15bb75d0 100644 --- a/app/views/admin/ad_banners/_ad_image_update.html.erb +++ b/app/views/admin/ad_banners/_ad_image_update.html.erb @@ -1,7 +1,7 @@
  • <%= image_tag ad_image.file rescue nil%>

    - <%= 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'}" %>

    <%if at_least_module_manager || sub_manager?(ad_image.ad_banner) %> diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb index 68e0a9c6..dc77bc5f 100644 --- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb +++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb @@ -4,33 +4,33 @@
    × -

    <%= t("admin.ad.new_banner") %>

    +

    <%= t('new.banner') %>

    - <%= f.label :title,t('admin.ad.title'),:class => "control-label" %> + <%= f.label :title, t(:title),:class => "control-label" %>
    <%= f.text_field :title %>
    - <%= f.label :transition_sec, t('admin.ad.transition_sec'),:class => "control-label" %> + <%= f.label :transition_sec, t('ad.transition_sec'),:class => "control-label" %>
    - <%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %> + <%= f.text_field :transition_sec %> <%= t("ad.trans_unit_sec") %>
    - <%= f.label :best_size, t('admin.ad.best_size'),:class => "control-label" %> + <%= f.label :best_size, t('ad.best_size'),:class => "control-label" %>
    <%= f.text_field :best_size %> Ex: 500px x 300px
    - <%= f.label :ad_fx, t('admin.ad.ab_fx') %> + <%= f.label :ad_fx, t('ad.ab_fx') %>
    <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
    diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb index 92c78f5b..9b2550d5 100644 --- a/app/views/admin/ad_banners/index.html.erb +++ b/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%> diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index 3ecda29b..4752736e 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -81,7 +81,7 @@ <%= image_tag @ad_image.file rescue ''%>
    <% if !@ad_image.ad_banner.best_size.empty?%> - <%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) %> + <%= t("ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) %> <% end -%>
    diff --git a/app/views/admin/app_auths/index.html.erb b/app/views/admin/app_auths/index.html.erb index 392f8d2b..f7bc5f42 100644 --- a/app/views/admin/app_auths/index.html.erb +++ b/app/views/admin/app_auths/index.html.erb @@ -5,18 +5,18 @@
    <%= flash_messages %>
    - <% #link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %> + <% #link_to t('new.user'), new_admin_user_path, :class => 'new' %>
    - - - - - - - + + + + + + + @@ -47,6 +47,6 @@
    <%= t('admin.app.title') %><%= t('admin.app.description') %><%= t('admin.app.use_status') %><%= t('admin.app.autdor') %><%= t('admin.app.organization') %><%= t('admin.app.version') %><%= t('admin.action') %><%= t(:title) %><%= t(:description) %><%= t(:use_status) %><%= t(:author) %><%= t(:organization) %><%= t(:version) %><%= t(':action') %>
    - <%# link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %> + <%# link_to t('new.user'), new_admin_user_path, :class => 'new' %>
    diff --git a/app/views/admin/asset_categories/_asset_category.html.erb b/app/views/admin/asset_categories/_asset_category.html.erb index 64a931da..e68ddae6 100644 --- a/app/views/admin/asset_categories/_asset_category.html.erb +++ b/app/views/admin/asset_categories/_asset_category.html.erb @@ -5,8 +5,8 @@
      -
    • <%= link_to t('asset_category.edit'), edit_admin_asset_category_path(asset_category), :remote => true %>
      • -
    • <%= link_to t('asset_category.delete'), admin_asset_category_path(asset_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
      • +
    • <%= link_to t(:edit), edit_admin_asset_category_path(asset_category), :remote => true %>
      • +
    • <%= link_to t(:delete), admin_asset_category_path(asset_category), :confirm => t(:sure?), :method => :delete, :remote => true %>
    diff --git a/app/views/admin/asset_categories/index.html.erb b/app/views/admin/asset_categories/index.html.erb index f1d1a787..0ca08b7b 100644 --- a/app/views/admin/asset_categories/index.html.erb +++ b/app/views/admin/asset_categories/index.html.erb @@ -7,7 +7,7 @@ - + <% @site_valid_locales.each do |locale| %> <% end %> diff --git a/app/views/admin/assets/_edit.html.erb b/app/views/admin/assets/_edit.html.erb index 0e592d19..5e26e0f6 100644 --- a/app/views/admin/assets/_edit.html.erb +++ b/app/views/admin/assets/_edit.html.erb @@ -1,5 +1,5 @@
    -

    <%= t('editing_asset') %>

    +

    <%= t('editing.asset') %>

    <%= flash_messages %> @@ -11,7 +11,7 @@ <%= link_back %> <%= f.submit t(:edit) %> <% else %> - <%= t(:update) %> + <%= t(:update_) %> <% end %>
    <% end %> diff --git a/app/views/admin/assets/_form.html.erb b/app/views/admin/assets/_form.html.erb index 75655604..7941ecb8 100644 --- a/app/views/admin/assets/_form.html.erb +++ b/app/views/admin/assets/_form.html.erb @@ -1,5 +1,5 @@
    - +
    <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> @@ -14,13 +14,13 @@
    - +
    <%= f.select :asset_category_id, @asset_categories.collect{|t| [ t.title, t.id ]}, {}, :class => "input-large" %>
    - +
    <% @tags.each do |tag| %> <%= content_tag :label, :class => "checkbox inline" do -%> @@ -32,7 +32,7 @@
    - +
    <%= f.file_field :data, :class => 'upload' %>
    diff --git a/app/views/admin/assets/_new.html.erb b/app/views/admin/assets/_new.html.erb index d8838278..27d2c3e0 100644 --- a/app/views/admin/assets/_new.html.erb +++ b/app/views/admin/assets/_new.html.erb @@ -1,5 +1,5 @@
    -

    <%= t('admin.new_asset') %>

    +

    <%= t('new.asset') %>

    <%= flash_messages %> @@ -7,7 +7,7 @@ <%= f.error_messages %> <%= render :partial => "form", :locals => { :f => f } %>
    - <%= t(:create) %> + <%= t(:create_) %>
    <% end %>
    diff --git a/app/views/admin/assets/_sort_headers.html.erb b/app/views/admin/assets/_sort_headers.html.erb index d266a086..85cb5df5 100644 --- a/app/views/admin/assets/_sort_headers.html.erb +++ b/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 %> diff --git a/app/views/admin/assets/edit.html.erb b/app/views/admin/assets/edit.html.erb index 9e752134..dee9fcb2 100644 --- a/app/views/admin/assets/edit.html.erb +++ b/app/views/admin/assets/edit.html.erb @@ -1,7 +1,7 @@ <% content_for :secondary do %>
      -
    • <%= link_to t(:new_asset, :scope => :admin), new_admin_asset_path, :remote => true, :class => 'button positive' %>
      • +
    • <%= link_to t('admin.new_asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %>
    <% end -%> diff --git a/app/views/admin/assets/file_upload.html.erb b/app/views/admin/assets/file_upload.html.erb index 5e19a1ad..33695877 100644 --- a/app/views/admin/assets/file_upload.html.erb +++ b/app/views/admin/assets/file_upload.html.erb @@ -7,12 +7,12 @@ <%= form_for :asset, :url => admin_assets_path(:uploader => true), :html => {:id => 'ajaxForm', :multipart => true } do |f| %>
    -

    <%= t 'admin.file_upload' %>

    +

    <%= t 'file.upload' %>

    - +
    <%= f.fields_for :title_translations do |f| %>
    @@ -29,7 +29,7 @@
    - +
    <%= f.fields_for :description_translations do |f| %>
    @@ -46,7 +46,7 @@
    - <%#= f.label :data, t('admin.data'), :class => "control-label" %> + <%#= f.label :data, t(:data), :class => "control-label" %>
    <%= f.file_field :data, :class => 'upload' %>
    @@ -54,7 +54,7 @@
    diff --git a/app/views/admin/assets/index.html.erb b/app/views/admin/assets/index.html.erb index 38ec6b5e..ff9e2fef 100644 --- a/app/views/admin/assets/index.html.erb +++ b/app/views/admin/assets/index.html.erb @@ -17,7 +17,7 @@
    <%= t('asset_category.key') %><%= t(:key) %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
    - <%= 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' %>
    <%= paginate @assets, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]}, :remote => true %>
    diff --git a/app/views/admin/assets/new.html.erb b/app/views/admin/assets/new.html.erb index f921f0f6..45d6a4b6 100644 --- a/app/views/admin/assets/new.html.erb +++ b/app/views/admin/assets/new.html.erb @@ -1,7 +1,7 @@ <% content_for :secondary do %>
      -
    • <%= link_to t(:new_asset, :scope => :admin), new_admin_asset_path, :remote => true, :class => 'button positive' %>
      • +
    • <%= link_to t('admin.new_asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %>
    <% end -%> diff --git a/app/views/admin/attributes/_attribute_field.html.erb b/app/views/admin/attributes/_attribute_field.html.erb index b2e94344..fca0243a 100644 --- a/app/views/admin/attributes/_attribute_field.html.erb +++ b/app/views/admin/attributes/_attribute_field.html.erb @@ -11,7 +11,7 @@ <%= f.select :markup, LIST[:markups], {}, {:style => "width:90px"} %>
    > - <%= t('admin.options') %>: + <%= t(:options) %>: <%= f.select "select_list_options", attribute_field.select_list_options, :style => "width:130px" %>
    diff --git a/app/views/admin/attributes/index.html.erb b/app/views/admin/attributes/index.html.erb index 83ded4eb..bdeb1a5c 100644 --- a/app/views/admin/attributes/index.html.erb +++ b/app/views/admin/attributes/index.html.erb @@ -4,13 +4,13 @@
    - <%= 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' %>
    - + @@ -34,6 +34,6 @@
    <%= t("admin.#{@attribute_type}") %><%= t('admin.action') %><%= t(':action') %>
    - <%= 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' %>
    diff --git a/app/views/admin/components/_user_role_management.html.erb b/app/views/admin/components/_user_role_management.html.erb index 6c8e0636..6d02feca 100644 --- a/app/views/admin/components/_user_role_management.html.erb +++ b/app/views/admin/components/_user_role_management.html.erb @@ -1,21 +1,21 @@
    -

    <%= t("admin.user_role.auth.all_member") %>

    +

    <%= t("auth.all_member") %>

    <%= form_tag(submit_url) do %> - <%= check_box_tag 'auth_all',true,(auth.all rescue true) %><%= submit_tag t("admin.user_role.auth.all_member") %>
    + <%= check_box_tag 'auth_all',true,(auth.all rescue true) %><%= submit_tag t("auth.all_member") %>
    <% end %>
    -

    <%= t("admin.user_role.auth.user") %>

    +

    <%= t(:user) %>

    <%= form_tag(submit_url) do %> <%= collection_select(:new,:role, Role.all, :id, :key, :prompt => true) %> - <%= submit_tag t("admin.user_role.auth.by_role") %>
    + <%= submit_tag t("auth.by_role") %>
    <%= collection_select(:new,:sub_role, SubRole.all, :id, :key, :prompt => true) %> - <%= submit_tag t("admin.user_role.auth.by_sub_role") %>
    + <%= submit_tag t("auth.by_sub_role") %>
    <%= collection_select(:new,:privilege_user, User.all, :id, :name, :prompt => true) %> - <%= submit_tag t("admin.user_role.auth.add_to_privilege_list") %>
    + <%= submit_tag t("auth.add_to_privilege_list") %>
    <%= collection_select(:new,:blocked_user, User.all, :id, :name, :prompt => true) %> - <%= submit_tag t("admin.user_role.auth.add_to_block_list") %>
    + <%= submit_tag t("auth.add_to_block_list") %>
    <% end %> <% unless auth.nil? %> <% auth.roles.each do |role| %> diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index 4fe3f18e..7e99c6d3 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -108,7 +108,7 @@
    -

    <%= t(:file) %>

    +

    <%= t(:file_) %>

    <%= t(:all_file) %>3,422

    diff --git a/app/views/admin/designs/_form.html.erb b/app/views/admin/designs/_form.html.erb index d787a58d..0a8b87c4 100644 --- a/app/views/admin/designs/_form.html.erb +++ b/app/views/admin/designs/_form.html.erb @@ -6,21 +6,21 @@ <% end %>

    - <%= f.label :title, t('admin.title') %> + <%= f.label :title, t(:title) %> <%= f.text_field :title, :class => 'text' %>

    - <%= f.label :author, t('admin.author') %> + <%= f.label :author, t(:author) %> <%= f.text_field :author, :class => 'text' %>

    - <%= f.label :intro, t('admin.intro') %> + <%= f.label :intro, t(:intro) %> <%= f.text_field :intro, :class => 'text' %>

    - <%= f.label "layout", t('admin.layout') %> + <%= f.label "layout", t(:layout) %> <% if @design.layout.blank? %> <%= fields_for 'design[layout]' do |f| %> <%= f.file_field :file %> @@ -31,7 +31,7 @@ <% end %>

    - <%= f.label "default_css", t('admin.default_css') %> + <%= f.label "default_css", t(:default_css) %> <% if @design.default_css.blank? %> <%= fields_for 'design[default_css]' do |f| %> <%= f.file_field :file %> @@ -42,7 +42,7 @@ <% end %>

    - <%= f.label :themes, t('admin.themes') %> + <%= f.label :themes, t(:themes) %>

      <% @design.themes.each do |theme| %> <%= render :partial => 'design_file', :object => theme, :locals => { :field_name => "themes", :f => f, :classes => "r_destroy, r_edit" } %> diff --git a/app/views/admin/designs/_new.html.erb b/app/views/admin/designs/_new.html.erb index a4aba6c9..109160e8 100644 --- a/app/views/admin/designs/_new.html.erb +++ b/app/views/admin/designs/_new.html.erb @@ -1,4 +1,4 @@ -

      <%= t('admin.new_design') %>

      +

      <%= t('new.design') %>

      <%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %> <%= f.error_messages %> diff --git a/app/views/admin/designs/_sort_headers.html.erb b/app/views/admin/designs/_sort_headers.html.erb index fb697143..ff03706f 100644 --- a/app/views/admin/designs/_sort_headers.html.erb +++ b/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 %> diff --git a/app/views/admin/designs/edit.html.erb b/app/views/admin/designs/edit.html.erb index 56adc075..e0129575 100644 --- a/app/views/admin/designs/edit.html.erb +++ b/app/views/admin/designs/edit.html.erb @@ -2,7 +2,7 @@ <%= render 'admin/sites/side_bar' %> <% end %> -

      <%= t('admin.editing_design') %>

      +

      <%= t('editing.design') %>

      <%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %> <%= f.error_messages %> diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index ab672b09..4f7d7481 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -8,5 +8,5 @@
    - <%= 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' %>
    \ No newline at end of file diff --git a/app/views/admin/designs/new.html.erb b/app/views/admin/designs/new.html.erb index 61c6868a..57e17fba 100644 --- a/app/views/admin/designs/new.html.erb +++ b/app/views/admin/designs/new.html.erb @@ -2,7 +2,7 @@ <%= render 'admin/sites/side_bar' %> <% end %> -

    <%= t('admin.new_design') %>

    +

    <%= t('new.design') %>

    <%= form_for :design, :url => admin_designs_path, :html => {:multipart => true} do |f| %> <%= f.error_messages %> diff --git a/app/views/admin/infos/_form.html.erb b/app/views/admin/infos/_form.html.erb index a499784a..a65b01e9 100644 --- a/app/views/admin/infos/_form.html.erb +++ b/app/views/admin/infos/_form.html.erb @@ -4,7 +4,7 @@ - + <% @site_valid_locales.each do |locale| %> <% end %> @@ -31,12 +31,12 @@
    <%= t('admin.key') %><%= t(:key) %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
    - - + + <% @site_valid_locales.each do |locale| %> <% end %> - + diff --git a/app/views/admin/links/_edit.html.erb b/app/views/admin/links/_edit.html.erb index d4d99cb0..1c9488ff 100644 --- a/app/views/admin/links/_edit.html.erb +++ b/app/views/admin/links/_edit.html.erb @@ -1,4 +1,4 @@ -

    <%= t('admin.editing_link') %>

    +

    <%= t('editing.link') %>

    <%= flash_messages %> @@ -7,6 +7,6 @@ <%= render :partial => "admin/links/form", :locals => { :f => f } %>

    - <%= f.submit t(:update) %> <%= link_back %> + <%= f.submit t(:update_) %> <%= link_back %>

    <% end %> diff --git a/app/views/admin/links/_form.html.erb b/app/views/admin/links/_form.html.erb index f1415e98..b19d660c 100644 --- a/app/views/admin/links/_form.html.erb +++ b/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) %> -

    -<%= f.label :name, "Name" %> -<%= f.text_field :name, :class => 'text' %> -

    +
    + <%= f.label :name, t(:name), :class => 'control-label' %> +
    + <%= f.text_field :name, :class => 'text input-xlarge' %> + +
    +
    <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %> -

    - <%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %> - <%= f.text_field locale, :value => (@item.title_translations[locale] rescue nil) %> -

    +
    + <%= f.label :locale, "#{t(:title)} #{I18nVariable.from_locale(locale)}", :class => 'control-label' %> +
    + <%= f.text_field locale, :class => 'text input-xlarge', :value => (@item.title_translations[locale] rescue nil) %> + +
    +
    <% end %> <% end %> -

    -<%= f.label :is_published, t('admin.is_published') %> -<%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No -

    +
    + <%= f.label :is_published, "#{t(:is_published)} ?", :class => 'control-label' %> +
    + + + +
    +
    -

    -<%= f.label :url, "URL" %> -<%= f.text_field :url %> -

    +
    + <%= f.label :menu_enabled_for, "#{t(:menu_enabled_for)}:", :class => 'control-label' %> +
    + <% @site_valid_locales.each do |valid_locale| %> + + <% end %> + <%= hidden_field_tag 'link[menu_enabled_for][]', '' %> + +
    +
    + +
    + <%= f.label :url, "#{t(:url)}:", :class => 'control-label' %> +
    + <%= f.text_field :url, :class => 'text input-xlarge', :value => (@item.url rescue nil) %> + +
    +
    diff --git a/app/views/admin/links/_new.html.erb b/app/views/admin/links/_new.html.erb index 122ac22e..1dec644b 100644 --- a/app/views/admin/links/_new.html.erb +++ b/app/views/admin/links/_new.html.erb @@ -1,4 +1,4 @@ -

    <%= t('admin.new_link') %>

    +

    <%= t('new.link') %>

    <%= flash_messages %> @@ -7,7 +7,7 @@ <%= render :partial => "admin/links/form", :locals => { :f => f } %>

    - <%= f.submit t(:create) %> <%= link_back %> + <%= f.submit t(:create_) %> <%= link_back %>

    <% end %> diff --git a/app/views/admin/links/_show.html.erb b/app/views/admin/links/_show.html.erb index 85927a85..36e6bd98 100644 --- a/app/views/admin/links/_show.html.erb +++ b/app/views/admin/links/_show.html.erb @@ -1,24 +1,37 @@ <%= flash_messages %> -

    - <%= t('admin.name') %> - <%= @item.name %> -

    + +
    + +
    + <%= @item.name %> + +
    +
    <% @site_valid_locales.each do |locale| %> -

    - <%= "#{t('admin.title')} #{locale}" %> - <%= @item.title_translations[locale] if @item.title %> -

    +
    + +
    + <%= @item.title_translations[locale] if @item.title %> + +
    +
    <% end %> -

    - <%= t('admin.is_published') %> - <%= @item.is_published.to_s %> -

    +
    + +
    + <%= @item.is_published.to_s %> + +
    +
    -

    - <%= t('admin.url') %> - <%= @item.url %> -

    +
    + +
    + <%= @item.url %> + +
    +
    <%= link_to t(:edit), edit_admin_link_path(@item), :class => 'nav' %> \ No newline at end of file diff --git a/app/views/admin/module_apps/edit.html.erb b/app/views/admin/module_apps/edit.html.erb index 7fb64d17..13138db1 100644 --- a/app/views/admin/module_apps/edit.html.erb +++ b/app/views/admin/module_apps/edit.html.erb @@ -5,26 +5,26 @@
    -
    <%= t("admin.user_role.auth.manager") %> +
    <%= t(:manager) %> <% @module_app.managers.each do |manager| %>
    <%= 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 %>
    <% end %>
    <%= 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 %>
    -
    <%#= t("admin.user_role.auth.sub_manager") %> +
    <%#= t(:sub_manager) %> <%# @module_app.sub_managers.each do |manager| %>
    <%#= 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 %>
    <%# end %>
    <%#= 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 %>
    diff --git a/app/views/admin/module_apps_new_interface/_modal_list.html.erb b/app/views/admin/module_apps_new_interface/_modal_list.html.erb index b5b0ebcd..e0158a86 100644 --- a/app/views/admin/module_apps_new_interface/_modal_list.html.erb +++ b/app/views/admin/module_apps_new_interface/_modal_list.html.erb @@ -3,7 +3,7 @@
    <%= t('admin.key') %><%= t('admin.multilingual') %><%= t(:key) %><%= t(:multilingual) %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><%= t('admin.type')%><%= t(:type)%>  
    - - + + @@ -34,6 +34,6 @@
    <%= t('admin.object_auth.title') %><%= t('admin.object_auth.obj_type') %><%= t(:title) %><%= t(:type) %>
    - <%# link_to t('admin.new_user'), new_admin_user_path, :class => 'new' %> + <%# link_to t('new.user'), new_admin_user_path, :class => 'new' %>
    diff --git a/app/views/admin/object_auths_new_interface/_modal_list.html.erb b/app/views/admin/object_auths_new_interface/_modal_list.html.erb index 04f46511..0c30010e 100644 --- a/app/views/admin/object_auths_new_interface/_modal_list.html.erb +++ b/app/views/admin/object_auths_new_interface/_modal_list.html.erb @@ -3,7 +3,7 @@