changed the frontend loading to more rails specific. and also fixed the filter reload in thumbnali and summary view of members

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

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

app/assets/javascripts/kernel.js

@@ -4,7 +4,7 @@ var banner_index = 0;
 $(document).ready(function() {
 	$.each($(".dymanic_load"),function(){
 		if($(this).attr("path")==''){
-			$(this).html("");
+			$(this).html("App setting Failed");
 		}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') {
-			if (respText.indexOf("<title>") == -1) wapper.html(respText);
+			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('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 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 pageSetting(id, edit, ps) {
   $pageModule = $('#pageslide #page_module_app_id');
@@ -189,10 +189,8 @@ function pageSetting(id, edit, ps) {
               if(_arr !== -1) {
                 $pageCategory.find('input[type="checkbox"]').eq(index).prop('checked', true);
               }
-              var $all = $pageCategory.siblings('.checkbox').children('.select_all'),
-                  $hiddenInput = $pageCategory.siblings('input[type="hidden"]');
-              _selectData.module.category.length ? $hiddenInput.removeAttr('name') : $hiddenInput.attr('name', 'page[category][]');
-              _selectData.module.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+              var $all = $pageCategory.siblings('.checkbox').children('.select_all')
+              _selectData.module.category.length > 1 && _selectData.module.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
             });
             $pageCategoryGroup.show();
           }
@@ -203,10 +201,8 @@ function pageSetting(id, edit, ps) {
               if(_arr !== -1) {
                 $pageTags.find('input[type="checkbox"]').eq(index).prop('checked', true);
               }
-              var $all = $pageTags.siblings('.checkbox').children('.select_all'),
-                  $hiddenInput = $pageTags.siblings('input[type="hidden"]');
-              _selectData.module.tags.length ? $hiddenInput.removeAttr('name') : $hiddenInput.attr('name', 'page[tag][]');
-              _selectData.module.tags.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+              var $all = $pageTags.siblings('.checkbox').children('.select_all')
+              _selectData.module.tags.length > 1 && _selectData.module.tags.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
             });
             $pageTagsGroup.show();
           }
@@ -401,7 +397,6 @@ $(function() {
 
               if(event.target.id == 'page_module_app_id') {
                 $pageCategory.empty();
-                var $hiddenInputA = $pageCategory.siblings('input[type="hidden"]');
                 if(val.category.length > 0) {
                   $.each(val.category, function(index, val) {
                     if(val !== 0) {
@@ -411,17 +406,14 @@ $(function() {
                         $pageCategory.find('input[type="checkbox"]').eq(index).prop('checked', true);
                       }
                       var $all = $pageCategory.siblings('.checkbox').children('.select_all');
-                      _boolean && _val == _select.main && _select.category.length ? $hiddenInputA.removeAttr('name') : $hiddenInputA.attr('name', 'page[category][]');
-                      _boolean && _val == _select.main && _select.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+                      _boolean && _val == _select.main && _select.category.length > 1 && _select.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
                     }
                   });
-                  $pageCategoryGroup.slideDown(300);
+                  $pageCategoryGroup.show();
                 } else {
-                  $pageCategoryGroup.slideUp(300);
-                  $hiddenInputA.removeAttr('name');
+                  $pageCategoryGroup.hide();
                 }
                 $pageTags.empty();
-                var $hiddenInputB = $pageTags.siblings('input[type="hidden"]');
                 if(val.tags.length > 0) {
                   $.each(val.tags, function(index, val) {
                     if(val !== 0) {
@@ -431,14 +423,12 @@ $(function() {
                         $pageTags.find('input[type="checkbox"]').eq(index).prop('checked', true);
                       }
                       var $all = $pageTags.siblings('.checkbox').children('.select_all');
-                      _boolean && _val == _select.main && _select.tags.length ? $hiddenInputB.removeAttr('name') : $hiddenInputB.attr('name', 'page[tag][]');
-                      _boolean && _val == _select.main && _select.tags.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+                      _boolean && _val == _select.main && _select.tags.length > 1 && _select.tags.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
                     }  
                   });
-                  $pageTagsGroup.slideDown(300);
+                  $pageTagsGroup.show();
                 } else {
-                  $pageTagsGroup.slideUp(300);
-                  $hiddenInputB.removeAttr('name');
+                  $pageTagsGroup.hide();
                 }
               }
               return false;
@@ -471,10 +461,8 @@ $(function() {
       if($checked.hasClass('select_all')) {
         if($checked.prop('checked')) {
           $checked.closest('.checkbox').siblings('.groups').find('input[type="checkbox"]').prop('checked', true);
-          $checked.closest('.checkbox').siblings('input[type="hidden"]').removeAttr('name');
         } else {
           $checked.closest('.checkbox').siblings('.groups').find('input[type="checkbox"]').prop('checked', false);
-          $checked.closest('.checkbox').siblings('input[type="hidden"]').attr('name', 'page['+$checked.closest('.checkbox-groups').data('for')+'][]');
         }
       } else if($checked.hasClass('lang-enable')) {
         var checkboxes = $checked.closest('.groups').find('input[type="checkbox"]');
@@ -495,11 +483,10 @@ $(function() {
         var _l = $checked.closest('.groups').find('input[type="checkbox"]').length,
             _c = $checked.closest('.groups').find('input[type="checkbox"]:checked').length;
         if(_l == _c) {
-          $checked.closest('.groups').siblings('.checkbox').find('.select_all').prop('checked', true);
+          $checked.closest('.groups').siblings('.checkbox').find('.select_all').prop('checked', true)
         } else {
-          $checked.closest('.groups').siblings('.checkbox').find('.select_all').prop('checked', false);
+          $checked.closest('.groups').siblings('.checkbox').find('.select_all').prop('checked', false)
         };
-        _c == 0 ? $checked.closest('.groups').siblings('input[type="hidden"]').attr('name', 'page['+$checked.closest('.checkbox-groups').data('for')+'][]') : $checked.closest('.groups').siblings('input[type="hidden"]').removeAttr('name');
       }
       return false;
     } else if($checked.attr('type') == 'radio' && !$(this).closest('div').hasClass('active-mune')) {

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

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

app/assets/javascripts/lib/site_set.js

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

app/controllers/admin/page_parts_controller.rb

@@ -12,8 +12,6 @@ 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
@@ -25,14 +23,9 @@ class Admin::PagePartsController < OrbitBackendController
         @class_options = LIST[:widget_field_type].collect{|widget_field| [widget_field.humanize, widget_field]}
         @partial = 'default_widget'
       else
-
-        # @frontend_styles = @module_app.widgets[params[:val]]["style"] rescue nil
-        @frontend_styles =  @module_app.widgets[@part.widget_path]["style"] rescue nil
+        @frontend_styles = @module_app.widgets[params[:val]]["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
@@ -79,7 +72,6 @@ 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")
@@ -94,8 +86,6 @@ 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/admin/pages_controller.rb

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

app/controllers/default_widget_controller.rb

@@ -39,7 +39,6 @@ class DefaultWidgetController< OrbitWidgetController
   end
 
   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
@@ -92,8 +91,6 @@ 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
   

app/controllers/desktop_controller.rb

@@ -344,7 +344,7 @@ class DesktopController< ApplicationController
 
   def check_desktop_open
     @site = Site.first
-    if !@site.desktop_closed  #Need to be change
+    if @site.desktop_closed  #Need to be change
       redirect_to '/admin/dashboards'  
     end
   end

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? ||  is_sub_manager?)
+    if @module_app.is_approvable && is_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? || is_sub_manager?)
+    if @module_app.is_approvable && is_manager?
       status << 'is_pending'
       status << 'is_checked'
       status << 'is_rejected'

app/controllers/pages_controller.rb

@@ -70,6 +70,7 @@ class PagesController < ApplicationController
       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
@@ -80,7 +81,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
    
@@ -104,7 +105,6 @@ class PagesController < ApplicationController
   protected
    
   def get_item
-    
     if params[:page_id]
       @item = Item.find(params[:page_id])
     elsif params[:same_page_id]

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? or is_sub_manager?)
+    by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin?)
     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? or is_sub_manager?)
+    by_user = ((object.category.authed_users("approval_#{@module_app.key}").include?(current_user) rescue nil) or is_manager? or is_admin?)
     by_object and  by_user
   end
 

app/mailer/user_mailer.rb

@@ -1,10 +0,0 @@
-class UserMailer < Devise::Mailer
- default :from => "noreply@rulingcom.com"
-
- def password_reset(user, password)
-   @user = user
-   @password = password
-  mail(:to => user.email,
-     :subject => 'Password Reset Notification')
-  end
-end

app/models/page_part.rb

@@ -12,7 +12,6 @@ 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/views/admin/items/_form_page.html.erb

@@ -28,22 +28,20 @@
         <%= select_tag "page[app_frontend_url]", nil, class: "input-xlarge change" %>
       </div>
 
-      <div class="checkbox-groups hide" id="page-category-groups" data-for="category">
+      <div class="checkbox-groups hide" id="page-category-groups">
         <%= f.label :categories, t(:categories) %>
         <%= content_tag :label, class: "checkbox" do %>
           <%= check_box_tag nil, nil, true, class: "select_all" %> <%= t(:all) %>
         <% end %>
         <div class="groups" id="page-category"></div>
-        <input type="hidden">
       </div>
 
-      <div class="checkbox-groups hide" id="page-tags-groups" data-for="tag">
+      <div class="checkbox-groups hide" id="page-tags-groups">
         <%= f.label :tags, t(:tags) %>
         <%= content_tag :label, class: "checkbox" do %>
           <%= check_box_tag nil, nil, true, class: "select_all" %> <%= t(:all) %>
         <% end %>
         <div class="groups" id="page-tags"></div>
-        <input type="hidden">
       </div>
 
       <div class="display-mode"></div>

app/views/admin/items/_node.html.erb

@@ -16,9 +16,8 @@
       <% else %>
         <%= link_to node.title, node.url %>
       <% end %>
-
       <div class="item-menu">
-        <%= link_to content_tag(:i, nil, class: "icon-eye-open"), eval("admin_#{node.class.to_s.downcase}_path(node)"), class: "view-page open-slide tip", title: t(:view), data: {title: node.title} if node.class.to_s.eql?('Page') %>
+        <%= link_to content_tag(:i, nil, class: "icon-eye-open"), "/#{node.path}?edit=true", class: "view-page open-slide tip", title: t(:view), data: {title: node.title} if node.class.to_s.eql?('Page') %>
         <% if node.class.to_s.downcase.eql?("page") %>
           <%= link_to content_tag(:i, nil, class: "icon-edit"), "#page", class: "open-slide tip page edit", title: t('editing.page'), data: {title: t('editing.page'), id: node.id.to_s, parent: node.parent_id.to_s, form: {name: node.name}.merge(node.title_translations)} %>
         <% elsif node.class.to_s.downcase.eql?("link") %>

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

@@ -4,12 +4,6 @@
     <%= 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|%>
@@ -25,8 +19,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,12 +74,6 @@
     </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

@@ -1,6 +0,0 @@
-<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/users_new_interface/_role.html.erb

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

app/views/default_widget/default_widget.html.erb

@@ -4,10 +4,6 @@
 	<% 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.short_link_to_more(request,@more_url) %>
-	  
+	  <%= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %>
 	<% end %>
 <% end %>

app/views/devise/passwords/new.html.erb

@@ -1,36 +1,22 @@
-<section id="main-wrap">
-      <div class="sign-in have-other-sign-in">
-<!--         <p class="alert alert-error in fade">You need to sign in.</p>
- -->    
 
- 		<div class="form">
-          <h3 class="login-logo">Reset Your Password</h3>
-          <div>
-            <input name="utf8" type="hidden" value="" />
-            <input name="authenticity_token" type="hidden" value="" />
-          </div>
-<!--           <div class="other-sign-in">
-            <a class="btn btn-primary" type="submit">Other Sign In</a>
-            <p>or</p>
-          </div> -->
-          <div class="form-block">
-            <div class="form-list clearfix">
-              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
-              <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => 'user_new form-horizontal' }) do |f| %>
-				<%= devise_error_messages! %>
-
-                <div class="control-group clear">
-                  <label for="user_email">
-                    <i class="icons-mail "></i>
-                  </label>
-                 	<%= f.text_field :email, :placeholder => t(:email), :id=>"user_email" %>
-                </div>
-				<%= content_tag :button, "Reset Password", :type => :submit, :class => 'btn btn-primary' %>
-              </form>
-            </div>
-          </div>
-        <% end %>
-
-        </div>
-      </div>
-    </section>
+<h1 class="login-logo"><%= t(:ruling_site) %></h1>
+<div id="signin-header">
+	<h3><%= t(:forgot_password) %></h3>
+</div>
+<div id="container" class="sign-in">
+	<%= form_for :user, :url => user_password_path, :html => {:class => 'user_new form-horizontal'} do |f| %>
+		<%= devise_error_messages! %>
+		<div class="content">
+			<div class="main">
+				<div class="control-group clear">
+					<%= f.label :email %>
+					<%= f.email_field :email, :placeholder => t(:email), :style => "width: 330px;" %>
+					<span class="help-inline">Please correct the error</span>
+				</div>
+			</div>	
+		</div>
+		<div class="form-actions clear">
+			<%= content_tag :button, "Send me reset password instructions", :type => :submit, :class => 'btn btn-primary pull-right' %>
+		</div>
+	<% end %>
+</div>

app/views/devise/sessions/new.html.erb

@@ -1,3 +1,5 @@
+   <!-- Orbit Bar -->
+    <!--#include virtual="include/orbit_bar.html"-->
     <section id="main-wrap">
       <div class="sign-in have-other-sign-in">
 <!--         <p class="alert alert-error in fade">You need to sign in.</p>
@@ -33,22 +35,25 @@
                   </label>
                   <%= f.password_field :password, :placeholder => t(:dots), :id=>"user_password" %>
                 </div>
-                <br/>
-                <label class="checkbox">
-                <% if devise_mapping.rememberable? -%>
-                  <%= f.check_box :remember_me %> <small><%= f.label :remember_me %></small>
-                <% end -%>
-                </label>
-                
-                <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
+                  <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
+              </form>
+
+              <form class="content" accept-charset="UTF-8" action="/users/sign_in" method="post">
+                <div class="control-group clear">
+                  <label for="user_email">
+                    <i class="icon-user"></i>
+                  </label>
+                  <input type="text" id="user_id" name="user[id]" placeholder="帳號" />
+                </div>
+                <div class="control-group clear">
+                  <label for="user_password">
+                    <i class="icons-mail"></i>
+                  </label>
+                  <input type="text" id="user_email" name="user[email]" placeholder="電子郵件" />
+                </div>
               </form>
-              
             </div>
           </div>
-          <div class="pull-right">
-            <%= link_to content_tag(:small, t(:forgot_password)), new_user_password_path %>
-          </div>
-          <br/>
          <!--  <div class="register">
             <button class="btn btn-inverse" type="submit">Register</button>
           </div> -->

app/views/front/show_banner.html.erb

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

app/views/layouts/_right_menu.html.erb

@@ -33,7 +33,7 @@
         <ul class="dropdown-menu" role="menu" aria-labelledby="orbit-user">
           <li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' +  t("users.change_passwd"), admin_users_new_interface_setting_account_path(current_user), tabindex: '-1' %></li>
           <li><%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' +  t("users.user_basic_data"), admin_users_new_interface_edit_user_data_path(current_user), tabindex: '-1' %></li>
-          <% if @site.desktop_closed %>
+          <% if @site.desktop_closed.blank? %>
           <li><%= link_to content_tag(:i, nil, class: 'icons-screen') + ' ' +  t(:desktop), desktop_path, tabindex: '-1' %></li>
           <% end %>
           <li><%= link_to content_tag(:i, nil, class: 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path, tabindex: '-1' %></li>
@@ -69,10 +69,10 @@
                 <%= f.password_field :password, class: "input-xlarge", placeholder: t(:password) %>
               </div>
               <div class="pull-left" style="width: 150px;">
-                <label class="checkbox">
-                  <input type="checkbox" name="user[remember_me]" value="1" checked="checked" />
+<!--                 <label class="checkbox">
+                  <input type="checkbox" value="">
                   <small>Remember me</small>
-                </label>
+                </label> -->
                 <%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
               </div>
               <div class="pull-right">

config/environments/development.rb

@@ -15,7 +15,7 @@ Orbit::Application.configure do
   config.action_controller.perform_caching = true
 
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log

config/initializers/devise.rb

@@ -3,10 +3,10 @@
 Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in DeviseMailer.
-  config.mailer_sender = "UserMailer"
+  config.mailer_sender = "please-change-me@config-initializers-devise.com"
 
   # Configure the class responsible to send e-mails.
-  config.mailer = "Devise::Mailer"
+  # config.mailer = "Devise::Mailer"
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
@@ -61,7 +61,7 @@ Devise.setup do |config|
 
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
-  config.remember_for = 2.weeks
+  # config.remember_for = 2.weeks
 
   # If true, a valid remember token can be re-used between multiple browsers.
   # config.remember_across_browsers = true

config/mongoid.yml

@@ -8,13 +8,13 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: orbit_site_new
+  database: test_site
 
 
 
 test:
   <<: *defaults
-  database: orbit_site_new
+  database: test_site
 
 # set these environment variables on your prod server
 production:
@@ -24,4 +24,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: orbit_site_new
+  database: test_site

lib/orbit_app/helper/default_widget_tag_helper.rb

@@ -12,19 +12,12 @@ 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()
       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

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

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

@@ -9,30 +9,19 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   end
 
   def search_result
-    if params[:search_query] == ""
-      @bulletins = get_bulletins_for_index
-      
-    else
       @search = Bulletin.solr_search do 
         fulltext params[:search_query]
         with(:frontend_search,true)
         with(:available_lang).any_of([I18n.locale.to_s])
       end
-      # @bulletins = Bulletin.where(:category_id.in => params[:category_id]).and(:is_rejected=>false).and(:is_pending=>false)
+
       search_result =  @search.results.collect{|result| result.id}
 
       @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
-    end
   end
 
   def index
-    @bulletins = get_bulletins_for_index
-   end
-
-   def get_bulletins_for_index
-    
-      @item = Page.find(params[:page_id]) rescue nil
-      
+    @item = Page.find(params[:page_id]) rescue nil
     if @item
       if @item.frontend_data_count
         @page_num = @item.frontend_data_count
@@ -41,23 +30,33 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
       end
       @frontend_style = @item.frontend_style
     end
-       
+    @item = Page.find(params[:page_id]) rescue nil
+    if  !params[:search_query].blank?
+      @search = Bulletin.solr_search do 
+        fulltext params[:search_query]
+        with(:frontend_search,true)
+        with(:available_lang).any_of([I18n.locale.to_s])
+      end
+      search_result =  @search.results.collect{|result| result.id}
+
+      @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.any_in(_id:search_result).page( params[:page_main]).per(@page_num)
+    else
       date_now = Time.now
       if !params[:category_id].blank? && !params[:tag_id].blank?
-        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
-        # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in=>params[:category_id],:tagged_ids.in=>params[:tag_id])
+        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id => params[:category_id], :tagged_ids => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:category_id].blank?
-        @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
+        @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:tag_id].blank?
-        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
+        @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:tagged_ids => params[:tag_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
       else
         @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
       end
       # delayed_impressionist(@tag) if @tag
-      @bulletins
-   end 
+    end
+
+  end 
   
   def show
     @item = Page.find(params[:page_id]) rescue nil

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

@@ -39,7 +39,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
       @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page] ).per(@page_num)
     end
 
-    @categories =  @module_app.categories.enabled
+    @categories = get_categories_for_index
     
   end
   
@@ -62,7 +62,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
       @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(@page_num )
     end
 
-    @categories =  @module_app.categories.enabled
+    @categories = get_categories_for_index
     
   end
   
@@ -139,7 +139,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
 
   def bulletins_side_bar
     @tags_and_class = @module_app.sorted_tags_for_cloud
-    @categories =  @module_app.categories.enabled
+    @categories = get_categories_for_index
   end
   
   def bulletins_search_block

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb

@@ -1,6 +1,7 @@
 <% # encoding: utf-8 %>
 
 <%= flash_messages %>
+
 <h1 class="h1"><%= @page.title rescue nil %></h1>
 
 	<table class="table table-bordered">

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/search_result.html.erb

@@ -1,6 +1,7 @@
 <% # encoding: utf-8 %>
 
 <%= flash_messages %>
+
 <h1 class="h1"><%= @page.title rescue nil %></h1>
 
 	<table class="table table-bordered">
@@ -22,7 +23,7 @@
 	<% @bulletins.each do |post| %>
 	  <tr>
 		<td><%= post.bulletin_category.title rescue nil %></td>
-		<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.category_id) %>
+		<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.bulletin_category_id) %>
 		<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>
 		</td>
 		<td><%= display_date_time(post.postdate) %></td>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb

