category click, event click and more button fix

This reverts commit e129b25554.

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

@@ -39,10 +39,8 @@ if($.support.touch) {
             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" />');    
                 } else {
-                    console.log('false')
                     $(this).wrap('<div class="togglebox" />');
                 }
                 $('<label><b></b></label>').insertAfter($(this));
@@ -73,7 +71,6 @@ if($.support.touch) {
                         $(this).parent('.togglebox').removeClass('disable').closest('li').removeClass('disabled');
                     };
                 } else {
-                    console.log($(this))
                     if($(this).prop('checked')) {
                         $(this).parent('.togglebox').addClass('disable').closest('li').addClass('disabled');
                     };
@@ -543,7 +540,6 @@ function changeStatusHidden() {
 
 // Document Ready
 $(function() {
-    console.log('true')
     showFiltersOnPageRefresh();
 
     new ini();

app/assets/javascripts/kernel.js

@@ -4,7 +4,7 @@ var banner_index = 0;
 $(document).ready(function() {
 	$.each($(".dymanic_load"),function(){
 		if($(this).attr("path")==''){
-			$(this).html("App setting Failed");
+			$(this).html("");
 		}else{
 			ajax_load_proc($(this),$(this).attr("path")); 	
 		}
@@ -16,7 +16,7 @@ $(document).ready(function() {
 function ajax_load_proc(wapper,url,isBanner){
 	$.get(encodeURI(url), {}, function(respText,textSta,XML){ 
 		if (textSta == 'success') {
-			wapper.html(respText);
+			if (respText.indexOf("<title>") == -1) wapper.html(respText);
 		};
 		if(textSta == 'error')
 			wapper.html("Loading Failed<br/>  <a href='"+$(this).attr('path')+"'>Go See</a>");

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

@@ -111,30 +111,30 @@ function customOpenSlide() {
              .closest('.navbar-inner')
              .addClass('active');
       pageslide.find('.content').css('padding', 0);
-      iFrameContent()
+      // iFrameContent()
     }
   });
 }
-function iFrameContent() {
-  function iFrameFunction(iContents, pc) {
-    pc.each(function(index, el) {
-      if($(this).siblings('*').length == 0) {
-        var _parentH = $(this).parent('*').outerHeight();
-        $(this).css('height', _parentH);
-      }
-    });
-    iContents.find('#orbit-bar').hide();
-    iContents.find('.main_wrap').css('margin-top', 0);
-    iContents.find('a').not('.edit_link a').on('click', function(event) {
-      event.preventDefault();
-    }).css('cursor', 'default');
-  }
-  $('#pageslide_iframe').load(function() {
-      var $iContents = $(this).contents(),
-            $pc = $iContents.find('.page_content');
-      iFrameFunction($iContents, $pc);
-  });
-}
+// function iFrameContent() {
+//   function iFrameFunction(iContents, pc) {
+//     pc.each(function(index, el) {
+//       if($(this).siblings('*').length == 0) {
+//         var _parentH = $(this).parent('*').outerHeight();
+//         $(this).css('min-height', _parentH);
+//       }
+//     });
+//     iContents.find('#orbit-bar').hide();
+//     iContents.find('.main_wrap').css('margin-top', 0);
+//     iContents.find('a').not('.edit_link a').on('click', function(event) {
+//       event.preventDefault();
+//     }).css('cursor', 'default');
+//   }
+//   $('#pageslide_iframe').load(function() {
+//       var $iContents = $(this).contents(),
+//             $pc = $iContents.find('.page_content');
+//       iFrameFunction($iContents, $pc);
+//   });
+// }
 
 function pageSetting(id, edit, ps) {
   $pageModule = $('#pageslide #page_module_app_id');

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

@@ -0,0 +1,18 @@
+$(function() {
+  // for toggle-check
+  $('.role_filter_checked').on({
+    change: function() {
+      var _path = $(this).data('path');
+      // var path = <%= @path %>
+      $.ajax({
+        url: _path,
+        type: 'POST',
+        dataType: 'json',
+        data: {remote: true},
+      })
+      .done(function() {})
+      .fail(function() {})
+      .always(function() {});
+    },
+  });
+});

app/assets/javascripts/member.js

@@ -4,3 +4,4 @@
 //= require lib/jquery.fastLiveFilter.js
 //= require lib/checkbox.card.js
 //= require lib/jquery.form.js
+//= require lib/member/member-role.js

app/controllers/admin/items_controller.rb

@@ -40,8 +40,18 @@ class Admin::ItemsController < OrbitBackendController
       m["main"] = [module_app.label, module_app.id.to_s]
       m["sub"] = module_app.app_pages.map{|name, data| [t(data["i18n"]), name]} rescue []
       m["sub"] << [I18n.t('default_widget.default_widget'),'default_widget'] if module_app.has_default_widget?
-      m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
-      m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
+   
+      if module_app.key == 'member'
+        m["category"] = RoleStatus.where(:role_id=> RoleStatus.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
+        m["tags"] = RoleCategory.where(:role_id=> RoleCategory.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
+      elsif module_app.key == 'member_staff'
+        m["category"] = RoleStatus.where(:role_id=> RoleStatus.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
+        m["tags"] = RoleCategory.where(:role_id=> RoleCategory.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
+      else
+        m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
+        m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
+      end
+
       m["count"] = module_app.get_registration.get_data_count.to_a
       module_apps << m
     end

app/controllers/admin/page_parts_controller.rb

@@ -63,8 +63,19 @@ class Admin::PagePartsController < OrbitBackendController
       m = {}
       m["main"] = [module_app.label, module_app.id.to_s]
       m["sub"] = module_app.widgets.map{|name, data| [t(data["i18n"]), name]} rescue []
-      m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
-      m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
+
+   
+      if module_app.key == 'member'
+        m["category"] = RoleStatus.can_display.where(:role_id=> RoleStatus.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
+        m["tags"] = RoleCategory.can_display.where(:role_id=> RoleCategory.get_role_data("teacher") ).map{|category| [category.title, category.id.to_s] } rescue ''
+      elsif module_app.key == 'member_staff'
+        m["category"] = RoleStatus.can_display.where(:role_id=> RoleStatus.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
+        m["tags"] = RoleCategory.can_display.where(:role_id=> RoleCategory.get_role_data("staff") ).map{|category| [category.title, category.id.to_s] } rescue ''
+      else
+        m["category"] = module_app.categories.map{|category| [category.title, category.id.to_s] } rescue ''
+        m["tags"] = module_app.tags.map{|tag| [tag.name, tag.id.to_s] } rescue ''
+      end
+      
       m["count"] = module_app.get_registration.get_data_count.to_a
       module_apps << m
     end

app/controllers/default_widget_controller.rb

@@ -40,6 +40,7 @@ class DefaultWidgetController< OrbitWidgetController
 
   def default_widget
     @search = params["search_query"].blank?  ?  false : true
+
     if !params[:id].blank? and !params["clicked_field_name"].blank?
       clicked_field_name = params["clicked_field_name"].to_sym
       redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
@@ -69,7 +70,10 @@ class DefaultWidgetController< OrbitWidgetController
         @data_limit = @page_part.widget_data_count.is_a?(Fixnum) ? @page_part.widget_data_count : (@page_part.widget_data_count.to_i rescue 3)
       end
 
-      if @paginate || @search
+      if params[:filter_category_id] and !params[:filter_category_id].blank?
+        @data = get_filter_data.page(params[:page_main]).per(@data_limit)
+        
+      elsif @paginate || @search
         if @search
           @data = search_result.page(params[:page_main]).per(@data_limit) rescue []
         else #regular listing
@@ -94,6 +98,18 @@ class DefaultWidgetController< OrbitWidgetController
     end
   end
 
+  def get_filter_data
+    model = eval(@default_widget["query"])
+    if params[:filter_category_id].is_a? Array
+      data = model.where(:category_id.in => params[:filter_category_id])
+    elsif params[:filter_category_id].is_a? String
+      data = model.where(:category_id => params[:filter_category_id])
+    end
+    data.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
+  end
+
+  
+  
   def get_category_field_name
     @ori_class_name = @ori_class_name.constantize
     @ori_class_name.fields.each_key do |key|

app/controllers/orbit_backend_controller.rb

@@ -14,7 +14,7 @@ class OrbitBackendController < ApplicationController
     status << 'is_top'
     status << 'is_hot'
     status << 'is_hidden' unless is_guest?
-    if @module_app.is_approvable && is_manager?
+    if @module_app.is_approvable && (is_manager? ||  is_sub_manager?)
       status << 'is_pending'
       status << 'is_checked'
       status << 'is_rejected'

app/controllers/orbit_member_controller.rb

@@ -14,7 +14,7 @@ class OrbitMemberController < ApplicationController
     status << 'is_top'
     status << 'is_hot'
     status << 'is_hidden' unless is_guest?
-    if @module_app.is_approvable && is_manager?
+    if @module_app.is_approvable && (is_manager? || is_sub_manager?)
       status << 'is_pending'
       status << 'is_checked'
       status << 'is_rejected'

app/controllers/pages_controller.rb

@@ -64,23 +64,25 @@ class PagesController < ApplicationController
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
+    options << "#{options.blank? ? '?' : '&'}click=#{params[:click]}" unless params[:click].blank?
+    # options << "#{options.blank? ? '?' : '&'}part_id=#{params[:page_part_id]}" unless params[:page_part_id].blank?
 
     if params[:category_id].is_a? Array
-      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id',params[:category_id])}" unless params[:category_id].blank?
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('filter_category_id',params[:category_id])}" unless params[:category_id].blank?
       elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
+        options << "#{options.blank? ? '?' : '&'}filter_category_id=#{params[:category_id]}" unless params[:category_id].blank?
     end
-    
     if params[:tag_id].is_a? Array
-      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('filter_tag_id',params[:tag_id])}" unless params[:tag_id].blank?
       elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
+        options << "#{options.blank? ? '?' : '&'}filter_tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
     end
     
 
     options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
     options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
-    uri = URI::escape(url + options)
+    # uri = URI::escape(url + options)
+    uri = url + options
     #uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
     redirect_to(uri)unless save_from_no_lang_for_page
   end
@@ -105,26 +107,94 @@ class PagesController < ApplicationController
   protected
    
   def get_item
+    # if params[:page_id]
+    #   @item = Item.find(params[:page_id])
+    # elsif params[:same_page_id]
+    #   @item = Item.find(params[:same_page_id])
+    # else
+    #   category_ids = Array(params[:category_id]) unless params[:category_id].nil?
+    #   tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
+    #   module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
+
+    #   default_query = { is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'] }
+    #   specific_categories = { :category => category_ids }
+    #   in_categories = { :category.in => category_ids }
+    #   nil_categories = { :category.in => [nil, []] }
+    #   specific_tags = { :tag => tag_ids }
+    #   in_tags = { :tag.in => tag_ids }
+    #   nil_tags = { :tag.in => [nil, []] }
+
+    #   if !category_ids.blank? && !tag_ids.blank?
+    #     @item = Item.where(default_query.merge(specific_categories).merge(specific_tags)).first
+    #     @item = Item.where(default_query.merge(specific_categories).merge(in_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(specific_tags).merge(in_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories).merge(in_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
+    #   elsif !category_ids.blank?
+    #     @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first
+    #     @item = Item.where(default_query.merge(specific_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories)).first unless @item
+    #   elsif !tag_ids.blank?
+    #     @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first
+    #     @item = Item.where(default_query.merge(specific_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(in_tags)).first unless @item
+    #   end
+    #   @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
+    #   @item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
+    #   @item = Item.where(default_query).first unless @item
+    # end
+    # raise PageError, 'Missing Frontend Page' if @item.nil?
+
+    # if params[:page_id]
+    #   @item = Item.find(params[:page_id])
+    # elsif params[:same_page_id]
+    #   @item = Item.find(params[:same_page_id])
+    # else
+    #   category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
+    #   tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
+    #   module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
+    #   if !category_ids.blank? && !tag_ids.blank?
+    #     @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
+    #     @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
+    #   elsif !category_ids.blank?
+    #     @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
+    #   elsif !tag_ids.blank?
+    #     @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
+    #   end
+    #   @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
+    #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
+    #   # @item = Item.root.children.where(:module_app_id => module_app.id).first
+    #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
+    #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
+    # end
+    # raise PageError,'Missing Frontend Page' if @item.nil?
+
     if params[:page_id]
       @item = Item.find(params[:page_id])
     elsif params[:same_page_id]
       @item = Item.find(params[:same_page_id])
     else
-      category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
-      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
-      if !category_ids.blank? && !tag_ids.blank?
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
-      elsif !category_ids.blank?
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
-      elsif !tag_ids.blank?
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
+      category_ids = params[:category_id] ? (params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]) : []
+      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
+      
+      if !category_ids.blank?
+        @item = Item.where(:category => category_ids).first
+      else
+        if params[:action] && params[:action] == "show_from_link"
+          default_widget = module_app.get_default_widget
+          model = eval(default_widget["query"])
+          item = model.find(params[:id])
+          @item = Item.where(:category => [item.category_id.to_s]).first
+        end
       end
-      @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
+    
+      @item = Item.root.children.where(:module_app_id => module_app.id).first unless @item
     end
     raise PageError,'Missing Frontend Page' if @item.nil?
   end

app/helpers/orbit_backend_helper.rb

@@ -12,13 +12,13 @@ module OrbitBackendHelper
 
   def show_form_status_field(object)
     #by_object = (!object.is_expired? and object.is_pending?)
-    by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin?)
+    by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin? or is_sub_manager?)
     by_user
   end
 
   def show_approval_link(object)
     by_object = (!object.is_expired? and object.is_pending?)
-    by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin?)
+    by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin? or is_sub_manager?)
     by_object and  by_user
   end
 

app/models/user/role_category.rb

@@ -3,6 +3,8 @@ class RoleCategory < RoleFilter
   has_and_belongs_to_many :users
   belongs_to :role
 
+  scope :can_display,where(disable: false)
+
   def self.get_role_data(role_key)
 
   	@role = Role.where(:key =>role_key).first

app/models/user/user.rb

@@ -186,20 +186,21 @@ class User
     }.uniq!
   end
 
-  def self.get_member_list_attribute_field_name(role_type,field_key)
+  def self.get_member_list_attribute_field(role_type,field_key)
     @attribute = ::Attribute.where(:key => role_type).first
-    return ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first.title
+    return ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first
   end
 
-  def self.get_member_list_attribute_value(user_id,role_type,field_key)
-    @attribute = ::Attribute.where(:key => role_type).first
-    @AttributeField = ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first
-    return ::AttributeValue.where(attribute_field_id: @AttributeField.id, :user_id => user_id).first
+  def self.get_member_list_attribute_value(user_id,field_id)
+    # @attribute = ::Attribute.where(:key => role_type).first
+    # @AttributeField = ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first
+    return ::AttributeValue.where(attribute_field_id: field_id, :user_id => user_id).first
   end
 
-  def self.get_role_member_data_by_sort(role_status_id)
+  def self.get_role_member_data_by_sort(role, field_key, role_status_id)
     a = Array.new
-    where(:role_status_ids=>role_status_id).desc(:_id).collect{|t| a << [ get_member_list_attribute_value(t.id,"staff","job_title")['val'].to_i, t ]  }
+    attribute_field_data = get_member_list_attribute_field(role,field_key)
+    where(:role_status_ids=>role_status_id).desc(:_id).collect{|t| a << [ get_member_list_attribute_value(t.id,attribute_field_data.id)['val'].to_i, t ]  }
     member_data = a.sort
     member_data_tmp = member_data.collect {|v| v[1] }
   end

app/views/admin/attributes/_attribute.html.erb

@@ -18,7 +18,7 @@
     <td class="action span3">
       <div class="toggle-control" style="float: right;">
         <div class="togglebox <%= attribute.disabled ? 'disabled' : ''  %>">
-          <%= link_to (check_box_tag 'accept', false , :class => 'toggle-check', :data=>{:deploy=>"right"}) , eval("admin_#{@attribute_type}_toggle_path(attribute)"), method: :post, remote: true, class: "switch" %>
+          <%= check_box_tag 'accept', attribute.disabled ? 'fasle' : 'true', false ,{ :class => 'toggle-check role_filter_checked', :data=>{:deploy=>"right"}, :data=>{:path=> eval("admin_#{@attribute_type}_toggle_path(attribute)")}, :checked=> attribute.disabled} %>
           <label><b></b></label>
         </div>
       </div>

app/views/admin/attributes/index.js.erb

@@ -1,3 +1,4 @@
-$("#attributes_index").html("<%= j render 'admin/attributes/index' %>")
+// $("#attributes_index").html("<%= j render 'admin/attributes/index' %>")
+location.reload();
 $.pageslide.close();
 openSlide();

app/views/admin/role_filters/_role_filter.html.erb

@@ -1,5 +1,5 @@
 
-<tr id="<%= dom_id role_filter %>" class="<% role_filter.disable ? 'disable' : '' %>">
+<tr id="<%= dom_id role_filter %>" class="<%= role_filter.disable ? 'disable' : ''  %>">
   <td><span class="label label-info"><%= role_filter.key %></span></td>
   <% if @types.is_localized?(:title) %>
   <% @site_valid_locales.each_with_index do |locale, i| %>
@@ -18,15 +18,7 @@
 	<td><%= role_filter.title %></td>
 	<% end %>
 
-  <td class="action">
-  	<%#= link_to role_filter.disable ? t(:disable) : t(:enable), polymorphic_path([:admin, role_filter]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"btn btn-mini btn-success", :type=>"button" %>
-
-      <div class="toggle-control" style="float: right;">
-        <div class="togglebox <%= role_filter.disable ? 'disabled' : ''  %>">
-          <%= link_to (check_box_tag 'accept', false , :class => 'toggle-check', :data=>{:deploy=>"right"}) , eval("admin_#{@app_type == 'role_statuses' ? 'role_status' : @app_type }_toggle_path(role_filter)"), method: :post, remote: true, class: "switch" %>
-          <label><b></b></label>
-        </div>
-      </div>
-
+  <td class="action dsrgsdgsdg">
+    <%= check_box_tag 'accept', role_filter.disable ? 'fasle' : 'true', false ,{ :class => 'toggle-check role_filter_checked', :data=>{:deploy=>"right"}, :data=>{:path=> eval("admin_#{@app_type == 'role_statuses' ? 'role_status' : @app_type }_toggle_path(role_filter)")}, :checked=> role_filter.disable} %>
   </td>
 </tr>

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

@@ -1,3 +1,4 @@
+
 <% content_for :side_bar do %>
   <%= render :partial => 'admin/users_new_interface/side_bar' %>
 <% end %>
@@ -9,14 +10,6 @@
     <%= stylesheet_link_tag "lib/togglebox.css" %>
 <% end -%>
 
-<div id="filter" class="topnav clearfix">
-  <ul class="breadcrumb text-info pull-left">
-    <li><%= link_to( t("role"), admin_roles_path ) %> <span class="divider">/</span></li>
-    <li class="active">( <%= @role.title %> ) <%= t(@app_type_name) %></a></li>
-  </ul>
-</div>
-
-
 <div class="bottomnav clearfix">
   <div class="action pull-right">
     <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), eval("new_admin_#{@app_type == 'role_statuses' ? 'role_status' : @app_type }_path(:role_id=>params[:role_id])"), class: "btn btn-primary open-slide" %>
@@ -27,4 +20,4 @@
 	<%= render 'index' %>
 </div>
 
-
+<% @path = "/admin/#{@app_type == 'role_category' ? 'role_categorys' : @app_type }/" %>

app/views/admin/role_filters/index.js.erb

@@ -1,3 +1,4 @@
-$("#role_filters_index").html("<%= j render 'index' %>")
+// $("#role_filters_index").html("<%= j render 'index' %>")
+location.reload();
 $.pageslide.close();
 openSlide();

app/views/admin/roles/sub_role.html.erb

@@ -2,7 +2,6 @@
   <%= render :partial => 'admin/users_new_interface/side_bar' %>
 <% end %>
 
-
 <% content_for :page_specific_css do -%>
     <%= stylesheet_link_tag "lib/wrap-nav.css" %>
     <%= stylesheet_link_tag "lib/pageslide.css" %>
@@ -10,13 +9,6 @@
     <%= stylesheet_link_tag "lib/togglebox.css" %>
 <% end -%>
 
-<div id="filter" class="topnav clearfix">
-  <ul class="breadcrumb text-info pull-left">
-    <li><%= link_to( t("#{@attribute_type}"), admin_roles_path ) %>/</span></li>
-    <li class="active"><%= @attribute.title %></a></li>
-  </ul>
-</div>
-
 <div class="bottomnav clearfix">
   <div class="action pull-right">
     <%= link_to content_tag(:i,t("new.sub_role"),:class=>"icon-plus"),eval("admin_#{@attribute_type}_add_sub_role_path(@attribute)"),:class=>"btn btn-primary open-slide"%>

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

@@ -1 +1 @@
-<%=render :partial=>"role",:collection=>Role.all.asc("_id")%>
+<%=render :partial=>"role",:collection=>Role.where(:disabled=>false).asc("_id")%>

app/views/front/show_page_sub_menu.html.erb

@@ -1,11 +1,19 @@
-<% if @menu_page && @menu_page.visible_children.size > 0 %>
+<% if @menu_page %>
   <div class='category_list'>
     <!-- <h3 class='h3'><%#= @menu_page.title %></h3> -->
     <ul class='list'>
+
       <% @menu_page.visible_children.each do |child| %>
+       <% if @menu_page.visible_children.nil?%>
+       <p>Test</p>
+        <li class="<%= @page_id.eql?(child.parent.id) ? 'active' : nil %>">
+          <a href="<%= (child.parent.class.to_s.eql?('Page') ? '/' + child.parent.path : child.parent.url) %>"><%= child.parent.title %></a>
+        </li>
+       <% else %>
         <li class="<%= @page_id.eql?(child.id) ? 'active' : nil %>">
           <a href="<%= (child.class.to_s.eql?('Page') ? '/' + child.path : child.url) %>"><%= child.title %></a>
         </li>
+       <% end %>
       <% end %>
     </ul>
   </div>

app/views/layouts/member.html.erb

@@ -24,8 +24,16 @@
     <div class="wrap-inner">
       <div id="filter" class="topnav clearfix">
         <ul class="breadcrumb text-info pull-left">
+        <% if !@role.blank? %>
+          <li><%= link_to( t("role"), admin_roles_path ) %> <span class="divider">/</span></li>
+          <li class="active">( <%= @role.title %> ) <%= t(@app_type_name) %></a></li>
+        <% elsif !@attribute.blank? %>
+          <li><%= link_to( t("#{@attribute_type}"), admin_roles_path ) %>/</span></li>
+          <li class="active"><%= @attribute.title %></a></li>
+        <% else %>
           <li><a href="<%= admin_users_new_interface_index_path %>">Member</a> <span class="divider">/</span></li>
           <li class="active">All</li>
+        <% end %>
         </ul>
         <%= yield :right_nav %>
       </div>

config/mongoid.yml

@@ -8,13 +8,13 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site
+  database: orbit_site_new
 
 
 
 test:
   <<: *defaults
-  database: test_site
+  database: orbit_site_new
 
 # set these environment variables on your prod server
 production:

lib/orbit_app/helper/default_widget_tag_helper.rb

@@ -12,9 +12,9 @@ module DefaultWidgetTagHelper
       if param.is_a?(Array) and !param.blank?
         params_str << param.collect{|t| "#{index}[]=#{t}"}.join("&")
         params.delete index
+        params_str = params_str + "&"
       end
     end  
-    
     params_str = params_str + (params_str.eql?("?") ? params.to_param : "&#{params.to_param}" )
       content_tag :div,:class=> 'more' do 
   	 link_to I18n.t(@more_link[:label_i18n]),[eval("#{@more_link[:path_method]}"),params_str].join()

lib/parsers/parser_front_end.rb

@@ -24,7 +24,6 @@ module ParserFrontEnd
     # tag = params[:tag_id].blank? ? page[:tag] : params[:tag_id]
     # category = params[:category_id].blank? ? page[:category] : params[:category_id]
     body = Nokogiri::HTML(page.content)
-
     if @edit
       body.css('.page_part').each do |page_part|
         part = PagePart.find(page_part['part_id']) rescue nil
@@ -41,13 +40,16 @@ module ParserFrontEnd
     end
 
     body.css('orbit_front').each do |front|
+
       if front['value']
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div id='#{front['id']}' class='#{front['class']}'>#{eval(front['value']).to_s}</div>")
       else
         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
+        ar = args.to_param
+        ar = URI.unescape(ar)
+        ret << (ret.include?("?") ? "&#{ar}" : "?#{ar}") if args.present?
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
       end
       front.swap(fragment)

vendor/built_in_modules/location/app/assets/javascripts/location.js

@@ -1,6 +1,6 @@
 var Locations = function(ls){
-
   l = this;
+  this.name = "Locations";
   this.locations = ls;
   this.markerCounts = 0;
   var map = null,
@@ -11,7 +11,6 @@ var Locations = function(ls){
 
 
   var initialize = function() {
-
     google.maps.visualRefresh = true;
     var location = ( l.locations.length ? new google.maps.LatLng( l.locations[0].latitude, l.locations[0].longitude ) : default_location ),
         mapOptions = {
@@ -119,10 +118,10 @@ var Locations = function(ls){
     }
     return filtered;
   }
-
-google.maps.event.addDomListener(window, 'load', initialize);
+  initialize();
 
 }
+
 var InvalidObjectError = function(){
   this.name = "InvalidObjectError";
   this.message = "Object not valid";

vendor/built_in_modules/location/app/controllers/panel/location/front_end/locations_controller.rb

@@ -0,0 +1,12 @@
+class Panel::Location::FrontEnd::LocationsController < OrbitWidgetController
+	def index
+		@categories = @module_app.categories.enabled
+		@locations = LocationInfo.all
+
+	    @location_infos = [];
+    	@locations.each do |loc|
+      		loc['color'] = Category.find(loc.category_id).custom_value
+      		@location_infos << loc
+    	end
+	end
+end

vendor/built_in_modules/location/app/controllers/panel/location/widget/locations_controller.rb

@@ -0,0 +1,17 @@
+class Panel::Location::Widget::LocationsController < OrbitWidgetController
+	def location_widget
+		@categories = params[:category_id]
+		locations = LocationInfo.where(:category_id.in => @categories)
+		@url = "http://maps.googleapis.com/maps/api/staticmap?zoom=16&size=400x400&maptype=roadmap%20&sensor=false&"
+		markers = ""
+		 locations.each do |loc|
+	      color = Category.find(loc.category_id).custom_value
+	      color.gsub!("#","")
+	      markers = markers + "markers=color:0x#{color}|#{loc.latitude},#{loc.longitude}&"
+	    end
+	    @url = @url + markers.chop
+		# http://maps.googleapis.com/maps/api/staticmap?zoom=13&size=600x300&maptype=roadmap%20&markers=color:0xCF2C9B|40.702147,-74.015794&markers=color:CF2C9B|label:G|40.711614,-74.012318%20&markers=color:red|color:red|label:C|40.718217,-73.998284&sensor=false
+
+
+	end
+end

vendor/built_in_modules/location/app/views/panel/location/front_end/locations/index.html.erb

@@ -0,0 +1,40 @@
+<%= javascript_include_tag "location" %>
+<div>
+	Categories : 
+   <% @categories.each do |category| %>
+     <input type="checkbox" class="btn cat-filter" data-category='<%= category.id %>' /><%= category.title %>
+    <% end %>
+</div>
+<a href="javascript:void(0);" id="clear_filter">Clear Filter</a>
+<div id="map" style="width: 100%; height: 500px;"></div>
+<script>
+	var loc = null;
+	var initialize = function(){
+		loc = new Locations(<%= @location_infos.to_json.html_safe %>);
+	}
+
+  jQuery(document).ready(function($) {
+    var filterCategories = [];
+    $("input.cat-filter").bind( "click",function(){
+      var catid =  $( this ).data('category');
+
+      if ( !$( this ).is(':checked') ){
+
+        var index = filterCategories.indexOf(filterCategories.filter(function(a,i){ return a == catid })[0]);
+        filterCategories.splice( index, 1 );
+      }else{
+
+        filterCategories.push( catid );
+      }
+      loc.filterMarkers(filterCategories);
+    })
+
+    $("a#clear_filter").bind( "click", function(){
+      filterCategories = [];
+      $("input.cat-filter").prop('checked',false);
+      loc.clearFilter();
+    })
+
+ });
+</script>
+<script src="http://maps.google.com/maps/api/js?sensor=true&callback=initialize"></script>

vendor/built_in_modules/location/app/views/panel/location/widget/locations/location_widget.html.erb

@@ -0,0 +1,3 @@
+<a href="<%= panel_location_front_end_locations_path %>" >
+	<%= image_tag @url, :width=>"300", :height=>"300" %>
+</a>

vendor/built_in_modules/location/config/routes.rb

@@ -9,6 +9,12 @@ Rails.application.routes.draw do
 
         resources :locations
       end
+      namespace :front_end do
+        resources :locations
+      end
+      namespace :widget do
+        match "location_widget" => "locations#location_widget"
+      end
     end
   end
 end

vendor/built_in_modules/location/init.rb

@@ -4,15 +4,17 @@ module Location
     base_url File.expand_path File.dirname(__FILE__)    
     # personal_plugin :enable => true,:path=>"panel/location/plugin/profile",:i18n=>'admin.location'
     
-    # version "0.1"
-    # organization "Rulingcom"
-    # author "RD dep"
-    # intro "I am intro"
-    # update_info 'some update_info'
+    version "0.1"
+    organization "Rulingcom"
+    author "RD dep"
+    intro "I am intro"
+    update_info 'some update_info'
 
-    # front_end do
-    #   app_page 'bulletins'
-    # end
+    front_end do
+      app_page 'locations' do
+        frontend_i18n 'location.location'
+      end
+    end
 
     # category ["BulletinCategory"]
 
@@ -34,6 +36,12 @@ module Location
     categorizable
     authorizable
 
+    widgets do
+        customize_widget "location_widget" do 
+            widget_i18n "location.location"
+        end
+    end
+    
     side_bar do
       head_label_i18n  'location.location',:icon_class=>"icons-location"
       available_for [:admin,:guest,:manager,:sub_manager]

vendor/built_in_modules/member/app/controllers/panel/member/front_end/member_lists_controller.rb

@@ -28,21 +28,26 @@ class Panel::Member::FrontEnd::MemberListsController < OrbitWidgetController
 
     @member_subroles = SubRole.where(:role_id => @role_id, :disabled => false)
     
-    @member_list_categorys = RoleCategory.where(:role_id => @role_id,disable: false).asc("key")
+    @member_list_categorys = RoleCategory.can_display.any_in(:_id => params[:tag_id]).asc("key")
 
-    if !params[:category_id].blank?
-      @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
+    @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
+
+    @mlcs = @member_list_categorys.map{|category| category.id.to_s }
+
+    @mcs = params[:mcid].blank? ? @mlcs.first : params[:mcid]
+
+    if !@member_list_categorys.blank? or !@member_status.blank?
+     
+      if !@mcs.blank? and @mlcs.include?(@mcs)
+        @member_lists = User.where(:role_ids => @role_id,:role_category_ids => @mcs).asc(:position)
+      else
+        @member_lists = User.where(:role_ids => @role_id).asc(:position)
+      end
     else
-      @member_status = RoleStatus.can_display.where(:role_id => @role_id).asc("key")
+      # @member_lists = User.where(:role_ids => @role_id)
+      @member_lists = ''
     end
 
-    if !params[:mcid].blank?
-      @member_lists = User.where(:role_ids => @role_id, :role_category_ids => params[:mcid])
-    else
-      @member_lists = User.where(:role_ids => @role_id)
-    end
-
-
   end
   
   def show

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/index.html.erb

@@ -1,5 +1,9 @@
 <% # encoding: utf-8 %>
 
+<% if !@member_lists.blank? %>	
+
+	<% @job_title_field = @member_lists.get_member_list_attribute_field("teacher","job_title") %>
+
 			<section> 
 
 				<div class="side"></div>
@@ -8,7 +12,7 @@
 					<% if !@member_list_categorys.blank? %>
 					<ul class="o-members-nav">
 					<% @member_list_categorys.each do |mc| %>
-						<li class="<%= (params[:mcid] == mc.id.to_s) ? 'active' : '' %>"><a href="?&mcid=<%= mc.id %>"><%= mc.title %></a></li>
+						<li class="<%= (params[:mcid] == mc.id.to_s or @mcs.to_s == mc.id.to_s) ? 'active' : '' %>"><a href="?&mcid=<%= mc.id %>"><%= mc.title %></a></li>
 					<% end %>
 					</ul>
 					<% end %>
@@ -17,6 +21,8 @@
 
 					<div class="o-members">
 
+						<%# @member_lists = @member_lists.where(:role_category_ids => @mcs) if !@mcs.blank? and @mlcs.include?(@mcs) %>
+
 						<% @member_status.each do |ms| %>
 
 						<% if @member_lists.where(:role_status_ids=>ms.id).count > 0  %>
@@ -30,11 +36,11 @@
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
-									<% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale))
+									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
 									   if @job_title != 'NoData' and !@job_title.blank?
 									%>
 									<li><b class="o-members-label">
-										<%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b>
+										<%= @job_title_field.title %></b>
 										<%= @job_title %>
 									</li>
 									<% end %>
@@ -55,12 +61,10 @@
 
 	<% elsif @item.frontend_style == 'Two' or @item.frontend_style.blank? %>
 
-			<section> 
-				
-				<div class="side"></div>
-				<div class="main">
 					<div class="o-members view-columns">
 
+						<%# @member_lists = @member_lists.where(:role_category_ids => @mcs) if !@mcs.blank? %>
+
 						<%  @member_status.each do |ms| %>
 
 						<% if @member_lists.where(:role_status_ids=>ms.id).count > 0  %>
@@ -74,10 +78,10 @@
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
-									<% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").get_value_by_locale(I18n.locale))
+									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
 									   if @job_title != 'NoData' and !@job_title.blank?
 									%>
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b><%= @job_title %></li>
+									<li><b class="o-members-label"><%= @job_title_field.title %></b><%= @job_title %></li>
 									<% end %>
 									<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
@@ -98,5 +102,6 @@
 				</div>
 			</section>
 
+<% end %>
 
-		<%#= stylesheet_link_tag "member/members" %>
+<%= stylesheet_link_tag "member/members" %>

vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb

@@ -36,7 +36,7 @@
 				<% end -%>
 				<% end -%>
 
-				<%= render :partial=> "show_roles",:collection=>@member.roles.asc(:created_at) %>
+				<%= render :partial=> "show_roles",:collection=>@member.roles.where(:disabled=>false).asc(:created_at) %>
 
 			</tbody>
 		</table>

vendor/built_in_modules/member_staff/app/assets/stylesheets/member_staff/members.css

@@ -8,6 +8,36 @@
 .o-members-category:first-child {
 	margin-top: 0;
 }
+.o-members-nav {
+	margin: 0 0 10px;
+	padding: 0;
+	list-style: none;
+}
+.o-members-nav:after {
+	content: "";
+	clear: both;
+	display: block;
+	height: 0;
+	visibility: hidden;
+}
+.o-members-nav li {
+	float: left;
+}
+.o-members-nav li + li {
+	margin-left: 8px;
+}
+.o-members-nav li a {
+	display: inline-block;
+	line-height: 23px;
+	padding: 5px 8px;
+	height: 23px;
+	background-color: #ccc;
+	border-radius: 3px;
+}
+.o-members-nav li.active a {
+	color: #FFF;
+	background-color: #0088CE;
+}
 .o-members-list {
 	list-style: none;
 	margin: 0;

vendor/built_in_modules/member_staff/app/controllers/panel/member_staff/front_end/member_staff_lists_controller.rb

@@ -28,16 +28,24 @@ class Panel::MemberStaff::FrontEnd::MemberStaffListsController < OrbitWidgetCont
 
     @member_subroles = SubRole.where(:role_id => @role_id, :disabled => false)
     
-    if !params[:category_id].blank?
-      @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
+    @member_list_categorys = RoleCategory.can_display.any_in(:_id => params[:tag_id]).asc("key")
 
-      @member_lists = User.where(:role_ids => @role_id)
+    @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
 
+    @mlcs = @member_list_categorys.map{|category| category.id.to_s }
+
+    @mcs = params[:mcid].blank? ? @mlcs.first : params[:mcid]
+
+    if !@member_list_categorys.blank? or !@member_status.blank?
+     
+      if !@mcs.blank? and @mlcs.include?(@mcs)
+        @member_lists = User.where(:role_ids => @role_id,:role_category_ids => @mcs).asc(:position)
+      else
+        @member_lists = User.where(:role_ids => @role_id).asc(:position)
+      end
     else
-      @member_status = RoleStatus.can_display.where(:role_id => @role_id).asc("key")
-
-      @member_lists = User.where(:role_ids => @role_id)
-
+      # @member_lists = User.where(:role_ids => @role_id)
+      @member_lists = ''
     end
 
   end

vendor/built_in_modules/member_staff/app/views/panel/member_staff/front_end/member_staff_lists/index.html.erb

@@ -1,29 +1,61 @@
 <% # encoding: utf-8 %>
 
-		<% if @item.frontend_style == 'Single' %>
+<% if !@member_lists.blank? %>	
+
+<% @job_title_field = @member_lists.get_member_list_attribute_field("staff","job_title") %>
+<% @job_business_field = @member_lists.get_member_list_attribute_field("staff","business") %>
+		
+		<% if @item.frontend_style == 'Single' or @item.frontend_style == 'Two' %>
 
 			<section> 
 
 				<div class="side"></div>
 				<div class="main">
+					
+					<% if !@member_list_categorys.blank? %>
+					<ul class="o-members-nav">
+					<% @member_list_categorys.each do |mc| %>
+						<li class="<%= (params[:mcid] == mc.id.to_s or @mcs.to_s == mc.id.to_s) ? 'active' : '' %>"><a href="?&mcid=<%= mc.id %>"><%= mc.title %></a></li>
+					<% end %>
+					</ul>
+					<% end %>
+
+			<% if @item.frontend_style == 'Single' %>
+
 					<div class="o-members">
 						
 						<%  @member_status.each do |ms| %>
 
+						<% if @member_lists.where(:role_status_ids=>ms.id).count > 0  %>
+						
 						<h3 class="o-members-category h3"><%= ms.title %></h3>
 						<ul class="o-members-list">
 
-							<% @member_lists.get_role_member_data_by_sort(ms.id).each do |member| %>
+							<% @member_lists.where(:role_status_ids=>ms.id).each do |member| %>
 
 							<li class="odd">
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("staff","job_title") %></b><%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"staff","job_title").get_value_by_locale(I18n.locale)) %></li>
+									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
+									   if @job_title != 'NoData' and !@job_title.blank?
+									%>
+									<li><b class="o-members-label">
+										<%= @job_title_field.title %></b>
+										<%= @job_title %>
+									</li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
 									<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("staff","business") %></b><%= nl2br(@member_lists.get_member_list_attribute_value(member.id,"staff","business").get_value_by_locale(I18n.locale)) %></li>
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("staff","agent") %></b><%= @member_lists.get_member_list_attribute_value(member.id,"staff","agent").get_value_by_locale(I18n.locale) %></li>
+									
+									<% @job_business = @member_lists.get_member_list_attribute_value(member.id,@job_business_field.id).get_value_by_locale(I18n.locale)
+									   if @job_business != 'NoData' and !@job_business.blank?
+									%>
+									<li><b class="o-members-label">
+										<%= @job_business_field.title %></b>
+										<%= @job_business %>
+									</li>
+									<% end %>
 								</ul>
 							</li>
 
@@ -33,34 +65,47 @@
 						
 						<% end %>
 
+						<% end %>
+
 					</div>
-				</div>
-			</section>
 
-		<% elsif @item.frontend_style == 'Two' %>
+			<% elsif @item.frontend_style == 'Two' %>
 
-			<section> 
-
-				<div class="side"></div>
-				<div class="main">
 					<div class="o-members view-columns">
 
 						<%  @member_status.each do |ms| %>
 
+						<% if @member_lists.where(:role_status_ids=>ms.id).count > 0  %>
+
 						<h3 class="o-members-category h3"><%= ms.title %></h3>
 						<ul class="o-members-list">
 
-							<% @member_lists.get_role_member_data_by_sort(ms.id).each_with_index do |member, i| %>
+							<% @member_lists.where(:role_status_ids=>ms.id).each_with_index do |member, i| %>
 
 							<li <%= ( (i + 1) % 2 != 0 ) ? "class=odd" : '' %>>
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("staff","job_title") %></b><%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"staff","job_title").get_value_by_locale(I18n.locale)) %></li>
+									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
+									   if @job_title != 'NoData' and !@job_title.blank?
+									%>
+									<li><b class="o-members-label">
+										<%= @job_title_field.title %></b>
+										<%= @job_title %>
+									</li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.name")%></b><%= link_to member.name, panel_member_front_end_member_list_path(member.id), {:class => "o-members-link"} %></li>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
 									<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("staff","business") %></b><%= nl2br(@member_lists.get_member_list_attribute_value(member.id,"staff","business").get_value_by_locale(I18n.locale)) %></li>
-									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("staff","agent") %></b><%= @member_lists.get_member_list_attribute_value(member.id,"staff","agent").get_value_by_locale(I18n.locale) %></li>
+
+									
+									<% @job_business = @member_lists.get_member_list_attribute_value(member.id,@job_business_field.id).get_value_by_locale(I18n.locale)
+									   if @job_business != 'NoData' and !@job_business.blank?
+									%>
+									<li><b class="o-members-label">
+										<%= @job_business_field.title %></b>
+										<%= @job_business %>
+									</li>
+									<% end %>
 								</ul>
 							</li>
 
@@ -70,47 +115,64 @@
 
 						<% end %>
 
+						<% end %>
+
 					</div>
+
+			<% end %>
+
 				</div>
 			</section>
 
 		<% elsif @item.frontend_style == 'List' %>
 					
+				<% if !@member_list_categorys.blank? %>
+				<ul class="o-members-nav">
+				<% @member_list_categorys.each do |mc| %>
+					<li class="<%= (params[:mcid] == mc.id.to_s or @mcs.to_s == mc.id.to_s) ? 'active' : '' %>"><a href="?&mcid=<%= mc.id %>"><%= mc.title %></a></li>
+				<% end %>
+				</ul>
+				<% end %>
+				
 				<div class="o-members view-ntu-lists">
 
 						<%  @member_status.each do |ms| %>
 
+						<% if @member_lists.where(:role_status_ids=>ms.id).count > 0  %>
+
 						<h3 class="o-members-category h3"><%= ms.title %></h3>
 
 						<table>
 							<thead>
 								<tr>
-									<td><span class="job_title"><%= @member_lists.get_member_list_attribute_field_name("staff","job_title") %></span></td>
+									<td><span class="job_title"><%= @job_title_field.title %></span></td>
 									<td><span class="name"><%= t("users.name")%></span></td>
 									<td><span class="tel"><%= t("users.office_tel")%></span></td>
-									<td><span class="business"><%= @member_lists.get_member_list_attribute_field_name("staff","business") %></span></td>
-									<td><span class="agent"><%= @member_lists.get_member_list_attribute_field_name("staff","agent") %></span></td>
+									<td><span class="business"><%= @job_business_field.title %></span></td>
 								</tr>
 							</thead>
 
-							<% @member_lists.get_role_member_data_by_sort(ms.id).each_with_index do |member, i| %>
+							<% @member_lists.where(:role_status_ids=>ms.id).each_with_index do |member, i| %>
 							
 							<tr>
 								<td>
 									<span class="job_title">
-									<%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"staff","job_title").get_value_by_locale(I18n.locale)) rescue '' %>
+									<% @job_title = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
+									   if @job_title != 'NoData' and !@job_title.blank?
+									%>
+									<%= @job_title %>
+									<% end %>
 									</span>
 								</td>
 								<td><span class="name"><%= link_to member.name, "mailto:#{member.email}" %></span></td>
 								<td><span class="tel"><%= member.office_tel %></span></td>
 								<td>
 									<span class="business">
-									<%= nl2br(@member_lists.get_member_list_attribute_value(member.id,"staff","business").get_value_by_locale(I18n.locale)) rescue '' %>
-									</span>
-								</td>
-								<td>
-									<span class="agent">
-									<%= @member_lists.get_member_list_attribute_value(member.id,"staff","agent").get_value_by_locale(I18n.locale) rescue '' %>
+									<% @job_business = @member_lists.get_member_list_attribute_value(member.id,@job_business_field.id).get_value_by_locale(I18n.locale)
+									   if @job_business != 'NoData' and !@job_business.blank?
+									%>
+									<%= @job_business %>
+									<% end %>
 									</span>
 								</td>
 							</tr>
@@ -121,9 +183,12 @@
 						
 						<% end %>
 
+						<% end %>
+
 				</div>
 
 		<% end %>
 
+<% end %>
 
-		<%= stylesheet_link_tag "member_staff/members" %>
+<%= stylesheet_link_tag "member_staff/members" %>

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb

@@ -3,7 +3,7 @@
 	quick_edit_link type: 'edit',
 									link: 'edit_panel_page_content_back_end_page_context_path'
 	quick_edit_link type: 'authorization',
-									link: "admin_authorizations_path(@module_app.key, 'page_context', object.id)"
+									link: "admin_authorizations_path(@module_app.key, 'page_context_authorization', object.id)"
 	field type: 'associated',
 				db_field: 'page',
 				model_field: 'path',

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb

@@ -23,8 +23,8 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController
     date_now = Time.now
 
     # @web_link_categorys = get_categories_for_index
-    if !params[:category_id].blank?
-      @web_link_categorys = @module_app.categories.enabled.any_in(:_id => params[:category_id])
+    if !params[:filter_category_id].blank?
+      @web_link_categorys = @module_app.categories.enabled.any_in(:_id => params[:filter_category_id])
     else
       @web_link_categorys = @module_app.categories.enabled
     end