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

Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb

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

@@ -1,27 +0,0 @@
-
-            <div id="module-nav">
-                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
-                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
-                <div class="module-nav-view">
-                    <ul class="nav nav-pills">
-                        <li class="active">
-                            <a href="#">All</a>
-                        </li>
-                        <li><a href="#">學歷</a></li>
-                        <li><a href="#">經歷</a></li>
-                        <li><a href="#">研究計畫</a></li>
-                        <li><a href="#">期刊論文</a></li>
-                        <li><a href="#">學歷</a></li>
-                        <li><a href="#">經歷</a></li>
-                        <li><a href="#">研究計畫</a></li>
-                        <li><a href="#">期刊論文</a></li>
-                        <li><a href="#">學歷</a></li>
-                        <li><a href="#">經歷</a></li>
-                        <li><a href="#">研究計畫</a></li>
-                        <li><a href="#">期刊論文</a></li>
-                        <li><a href="#">學歷</a></li>
-                        <li><a href="#">經歷</a></li>
-                        <li><a href="#">期刊論文</a></li>
-                    </ul>
-                </div>
-            </div>

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

@@ -1,4 +1,2 @@
 
-        <div class="subnav">
-			<%= render :partial => 'plugin', :collection => @plugins %>
-        </div>
+<%= render_plugin_list %>	

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

@@ -0,0 +1,6 @@
+            <div class="member-plugin">
+                <% #binding.pry%>
+                <%= render :partial=> 'plugin_summary'%>
+                <%= render :partial=> 'plugin_summary'%>
+                <%= render :partial=> 'plugin_summary'%>
+            </div>

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

@@ -6,22 +6,20 @@
                 <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
                 <div class="module-nav-view">
                     <ul class="nav nav-pills">
-                        <li class="active">
-                            <a href="#"><%= t("admin.new_admin.users.all_plugin_summary")%></a>
-                        </li>
-                        <li><a href="#">學歷</a></li>
-                        <li><a href="#">學歷</a></li>
-                        <li><a href="#">學歷</a></li>
-                        <li><a href="#">學歷</a></li>
+                        <%= 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 -%>
+
 
                     </ul>
                 </div>
             </div>
-            <div class="member-plugin">
-                <%= render :partial=> 'plugin_summary'%>
-                <%= render :partial=> 'plugin_summary'%>
-                <%= render :partial=> 'plugin_summary'%>
-            </div>
+            <%=render :partial=> @right_partial%>
         </div>
         <div class="user-info">
             <div id="brand" class="clear">

app/views/layouts/_side_bar.html.erb

@@ -105,7 +105,7 @@
 	<% end -%>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('cals','calendar_categories') || active_for_app_auth("calendar") do -%>
+<%= content_tag :li, :class => active_for_controllers('cals') || 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') %>
@@ -116,6 +116,17 @@
 	<%#= 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 %>
+<%= content_tag :li, :class => active_for_controllers('locations') || active_for_app_auth("gprs") do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-link') + content_tag(:span, t('admin.gprs')), panel_gprs_back_end_locations_path %>
+	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('locations') ) 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.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 %>
 
 <%= content_tag :li, :class => (active_for_controllers('writing_journals', '/panel/personal_journal/back_end/tags', 'writing_journal_categorys', 'approvals') ||  active_for_app_auth('PersonalJournal') ) do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-personal_journal') + t('admin.personal_journal'), panel_personal_journal_back_end_writing_journals_path %>
@@ -157,6 +168,41 @@
 
 <% end -%>
 
+<%= content_tag :li, :class => (active_for_controllers('researchs', '/panel/personal_research/back_end/tags', 'research_categorys', 'approvals') ||  active_for_app_auth('PersonalJournal') ) do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-personal_research') + t('admin.personal_research'), panel_personal_research_back_end_researchs_path %>
+	<%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('researchs', '/panel/personal_research/back_end/tags', 'research_categorys', 'approvals'))) do -%>
+		<%= content_tag :li, link_to(t('personal_research.all_articles'), panel_personal_research_back_end_researchs_path), :class => active_for_action('researchs', 'index') %>
+		<%#= content_tag :li, link_to(t('personal_research.setting'), panel_personal_research_back_end_research_setting_path), :class => active_for_action('research_setting', 'index') %>
+		<%= content_tag :li, link_to(t('personal_research.tags'), panel_personal_research_back_end_tags_path), :class => active_for_action('/panel/personal_research/back_end/tags', 'index') %>
+
+	<% end -%>
+
+<% end -%>
+
+<%= content_tag :li, :class => (active_for_controllers('projects', '/panel/personal_project/back_end/tags', 'project_categorys', 'approvals') ||  active_for_app_auth('PersonalJournal') ) do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-personal_project') + t('admin.personal_project'), panel_personal_project_back_end_projects_path %>
+	<%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('projects', '/panel/personal_project/back_end/tags', 'project_categorys', 'approvals'))) do -%>
+		<%= content_tag :li, link_to(t('personal_project.all_articles'), panel_personal_project_back_end_projects_path), :class => active_for_action('projects', 'index') %>
+		<%= content_tag :li, link_to(t('personal_project.setting'), panel_personal_project_back_end_project_setting_path), :class => active_for_action('project_setting', 'index') %>
+		<%= content_tag :li, link_to(t('personal_project.project_category'), panel_personal_project_back_end_project_categorys_path), :class => active_for_action('project_categorys', 'index') %>
+		<%= content_tag :li, link_to(t('personal_project.tags'), panel_personal_project_back_end_tags_path), :class => active_for_action('/panel/personal_project/back_end/tags', 'index') %>
+
+	<% end -%>
+
+<% end -%>
+
+<%= content_tag :li, :class => (active_for_controllers('writing_patents', '/panel/personal_patent/back_end/tags', 'writing_patent_categorys', 'approvals') ||  active_for_app_auth('PersonalJournal') ) do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-personal_patent') + t('admin.personal_patent'), panel_personal_patent_back_end_writing_patents_path %>
+	<%= content_tag :ul, :class => ("nav nav-list " + (visible_for_controllers('writing_patents', '/panel/personal_patent/back_end/tags', 'writing_patent_categorys', 'approvals'))) do -%>
+		<%= content_tag :li, link_to(t('personal_patent.all_articles'), panel_personal_patent_back_end_writing_patents_path), :class => active_for_action('writing_patents', 'index') %>
+		<%= content_tag :li, link_to(t('personal_patent.setting'), panel_personal_patent_back_end_writing_patent_setting_path), :class => active_for_action('writing_patent_setting', 'index') %>
+		<%#= content_tag :li, link_to(t('personal_patent.writing_patent_category'), panel_personal_patent_back_end_writing_patent_categorys_path), :class => active_for_action('writing_patent_categorys', 'index') %>
+		<%= content_tag :li, link_to(t('personal_patent.tags'), panel_personal_patent_back_end_tags_path), :class => active_for_action('/panel/personal_patent/back_end/tags', 'index') %>
+
+	<% end -%>
+
+<% end -%>
+
 <div class="content">
 	<% flash.each do |key, msg| %>
  		<%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>