Merge branch 'master' into desktop_harry

app/views/admin/ad_banners/_ad_banner_tab.html.erb

@@ -15,5 +15,5 @@
 			<%= link_to 'Add AdImage',new_admin_ad_banner_ad_image_path(ad_banner_tab) %>
 	</div>
 	<% end -%>
-	<%= preview_block ad_banner_tab %>
+	<%= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %> 
 </div>

app/views/admin/ad_banners/_modal_ad_banner_form.html.erb

@@ -1,5 +1,3 @@
-<script type="text/javascript" charset="utf-8">
-</script>
 
 <div id="new-a-banner" class="modal fade in tab-pane <%= 'active' if @active.nil? %>">
 	<%= form_for(:ad_banner,:remote => true, :url => admin_ad_banners_path) do |f| %>
@@ -37,4 +35,21 @@
 		</div>
 	<% end %>
 </div>
+<script type="text/javascript" charset="utf-8">
+if(window.location.pathname == "/admin/ad_banners/new"){
+	$('#new-a-banner').modal({show: true});
+}
+
+$('#new_ad_banner_tab_but').on('shown', function (e) {
+	$('#new-a-banner').modal({show: true});
+})
+
+$('#new-a-banner').on('shown', function (e) {
+	alert('show!');
+})
+
+$('#new-a-banner').on('hidden', function (e) {
+	$(".nav.nav-tabs  a[id!='new_ad_banner_tab_but']:last").tab('show');
+})
+</script>
 

app/views/admin/ad_banners/_preview_block.html.erb

@@ -0,0 +1,29 @@
+<% if ad_banner -%>
+<%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
+
+<div class="modal hide fade in" id='slideshow-<%=ad_banner.title.dehumanize%>'>
+  <div class="modal-header">
+    <a class="close" data-dismiss="modal">×</a>
+    <h3>Modal header</h3>
+  </div>
+  <div class="modal-body">
+    <p class="ad_banner_slideshow">
+			<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
+				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
+			<% end -%>
+    </p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal">Close</a>
+  </div>
+</div>
+
+<% end -%>
+
+<script type='text/javascript' src='/static/kernel.js'></script>
+<script type='text/javascript'>
+	$('#slideshow-<%=ad_banner.title.dehumanize%>').on('show', function () {
+  	$('#slideshow-banner_1').find(".ad_banner_slideshow").cycle({delay: -1000, fx: '<%= ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx %>', timeoutFn: getTimeout });
+	});
+
+</script>

app/views/admin/ad_banners/index.html.erb

@@ -1,9 +1,9 @@
 <div id="post-body-content" class="clear">
 	<ul class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>
-			<%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : '' ) %>
+			<%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : nil ) %>
 		<% end -%>
-		<%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:class => (@active.nil? ? 'active' : '' ) %>
+		<%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
 		
 	</ul>
 	
@@ -13,4 +13,3 @@
 	</div>
 		
 </div>
-

app/views/layouts/_drop_down_menu.html.erb

@@ -7,18 +7,4 @@
 	<li><%= link_to t('admin.member'), admin_users_path, :class => 'orblink' %></li>
 	<li><%= link_to t('admin.translation'), admin_translations_path, :class => 'orblink' %></li>
 	<li><%= link_to t('admin.site'), admin_sites_path, :class => 'orblink' %></li>
-	
-<!--  	<li><%= link_to t('admin.purchase'), admin_purchases_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.site_setting'), admin_sites_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.design'), admin_designs_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.announcement'), panel_announcement_back_end_root_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.super_pages'), '', :class => 'orblink' %></li>
-	<li><%= link_to t('admin.links'), '', :class => 'orblink' %></li>
-	<li><%= link_to t('admin.ad_banner'), admin_ad_banners_path, :class => 'orblink' %></li>
-	<li><%= link_to t('admin.calendar'), '', :class => 'orblink' %></li>
-	<li><%= link_to t('admin.nccu'), '', :class => 'orblink' %></li>
-	 t('admin.dashbroad')
-	 t('admin.content'
-	t('admin.add_drop_down_item')
-   -->
 </ul>

app/views/layouts/_side_bar.html.erb

@@ -2,14 +2,14 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-purchase') + t('admin.purchase'), admin_purchases_path %>
 <% end -%>
 
-<%= content_tag :li, :class => active_for_controllers('bulletins', 'tags', 'bulletin_categorys') do -%>
+<%= content_tag :li, :class => active_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks') do -%>
 	<%= link_to content_tag(:i, nil, :class => 'icons-announcement') + t('admin.announcement'), panel_announcement_back_end_bulletins_path %>
-	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', 'tags', 'bulletin_categorys')) do -%>
+	  <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('bulletins', 'tags', 'bulletin_categorys', 'fact_checks')) do -%>
 		<%= content_tag :li, link_to(t('admin.all_articles'), panel_announcement_back_end_bulletins_path), :class => active_for_action('bulletins', 'index') %>
 		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_announcement_back_end_bulletin_path), :class => active_for_action('bulletins', 'new') %>
 		<%= content_tag :li, link_to(t('admin.categories'), panel_announcement_back_end_bulletin_categorys_path), :class => active_for_action('bulletin_categorys', 'index') %>
-		<%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('tags', 'index') %>
-		<%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('bulletins', 'fact_check_setting')  if (is_manager? rescue nil) %>
+		<%= content_tag :li, link_to(t('admin.tags'), panel_announcement_back_end_tags_path), :class => active_for_action('panel/bulletin/back_end/tags', 'index') %>
+		<%= content_tag :li, link_to(t('announcement.bulletin.fact_check_setting'), panel_announcement_back_end_fact_checks_setting_path), :class => active_for_action('fact_checks', 'setting')  if (is_manager? rescue nil) %>
 	<% end -%>
 
 <% end -%>
@@ -44,7 +44,7 @@
 		<%= content_tag :li, link_to(t('admin.all_articles'), panel_web_resource_back_end_web_links_path), :class => active_for_action('web_link', 'index') %>
 		<%= content_tag :li, link_to(t('admin.add_new'), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_link', 'new') %>
 		<%= content_tag :li, link_to(t('admin.categories'), panel_web_resource_back_end_web_link_categorys_path), :class => active_for_action('web_link_categorys', 'index') %>
-		<%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('tags', 'index') %>
+		<%= content_tag :li, link_to(t('admin.tags'), panel_web_resource_back_end_tags_path), :class => active_for_action('panel/web_resource/back_end/tags', 'index') %>
 	<% end -%>
 <% end -%>