more button fix and also new way to select more page.

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

@@ -39,8 +39,10 @@ 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));
@@ -71,6 +73,7 @@ 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');
                     };
@@ -540,6 +543,7 @@ function changeStatusHidden() {
 
 // Document Ready
 $(function() {
+    console.log('true')
     showFiltersOnPageRefresh();
 
     new ini();

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

@@ -1,18 +0,0 @@
-$(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

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

app/controllers/admin/items_controller.rb

@@ -40,18 +40,8 @@ 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?
-   
-      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["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 ''
       m["count"] = module_app.get_registration.get_data_count.to_a
       module_apps << m
     end

app/controllers/admin/page_parts_controller.rb

@@ -12,6 +12,8 @@ class Admin::PagePartsController < OrbitBackendController
     @module_app_categories = @module_app.categories
     @module_app_tags = @module_app.tags
     @widget_paths = ModuleApp.find(@module_app.id).widgets.map{|name, data| [t(data["i18n"]), name]} rescue []
+    @pages = Page.where(:module_app_id => @module_app.id)
+
     if @part.widget_path.present?
       if @part.widget_path.eql?("default_widget")
         @checked_style = @part.widget_style
@@ -27,7 +29,10 @@ class Admin::PagePartsController < OrbitBackendController
         # @frontend_styles = @module_app.widgets[params[:val]]["style"] rescue nil
         @frontend_styles =  @module_app.widgets[@part.widget_path]["style"] rescue nil
         @partial = 'custom_widget' if @frontend_styles.present?
+        
       end
+      @partial = 'more_link' unless @partial
+
     end
     @data_count = @module_app.get_registration.get_data_count.to_a rescue []
     @no_orbit_bar = @side_bar = @no_header = true
@@ -63,19 +68,8 @@ 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 []
-
-   
-      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["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 ''
       m["count"] = module_app.get_registration.get_data_count.to_a
       module_apps << m
     end
@@ -85,6 +79,7 @@ class Admin::PagePartsController < OrbitBackendController
   def get_display_style
     @part = PagePart.find(params[:id]) rescue nil
     @module_app = ModuleApp.find(params[:module_id]) rescue nil
+    @pages = Page.where(:module_app_id => @module_app.id)
     if @module_app
       if params[:val].eql?("default_widget")
         @checked_style = @part.widget_path.present? ? @part.widget_style : nil if @part && @part.widget_path.eql?("default_widget")
@@ -99,6 +94,8 @@ class Admin::PagePartsController < OrbitBackendController
         @frontend_styles = @module_app.widgets[params[:val]]["style"] rescue nil
         @partial = 'custom_widget' if @frontend_styles.present?
       end
+      @partial = 'more_link' unless @partial
+      
     end
   end
 

app/controllers/default_widget_controller.rb

@@ -39,8 +39,8 @@ class DefaultWidgetController< OrbitWidgetController
   end
 
   def default_widget
-    @search = params["search_query"].blank?  ?  false : true
 
+    @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}})")
@@ -70,10 +70,7 @@ 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 params[:click]
-        @data = get_more_btn_data.page(params[:page_main]).per(@data_limit)
-        
-      elsif @paginate || @search
+      if @paginate || @search
         if @search
           @data = search_result.page(params[:page_main]).per(@data_limit) rescue []
         else #regular listing
@@ -95,17 +92,10 @@ class DefaultWidgetController< OrbitWidgetController
         @tag_class = 'default_widget_typeC'
         @partial = "typeC"
       end
+      @more_url = Page.find(@page_part.more_link).path rescue nil
+      # debugger
     end
   end
-
-  def get_more_btn_data
-    filterids = PagePart.find(params[:part_id]).category
-    model = eval(@default_widget["query"])
-    data = model.where(:category_id.in => filterids)
-    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

app/controllers/pages_controller.rb

@@ -64,15 +64,12 @@ 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?
       elsif params[:category_id].is_a? String
         options << "#{options.blank? ? '?' : '&'}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?
       elsif params[:category_id].is_a? String
@@ -83,7 +80,7 @@ class PagesController < ApplicationController
     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}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
+    # uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
     redirect_to(uri)unless save_from_no_lang_for_page
   end
    
@@ -107,78 +104,27 @@ 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.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]})
-      @item = Item.root.children.where(:module_app_id => module_app.id).first
+      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.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?
   end

