From 0babd5f30255437a9e3e6efa1df65e5993e9e398 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 15 Oct 2012 15:30:48 +0800 Subject: [PATCH] Changes for side_bar --- app/assets/stylesheets/site_editor.css.erb | 2 + app/controllers/admin/plugins_controller.rb | 8 +- app/helpers/admin/plugins_helper.rb | 2 +- app/views/admin/designs/edit.html.erb | 2 +- app/views/admin/designs/index.html.erb | 2 +- app/views/admin/plugins/index.html.erb | 26 +- app/views/admin/sites/_side_bar.html.erb | 4 +- app/views/admin/sites/language.html.erb | 2 +- app/views/admin/sites/mail_setting.html.erb | 2 +- app/views/admin/sites/site_info.html.erb | 2 +- app/views/admin/sites/sitemap.html.erb | 2 +- app/views/admin/sites/system_info.html.erb | 2 +- app/views/admin/sites/ui_theme.html.erb | 2 +- .../users_new_interface/_side_bar.html.erb | 16 ++ .../admin/users_new_interface/edit.html.erb | 4 + .../admin/users_new_interface/index.html.erb | 34 +-- .../index_summary.html.erb | 4 + .../index_thumbnail.html.erb | 4 + .../admin/users_new_interface/new.html.erb | 4 + .../plugin_dashbroad.html.erb | 4 + .../admin/users_new_interface/show.html.erb | 23 +- .../users_new_interface/temp_edit.html.erb | 4 + app/views/layouts/_side_bar.html.erb | 229 ++---------------- app/views/layouts/_side_bar_content.html.erb | 121 +++++++++ app/views/layouts/new_admin.html.erb | 29 +-- config/routes.rb | 1 + .../personal_book/plugin/_profile.html.erb | 7 +- .../personal_diploma/plugin/_profile.html.erb | 7 +- .../plugin/_profile.html.erb | 6 +- .../personal_honor/plugin/_profile.html.erb | 6 +- .../personal_journal/plugin/_profile.html.erb | 8 +- .../personal_lab/plugin/_profile.html.erb | 6 +- .../personal_patent/plugin/_profile.html.erb | 6 +- .../personal_project/plugin/_profile.html.erb | 6 +- .../plugin/_profile.html.erb | 7 +- .../personal_seminar/plugin/_profile.html.erb | 6 +- 36 files changed, 311 insertions(+), 289 deletions(-) create mode 100644 app/views/admin/users_new_interface/_side_bar.html.erb create mode 100644 app/views/layouts/_side_bar_content.html.erb diff --git a/app/assets/stylesheets/site_editor.css.erb b/app/assets/stylesheets/site_editor.css.erb index e36d0b7b..6506589e 100644 --- a/app/assets/stylesheets/site_editor.css.erb +++ b/app/assets/stylesheets/site_editor.css.erb @@ -7,6 +7,8 @@ *= require message *= require bootstrap *= require style + *= require font-awesome + *= require orbit-bar *= require bootstrap-orbit *= require scroll_style *= require site_items diff --git a/app/controllers/admin/plugins_controller.rb b/app/controllers/admin/plugins_controller.rb index 15ed630e..feeff300 100644 --- a/app/controllers/admin/plugins_controller.rb +++ b/app/controllers/admin/plugins_controller.rb @@ -4,7 +4,13 @@ class Admin::PluginsController < ApplicationController def index - @plugins = ModuleApp.where(has_plugin: true).order_by(:title, :asc) + @plugins = OrbitApp::Module::Registration.all + + if(!params[:show_plugin_profile].nil?) + @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary' + else + @right_partial = "admin/users_new_interface/plugin_summary" + end end diff --git a/app/helpers/admin/plugins_helper.rb b/app/helpers/admin/plugins_helper.rb index 7d0bc5c3..a169e14d 100644 --- a/app/helpers/admin/plugins_helper.rb +++ b/app/helpers/admin/plugins_helper.rb @@ -13,7 +13,7 @@ module Admin::PluginsHelper @plugins.each do |plugin| ret << "
  • " - ret << (link_to eval("#{plugin.title}") , eval("panel_#{plugin.title}_back_end_#{plugin.object}s_path")) + ret << (link_to eval("#{plugin.title}") , eval("panel_#{plugin.title}_back_end_#{plugin.object}s_path")) rescue nil ret << "
    • " end diff --git a/app/views/admin/designs/edit.html.erb b/app/views/admin/designs/edit.html.erb index 56adc075..6ed2287e 100644 --- a/app/views/admin/designs/edit.html.erb +++ b/app/views/admin/designs/edit.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render 'admin/sites/side_bar' %> + <%= 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'} %> <% end %>

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

    diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index ab672b09..e1df6fa1 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render 'admin/sites/side_bar' %> + <%= 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'} %> <% end %> <%= render 'filter' %> diff --git a/app/views/admin/plugins/index.html.erb b/app/views/admin/plugins/index.html.erb index a4233864..01bc8bbc 100644 --- a/app/views/admin/plugins/index.html.erb +++ b/app/views/admin/plugins/index.html.erb @@ -1,2 +1,26 @@ +<% 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'} %> +<% end %> -<%= render_plugin_list %> \ No newline at end of file + +
    +
    +
    +
    +
    +
      + <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %> + <%= link_to t("admin.new_admin.users.all_plugin_summary")%> + <% end -%> + <% @plugins.each do |plugin| %> + <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %> + <%= link_to plugin.name, :show_plugin_profile => plugin.name %> + <% end -%> + <% end -%> + + +
    +
    +
    + <%= render :partial => @right_partial %> +
    \ No newline at end of file diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb index bf214a0e..fc518604 100644 --- a/app/views/admin/sites/_side_bar.html.erb +++ b/app/views/admin/sites/_side_bar.html.erb @@ -1,5 +1,5 @@ <%= content_tag :li, :class => active_for_controllers('sites') do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %> + <%= link_to content_tag(:i, nil, :class => 'icons-cog') + content_tag(:span, t('admin.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') %> @@ -13,5 +13,5 @@ <% end -%> <%= content_tag :li, :class => active_for_controllers('designs') do -%> - <%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %> + <%= link_to content_tag(:i, nil, :class => 'icons-window-block') + content_tag(:span, t('admin.design')), admin_designs_path %> <% end -%> diff --git a/app/views/admin/sites/language.html.erb b/app/views/admin/sites/language.html.erb index 2b626564..b63cd183 100644 --- a/app/views/admin/sites/language.html.erb +++ b/app/views/admin/sites/language.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render 'side_bar' %> + <%= 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'} %> <% end %> language.html.erb \ No newline at end of file diff --git a/app/views/admin/sites/mail_setting.html.erb b/app/views/admin/sites/mail_setting.html.erb index 72ec6787..8863f0bb 100644 --- a/app/views/admin/sites/mail_setting.html.erb +++ b/app/views/admin/sites/mail_setting.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render 'side_bar' %> + <%= 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'} %> <% end %>
    diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb index 7a198c04..6829cf74 100644 --- a/app/views/admin/sites/site_info.html.erb +++ b/app/views/admin/sites/site_info.html.erb @@ -1,7 +1,7 @@ <% # encoding: utf-8 %> <% content_for :side_bar do %> - <%= render 'side_bar' %> + <%= 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'} %> <% end %>
    diff --git a/app/views/admin/sites/sitemap.html.erb b/app/views/admin/sites/sitemap.html.erb index 453f73f0..511e68b4 100644 --- a/app/views/admin/sites/sitemap.html.erb +++ b/app/views/admin/sites/sitemap.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render 'side_bar' %> + <%= 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'} %> <% end %> diff --git a/app/views/admin/sites/system_info.html.erb b/app/views/admin/sites/system_info.html.erb index dc9d45c9..d1b8cba8 100644 --- a/app/views/admin/sites/system_info.html.erb +++ b/app/views/admin/sites/system_info.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render 'side_bar' %> + <%= 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'} %> <% end %> system_info.html.erb \ No newline at end of file diff --git a/app/views/admin/sites/ui_theme.html.erb b/app/views/admin/sites/ui_theme.html.erb index 540405da..6584825d 100644 --- a/app/views/admin/sites/ui_theme.html.erb +++ b/app/views/admin/sites/ui_theme.html.erb @@ -1,5 +1,5 @@ <% content_for :side_bar do %> - <%= render 'side_bar' %> + <%= 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'} %> <% end %> ui_theme.html.erb \ No newline at end of file diff --git a/app/views/admin/users_new_interface/_side_bar.html.erb b/app/views/admin/users_new_interface/_side_bar.html.erb new file mode 100644 index 00000000..3f82987b --- /dev/null +++ b/app/views/admin/users_new_interface/_side_bar.html.erb @@ -0,0 +1,16 @@ +<%= content_tag :li, :class => active_for_controllers('users_new_interface') do -%> + <%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t('admin.new_admin.user')), admin_users_new_interface_index_path %> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%> + <%= content_tag :li, link_to((t('admin.new_admin.side_bar.all_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %> + <%= content_tag :li, link_to((t('admin.new_admin.side_bar.add_user') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %> + <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_roles') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %> + <%= content_tag :li, link_to((t('admin.new_admin.side_bar.user_info') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, ), :class => active_for_action('users_new_interfacexx', 'index') %> + <% end -%> +<% end -%> + +<%= content_tag :li, :class => active_for_controllers('plugins') do -%> + <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t('admin.plugins')), admin_plugins_path %> + <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('plugins')) do -%> + <%= content_tag :li, link_to((t('admin.all_plugins') + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %> + <% end -%> +<% end -%> \ No newline at end of file diff --git a/app/views/admin/users_new_interface/edit.html.erb b/app/views/admin/users_new_interface/edit.html.erb index 0c295dfe..d61886df 100644 --- a/app/views/admin/users_new_interface/edit.html.erb +++ b/app/views/admin/users_new_interface/edit.html.erb @@ -1,3 +1,7 @@ +<% 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'} %> +<% end %> + <% content_for :page_specific_css do -%> <%= stylesheet_link_tag "member" %> <%= stylesheet_link_tag "site-map" %> diff --git a/app/views/admin/users_new_interface/index.html.erb b/app/views/admin/users_new_interface/index.html.erb index d07a7668..58f4f0aa 100644 --- a/app/views/admin/users_new_interface/index.html.erb +++ b/app/views/admin/users_new_interface/index.html.erb @@ -1,20 +1,24 @@ +<% 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'} %> +<% end %> + <%= render :partial => "js_and_css"%> <%= render :partial => "filter"%> - - - - - - - - - - - - - <%= render :partial => "user_for_listing",:collection=> @users%> - -
    + + + + + + + + + + + + + <%= render :partial => "user_for_listing",:collection=> @users%> + +
    <%= render :partial=> "index_paginator" %> diff --git a/app/views/admin/users_new_interface/index_summary.html.erb b/app/views/admin/users_new_interface/index_summary.html.erb index 993dece6..5de99bb3 100644 --- a/app/views/admin/users_new_interface/index_summary.html.erb +++ b/app/views/admin/users_new_interface/index_summary.html.erb @@ -1,3 +1,7 @@ +<% 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'} %> +<% end %> + <%= render :partial => "js_and_css"%> <%= render :partial => "filter"%> diff --git a/app/views/admin/users_new_interface/index_thumbnail.html.erb b/app/views/admin/users_new_interface/index_thumbnail.html.erb index 7402f6c3..3f07dbe7 100644 --- a/app/views/admin/users_new_interface/index_thumbnail.html.erb +++ b/app/views/admin/users_new_interface/index_thumbnail.html.erb @@ -1,3 +1,7 @@ +<% 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'} %> +<% end %> + <%= render :partial => "js_and_css"%> <%= render :partial => "filter"%> diff --git a/app/views/admin/users_new_interface/new.html.erb b/app/views/admin/users_new_interface/new.html.erb index 68420f49..3e9bfc77 100644 --- a/app/views/admin/users_new_interface/new.html.erb +++ b/app/views/admin/users_new_interface/new.html.erb @@ -1,3 +1,7 @@ +<% 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'} %> +<% end %> + <% content_for :page_specific_css do -%> <%= stylesheet_link_tag "member" %> <%= stylesheet_link_tag "site-map" %> diff --git a/app/views/admin/users_new_interface/plugin_dashbroad.html.erb b/app/views/admin/users_new_interface/plugin_dashbroad.html.erb index 7cd090b5..3dc72819 100644 --- a/app/views/admin/users_new_interface/plugin_dashbroad.html.erb +++ b/app/views/admin/users_new_interface/plugin_dashbroad.html.erb @@ -1,3 +1,7 @@ +<% 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'} %> +<% end %> +
    <% #binding.pry%> <%= render :partial=> 'plugin_summary'%> diff --git a/app/views/admin/users_new_interface/show.html.erb b/app/views/admin/users_new_interface/show.html.erb index cff591df..7ac1caea 100644 --- a/app/views/admin/users_new_interface/show.html.erb +++ b/app/views/admin/users_new_interface/show.html.erb @@ -1,3 +1,7 @@ +<% 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'} %> +<% end %> + <%= render :partial => "js_and_css"%>
    @@ -6,25 +10,20 @@
      - <%= content_tag :li,:class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %> + <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %> <%= link_to t("admin.new_admin.users.all_plugin_summary")%> - <%end -%> - <% @plugins.each do |plugin|%> - <%= content_tag :li,:class=>(params[:show_plugin_profile]==plugin.name ? "active" : nil) do %> - <%= link_to plugin.name,:show_plugin_profile=> plugin.name %> + <% end -%> + <% @plugins.each do |plugin| %> + <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %> + <%= link_to plugin.name, :show_plugin_profile => plugin.name %> <% end -%> - <%end -%> + <% end -%>
    - <%=render :partial=> @right_partial%> -
    - <%= render :partial=> 'plugin_summary'%> - <%= render :partial=> 'plugin_summary'%> - <%= render :partial=> 'plugin_summary'%> -
    + <%=render :partial => @right_partial %>