fixed announcement rendering..

app/assets/javascripts/basic/orbit_js_1.0.1.js

@@ -38,11 +38,9 @@ if($.support.touch) {
         $checked.each(function() {
             if(!$(this).closest('div').hasClass('togglebox')) {
                 $(this).wrap('<div class="toggle-control"/>');
-                if($(this).attr('type') == "hidden" && $(this).attr('value') == 'true') {
-                    console.log('true')
-                    $(this).wrap('<div class="togglebox disable" />');    
+                if($(this).attr('type') == "hidden" && $(this).attr('value')) {
+                    $(this).wrap('<div class="togglebox disabled" />');    
                 } else {
-                    console.log('false')
                     $(this).wrap('<div class="togglebox" />');
                 }
                 $('<label><b></b></label>').insertAfter($(this));
@@ -543,7 +541,6 @@ function changeStatusHidden() {
 
 // Document Ready
 $(function() {
-    console.log('true')
     showFiltersOnPageRefresh();
 
     new ini();

app/assets/javascripts/lib/items/items.js.erb

@@ -411,7 +411,7 @@ $(function() {
                         $pageCategory.find('input[type="checkbox"]').eq(index).prop('checked', true);
                       }
                       var $all = $pageCategory.siblings('.checkbox').children('.select_all');
-                      _boolean && _val == _select.main && _select.category.length ? $hiddenInputA.removeAttr('name') : $hiddenInputA.attr('name', 'page[category][]');
+                      _val == _select.main && _select.category.length ? $hiddenInputA.removeAttr('name') : $hiddenInputA.attr('name', 'page[category][]');
                       _boolean && _val == _select.main && _select.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
                     }
                   });
@@ -431,7 +431,7 @@ $(function() {
                         $pageTags.find('input[type="checkbox"]').eq(index).prop('checked', true);
                       }
                       var $all = $pageTags.siblings('.checkbox').children('.select_all');
-                      _boolean && _val == _select.main && _select.tags.length ? $hiddenInputB.removeAttr('name') : $hiddenInputB.attr('name', 'page[tag][]');
+                      _val == _select.main && _select.tags.length ? $hiddenInputB.removeAttr('name') : $hiddenInputB.attr('name', 'page[tag][]');
                       _boolean && _val == _select.main && _select.tags.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
                     }  
                   });

app/assets/javascripts/lib/member/role-forms.js

@@ -222,7 +222,7 @@ $(function() {
 		});
 		$('#user-forms').delegate('.togglebox, .delete, .trigger, .remove-input', clickEvent, function(event) {
 			if($(this).hasClass('togglebox')) {
-				if($(this).hasClass('disable')) {
+				if($(this).hasClass('disabled')) {
 					$(this).find('.toggle-check')
 						   .attr('value', 'false')
 						   .closest('.attributes')
@@ -237,7 +237,7 @@ $(function() {
 						   .children('.attributes-body')
 						   .fadeOut(300);
 				}
-				$(this).toggleClass('disable');
+				$(this).toggleClass('disabled');
 			};
 			if($(this).hasClass('remove-input')) {
 				$(this).closest('.input-append').fadeOut(300, function() {
@@ -382,7 +382,7 @@ $(function() {
 		});
 		$('#attributes-area').delegate('.togglebox, .delete, .trigger, .remove-input', clickEvent, function(event) {
 			if($(this).hasClass('togglebox')) {
-				if($(this).hasClass('disable')) {
+				if($(this).hasClass('disabled')) {
 					$(this).find('.toggle-check')
 						   .attr('value', 'false')
 						   .closest('.attributes')
@@ -411,7 +411,7 @@ $(function() {
 						    	$(this).parent('.field-type').removeClass('in');
 						   });
 				}
-				$(this).toggleClass('disable');
+				$(this).toggleClass('disabled');
 			};
 			if($(this).hasClass('delete')) {
 				$(this).closest('.attributes').fadeOut(300, function() {

app/assets/javascripts/lib/site_set.js

@@ -51,7 +51,7 @@ $(function() {
 	}
 	if($('.set-sidebar-state').length) {
 		if(window.localStorage.getItem('sidebarState') == 1) {
-			$('.set-sidebar-state').prop('checked',true).parent('.togglebox').removeClass('disable');
+			$('.set-sidebar-state').prop('checked',true).parent('.togglebox').removeClass('disabled');
 		}
 		$('.set-sidebar-state').on({
 			change: function() {

app/controllers/admin/pages_controller.rb

@@ -21,15 +21,11 @@ class Admin::PagesController < Admin::ItemsController
   end
 
   def update
-    if params[:page][:category]
-      if params[:page][:category][0] == ""
-        params[:page][:category] = []
-      end
+    if params[:page][:category][0] == ""
+      params[:page][:category] = []
     end
-    if params[:page][:tag]
-      if params[:page][:tag][0] == ""
-        params[:page][:tag] = []
-      end
+    if params[:page][:tag][0] == ""
+      params[:page][:tag] = []
     end
     @item = Page.find(params[:id])
     if @item.module_app && @item.module_app.key == 'page_content' && @item.page_contexts.blank?

app/views/admin/users_new_interface/_role.html.erb

@@ -5,7 +5,12 @@
 
   <div class="attributes <%= role_disable ? 'disabled' : '' %>">
   <div class="attributes-header clearfix">
-    <%= hidden_field_tag("user[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable)%>
+    <div class="toggle-control" style="float: right;">
+      <div class="togglebox <%= role_disable ? 'disabled' : '' %>">
+        <%= hidden_field_tag("user[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable)%>
+        <label><b></b></label>
+      </div>
+    </div>
     <h4><%= role.title %><%= t(:role_info)%></h4>
   </div>
 

app/views/front/show_banner.html.erb

@@ -1,5 +1,5 @@
 <div style='position:relative'>
-  <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class="orbit-cycle-slideshow"  data-cycle-timeout="<%= @ad_banner.timeout_millisecond %>" data-cycle-fx="<%= @ad_banner.ad_fx %>" data-cycle-pager=".banner_nav_<%= @ad_banner.title.dehumanize %>" data-cycle-pager-template="<li class='needed'><a href='#'></a></li>" data-cycle-pager-active-class="activeSlide" data-cycle-random='true' style="z-index: 0">
+  <div id='slideshow-<%= @ad_banner.title.dehumanize %>' class="orbit-cycle-slideshow"  data-cycle-timeout="<%= @ad_banner.timeout_millisecond %>" data-cycle-fx="<%= @ad_banner.ad_fx %>" data-cycle-pager=".banner_nav_<%= @ad_banner.title.dehumanize %>" data-cycle-pager-template="<li><a href='#'></a></li>" data-cycle-pager-active-class="activeSlide" data-cycle-random='true' style="z-index: 0">
     <% @ad_banner.ad_images.can_display.each do |ad_image| %>
       <% link = ad_image_link(ad_image) %>
       <%= image_tag ad_image.file, width: @ad_banner.width, height: @ad_banner.height, link_open: ad_image.link_open, link_url: link, style: "display:none; #{'cursor:pointer;' if link.present?}" %>
@@ -17,12 +17,6 @@
       <% end %>
       $.preload(a, 2, function(){
         $('.orbit-cycle-slideshow').cycle();
-        var lis = $("ul.banner_nav_<%= @ad_banner.title.dehumanize %> li");
-        if( lis.length > a.length ){
-          for( i = lis.length - 1; i > a.length - 1; i-- ){
-            lis[i].remove();
-          }
-        }
       });
     }
     else{

config/mongoid.yml

@@ -24,4 +24,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: orbit_site_new
+  database: test_site

lib/parsers/parser_front_end.rb

@@ -48,7 +48,13 @@ module ParserFrontEnd
         ret = ''
         part = PagePart.find(front['part_id']) if front['part_id']
         ret << eval("\"#{front['path']}\"") rescue ''
-        ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args
+        args.each do |index,arg|
+          if index=="tag_id" || index=="category_id"
+            ret << (ret.include?("?") ? "&#{index}[]=#{arg}": "?#{index}[]=#{arg}" )
+            else
+            ret << (ret.include?("?") ? "&#{index}=#{arg}": "?#{index}=#{arg}" )    
+          end
+        end if args
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
       end
       front.swap(fragment)

vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -26,7 +26,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def index
-    @bulletins = get_bulletins_for_index
+
    end
 
    def get_bulletins_for_index
@@ -47,6 +47,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
         @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
         # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in=>params[:category_id],:tagged_ids.in=>params[:tag_id])
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
+        debugger        
       elsif !params[:category_id].blank?
         @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil

vendor/built_in_modules/announcement/init.rb

@@ -37,7 +37,7 @@ module Announcement
         image :image
         field :postdate
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
-        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:category,:id]}}
+        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
         field :subtitle
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end

vendor/built_in_modules/faq/app/controllers/panel/faq/front_end/qas_controller.rb

@@ -37,14 +37,14 @@ class Panel::Faq::FrontEnd::QasController < OrbitWidgetController
   
   def show
     @qa = Qa.find(params[:id])
-	  # get_categorys
+	  get_categorys
   end
   
   
   protected
   
   def get_categorys
-    # @qa_categorys = QaCategory.excludes('disable' => true)
+    @qa_categorys = QaCategory.excludes('disable' => true)
   end
   
 end

vendor/built_in_modules/faq/app/models/qa.rb

@@ -22,7 +22,7 @@ class Qa
   accepts_nested_attributes_for :qa_files, :allow_destroy => true
   accepts_nested_attributes_for :qa_links, :allow_destroy => true
   
-  # belongs_to :qa_category
+  belongs_to :qa_category
   
   before_save :clean_values
 

vendor/built_in_modules/faq/app/views/panel/faq/front_end/qas/show.html.erb

@@ -2,7 +2,7 @@
 <h1 class="h1"><%= @qa.title %></h1>
 <div class="info">
 	<div class="info1">
-		<span><%= t(:category) %>：<%= @qa.category.title rescue nil %></span>
+		<span><%= t(:category) %>：<%= @qa.qa_category.title rescue nil %></span>
 	</div>
 </div>
 <div class="news_paragraph">

vendor/built_in_modules/faq/init.rb

@@ -16,7 +16,7 @@ module Faq
       end
     end
 
-    # category ["QaCategory"]
+    category ["QaCategory"]
     data_count 1..20
 
     taggable
@@ -25,9 +25,9 @@ module Faq
 
     widgets do
       default_widget do
-        query 'Qa'
-        enable ['typeA']
-        link_field :qa_category_with_title,{:method => 'panel_faq_front_end_qas_path',:args=>{:category_id => [:category,:id]}}
+        query 'Qa.all'
+        # enable ['typeA']
+        link_field :qa_category_with_title,{:method => 'panel_faq_front_end_qas_path',:args=>{:category_id => [:qa_category,:id]}}
         link_field :title, {:method => 'panel_faq_front_end_qa_path',:args=>:self}
         link_to_more 'panel_faq_front_end_qas_path',:title_i18n=> 'faq.default_widget.to_more'
       end
@@ -45,7 +45,7 @@ module Faq
     side_bar do
       head_label_i18n  'faq.faq',:icon_class=>"icons-help"
       available_for [:admin,:guest,:manager,:sub_manager]
-      active_for_controllers ({:private=>['qas', 'qa_categorys','module_tags', 'categories']})
+      active_for_controllers ({:private=>['qas', 'qa_categorys']})
       active_for_object_auth ['QaCategory'] 
 
       head_link_path "panel_faq_back_end_qas_path"
@@ -65,10 +65,11 @@ module Faq
        context_link 'categories',
                             :link_path=>"admin_module_app_categories_path(get_module_app)" ,
                             :priority=>3,
-                            :active_for_category => 'Faq',
+                            :active_for_category => 'Qa',
                             :available_for => [:manager]
+
       context_link 'tags',
-                            :link_path=>"admin_module_tags_path(module_app_id: get_module_app)" ,
+                            :link_path=>"admin_module_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Faq'}))" ,
                             :priority=>4,
                             :active_for_tag => 'Faq',
                             :available_for => [:manager]