@@ -53,7 +53,7 @@
 			</tr>
 		<% end %>
 		</table>
-
+		
 		<% if !@category_id.blank? %>
 		<div class="more"><%= link_to t('more'), panel_announcement_front_end_bulletins_path( :category_id => @category_id ) %></div>
 		<% else %>
@@ -100,7 +100,7 @@
 			</li>
 		<% end %>
 		</ul>
-
+		
 		<% if !@category_id.blank? %>
 		<div class="more"><%= link_to t('more'), panel_announcement_front_end_bulletins_path( :category_id => @category_id ) %></div>
 		<% else %>
@@ -149,6 +149,7 @@
 			</li>
 			<% end %>
 		</ul>
+			
 		<% if !@category_id.blank? %>
 		<div class="more"><%= link_to t('more'), panel_announcement_front_end_bulletins_path( :category_id => @category_id ) %></div>
 		<% else %>
@@ -197,7 +198,8 @@
 				</div>
 			</li>
 			<% end %>
-		</ul>			
+		</ul>
+			
 		<% if !@category_id.blank? %>
 		<div class="more"><%= link_to t('more'), panel_announcement_front_end_bulletins_path( :category_id => @category_id ) %></div>
 		<% else %>
@@ -244,6 +246,7 @@
 			</li>
 			<% end %>
 		</ul>
