Merge branch 'ad_banner' into ldap

app/views/layouts/_side_bar.html.erb

@@ -33,8 +33,8 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%>
 		<%= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
-		<%= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
-		<%= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
+		<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
+		<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
 	<% end %>
 <% end %>
 

app/views/layouts/site_editor.html.erb

@@ -9,31 +9,30 @@
 	<![endif]-->
 	<%= stylesheet_link_tag "site_editor" %>
 	<%= javascript_include_tag "site_editor" %>
-	<%= yield :page_specific_css %>
-	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
 </head>
 <body>
-<!--
-	<header id="back_banner_link" class="fixed clear" >
-		<nav id="back_orbit">
-			<span>Orbit Icon</span>
-			<%= render 'layouts/drop_down_menu' %>
-		</nav>
-		<div class="hmenu">
-			<%= render 'devise/menu/login_items' %>
-			<div class="lang"><%= render 'layouts/lang_menu' %></div>
+	<%= render 'layouts/orbit_bar' %>
+	<nav id="main-sidebar" class="my_scroll">
+		<div class="scrollbar">
+			<div class="track">
+				<div class="thumb">
+					<div class="end"></div>
+				</div>
+			</div>
 		</div>
-	</header>
--->
+		<div class="viewport">
+			<div id='back_sidebar' class="overview">
+				<ul class="nav nav-list">
+					<%= yield :sidebar %>
+				</ul>
+			</div>
+		</div>
+	</nav>
 	<div id="main-wrap">
-		<div id="main-sidebar"><%= yield :sidebar %></div>
-		<div class="main"><div id='back_main' class="main2">
+		<div id='back_main'>
 			<%= yield %>
-		</div></div>
-		<div class="tertiary"><%= yield :tertiary %></div>
-		<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
+		</div>
 	</div>
-
 </body>
 </html>