implementd maps with category filteration and custom color markers.

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

@@ -38,9 +38,11 @@ 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')) {
-                    $(this).wrap('<div class="togglebox disabled" />');    
+                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));
@@ -541,6 +543,7 @@ function changeStatusHidden() {
 
 // Document Ready
 $(function() {
+    console.log('true')
     showFiltersOnPageRefresh();
 
     new ini();

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

@@ -189,8 +189,10 @@ 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')
-              _selectData.module.category.length > 1 && _selectData.module.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+              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);
             });
             $pageCategoryGroup.show();
           }
@@ -201,8 +203,10 @@ 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')
-              _selectData.module.tags.length > 1 && _selectData.module.tags.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+              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);
             });
             $pageTagsGroup.show();
           }
@@ -397,6 +401,7 @@ $(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) {
@@ -406,14 +411,17 @@ $(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 > 1 && _select.category.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+                      _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);
                     }
                   });
-                  $pageCategoryGroup.show();
+                  $pageCategoryGroup.slideDown(300);
                 } else {
-                  $pageCategoryGroup.hide();
+                  $pageCategoryGroup.slideUp(300);
+                  $hiddenInputA.removeAttr('name');
                 }
                 $pageTags.empty();
+                var $hiddenInputB = $pageTags.siblings('input[type="hidden"]');
                 if(val.tags.length > 0) {
                   $.each(val.tags, function(index, val) {
                     if(val !== 0) {
@@ -423,12 +431,14 @@ $(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 > 1 && _select.tags.length == index + 1 ? $all.prop('checked', true) : $all.prop('checked', false);
+                      _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);
                     }  
                   });
-                  $pageTagsGroup.show();
+                  $pageTagsGroup.slideDown(300);
                 } else {
-                  $pageTagsGroup.hide();
+                  $pageTagsGroup.slideUp(300);
+                  $hiddenInputB.removeAttr('name');
                 }
               }
               return false;
