diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb
new file mode 100644
index 00000000..4b25835e
--- /dev/null
+++ b/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 -%>
diff --git a/app/views/admin/sites/language.html.erb b/app/views/admin/sites/language.html.erb
index ceb9b012..2b626564 100644
--- a/app/views/admin/sites/language.html.erb
+++ b/app/views/admin/sites/language.html.erb
@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+ <%= render '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 3a52ede2..aaef1857 100644
--- a/app/views/admin/sites/mail_setting.html.erb
+++ b/app/views/admin/sites/mail_setting.html.erb
@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+ <%= render 'side_bar' %>
+<% end %>
+
mail_setting.html.erb
\ No newline at end of file
diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
index 96a73aac..ba3bca2a 100644
--- a/app/views/admin/sites/site_info.html.erb
+++ b/app/views/admin/sites/site_info.html.erb
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+ <%= render 'side_bar' %>
+<% end %>
+
<%= form_for @site, :url => admin_site_path(@site), :html => {:class => "clear"} do |f| %>
diff --git a/app/views/admin/sites/system_info.html.erb b/app/views/admin/sites/system_info.html.erb
index 45535dac..dc9d45c9 100644
--- a/app/views/admin/sites/system_info.html.erb
+++ b/app/views/admin/sites/system_info.html.erb
@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+ <%= render '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 222f5969..540405da 100644
--- a/app/views/admin/sites/ui_theme.html.erb
+++ b/app/views/admin/sites/ui_theme.html.erb
@@ -1 +1,5 @@
+<% content_for :side_bar do %>
+ <%= render 'side_bar' %>
+<% end %>
+
ui_theme.html.erb
\ No newline at end of file
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index 46f2b712..4c14a8fe 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -10,6 +10,7 @@
<%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %>
<%= link_to content_tag(:i, nil, :class => 'icons-structure') + t('admin.structure'), admin_items_path %>
+ <%= 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-plus-cube') + t('admin.add_item') %>
diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index c3838827..05562e0b 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -67,14 +67,3 @@
<%= content_tag :li, link_to(t('announcement.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') %>
<% end -%>
<% end -%>
-
-<%= 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 -%>
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index 51a96190..3a493a9d 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -26,7 +26,11 @@
- <%= render 'layouts/side_bar' %>
+ <% if !(yield :side_bar).blank? %>
+ <%= yield :side_bar %>
+ <% else %>
+ <%= render 'layouts/side_bar' %>
+ <% end %>