Changes for side_bar

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