Changes for side_bar

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 %>
 
 <h1><%= t('admin.editing_design') %></h1>

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' %>

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 %>	
+
+        <div id="isotope" class="user-data">
+            <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">
+                        <%= 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>
+            <%= render :partial => @right_partial %>
+        </div>

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 -%>

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

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 %>
 
 <div id="poststuff">

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 %>
 
 <div id="poststuff">

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 %>
 
 

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

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

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 -%>

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" %>

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"%>
-    <table class="table main-list member-list">
-        <thead>
-            <tr>
-                <th class="span1"></th>
-                <th class="span3"></th>
-                <th class="span1-2"></th>
-                <th class="span2"></th>
-                <th class="span2"></th>
-                <th class="span2"></th>
-            </tr>
-        </thead>
-        <tbody id="tbody_users">
-        <%= render :partial => "user_for_listing",:collection=> @users%>
-        </tbody>
-    </table>
+  <table class="table main-list member-list">
+    <thead>
+      <tr>
+        <th class="span1"></th>
+        <th class="span3"></th>
+        <th class="span1-2"></th>
+        <th class="span2"></th>
+        <th class="span2"></th>
+        <th class="span2"></th>
+      </tr>
+    </thead>
+    <tbody id="tbody_users">
+      <%= render :partial => "user_for_listing",:collection=> @users%>
+    </tbody>
+  </table>
 
 <%= render :partial=> "index_paginator" %>

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"%>

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"%>

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" %>

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 %>
+
             <div class="member-plugin">
                 <% #binding.pry%>
                 <%= render :partial=> 'plugin_summary'%>

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"%>
 
         <div id="isotope" class="user-data">
@@ -6,25 +10,20 @@
                 <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
                 <div class="module-nav-view">
                     <ul class="nav nav-pills">
-                        <%= 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 -%>
 
 
                     </ul>
                 </div>
             </div>
-            <%=render :partial=> @right_partial%>
-            <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/admin/users_new_interface/temp_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" %>