+			
 		<% if !@category_id.blank? %>
 		<div class="more"><%= link_to t('more'), panel_announcement_front_end_bulletins_path( :category_id => @category_id ) %></div>
 		<% else %>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb

@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag "default_widget" %>
-<script type='text/javascript' src='/assets/lib/jquery.mu.image.resize.js'></script>
-<!-- <script type='text/javascript' src='/assets/lib/jquery.mu.image.resize.degsin.js'></script> -->
+<script type='text/javascript' src='/assets/jquery.mu.image.resize.js'></script>
+<script type='text/javascript' src='/assets/jquery.mu.image.resize.degsin.js'></script>
 
 <div id="bulletin_widget">
 	<%= render 'index' %>

vendor/built_in_modules/announcement/init.rb

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

vendor/built_in_modules/calendar_new/app/views/panel/calendar_new/back_end/event_categories/list.html.erb

@@ -10,12 +10,4 @@
   <tbody>
     <%= render partial: 'category', collection: @categories %>
   </tbody>
-</table>
-<div class="bottomnav clearfix">
-  <div class="action pull-right">
-    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), '#', class: "btn btn-primary open-slide", data: {title: t(:add_category), id: 'new', module: @module_app_id.to_s } %>
-  </div>
-  <div class="pagination pagination-centered">
-    <%= paginate @categories unless @categories.blank? %>
-  </div>
-</div>
+</table>

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

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

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

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

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

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

