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

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

@@ -57,6 +57,14 @@
 								<% end %>
 							</div>
 						</div>
+						<div class="control-group">
+							<label class="control-label"><%= t 'admin.site_sub_menu' %></label>
+							<div class="controls">
+								<%= f.fields_for :sub_menu, @site.sub_menu do |f| %>
+									<%= f.text_area locale, :class => "tinymce_textarea input-xxlarge" %>
+								<% end %>
+							</div>
+						</div>
 					<% end %>
 				<% end %>
 			</div>

app/views/layouts/_side_bar.html.erb

@@ -27,6 +27,7 @@
 		<%= content_tag :li, link_to(t('announcement.categories'), panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.tags'), panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') %>
 		<%= content_tag :li, link_to(t('announcement.news_bulletin.approval_setting'), panel_news_back_end_news_approval_setting_path), :class => active_for_action('news_approvals', 'setting')  if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to(t('admin.module.authorization'),edit_admin_module_app_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_sys_call_for_app('module_apps','edit','news') if (is_admin? rescue nil) %>
 	<% 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]-->

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