app/models/page_part.rb

@@ -12,6 +12,7 @@ class PagePart
   field :widget_path
   field :category,type: Array, :default => []
   field :tag, type: Array,:default => []
+  field :more_link_page_id
   
   field :widget_style
   field :widget_field , :type => Array,:default => []

app/models/user/role_category.rb

@@ -3,8 +3,6 @@ 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,21 +186,20 @@ class User
     }.uniq!
   end
 
-  def self.get_member_list_attribute_field(role_type,field_key)
+  def self.get_member_list_attribute_field_name(role_type,field_key)
     @attribute = ::Attribute.where(:key => role_type).first
-    return ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first
+    return ::AttributeField.where(:key => field_key, :attribute_id => @attribute.id).first.title
   end
 
-  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
+  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
   end
 
-  def self.get_role_member_data_by_sort(role, field_key, role_status_id)
+  def self.get_role_member_data_by_sort(role_status_id)
     a = Array.new
-    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 ]  }
+    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 ]  }
     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' : ''  %>">
-          <%= 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} %>
+          <%= 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" %>
           <label><b></b></label>
         </div>
       </div>

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

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

app/views/admin/page_parts/_custom_widget.html.erb

@@ -4,6 +4,12 @@
     <%= select 'page_part', 'widget_style', @frontend_styles, {:selected => (@part && @part[:widget_style])}, class: "input-xlarge" %>
   </div>
 </div>
+<div class="control-group input-content">
+  <label class="control-label muted">More Link</label>
+  <div class="controls">
+    <%= select 'page_part', 'more_link_page_id', options_for_select(@pages.collect{|page|[page.title,page.id]},(@part.more_link_page_id rescue nil)), class: "input-xlarge" %>
+  </div>
+</div>
 
 <div class="control-group input-content">
 <% @module_app.widget_options.tap { |widget|%>
@@ -19,8 +25,8 @@
            <% else%>
             <div class="controls">
             <%= select_tag "page_part[widget_options][#{key}]", options_for_select(options,(@part.widget_options[key] rescue nil)), class: "input-xlarge" %>
+            </div>
           <% end %>
-          </div>
         <% end %>
    <% } %>
 <% } %>

app/views/admin/page_parts/_default_widget.html.erb

@@ -74,6 +74,12 @@
     </table>
   </div>
 </div>
