Merge branch 'master' into desktop_harry

app/assets/javascripts/bulletin_form.js.erb

@@ -17,4 +17,12 @@ $('.quick_edit_cancel').live('click', function(){
   $('#' + tr).hide();
   $("tr#bulletin_file_" + $(this).prev().attr('value')).hide();
   $("tr#bulletin_link_" + $(this).prev().attr('value')).hide();
+});
+
+$(document).on('click', '.list-remove', function(){
+	$('#delete_bulletins').submit();
+});
+
+$(document).on('click', '#check_all_bulletins', function(){
+  $('.checkbox_in_list').attr("checked", this.checked);
 });

app/assets/javascripts/inc/permission-checkbox.js

@@ -1,14 +1,19 @@
 $(document).ready(function() {
-	$('.check[checked="checked"]').parents(".checkbox").addClass("checked");
+	$('.check[checked="checked"]').parents(".checkbox").addClass("checked")
 	$(".checkbox").click(function(){
 		if($(this).children(".check").attr("checked")){
 			// uncheck
-		$(this).children(".check").attr('checked', false);
-		$(this).removeClass("checked");
+			$(this).children(".check").attr('checked', false);
+			$(this).removeClass("checked");
 		}else{
 			// check
 			$(this).children(".check").attr({checked: "checked"});
 			$(this).addClass("checked");
 		}
 	});
+	$(".checkbox").popover({
+		trigger: 'hover',
+		placement: 'bottom',
+		delay: { show: 100, hide: 300 },
+	});
 });

app/assets/javascripts/inc/search.js

@@ -0,0 +1,31 @@
+// JavaScript Document
+
+// can copy code to any of ur desired javascsript 
+
+//extended jquery to search fast.
+$.extend($.expr[':'], {
+	'containsi': function (elem, i, match, array) {
+		return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
+	}
+});
+$(document).ready(function(){
+	$("#user_filter").keyup(function(){
+		if($(this).val()){
+			var totalfoundbyname = $("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").length
+			if(totalfoundbyname!=0){
+				$("div#users_checkbox_ary label.member-name:not(:containsi("+$(this).val()+"))").parent().parent().slideUp();
+				//$("div#users_checkbox_ary label.member-name:not(:containsi("+$(this).val()+"))").parent().popover('hide');
+				$("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").parent().parent().slideDown();
+				$("div#users_checkbox_ary label.member-name:containsi("+$(this).val()+")").parent().popover('toggle');				
+			}else if(totalfoundbyname==0){
+				$("div#users_checkbox_ary div.for_unit:not(:containsi("+$(this).val()+"))").parent().slideUp();
+				//$("div#users_checkbox_ary div.for_unit:not(:containsi("+$(this).val()+"))").popover('hide');
+				$("div#users_checkbox_ary div.for_unit:containsi("+$(this).val()+")").parent().slideDown();
+				$("div#users_checkbox_ary div.for_unit:containsi("+$(this).val()+")").popover('toggle');
+			}	
+		}else{
+			$(".checkbox").popover('hide');	
+			$("div.checkblock").slideDown();
+		}
+	})
+})

app/assets/javascripts/new_admin.js

@@ -12,4 +12,5 @@
 //= require orbit-1.0
 //= require tinymce-jquery
 //= require tinymce_orbit
-//= require orbit-bar-search
+//= require orbit-bar-search
+//= require side_bar_history

app/assets/javascripts/orbit-1.0.js

