Merge branch 'design_team' into ldap

Conflicts:
	config/environments/development.rb

app/views/layouts/_orbit_bar.html.erb

@@ -10,6 +10,7 @@
 							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %></li>
 			        <li class="divider"></li>
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t('admin.structure'), admin_items_path %></li>
+							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %></li>
 			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t('admin.add_item') %></li>
 			    </ul>
 			</div>

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

app/views/layouts/new_admin.html.erb

@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 	<title><%= @title || APP_CONFIG['orbit'] %></title>
+	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>
 	<![endif]-->
@@ -25,7 +26,11 @@
 		<div class="viewport">
 			<div class="overview">
 				<ul class="nav nav-list">
-					<%= render 'layouts/side_bar' %>
+					<% if !(yield :side_bar).blank? %>
+					 	<%= yield :side_bar %>
+					<% else %>
+					 	<%= render 'layouts/side_bar' %>
+					<% end %>
 				</ul>
 			</div>
 		</div>

app/views/layouts/page_layout.html.erb

@@ -3,6 +3,7 @@
 <head>
 <meta charset="utf-8">
 	<%= page_title(@item).html_safe %>
+	<link rel="shortcut icon" href="<%= asset_path "ncculogo.ico" %>">
 	<%= page_metas(@item).html_safe %>
 	<!--[if lt IE 9]>
 	   <%= javascript_include_tag "html5" %>