+<div class="control-group input-content">
+  <label class="control-label muted">More Link</label>
+  <div class="controls">
+    <%= select 'page_part', 'more_link_page_id', options_for_select(@pages.collect{|page|[page.title,page.id]},(@part.more_link_page_id rescue nil)), class: "input-xlarge" %>
+  </div>
+</div>
 
 <script>
   $('.typesetting li').each(function(index, el) {

app/views/admin/page_parts/_more_link.html.erb

@@ -0,0 +1,6 @@
+<div class="control-group input-content">
+   <label class="control-label muted">More Link</label>
+    <div class="controls">
+    <%= select 'page_part', 'more_link_page_id', options_for_select(@pages.collect{|page|[page.title,page.id]},(@part.more_link_page_id rescue nil)), class: "input-xlarge" %>
+ 	</div>
+</div>

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,7 +18,15 @@
 	<td><%= role_filter.title %></td>
 	<% end %>
 
-  <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 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>
 </tr>

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

@@ -1,4 +1,3 @@
-
 <% content_for :side_bar do %>
   <%= render :partial => 'admin/users_new_interface/side_bar' %>
 <% end %>
@@ -10,6 +9,14 @@
     <%= 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" %>
@@ -20,4 +27,4 @@
 	<%= render 'index' %>
 </div>
 
-<% @path = "/admin/#{@app_type == 'role_category' ? 'role_categorys' : @app_type }/" %>
+

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

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

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

@@ -2,6 +2,7 @@
   <%= 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" %>
@@ -9,6 +10,13 @@
     <%= 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.where(:disabled=>false).asc("_id")%>
+<%=render :partial=>"role",:collection=>Role.all.asc("_id")%>

app/views/default_widget/default_widget.html.erb

@@ -4,6 +4,10 @@
 	<% if @paginate %>
 	  <%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %>
 	<% elsif @page_part.module_app %>
-	  <%= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
+	
+	  <%#= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
+
+	  <%= @page_part.module_app.get_registration.default_widget_setting.short_link_to_more(request,@more_url) %>
+	  
 	<% end %>
 <% end %>

app/views/front/show_page_sub_menu.html.erb

@@ -1,20 +1,12 @@
-<% if @menu_page %>
+<% if @menu_page && @menu_page.visible_children.size > 0 %>
   <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>
-<% end %>
+<% end %>

app/views/layouts/member.html.erb

@@ -24,16 +24,8 @@
     <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>

lib/orbit_app/helper/default_widget_tag_helper.rb

@@ -16,9 +16,15 @@ module DefaultWidgetTagHelper
       end
     end  
     params_str = params_str + (params_str.eql?("?") ? params.to_param : "&#{params.to_param}" )
-    params_str = params_str + "&click=more_btn&page_part_id=#{@params[:part_id]}"
       content_tag :div,:class=> 'more' do 
   	 link_to I18n.t(@more_link[:label_i18n]),[eval("#{@more_link[:path_method]}"),params_str].join()
       end
   end
+
+  def short_link_to_more(req,url)
+    @request = req
+     content_tag :div,:class=> 'more' do 
+      link_to I18n.t(@more_link[:label_i18n]),url
+      end
+  end
 end

lib/parsers/parser_front_end.rb

@@ -19,12 +19,12 @@ module ParserFrontEnd
   end
 
   def parse_page_content(page,args={})
-
      args["category_id"] = args["category_id"].gsub(/\"|\[|\]/,'').split(",").each(&:strip!) if !args["category_id"].blank? and args["category_id"].is_a?(String)
      args["tag_id"] = args["tag_id"].gsub(/\"|\[|\]/,'').split(",").each(&:strip!) if  !args["tag_id"].blank? and args["tag_id"].is_a? String
     # 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,7 +41,6 @@ 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

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

@@ -9,7 +9,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def search_result
-    debugger
     if params[:search_query] == ""
       @bulletins = get_bulletins_for_index
       

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

@@ -27,27 +27,22 @@ class Panel::Member::FrontEnd::MemberListsController < OrbitWidgetController
     @member_role = Role.where(:_id => @role_id)
 
     @member_subroles = SubRole.where(:role_id => @role_id, :disabled => false)
-    
-    @member_list_categorys = RoleCategory.can_display.any_in(:_id => params[:tag_id]).asc("key")
 
-    @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
+    @member_list_categorys = RoleCategory.where(:role_id => @role_id,disable: false).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
+    if !params[:category_id].blank?
+      @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
     else
-      # @member_lists = User.where(:role_ids => @role_id)
-      @member_lists = ''
+      @member_status = RoleStatus.can_display.where(:role_id => @role_id).asc("key")
     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,9 +1,5 @@
 <% # 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>
@@ -12,7 +8,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 or @mcs.to_s == mc.id.to_s) ? 'active' : '' %>"><a href="?&mcid=<%= mc.id %>"><%= mc.title %></a></li>
+						<li class="<%= (params[:mcid] == mc.id.to_s) ? 'active' : '' %>"><a href="?&mcid=<%= mc.id %>"><%= mc.title %></a></li>
 					<% end %>
 					</ul>
 					<% end %>
@@ -21,8 +17,6 @@
 
 					<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  %>
@@ -36,11 +30,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 = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
+									<% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").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>
+										<%= @member_lists.get_member_list_attribute_field_name("teacher","job_title") %></b>
 										<%= @job_title %>
 									</li>
 									<% end %>
@@ -61,10 +55,12 @@
 
 	<% 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  %>
@@ -78,10 +74,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 = @member_lists.get_member_list_attribute_value(member.id,@job_title_field.id).get_value_by_locale(I18n.locale)
+									<% @job_title = show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"teacher","job_title").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>
+									<li><b class="o-members-label"><%= @member_lists.get_member_list_attribute_field_name("teacher","job_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>
@@ -102,6 +98,5 @@
 				</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.where(:disabled=>false).asc(:created_at) %>
+				<%= render :partial=> "show_roles",:collection=>@member.roles.asc(:created_at) %>
 
 			</tbody>
 		</table>

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

@@ -8,36 +8,6 @@
 .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;
@@ -137,4 +107,4 @@
  font-size: 16px;
  margin: 0;
  line-height: 40px;
-}
+}

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

@@ -27,25 +27,17 @@ class Panel::MemberStaff::FrontEnd::MemberStaffListsController < OrbitWidgetCont
     @member_role = Role.where(:_id => @role_id)
 
     @member_subroles = SubRole.where(:role_id => @role_id, :disabled => false)
-    
-    @member_list_categorys = RoleCategory.can_display.any_in(:_id => params[:tag_id]).asc("key")
 
-    @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
+    if !params[:category_id].blank?
+      @member_status = RoleStatus.can_display.any_in(:_id => params[:category_id]).asc("key")
 
-    @mlcs = @member_list_categorys.map{|category| category.id.to_s }
+      @member_lists = User.where(:role_ids => @role_id)
 
-    @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_lists = User.where(:role_ids => @role_id)
-      @member_lists = ''
+      @member_status = RoleStatus.can_display.where(:role_id => @role_id).asc("key")
+
+      @member_lists = User.where(:role_ids => @role_id)
+
     end
 
   end

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

@@ -1,61 +1,29 @@
 <% # encoding: utf-8 %>
-
-<% 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' %>
+		<% if @item.frontend_style == 'Single' %>
 
 			<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.where(:role_status_ids=>ms.id).each do |member| %>
+							<% @member_lists.get_role_member_data_by_sort(ms.id).each do |member| %>
 
 							<li class="odd">
 								<div class="o-members-pic"><%= show_avatar(member) %></div>
 								<ul class="o-members-info">
-									<% @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"><%= @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>
 									<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>
-									
-									<% @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 %>
+									<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>
 								</ul>
 							</li>
 
@@ -65,47 +33,34 @@
 						
 						<% 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.where(:role_status_ids=>ms.id).each_with_index do |member, i| %>
+							<% @member_lists.get_role_member_data_by_sort(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">
-									<% @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"><%= @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>
 									<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>
-
-									
-									<% @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 %>
+									<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>
 								</ul>
 							</li>
 
@@ -115,64 +70,47 @@
 
 						<% 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"><%= @job_title_field.title %></span></td>
+									<td><span class="job_title"><%= @member_lists.get_member_list_attribute_field_name("staff","job_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"><%= @job_business_field.title %></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>
 								</tr>
 							</thead>
 
-							<% @member_lists.where(:role_status_ids=>ms.id).each_with_index do |member, i| %>
+							<% @member_lists.get_role_member_data_by_sort(ms.id).each_with_index do |member, i| %>
 							
 							<tr>
 								<td>
 									<span class="job_title">
-									<% @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 %>
+									<%= show_attribute_value(@member_lists.get_member_list_attribute_value(member.id,"staff","job_title").get_value_by_locale(I18n.locale)) rescue '' %>
 									</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">
-									<% @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 %>
+									<%= 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 '' %>
 									</span>
 								</td>
 							</tr>
@@ -183,12 +121,9 @@
 						
 						<% end %>
 
-						<% end %>
-
 				</div>
 
 		<% end %>
 
-<% end %>
 
-<%= stylesheet_link_tag "member_staff/members" %>
+		<%= stylesheet_link_tag "member_staff/members" %>

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

@@ -11,7 +11,6 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
   def index
 
     @part = PagePart.find(params[:part_id])
-  
     if @part.widget_data_count
       @page_num = @part.widget_data_count
     else
@@ -64,7 +63,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
       @web_link_datas << { "title" => wlcg.title, "web_links" => web_link_datas } if !@web_links.blank?
 
     end
-
+    @more_url = Page.find(@part.more_link_page_id).path
   end
   
   def get_categorys

vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb

@@ -30,9 +30,5 @@
 </div>  
 
 <div class="pull_right"> 
-<% if !params[:category_id].blank? %>
-<%= link_to t(:more_plus), panel_web_resource_front_end_web_links_path(:category_id => @part.category) %>
-<% else %>
-<%= link_to t(:more_plus), panel_web_resource_front_end_web_links_path %>
-<% end %>
+<%= link_to t(:more_plus), "/"+@more_url %>
 </div>