@@ -51,7 +51,7 @@ $(document).ready(function(){
 	$('#main-sidebar').css("height", viewportheight-30);
 	$('#main-sidebar .viewport').css("height", viewportheight-30);
 	$('.post-title').css("width", viewportwidth-495);
-	$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
+	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
 	$('#main-sidebar').tinyscrollbar();
 	$('.detal-list').tinyscrollbar();
 	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
@@ -72,14 +72,14 @@ $(window).resize(function(){
 	$('#main-sidebar').css("height", viewportheight-30);
 	$('#main-sidebar .viewport').css("height", viewportheight-30);
 	$('.post-title').css("width", viewportwidth-495);
-	$('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
+	$('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
 	$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
 	mainTablePosition();
 });
 /*main-table position*/
 function mainTablePosition() {
 	var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height();
-	var $table = $('#main-wrap > table').length && $('#main-wrap > table');
+	var $table = $('.main-list').length && $('.main-list:last');
 	if($table && $table==0){
 		$table.css({marginTop:$height});
 	}

app/assets/javascripts/side_bar_history.js

@@ -1,31 +1,49 @@
-$(function () { 
-  $('#back_sidebar a, #back_main a.nav').live('click',  
-    function () {  
-      $.getScript(this.href);
-			history.pushState(null, document.title, this.href);
-			history_edited = true;
-      return false;
-    }  
-  );
+var history_edited = false; 
 
-  $('#back_main a.reload').live('click',
-    function () { 
-      $.getScript(this.href);
-			history.replaceState(null, document.title, this.href);
-			history_edited = true;
-      return false;
-    }
-  );
-
-	$('.form').live('submit', function () { 
-    $.post(this.action, $(this).serialize(), null, 'script');
+$('#back_sidebar a, #back_main a.nav').live('click',  
+  function () {  
+    $.getScript(this.href);
+		history.pushState(null, document.title, this.href);
 		history_edited = true;
     return false;
-  });
+  }  
+);
 
-	$(window).bind("popstate", function () { 
-		if (history_edited) { 
-    	$.getScript(location.href);  
-		}
-  });
+$('#back_main a.reload').live('click',
+  function () { 
+    $.getScript(this.href);
+		history.replaceState(null, document.title, this.href);
+		history_edited = true;
+    return false;
+  }
+);
+
+$('.form').live('submit', function () { 
+  $.post(this.action, $(this).serialize(), null, 'script');
+	history_edited = true;
+  return false;
+});
+
+$(document).on('click', '.js_history',
+  function () { 
+    $.getScript(this.href);
+    history.pushState(null, document.title, this.href);
+    history_edited = true;
+    return false;
+  }
+);
+
+$(document).on('click', '.pagination a',
+  function () { 
+    $.getScript(this.href);
+    history.pushState(null, document.title, this.href);
+    history_edited = true;
+    return false;
+  }
+);
+
+$(window).bind("popstate", function () { 
+  if (history_edited) { 
+    $.getScript(location.href);  
+  }
 });

app/assets/stylesheets/bootstrap-orbit.css

@@ -102,6 +102,14 @@ table .span1-2 {
 	float: none;
 	margin-left: 0;
 }
+table .span1-3 {
+	min-width: 200px;
+	float: none;
+	margin-left: 0;
+}
 .qe-block .form-horizontal .form-actions {
 	text-align:right;
+}
+.modal.fade {
+    top: -50%;
 }

app/assets/stylesheets/inc/permission-checkbox.css

@@ -7,8 +7,8 @@
 	display:none;
 }
 .checkbox{
-	padding:5px;
-	margin:5px;
+	padding: 5px;
+	margin: 5px 5px 10px;
 	display: inline-block;
 	color:#777777;
 	text-shadow: 0 1px 0px rgba(255,255,255,.4);
@@ -28,26 +28,50 @@
 .checkbox .check-icon {
 	display: none;
 	position: absolute;
-	width: 22px;
-	height: 22px;
-	border-radius: 11px;
-	background-color: #d0f311;
-	right: -5px;
+	width: 26px;
+	height: 26px;
+	background: url('img/check.png') no-repeat left top;
+	right: -10px;
     top: -5px;
-    box-shadow: 0px 0px 5px rgba(0,0,0,.05);
-}
-.checkbox .check-icon i {
-	margin: 1px 0 0 3px;
 }
 .checkbox .member-name {
+	cursor: pointer;
+	font-family: helvetica;
+	font-size: 12px;
 	line-height: 30px;
-	padding: 0 10px;
+	padding: 0 10px 0 40px;
+	color: #333333;
+	display: inline-block;
+	margin-bottom: 0;
+}
+.member-avatar {
+	position: absolute;
+    width: 34px;
+    height: 34px;
+    overflow: hidden;
+    margin-top: -2px;
 }
 img.member-img {
-    display: inline-block;
-    float: left;
-    max-width: 30px;
+    max-width: 100%;
 }
 .checked .check-icon {
 	display: block;
+}
+.popover-inner {
+    width: auto;
+    display: inline-block;
+    text-align: center;
+}
+.popover-title {
+    display: block;
+    font-size: 12px;
+    font-weight: normal;
+    padding: 3px 10px;
+}
+.popover-content {
+    padding: 3px 10px;
+    color: #898989;
+}
+.popover-content p {
+	font-size: 12px;
 }

app/helpers/admin/ad_banner_helper.rb

@@ -1,12 +1,5 @@
 module Admin::AdBannerHelper
-  def preview_block(ad_banner)  
-      res =''
-      #same code as in frontend backend parser
-      if ad_banner 
-        res << "<script type='text/javascript'>
-                $(document).ready(function(){ $('#slideshow-#{ad_banner.title.dehumanize}').cycle({delay: -1000, fx: '#{ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx}', timeoutFn: getTimeout }); });
-                </script>"
-        res << "<div id='slideshow-#{ad_banner.title.dehumanize}'>"
+  def preview_block_ad_images_helper(ad_banner)  
          printable_ad_images = []
          ad_banner.ad_images.each do |ad_image|
            if ad_image.display?
@@ -17,18 +10,7 @@ module Admin::AdBannerHelper
           end
           
       printable_ad_images.shuffle!
-      printable_ad_images.each  do |ad_image|  #TODO Need Reflact
-        res << "<img src='#{ad_image.file}' "
-        res << "alt='#{ad_image.title || ' '}' "
-        res << "time_to_next='#{ad_banner.transition_sec}' "
-        res << "link_open='#{ad_image.link_open}' "
-        # res << "link_url='#{(ad_image.direct_to_after_click?? ad_image.out_link : ad_banner.context) || ' '}' "
-        res << "link_url='#{(ad_image.out_link || ad_banner.context || ' ')}' "
-        res << "/>"          
-      end
-      res << "</div>"  
-      res.html_safe
-    end
-  end
+ end
+  
 
 end

app/helpers/application_helper.rb

@@ -83,7 +83,7 @@ module ApplicationHelper
   end
   
   def active_for_action(controller_name, action_name)
-    (controller.controller_name.eql?(controller_name) && controller.action_name.eql?(action_name)) ? 'active' : nil
+    ((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil
   end
 
   def sortable(column)
@@ -102,18 +102,10 @@ module ApplicationHelper
     ' web-symbol' if params[:sort].eql?(name)
   end
 
-  def add_filter(param_name, value)
-    filter = params[:filter] rescue nil
-    if filter && filter.has_key(param_name)
-      filter[param_name] << value
-    elsif filter
-      filter.merge({param_name => [value]})
-    else
-      {param_name => [value]}
-    end
+  def is_filter_active?(type, id)
+    ' active' if (@filter[type].include?(id.to_s) rescue nil)
   end
 
-
   def process_page(page, id)
     parse_page_noko(page, id)
   end

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