small fix for banner pagination.

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');
-                      _val == _select.main && _select.category.length ? $hiddenInputA.removeAttr('name') : $hiddenInputA.attr('name', 'page[category][]');
+                      _boolean && _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');
-                      _val == _select.main && _select.tags.length ? $hiddenInputB.removeAttr('name') : $hiddenInputB.attr('name', 'page[tag][]');
+                      _boolean && _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/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><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 class='needed'><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,6 +17,12 @@
       <% 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: test_site
+  database: orbit_site_new

lib/parsers/parser_front_end.rb

@@ -48,13 +48,7 @@ module ParserFrontEnd
         ret = ''
         part = PagePart.find(front['part_id']) if front['part_id']
         ret << eval("\"#{front['path']}\"") rescue ''
-        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
+        ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") 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/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 => [:bulletin_category,:id]}}
+        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [: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.qa_category.title rescue nil %></span>
+		<span><%= t(:category) %>：<%= @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.all'
-        # enable ['typeA']
-        link_field :qa_category_with_title,{:method => 'panel_faq_front_end_qas_path',:args=>{:category_id => [:qa_category,:id]}}
+        query 'Qa'
+        enable ['typeA']
+        link_field :qa_category_with_title,{:method => 'panel_faq_front_end_qas_path',:args=>{:category_id => [: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']})
+      active_for_controllers ({:private=>['qas', 'qa_categorys','module_tags', 'categories']})
       active_for_object_auth ['QaCategory'] 
 
       head_link_path "panel_faq_back_end_qas_path"
@@ -65,11 +65,10 @@ module Faq
        context_link 'categories',
                             :link_path=>"admin_module_app_categories_path(get_module_app)" ,
                             :priority=>3,
-                            :active_for_category => 'Qa',
+                            :active_for_category => 'Faq',
                             :available_for => [:manager]
-
       context_link 'tags',
-                            :link_path=>"admin_module_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Faq'}))" ,
+                            :link_path=>"admin_module_tags_path(module_app_id: get_module_app)" ,
                             :priority=>4,
                             :active_for_tag => 'Faq',
                             :available_for => [:manager]