@@ -461,8 +471,10 @@ $(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"]');
@@ -483,10 +495,11 @@ $(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('disabled')) {
+				if($(this).hasClass('disable')) {
 					$(this).find('.toggle-check')
 						   .attr('value', 'false')
 						   .closest('.attributes')
@@ -237,7 +237,7 @@ $(function() {
 						   .children('.attributes-body')
 						   .fadeOut(300);
 				}
-				$(this).toggleClass('disabled');
+				$(this).toggleClass('disable');
 			};
 			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('disabled')) {
+				if($(this).hasClass('disable')) {
 					$(this).find('.toggle-check')
 						   .attr('value', 'false')
 						   .closest('.attributes')
@@ -411,7 +411,7 @@ $(function() {
 						    	$(this).parent('.field-type').removeClass('in');
 						   });
 				}
-				$(this).toggleClass('disabled');
+				$(this).toggleClass('disable');
 			};
 			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('disabled');
+			$('.set-sidebar-state').prop('checked',true).parent('.togglebox').removeClass('disable');
 		}
 		$('.set-sidebar-state').on({
 			change: function() {

app/controllers/admin/page_parts_controller.rb

@@ -23,7 +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[params[:val]]["style"] rescue nil
+        @frontend_styles =  @module_app.widgets[@part.widget_path]["style"] rescue nil
         @partial = 'custom_widget' if @frontend_styles.present?
       end
     end

app/controllers/admin/pages_controller.rb

@@ -21,6 +21,16 @@ 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/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/mailer/user_mailer.rb

@@ -0,0 +1,10 @@
+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/views/admin/items/_form_page.html.erb

@@ -28,20 +28,22 @@
         <%= select_tag "page[app_frontend_url]", nil, class: "input-xlarge change" %>
       </div>
 
-      <div class="checkbox-groups hide" id="page-category-groups">
+      <div class="checkbox-groups hide" id="page-category-groups" data-for="category">
         <%= 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">
+      <div class="checkbox-groups hide" id="page-tags-groups" data-for="tag">
         <%= 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,8 +16,9 @@
       <% else %>
         <%= link_to node.title, node.url %>
       <% end %>
+
       <div class="item-menu">
-        <%= 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') %>
+        <%= 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') %>
         <% 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

@@ -3,4 +3,25 @@
   <div class="controls">
     <%= select 'page_part', 'widget_style', @frontend_styles, {:selected => (@part && @part[:widget_style])}, class: "input-xlarge" %>
   </div>
+</div>
+
+<div class="control-group input-content">
+<% @module_app.widget_options.tap { |widget|%>
+   <% widget.each { |w|%>
+      <% w.get_options.each do |key, settings| %>
+       <% options = settings[:opts] %>
+        <%= label_tag(t(settings[:label_i18n], :class=>"control-label muted"))%>
+         <% case options%>
+           <% when Hash%>
+            <div class="controls">
+            <%= select_tag "page_part[widget_options][#{key}]", options_from_collection_for_select(eval(options["query"]), options["value"], options["label"].to_s, :selected => (@part.widget_options[key] rescue nil)), class: "input-xlarge" %>
+            </div>
+           <% else%>
+            <div class="controls">
+            <%= select_tag "page_part[widget_options][#{key}]", options_for_select(options,(@part.widget_options[key] rescue nil)), class: "input-xlarge" %>
+          <% end %>
+          </div>
+        <% end %>
+   <% } %>
+<% } %>
 </div>

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

@@ -0,0 +1,18 @@
+<% if (not(@selected[:module_app].widget_options(@selected[:app_frontend_url]).blank?) and @selected[:app_frontend_url]!='default_widget')%>
+  
+
+      <% @selected[:module_app].widget_options(@selected[:app_frontend_url]).get_options.each do |key,settings| %>
+      <% options = settings[:opts] %>
+      <%= label_tag(t(settings[:label_i18n]))%>
+        <% case options%>
+          <% when Hash%>
+            <%= select_tag "page_part[widget_options][#{key}]", options_from_collection_for_select(eval(options["query"]), options["value"], options["label"].to_s, :selected => (@part.widget_options[key] rescue nil)) %>
+           <% else%>
+            <%= select_tag "page_part[widget_options][#{key}]", options_for_select(options,(@part.widget_options[key] rescue nil)) %>
+            <!-- (@part[:widget_field][i][0] if (@part && !@part[:widget_field].blank? && !@part[:widget_field][i].blank?)) ) -->
+        <% end %>
+        
+  
+      <% end %>
+
+<% end %>

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

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

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

@@ -25,12 +25,12 @@
   <ul class="nav nav-pills filter-nav pull-right">
     <li class="accordion-group">
       <div class="accordion-heading">
-        <a href="#collapse-status" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
+        <a href="#collapse-role" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
       </div>
     </li>
   </ul>
   <div class="filter-group accordion-group">
-    <div class="accordion-body collapse" id="collapse-status">
+    <div class="accordion-body collapse" id="collapse-role">
 
     <%= render :partial => "filter"%>
 

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

@@ -25,12 +25,12 @@
   <ul class="nav nav-pills filter-nav pull-right">
     <li class="accordion-group">
       <div class="accordion-heading">
-        <a href="#collapse-status" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
+        <a href="#collapse-role" data-toggle="collapse" data-parent="#filter" class="accordion-toggle">Roles</a>
       </div>
     </li>
   </ul>
   <div class="filter-group accordion-group">
-    <div class="accordion-body collapse" id="collapse-status">
+    <div class="accordion-body collapse" id="collapse-role">
 
     <%= render :partial => "filter"%>
 

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

@@ -1,22 +1,36 @@
+<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>
+ -->    
 
-<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>
+ 		<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>

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

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

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.blank? %>
+          <% if @site.desktop_closed %>
           <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" value="">
+                <label class="checkbox">
+                  <input type="checkbox" name="user[remember_me]" value="1" checked="checked" />
                   <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 = false
+  config.action_mailer.raise_delivery_errors = true
 
   # 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 = "please-change-me@config-initializers-devise.com"
+  config.mailer_sender = "UserMailer"
 
   # 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

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

lib/parsers/parser_front_end.rb

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

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

@@ -9,19 +9,30 @@ 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
-    @item = Page.find(params[:page_id]) rescue nil
+    @bulletins = get_bulletins_for_index
+   end
+
+   def get_bulletins_for_index
+    
+      @item = Page.find(params[:page_id]) rescue nil
+      
     if @item
       if @item.frontend_data_count
         @page_num = @item.frontend_data_count
@@ -30,33 +41,23 @@ 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 => params[:category_id], :tagged_ids => 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]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
+        # @bulletins = Bulletin.available_for_lang(I18n.locale).can_display.where(:category_id.in=>params[:category_id],:tagged_ids.in=>params[:tag_id])
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:category_id].blank?
-        @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)
+        @bulletins = Bulletin.all.available_for_lang(I18n.locale).can_display.where(:category_id.in => params[:category_id]).desc( :is_top, :postdate).page( params[:page_main]).per(@page_num)
         @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
       elsif !params[:tag_id].blank?
