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

app/views/admin/sites/_side_bar.html.erb

@@ -0,0 +1,12 @@
+<%= 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) %>
+
+	<%= 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') %>
+		<%= content_tag :li, link_to(t('admin.system_info'), admin_site_system_info_path(@site)), :class => active_for_action('sites', 'system_info') %>
+		<%= content_tag :li, link_to(t('admin.language'), admin_site_language_path(@site)), :class => active_for_action('sites', 'language') %>
+		<%= content_tag :li, link_to(t('admin.mail_setting'), admin_site_mail_setting_path(@site)), :class => active_for_action('sites', 'mail_setting') %>
+		<%= content_tag :li, link_to(t('admin.ui_theme'), admin_site_ui_theme_path(@site)), :class => active_for_action('sites', 'ui_theme') %>
+	<% end -%>
+
+<% end -%>

app/views/admin/sites/language.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 language.html.erb

app/views/admin/sites/mail_setting.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 mail_setting.html.erb

app/views/admin/sites/site_info.html.erb

@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 <div id="poststuff">
 <%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
 	<div id="post-body">

app/views/admin/sites/system_info.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 system_info.html.erb

app/views/admin/sites/ui_theme.html.erb

@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+	<%= render 'side_bar' %>
+<% end %>
+
 ui_theme.html.erb