gallery theater url fix for theater

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);
+                      _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);
+                      _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/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,12 @@ class Admin::PagesController < Admin::ItemsController
   end
 
   def update
+    if params[:page][:category][0] == ""
+      params[:page][:category] = []
+    end
+    if params[:page][:tag][0] == ""
+      params[:page][:tag] = []
+    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/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/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"%>
 

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

@@ -32,52 +32,8 @@ var galleryAPI = function(){
  			}
  		}
 
-		$(document).ready(function(){
-			//bindHandlers();
-		})
-		var bindHandlers = function(){
-			
-		}
+	}
 
-	}
-	
-	this.loadAlbums = function(cids){
-		g.albumArea.find(".rghead .rgfn a").click(function(){g.makeNewAlbum($(this).attr("href"))});
-		g.albumArea.addClass('o_gallery');
-		g.albumArea.find("#imgholder").empty();
-		$.getJSON("/panel/gallery/front_end/get_albums",{"cid":cids,"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;
@@ -257,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,31 +1,11 @@
 class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
   def index
-    @categories = params[:category_id]
+    @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"]
-    @albums = Array.new
-    @albums << GalleryAlbum.where(:category_id.in => @categoryids)
-
-   
-    @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,35 +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();
-  var categories = <%= @categories.to_json.html_safe %>;
-  gallery.initialize();
-  gallery.loadArea = "albums";
-  gallery.loadAlbums(categories);
-</script>
+
 

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

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