-        @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)
+        @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)
       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
-    end
-
-  end 
+      @bulletins
+   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 = get_categories_for_index
+    @categories =  @module_app.categories.enabled
     
   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 = get_categories_for_index
+    @categories =  @module_app.categories.enabled
     
   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 = get_categories_for_index
+    @categories =  @module_app.categories.enabled
   end
   
   def bulletins_search_block

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

@@ -1,7 +1,6 @@
 <% # 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,7 +1,6 @@
 <% # encoding: utf-8 %>
 
 <%= flash_messages %>
-
 <h1 class="h1"><%= @page.title rescue nil %></h1>
 
 	<table class="table table-bordered">
@@ -23,7 +22,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.bulletin_category_id) %>
+		<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post, :category_id => post.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,7 +149,6 @@
 			</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 %>
@@ -198,8 +197,7 @@
 				</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 %>
@@ -246,7 +244,6 @@
 			</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/jquery.mu.image.resize.js'></script>
-<script type='text/javascript' src='/assets/jquery.mu.image.resize.degsin.js'></script>
+<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> -->
 
 <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 => [:bulletin_category,:id]}}
+        link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:category,:id]}}
         field :subtitle
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end

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

@@ -10,4 +10,12 @@
   <tbody>
     <%= render partial: 'category', collection: @categories %>
   </tbody>
-</table>
+</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/faq/app/controllers/panel/faq/front_end/qas_controller.rb

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

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

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

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

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

vendor/built_in_modules/faq/init.rb

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

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

@@ -32,73 +32,8 @@ var galleryAPI = function(){
  			}
  		}
 
-		$(document).ready(function(){
-			//bindHandlers();
-		})
-		var bindHandlers = function(){
-			
-		}
+	}
 