vendor/built_in_modules/faq/init.rb

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

vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb

@@ -176,7 +176,7 @@ var galleryAPI = function(){
 					if(rcom.getInternetExplorerVersion() == -1){
 
 					    if(pageurl!=window.location){
-					    	pageurl = window.location.pathname+"?id="+pageurl+"&controller_action=theater";
+					    	pageurl = window.location.pathname.replace("/","")+"?id="+pageurl+"&controller_action=theater";
 					      window.history.pushState({path:pageurl},'',pageurl);
 					    }
 					}else{
@@ -213,7 +213,7 @@ var galleryAPI = function(){
 		}
 		
 		var preparestage = function(albumid){
-			$.getJSON("/panel/gallery/front_end/albums/"+albumid+"/imgs",{"inner":true},function(album){
+			$.getJSON("panel/gallery/front_end/albums/"+albumid+"/imgs",{"inner":true},function(album){
 				imageArray = eval(album.images);
 				$.each(album.images,function(i,image){
 					if(image._id == id)

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

@@ -1,131 +0,0 @@
-var Locations = function(ls){
-  l = this;
-  this.name = "Locations";
-  this.locations = ls;
-  this.markerCounts = 0;
-  var map = null,
-      infowindow = new google.maps.InfoWindow(),
-      default_location = new google.maps.LatLng( 24.8043107, 121.03042159999995 ),
-      infowindow_template = "<div class='title'></div><div class='image'><img class='thumbnail' src='' /></div>",
-      markers = [];
-
-
-  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 = {
-          zoom: 16,
-          center: location,
-          mapTypeId: google.maps.MapTypeId.ROADMAP
-        };
-
-    map = new google.maps.Map( document.getElementById('map'), mapOptions );
-
-    for( i = 0; i < l.locations.length; i++ ){
-      markers.push( addMarker( new google.maps.LatLng(l.locations[i].latitude, l.locations[i].longitude), l.locations[i].color, i, function( index ){
-
-      }) );
-    }
-
-  }
-
-  var addMarker = function( location, pinColor, index, markerCallback ){
-
-    var pin = getPin(( pinColor.substr( 0, 1 ) == "#" ? pinColor.replace("#","") : pinColor )),
-        marker = new google.maps.Marker({
-                        map: map,
-                        icon: pin.image,
-                        shadow: pin.shadow,
-                        position: location,
-                        zIndex: 10
-                  });
-
-    google.maps.event.addListener( marker, 'click', function() {
-
-      infowindow.setContent( getTemplate( index ) );
-      infowindow.open( map, marker );
-      if( typeof markerCallback == "function" )
-        markerCallback.call( this, index );
-
-    });
-
-    l.markerCounts++;
-    return {"marker" : marker, "category_id" : l.locations[index].category_id};
-  }
-
-
-
-  var getTemplate = function( obj ){
-
-    var object = ( typeof obj == "number" ? l.locations[obj] : ( typeof obj == "object" ? obj : null ) );
-
-    if ( object ){
-
-      var template = $( "<div></div>" );
-      template.html( infowindow_template );
-      template.find( '.title' ).text( object.name );
-      template.find( "img.thumbnail" ).attr( "src", object.file.thumb.url );
-      return template.html();
-
-    }else{
-
-      throw new InvalidObjectError();
-    }
-
-  }
-
-  var getPin = function( color ){
-
-    var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + color,
-        new google.maps.Size(21, 34),
-        new google.maps.Point(0,0),
-        new google.maps.Point(10, 34));
-
-    var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow",
-        new google.maps.Size(40, 37),
-        new google.maps.Point(0, 0),
-        new google.maps.Point(12, 35));
-
-    return {"image":pinImage,"shadow":pinShadow};
-  }
-
-  this.getMarker = function( index ){
-    return markers[index];
-  }
-  this.getAllMarkers = function(  ){
-    return markers;
-  }
-
-  this.clearFilter = function(){
-    var m = l.getAllMarkers();
-    for( i = 0; i < m.length; i++ ){
-      m[i].marker.setVisible(true);
-    }
-  }
-
-  this.filterMarkers = function( categories ){
-    var filtered = [],
-        m = l.getAllMarkers();
-
-    for( i = 0; i < m.length; i++ ){
-      m[i].marker.setVisible(false);
-    }
-    for( i = 0; i < categories.length; i++ ){
-      filtered = filtered.concat(m.filter(function(a){return a.category_id == categories[i]}));
-    }
-    for( i = 0; i < filtered.length; i++ ){
-      filtered[i].marker.setVisible(true);
-    }
-    return filtered;
-  }
-  initialize();
-
-}
-
-var InvalidObjectError = function(){
-  this.name = "InvalidObjectError";
-  this.message = "Object not valid";
-}
-
-InvalidObjectError.prototype = new Error();
-InvalidObjectError.prototype.constructor = InvalidObjectError;

vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

vendor/built_in_modules/location/app/controllers/panel/location/back_end/location_categories_controller.rb

@@ -1,19 +0,0 @@
-class Panel::Location::BackEnd::LocationCategoriesController < OrbitBackendController
-	def index
-        @module_app_id = @module_app.id rescue nil
-    	@categories = get_categories_for_index
-    	@categories = @categories.page(params[:page]).per(10)
-    	respond_to do |format|
-      		format.html # index.html.erb
-      		format.json { render json: @categories }
-    	end
-  end
-
-    def list
-   	    @module_app_id = @module_app.id rescue nil
-   	    @categories = get_categories_for_index
-        @categories = @categories.page(params[:page]).per(10)
-        render :layout => false
-    end
-
-end

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

@@ -2,13 +2,8 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
   include AdminHelper
 
   def index
-    @locations = LocationInfo.all
+    @location_infos = LocationInfo.all
     @categories = get_categories_for_index
-    @location_infos = [];
-    @locations.each do |loc|
-      loc['color'] = Category.find(loc.category_id).custom_value
-      @location_infos << loc
-    end
     respond_to do |format|
       format.html # new.html.erb
       format.json { render json: @locations }
@@ -27,8 +22,6 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
 
   def edit
     @location_info = LocationInfo.find(params[:id])
-    @categories = get_categories_for_index
-
   end
 
   def show
@@ -41,7 +34,6 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
 
   def create
     @location_info = LocationInfo.new(params[:location_info])
-    @categories = get_categories_for_index
     if @location_info.save
       flash[:success] = "Success!!"
       redirect_to panel_location_back_end_locations_url

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

@@ -1,12 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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/back_end/location_categories/_category.html.erb

@@ -1,21 +0,0 @@
-<tr class="<%= 'disable' if category.disable %>">
-  <% @site_valid_locales.each_with_index do |locale, i| %>
-		<td>
-			<%= category.title_translations[locale] %>
-			<% if i == 0 %>
-		      <div class="quick-edit">
-	         	 <ul class="nav nav-pills">
-		          	<% if is_admin?%>
-			            <li><%= link_to t(:edit), '#', class: "open-slide", data: {title: t(:edit_category), id: category.id.to_s, module: @module_app_id.to_s, form: category.title_translations.merge(color: category.custom_value)} %></li>
-			            <li><%= link_to show_toggle_archive_btn(category), toggle_admin_module_app_category_path(@module_app_id, category), method: :post, remote: true, class: "archive_toggle" %></li>
-			           <% end %>
-		            <% if is_manager? || is_admin? %>
-						<li><%= link_to t(:category_auth), admin_authorizations_path(@module_app.key, 'category_authorization', category.id) %></li>
-					<% end %>
-	          </ul>
-	        </div>
-			<% end %>
-		</td>
-	<% end %>
-	<td><span class="badge" style="background-color: <%= category.custom_value %>;"><%= category.custom_value %></span></td>
-</tr>

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/_form.html.erb

@@ -1,12 +0,0 @@
-<%= flash_messages %>
-<%= f.error_messages %>
-<%= label_tag("color", t("location.color")) %>
-<div class="input-append">
-  <%= f.text_field :custom_value, id: "color", :class => "color-picker miniColors input-small", :size => "7", :maxlength => "7", :autocomplete=>"off",:value=>"9100FF" %>
-</div>
-<%= f.fields_for :title_translations do |f| %>
-  <% @site_valid_locales.each do |locale| %>
-		<%= label_tag "name-#{locale}", "#{t(:name)} (#{I18nVariable.from_locale(locale)})" %>
-		<%= f.text_field locale, :class => 'input-large', :value => (@category.title_translations[locale] rescue ''), placeholder: t(:name), id: locale %>
-  <% end %>
-<% end %>

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/index.html.erb

@@ -1,66 +0,0 @@
-<%= stylesheet_link_tag "jquery.miniColors" %>
-
-<%= javascript_include_tag "jquery.miniColors.min" %>
-
-<%= javascript_include_tag "admin/categories" %>
-
-<div id="categories_index">
-   <table class="table main-list">
-    <thead>
-      <tr class="sort-header">
-        <% @site_valid_locales.each_with_index do |locale, i| %>
-          <th class="<%= 'span5' if i <= 1  %>"><a href="#"><%= t(:_locale, :locale => locale) %></a></th>
-        <% end %>
-        <th class="span2"><a href="#"><%= t('event_category.color') %></a></th>
-      </tr>
-    </thead>
-    <tbody>
-      <%= render partial: 'category', collection: @categories %>
-    </tbody>
-  </table>
-
-
-<div class="bottomnav clearfix">
-  <div class="action pull-right">
-    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), '#', class: "btn btn-primary open-slide", data: {title: t(:add_category), id: 'new', module: @module_app_id.to_s } %>
-  </div>
-  <div class="pagination pagination-centered">
-    <%= paginate @categories unless @categories.blank? %>
-  </div>
-</div>
-</div>
-<div id="pageslide">
-  <div class="page-title clearfix">
-    <a class="pull-right" href="javascript:$.pageslide.close()">
-      <i class="icons-arrow-left-2"></i>
-    </a>
-    <span></span>
-  </div>
-  <div class="view-page">
-    <div class="nano">
-      <div class="content">
-        <%= form_for :category, url: nil, html:{:id=>"color"}, remote: true do |f| %>
-          <fieldset>
-            <%= render :partial => "form", :locals => { :f => f } %>
-            <div class="form-actions">
-              <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
-              <%= f.submit t(:submit), class: 'btn btn-primary btn-small' %>
-            </div>
-          </fieldset>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-<script type="text/javascript">
-if($('.color-picker').length > 0){
-    $('.color-picker').miniColors(); // just in category view
-    $('.miniColors-trigger').addClass('btn');
-}
-$("form#color").bind("ajax:complete",function(){
-  $.get("<%= panel_location_back_end_location_categories_list_path %>",function(data){
-    $("#categories_index").html(data);
-    openSlide();
-  })
-})
-</script>

vendor/built_in_modules/location/app/views/panel/location/back_end/location_categories/list.html.erb

@@ -1,21 +0,0 @@
-<table class="table main-list">
-  <thead>
-    <tr class="sort-header">
-      <% @site_valid_locales.each_with_index do |locale, i| %>
-        <th class="<%= 'span5' if i <= 1  %>"><a href="#"><%= t(:_locale, :locale => locale) %></a></th>
-      <% end %>
-      <th class="span2"><a href="#"><%= t('location_category.color') %></a></th>
-    </tr>
-  </thead>
-  <tbody>
-    <%= render partial: 'category', collection: @categories %>
-  </tbody>
-</table>
-<div class="bottomnav clearfix">
-  <div class="action pull-right">
-    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), '#', class: "btn btn-primary open-slide", data: {title: t(:add_category), id: 'new', module: @module_app_id.to_s } %>
-  </div>
-  <div class="pagination pagination-centered">
-    <%= paginate @categories unless @categories.blank? %>
-  </div>
-</div>

vendor/built_in_modules/location/app/views/panel/location/back_end/locations/_form.html.erb

@@ -19,8 +19,8 @@
   <div class="control-group">
     <label class="control-label" for=""><%= t 'coordinates' %></label>
     <div class="controls">
-      <%= f.text_field :latitude, :class=>"span2", :placeholder => "Latitude" %>
       <%= f.text_field :longitude, :class=>"span2", :placeholder => "Longitude" %>
+      <%= f.text_field :latitude, :class=>"span2", :placeholder => "Langitude" %>
     </div>
   </div>
 

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

@@ -1,5 +1,3 @@
-<script src="http://maps.google.com/maps/api/js?sensor=true"></script>
-<%= javascript_include_tag "location" %>
 <table class="table main-list">
   <thead>
     <tr>
@@ -30,44 +28,6 @@
     <% end %>
   </tbody>
 </table>
-<div>
-  Categories : 
-</div>
-<div class="btn-group">
-   <% @categories.each do |category| %>
-     <button class="btn cat-filter" data-category='<%= category.id %>'><%= category.title %></button>
-    <% end %>
-</div>
-<a href="javascript:void(0);" id="clear_filter">Clear Filter</a>
-<div id="map" style="width: 100%; height: 500px;"></div>
 <%if is_manager? %>
 <td><%= link_to 'Add', new_panel_location_back_end_location_path, :class => "btn btn-primary pull-right", :id=>"create_event_btn", :ref=>"add-btn"%></td>
 <% end %>
-<script>
-
-  var loc = new Locations(<%= @location_infos.to_json.html_safe %>);
-  jQuery(document).ready(function($) {
-    var filterCategories = [];
-    $("button.cat-filter").bind( clickEvent,function(){
-      var catid =  $( this ).data('category');
-
-      if ( $( this ).hasClass('active') ){
-        $( this ).removeClass('active');
-        var index = filterCategories.indexOf(filterCategories.filter(function(a,i){ return a == catid })[0]);
-        filterCategories.splice( index, 1 );
-      }else{
-        $( this ).addClass('active');
-        filterCategories.push( catid );
-      }
-      loc.filterMarkers(filterCategories);
-    })
-
-    $("a#clear_filter").bind( clickEvent, function(){
-      filterCategories = [];
-      $("button.cat-filter").removeClass('active');
-      loc.clearFilter();
-    })
-
- });
-
-</script>

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

@@ -1,40 +0,0 @@
-<%= 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

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

vendor/built_in_modules/location/config/routes.rb

@@ -2,19 +2,12 @@ Rails.application.routes.draw do
   namespace :panel do
     namespace :location do
       namespace :back_end do 
-      	match 'location_categories/list' => "location_categories#list"
-	    resources :location_categories
+
         match "locations/get_locations" => "locations#get_locations"
          match "locations/get_categories" => "locations#get_categories"
 
         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,17 +4,15 @@ 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 'locations' do
-        frontend_i18n 'location.location'
-      end
-    end
+    # front_end do
+    #   app_page 'bulletins'
+    # end
 
     # category ["BulletinCategory"]
 
@@ -35,37 +33,31 @@ 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]
-      active_for_controllers ({:private=>['locations','location_categories']})
+      active_for_controllers ({:private=>['locations']})
 
       head_link_path "panel_location_back_end_locations_path"
 
       context_link 'location.all_locations',
                      :link_path=>"panel_location_back_end_locations_path" ,
                      :priority=>1,
-                     :active_for_action=>{:locations=>:index},
+                     :active_for_action=>{:localtions=>:index},
                      :available_for => [:manager]
 
       context_link 'location.add_location',
                      :link_path=>"new_panel_location_back_end_location_path" ,
                      :priority=>1,
-                     :active_for_action=>{:locations=>:new},
+                     :active_for_action=>{:localtions=>:new},
                      :available_for => [:manager]
 
 
       context_link 'location.categories',
-                     :link_path=>"panel_location_back_end_location_categories_path" ,
+                     :link_path=>"admin_module_app_categories_path(get_module_app)" ,
                      :priority=>1,
-                     :active_for_category => 'Location',
+                     :active_for_action=>{:localtion_categories=>:index},
                      :available_for => [:manager]
 
     end

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_authorization', object.id)"
+									link: "admin_authorizations_path(@module_app.key, 'page_context', object.id)"
 	field type: 'associated',
 				db_field: 'page',
 				model_field: 'path',

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

@@ -11,6 +11,7 @@ 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
@@ -63,7 +64,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,5 +30,9 @@
 </div>  
 
 <div class="pull_right"> 
-<%= link_to t(:more_plus), "/"+@more_url %>
+<% 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 %>
 </div>