-	}
-	
-	this.loadAlbums = function(id){
-		g.albumArea.find(".rghead .rgfn a").click(function(){g.makeNewAlbum($(this).attr("href"))});
-		g.albumArea.addClass('o_gallery');
-		g.albumArea.find("#imgholder").empty();
-		if(id!="all"){
-			var cids = [];
-			var tids = [];
-			var href = null;
-		    var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-		    for(var i = 0; i < hashes.length; i++){
-		        hash = hashes[i].split('=');
-		        if(hash[0]=="cat"){
-		        	cids.push(hash[1]);
-		        	href = "cat="+hash[1];
-		    	}else if(hash[0]=="tag"){
-		    		tids.push(hash[1]);
-		    		href = "tag="+hash[1];
-		    	}
-		        $("#filter .filter_btns a[href='"+href+"']").addClass("active");
-		    }
-		    if(cids.length == 0)
-		    		cids = "all";
-		}else{
-			var cids = "all";
-		}
-		$.getJSON("/panel/gallery/front_end/get_albums",{"cid":cids,"tid":tids,"inner":true},function(categories){
-			$.each(categories,function(x,category){
-				$.each(category,function(i,album){
-					album.description = (album.description?album.description:"<%= I18n.t('gallery.no_description') %>")
-					if(album.cover == "default")
-						var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='"+album.show_path+"'><img src='../../../assets/gallery/default.jpg'/></a><span class='albumname'><a title='"+album.description+"' href='?album="+album._id+"'>"+album.name+"</a></span><span class='categoryname'><i class='icon-folder-close'></i> "+album.category_name+"</span><span class='tagnames'></span></div>");
-					else
-						var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='"+album.show_path+"'><img src='"+album.cover_path+"'/></a><span class='albumname'><a title='"+album.description+"' href='?album="+album._id+"'>"+album.name+"</a></span><span class='categoryname'><i class='icon-folder-close'></i> "+album.category_name+"</span><span class='tagnames'></span></div>");
-					var tag_string = "";
-					for(tag in album.tag_names){
-						if(tag == album.tag_names.length-1)
-							tag_string+= '<span class="tags">' + album.tag_names[tag] + '</span>';
-						else
-							tag_string+= '<span class="tags">' + album.tag_names[tag] + ', </span>';
-					}
-					$img.find(".tagnames").html(tag_string);
-					g.albumArea.find("#imgholder").append($img);
-				})
-			})
-		})
-	}
-	this.loadImages = function(id){
-		g.albumArea.addClass('o_album');
-		g.albumArea.find("#imgholder").empty();
-		$.getJSON("panel/gallery/front_end/albums/"+id+"/imgs",{inner:true},function(album){
-			$.each(album.images,function(i,image){
-				var thumb = image.file.thumb.url;
-				image.description = (image.description?image.description:"<%= I18n.t('gallery.no_description') %>")
-				var $img = $("<div class='rgphoto'><a title='"+image.description+"' href='"+image.theater_link+"'><img src='"+thumb+"'/></a></div>");
-				g.albumArea.find("#imgholder").append($img);
-			})
-		})
-	}
 	this.loadTheater = function(id){
 		var imageArray;
 		var imagecount = 0;
@@ -241,7 +176,7 @@ var galleryAPI = function(){
 					if(rcom.getInternetExplorerVersion() == -1){
 
 					    if(pageurl!=window.location){
-					    	pageurl = window.location.pathname.replace("/","")+"?id="+pageurl+"&controller_action=theater";
+					    	pageurl = window.location.pathname+"?id="+pageurl+"&controller_action=theater";
 					      window.history.pushState({path:pageurl},'',pageurl);
 					    }
 					}else{
@@ -278,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/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb

@@ -1,56 +1,11 @@
 class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
   def index
+    @albums = GalleryAlbum.where(:category_id.in => params[:category_id])
   end
 
   def show
     @album = GalleryAlbum.find(params[:id])
-    @tags = Tag.find(@album.tagged_ids).map{|t| t.name}
-  end
-
-  def get_albums
-    @categoryids = params["cid"]
-    @tags = params["tid"]
-    @albums = Array.new
-    if @categoryids == "all"
-      if @tags
-        if @tags.kind_of?(Array)
-          @tags.each do |tag|
-            @albums << GalleryAlbum.where(tagged_ids: tag)
-          end
-        else
-          @albums <<  GalleryAlbum.where(tagged_ids: @tags)
-        end
-      else
-        @albums << GalleryAlbum.all
-      end
-    else
-      @categoryids.each do |id|
-        category = Category.find(id)
-        if @tags
-          if @tags.kind_of?(Array)
-            @tags.each do |tag|
-              @albums << category.gallery_albums.where(tagged_ids: tag)
-            end
-          else
-            @albums << category.gallery_albums.where(tagged_ids: @tags)
-          end
-        else
-          @albums << category.gallery_albums.all
-        end
-      end
-    end
-    @output =  Array.new
-    @albums.each do |album|
-      @albs = Array.new
-      album.each do |values|
-        tags = Tag.find(values.tagged_ids).map{|t| t.name}
-        category = Category.find(values.category_id).title
-
-        @albs << {"_id"=>values.id,"show_path"=>panel_gallery_front_end_album_path(values),"cover"=>values.cover,"cover_path"=>values.cover_path,"description"=>values.description,"category_name"=>category,"gallery_category_id" => values.category_id,"name"=>values.name,"tag_ids"=>values.tag_ids,"tag_names"=>tags}
-      end
-      @output << @albs
-    end
-    render :json=>@output.to_json
+    @images = @album.gallery_images
   end
 
   def imgs

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/_album.html.erb

@@ -0,0 +1,14 @@
+<div class='rgalbum'>
+	<a title='<%= album.name %>' href='<%= panel_gallery_front_end_album_path(album) %>'>
+	 <% if album.cover == "default" %>
+	     <%= image_tag "gallery/default.jpg" %>
+	  <% else %>
+	     <img src="<%= album.cover_path %>">
+    <% end %>
+	</a>
+	<span class='albumname'>
+		<a title='<%= album.description %>' href='<%= panel_gallery_front_end_album_path(album) %>'><%= album.name %></a>
+	</span>
+	<span class='categoryname'><i class='icon-folder-close'></i><%=  Category.find(album.category_id).title %></span>
+	<span class='tagnames'></span>
+</div>

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/_image.html.erb

@@ -0,0 +1,5 @@
+<div class='rgphoto'>
+	<a title='<%= image.description %>' href='<%= theater_panel_gallery_front_end_album_path(image) %>'>
+		<img src='<%= image.file.thumb.url %>'/>
+	</a>
+</div>

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb

@@ -1,42 +1,14 @@
-
-
 <%= stylesheet_link_tag "gallery_frontend" %>
 
-<%#= stylesheet_link_tag "gallery" %>
 <div id="orbit_gallery" class="rg">
-   
   <div class="rgbody">
     <div id="imgholder">
-
+      <% @albums.each do |album| %>
+        <%= render :partial => "album", :object => album %>
+      <% end %>
     </div>
   </div>
-  
-  <div class="rghead">
-  <div class="rgfn">
-  </div>
 </div>
-</div>
-<script type="text/javascript">
-</script>
-<% content_for :page_specific_javascript do %>
-  <%= javascript_include_tag "galleryAPI_frontend" %>
-   <%#= javascript_include_tag "jquery.tinyscrollbar" %>
-  <%= javascript_include_tag "rss" %>
-<% end %>
 
-<script type="text/javascript">
-  galleryAPI.prototype.locale = "<%= I18n.locale %>";
-  var gallery = new galleryAPI();
-  gallery.initialize();
-  if(typeof gallery.urlVars['cat']!= "undefined"){
-       gallery.loadArea = "albums";
-       gallery.loadAlbums(gallery.urlVars['cat']);
-    }else if(typeof gallery.urlVars['tag']!= "undefined"){
-        gallery.loadArea = "albums";
-        gallery.loadAlbums(gallery.urlVars['tag']);
-    }else{
-      gallery.loadArea = "albums";
-      gallery.loadAlbums("all");
-    }
-</script>
+
 

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb

@@ -1,45 +1,12 @@
-
 <%= stylesheet_link_tag "gallery_frontend" %>
 
 <div id="orbit_gallery" class="rg">
   <div class="rgbody">
     <div id="imgholder">
-
+      <% @images.each do |image| %>
+        <%= render :partial => "image", :object => image %>
+      <% end %>
     </div>
   </div>
-  <!-- tag part -->
- <!-- add "album_tags" or "photo_tags" class to .taglist -->
-  <div class="taglist"> 
-    <h3 class="taglist_title"><%= t('gallery.album_tag') %></h3>
-    <ul>
-    <% @tags.each do |tag|%>
-        <li><%= tag %></li>
-    <% end %>
-    </ul>
-  </div>
-  <!-- tag end -->
-  <div class="form-actions form-fixed pagination-right rghead">
-    <div class="rgfn">
-   		<a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="<%= panel_gallery_front_end_albums_path %>"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a>
-  </div>
-</div>
 </div>
 
-<% content_for :page_specific_javascript do %>
-  <%= javascript_include_tag "galleryAPI_frontend" %>
-   <%#= javascript_include_tag "jquery.tinyscrollbar" %>
-  <%= javascript_include_tag "rss" %>
-<% end %>
-
-<script type="text/javascript">
-  galleryAPI.prototype.locale = "<%= I18n.locale %>";
-  var gallery = new galleryAPI();
-  gallery.initialize();
-   gallery.loadArea = "images";
-   gallery.loadImages("<%= params[:id] %>");
-</script>
-
-
-
-
-

vendor/built_in_modules/gallery/init.rb

@@ -34,7 +34,7 @@ module Gallery
 
       customize_widget "widget1" do 
         widget_i18n "gallery.widget.widget1"
-        style []
+        style ["1","2"]
         options "vertical",:i18n => "gallery.widget_option.vertical",:options_item=>[1, 2]
         options "horizontal",:i18n => "gallery.widget_option.horizontal",:options_item=>[1, 2,3,4,5,6]
         options "album_id",:i18n =>"gallery.album",:options_item => {"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}

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

@@ -0,0 +1,132 @@
+var Locations = function(ls){
+
+  l = this;
+  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;
+  }
+
+google.maps.event.addDomListener(window, 'load', 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

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

@@ -0,0 +1,19 @@
+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,8 +2,13 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
   include AdminHelper
 
   def index
-    @location_infos = LocationInfo.all
+    @locations = 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 }
@@ -22,6 +27,8 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
 
   def edit
     @location_info = LocationInfo.find(params[:id])
+    @categories = get_categories_for_index
+
   end
 
   def show
@@ -34,6 +41,7 @@ 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/views/panel/location/back_end/location_categories/_category.html.erb

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

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

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

@@ -0,0 +1,21 @@
+<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,3 +1,5 @@
+<script src="http://maps.google.com/maps/api/js?sensor=true"></script>
+<%= javascript_include_tag "location" %>
 <table class="table main-list">
   <thead>
     <tr>
@@ -28,6 +30,44 @@
     <% 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/config/routes.rb

@@ -2,7 +2,8 @@ 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"
 

vendor/built_in_modules/location/init.rb

@@ -37,27 +37,27 @@ module Location
     side_bar do
       head_label_i18n  'location.location',:icon_class=>"icons-location"
       available_for [:admin,:guest,:manager,:sub_manager]
-      active_for_controllers ({:private=>['locations']})
+      active_for_controllers ({:private=>['locations','location_categories']})
 
       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=>{:localtions=>:index},
+                     :active_for_action=>{:locations=>:index},
                      :available_for => [:manager]
 
       context_link 'location.add_location',
                      :link_path=>"new_panel_location_back_end_location_path" ,
                      :priority=>1,
-                     :active_for_action=>{:localtions=>:new},
+                     :active_for_action=>{:locations=>:new},
                      :available_for => [:manager]
 
 
       context_link 'location.categories',
-                     :link_path=>"admin_module_app_categories_path(get_module_app)" ,
+                     :link_path=>"panel_location_back_end_location_categories_path" ,
                      :priority=>1,
-                     :active_for_action=>{:localtion_categories=>:index},
+                     :active_for_category => 'Location',
                      :available_for => [:manager]
 
     end

vendor/built_in_modules/video/init.rb

@@ -50,6 +50,7 @@ module Videos
       #* customize_widget_options_fields_i18n({"widget1"=>{"vertical"=>"gallery.widget_option.vertical", "horizontal"=>"gallery.widget_option.horizontal", "album_id"=>"gallery.album"}} )
       customize_widget "channel_videos" do 
         widget_i18n "videos.widget.channel_videos"
+        style ["1","2"]
         options "channel_videos",:i18n =>"videos.channel_videos",:options_item => {"query"=>"ChannelVideo.all", "value"=>:id, "label"=>:channel_name}
       end