small ie fix for gallery forntend after routes changed

app/assets/javascripts/mobile.js

@@ -4,7 +4,7 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery
+//= require mobile/jquery-1.7.1
 //= require lib/jquery.preload.min.js
 //= require cycle2
 //= require mobile/jquery.mu.image.resize

app/assets/javascripts/mobile/orbit.mobile.js.erb

@@ -24,10 +24,10 @@ $('#index').live('pageinit',function(){
 	});
 	$(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)});
 	$(this).find(".newpic img").muImageResize({width: 280, height: 200});
-	$('.slideshow').cycle({
-		fx: $effect,
-		timeout: $timeout
-	});
+	// $('.slideshow').cycle({
+	// 	fx: $effect,
+	// 	timeout: $timeout
+	// });
 	$(".newlist").css({
 		"width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30,
 	})
@@ -113,10 +113,10 @@ $(window).bind("orientationchange", function(){
 		});
 
 		$(".slideImg").muImageResize({width: $globalW, height: Math.floor($globalW/720*240)});
-		$('.slideshow').cycle({
-			fx: $effect,
-			timeout: $timeout
-		});
+		// $('.slideshow').cycle({
+		// 	fx: $effect,
+		// 	timeout: $timeout
+		// });
 
 		$(".newlist").css({
 			"width" : $(".newitem").outerWidth()*(Math.floor($globalW/$(".newitem").outerWidth()))+30,

app/assets/stylesheets/mobile/orbit-mobile.css.erb.css

@@ -171,12 +171,19 @@ div[data-role="page"] {
 	float: left;
 	width: 280px;
 	min-height: 490px;
-	max-height: 490px;
+	/*max-height: 490px;*/
 	background-color: #FFFFFF;
 	padding: 10px;
 	margin: 0 10px 10px 0;
 	box-shadow: 0px 3px 5px rgba(0,0,0,.1);
 }
+.content .orbit-cycle-slideshow {
+	height: 300px;
+}
+.content .orbit-cycle-slideshow img {
+	width: 100%;
+	height: auto;
+}
 #index .content .newpic {
 	width: 280px;
 	height: 200px;

app/controllers/application_controller.rb

@@ -238,7 +238,7 @@ class ApplicationController < ActionController::Base
     redirect_to ret
   end
 
-  def get_sorted_and_filtered(object_class, query = nil, objects = nil)  
+  def get_sorted_and_filtered(object_class, query = nil, objects = nil, pagination = true)  
     if params[:filter] || params[:sort] || params[:new_filter]
       @filter = params[:filter]
       new_filter = params[:new_filter]
@@ -346,7 +346,11 @@ class ApplicationController < ActionController::Base
       objects = get_bulletins_for_open_backend(objects)
     end
 
-    Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
+    if pagination
+      Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10)
+    else
+      filter_authorized_objects(objects)
+    end
   end
 
   def get_bulletins_for_open_backend(objects)

app/controllers/default_widget_controller.rb

@@ -70,8 +70,8 @@ class DefaultWidgetController< OrbitWidgetController
         @data_limit = @page_part.widget_data_count.is_a?(Fixnum) ? @page_part.widget_data_count : (@page_part.widget_data_count.to_i rescue 3)
       end
 
-      if params[:click]
-        @data = get_more_btn_data.page(params[:page_main]).per(@data_limit)
+      if params[:filter_category_id] and !params[:filter_category_id].blank?
+        @data = get_filter_data.page(params[:page_main]).per(@data_limit)
         
       elsif @paginate || @search
         if @search
@@ -98,10 +98,13 @@ class DefaultWidgetController< OrbitWidgetController
     end
   end
 
-  def get_more_btn_data
-    filterids = PagePart.find(params[:part_id]).category
-    model = eval(@default_widget["query"])
-    data = model.where(:category_id.in => filterids)
+  def get_filter_data
+    model = @default_widget["query"].classify.constantize
+    if params[:filter_category_id].is_a? Array
+      data = model.where(:category_id.in => params[:filter_category_id])
+    elsif params[:filter_category_id].is_a? String
+      data = model.where(:category_id => params[:filter_category_id])
+    end
     data.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
   end
 

app/controllers/mobile_controller.rb

@@ -7,7 +7,7 @@ class MobileController < ApplicationController
   def index
     date_now = Time.now
     @bulletins = Bulletin.all.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_main]).per(15)
-    @ad_banner = AdBanner.where(title: "Banner")[0]
+    @ad_banner = AdBanner.find(:all, :conditions => {:title => /Home/i})[0]
   end
 
   def announcement

app/controllers/pages_controller.rb

@@ -65,24 +65,24 @@ class PagesController < ApplicationController
     options = ''
     options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
     options << "#{options.blank? ? '?' : '&'}click=#{params[:click]}" unless params[:click].blank?
-    options << "#{options.blank? ? '?' : '&'}part_id=#{params[:page_part_id]}" unless params[:page_part_id].blank?
+    # options << "#{options.blank? ? '?' : '&'}part_id=#{params[:page_part_id]}" unless params[:page_part_id].blank?
 
     if params[:category_id].is_a? Array
-      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id',params[:category_id])}" unless params[:category_id].blank?
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('filter_category_id',params[:category_id])}" unless params[:category_id].blank?
       elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
+        options << "#{options.blank? ? '?' : '&'}filter_category_id=#{params[:category_id]}" unless params[:category_id].blank?
     end
-    
     if params[:tag_id].is_a? Array
-      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('filter_tag_id',params[:tag_id])}" unless params[:tag_id].blank?
       elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
+        options << "#{options.blank? ? '?' : '&'}filter_tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
     end
     
 
     options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
     options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
-    uri = URI::escape(url + options)
+    # uri = URI::escape(url + options)
+    uri = url + options
     #uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
     redirect_to(uri)unless save_from_no_lang_for_page
   end
@@ -96,6 +96,7 @@ class PagesController < ApplicationController
     options << "#{options.blank? ? '?' : '&'}preview=#{params[:preview]}" unless params[:preview].blank?
     options << "#{options.blank? ? '?' : '&'}controller_action=#{params[:controller_action]}" unless params[:controller_action].blank?
     options << "#{options.blank? ? '?' : '&'}clicked_field_name=#{params[:clicked_field_name]}" unless params[:clicked_field_name].blank?
+    options << "#{options.blank? ? '?' : '&'}image_id=#{params[:image_id]}" unless params[:image_id].blank?
     redirect_to(url + options) unless save_from_no_lang_for_page
   end
    
@@ -168,17 +169,32 @@ class PagesController < ApplicationController
     #   end
     #   @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
     #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
+    #   # @item = Item.root.children.where(:module_app_id => module_app.id).first
     #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
     #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
     # end
     # raise PageError,'Missing Frontend Page' if @item.nil?
+
     if params[:page_id]
       @item = Item.find(params[:page_id])
     elsif params[:same_page_id]
       @item = Item.find(params[:same_page_id])
     else
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
-      @item = Item.root.children.where(:module_app_id => module_app.id).first
+      category_ids = params[:category_id] ? (params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]) : []
+      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
+      
+      if !category_ids.blank?
+        @item = Item.where(:category => category_ids).first
+      else
+        if params[:action] && params[:action] == "show_from_link"
+            model = params[:app_action].classify.constantize
+            item = model.find(params[:id])
+            @item = Item.where(:category => [item.category_id.to_s]).first
+        end
+      end
+    
+      @item = Item.root.children.where(:module_app_id => module_app.id).first unless @item
     end
     raise PageError,'Missing Frontend Page' if @item.nil?
   end

lib/orbit_app/helper/default_widget_tag_helper.rb

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

lib/parsers/parser_front_end.rb

@@ -19,7 +19,6 @@ module ParserFrontEnd
   end
 
   def parse_page_content(page,args={})
-
      args["category_id"] = args["category_id"].gsub(/\"|\[|\]/,'').split(",").each(&:strip!) if !args["category_id"].blank? and args["category_id"].is_a?(String)
      args["tag_id"] = args["tag_id"].gsub(/\"|\[|\]/,'').split(",").each(&:strip!) if  !args["tag_id"].blank? and args["tag_id"].is_a? String
     # tag = params[:tag_id].blank? ? page[:tag] : params[:tag_id]
@@ -48,7 +47,9 @@ 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?
+        ar = args.to_param
+        ar = URI.unescape(ar)
+        ret << (ret.include?("?") ? "&#{ar}" : "?#{ar}") if args.present?
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
       end
       front.swap(fragment)

lib/tasks/gallery.rake

@@ -0,0 +1,23 @@
+namespace :gallery do
+  task :migrate_albums => :environment do
+  	@albums = GalleryAlbum.all
+  	@albums.each do |album|
+  		newalbum = Album.new
+  		newalbum.name = album.name
+  		newalbum.description = album.description
+  		newalbum.cover = album.cover
+  		newalbum.cover_path = album.cover_path
+  		newalbum.tag_names = album.tag_names
+  		newalbum.category_id = album.category_id
+  		newalbum.save!
+  		@images = album.gallery_images
+  		@images.each do |image|
+  			img = newalbum.album_images.new
+  			img.title = image.title
+  			img.description = image.description
+  			img.file = image.file
+  			img.save!
+  		end
+  	end
+  end
+end

lib/tasks/migrate.rake

@@ -122,7 +122,7 @@ namespace :migrate do
       a.widgets = {}
       a.widgets[:widget1] = []
       a.widget_options_fields_i18n = {"widget1"=>{"vertical"=>"gallery.widget_option.vertical", "horizontal"=>"gallery.widget_option.horizontal", "album_id"=>"gallery.album"}} 
-      a.widget_options = {"widget1"=>{"vertical"=>[1, 2], "horizontal"=>[1, 2, 3, 4, 5, 6], "album_id"=>{"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}}} 
+      a.widget_options = {"widget1"=>{"vertical"=>[1, 2], "horizontal"=>[1, 2, 3, 4, 5, 6], "album_id"=>{"query"=>"Album.all", "value"=>:id, "label"=>:name}}} 
       a.save  
     end
     

lib/tasks/new_ui.rake

@@ -5,7 +5,7 @@ namespace :new_ui do
                   %w(ask ask_question ask_category),
                   %w(asset asset),
                   %w(faq qa),
-                  %w(gallery gallery_album gallery_category),
+                  %w(gallery album gallery_category),
                   %w(location location),
                   %w(personal_book writing_book),
                   %w(personal_conference writing_conference),

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

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

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

@@ -228,8 +228,8 @@ var galleryAPI = function(){
 					next = imagecount + 1;
 					prev = imagecount - 1;
 				}
-				$(".navN").attr({"href":imageArray[next]._id,"data-content":imageArray[next].file.url});
-				$(".navP").attr({"href":imageArray[prev]._id,"data-content":imageArray[prev].file.url});
+				$(".navN").attr({"href":imageArray[next]._id,"data-content":imageArray[next].file.theater.url});
+				$(".navP").attr({"href":imageArray[prev]._id,"data-content":imageArray[prev].file.theater.url});
 			};
 			if(imageArray.length > 1)
 				updateNavigation();

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

@@ -8,7 +8,7 @@ var galleryAPI = function(){
 	g = this;
 	this.urlVars = rcom.getUrlVars();
 	this.albumArea = $("#orbit_gallery");
-	this.loadArea = null;
+	this.loadArea = "theater";
 	this.tagList = $(".taglist ul");
 	this.loading = $("#loading");
 	// this.authenticated = false;
@@ -19,7 +19,7 @@ var galleryAPI = function(){
 				if(photo_id){
 					var params = rcom.getUrlVars();
 					var url = window.location.href.split("?")[0];
-					params["id"] = photo_id;
+					params["image_id"] = photo_id;
 					for(i=0;i<params.length;i++){
 						if(i == 0)
 							url+="?"+params[i]+"="+params[params[i]];
@@ -34,7 +34,7 @@ var galleryAPI = function(){
 
 	}
 
-	this.loadTheater = function(id){
+	this.loadTheater = function(albumid,id){
 		var imageArray;
 		var imagecount = 0;
 		// var picHeight = 0;
@@ -163,7 +163,6 @@ var galleryAPI = function(){
 						});
 					}else{
 						$img.attr({"src":dom.attr("data-content")}).css("height","auto").load(function(){
-							console.log(dom.attr("data-content"));
 							g.loadcomplete();
 							$img.fadeIn(200);
 						});;
@@ -174,9 +173,8 @@ var galleryAPI = function(){
 	 				$slidelist.stop().animate({'height':'0px'}, 300);
 					$slidelist.find("ul").hide();
 					if(rcom.getInternetExplorerVersion() == -1){
-
 					    if(pageurl!=window.location){
-					    	pageurl = window.location.pathname+"?id="+pageurl+"&controller_action=theater";
+					    	pageurl = window.location.pathname+"?id="+albumid+"&controller_action=theater&image_id="+pageurl;
 					      window.history.pushState({path:pageurl},'',pageurl);
 					    }
 					}else{
@@ -205,8 +203,8 @@ var galleryAPI = function(){
 					next = imagecount + 1;
 					prev = imagecount - 1;
 				}
-				$(".navN").attr({"href":imageArray[next]._id,"data-content":imageArray[next].file.url});
-				$(".navP").attr({"href":imageArray[prev]._id,"data-content":imageArray[prev].file.url});
+				$(".navN").attr({"href":imageArray[next]._id,"data-content":imageArray[next].file.theater.url});
+				$(".navP").attr({"href":imageArray[prev]._id,"data-content":imageArray[prev].file.theater.url});
 			};
 			if(imageArray.length > 1)
 				updateNavigation();

vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/album_images_controller.rb

@@ -6,32 +6,32 @@ class Panel::Gallery::BackEnd::AlbumImagesController < OrbitBackendController
 
 	def show
 		@tags = get_tags
-		@image = GalleryImage.find(params[:id])
-		@albumid = @image.gallery_album_id
-		@album = GalleryAlbum.find(@albumid)
-		@images = @album.gallery_images.all
+		@image = AlbumImage.find(params[:id])
+		@albumid = @image.album_id
+		@album = Album.find(@albumid)
+		@images = @album.album_images.all
 	end
 
 
 	def destroy
 		images = params['images']
 		images.each do |image|
-			img = GalleryImage.find(image)
+			img = AlbumImage.find(image)
 			img.delete
 		end
 		if params['delete_cover'] == "true"
-			album = GalleryAlbum.find(params['id'])
+			album = Album.find(params['id'])
 			album.update_attributes(:cover=>"default",:cover_path => nil)
 		end
 		render :json =>{"success"=>true}.to_json
 	end
 
 	def update_image
-		image = GalleryImage.find(params[:image_id])
-		image.update_attributes(params[:gallery_image])
+		image = AlbumImage.find(params[:image_id])
+		image.update_attributes(params[:album_image])
 		image.save
-		@album = GalleryAlbum.find(image.gallery_album_id.to_s)
-		@images = @album.gallery_images
+		@album = Album.find(image.album_id.to_s)
+		@images = @album.album_images
 	    @image_content = []
 	    @images.each do |image|
 	      @image_content << {"id" => image.id.to_s, "description" => image.description_translations,"tags" => image.tagged_ids}
@@ -42,11 +42,11 @@ class Panel::Gallery::BackEnd::AlbumImagesController < OrbitBackendController
 	def delete_photos
 		images = params['images']
 		images.each do |image|
-			img = GalleryImage.find(image)
+			img = AlbumImage.find(image)
 			img.delete
 		end
 		if params['delete_cover'] == "true"
-			album = GalleryAlbum.find(params['album_id'])
+			album = Album.find(params['album_id'])
 			album.update_attributes(:cover=>"default",:cover_path => nil)
 		end
 		render :json =>{"success"=>true}.to_json
@@ -57,13 +57,13 @@ class Panel::Gallery::BackEnd::AlbumImagesController < OrbitBackendController
 		tags = params[:tag_ids]
 		i = nil
 		images.each do |image|
-			img = GalleryImage.find(image)
+			img = AlbumImage.find(image)
 			img.tagged_ids = tags
 			img.save
 			i = img
 		end
-		@album = GalleryAlbum.find(i.gallery_album_id.to_s)
-		@images = @album.gallery_images
+		@album = Album.find(i.album_id.to_s)
+		@images = @album.album_images
 	    @image_content = []
 	    @images.each do |image|
 	      @image_content << {"id" => image.id.to_s, "description" => image.description_translations,"tags" => image.tagged_ids}

vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb

@@ -13,12 +13,13 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
     @categories = get_categories_for_index
     @tags = get_tags
     category_ids = @categories.collect{|t| t.id}
-    @albums = get_sorted_and_filtered("gallery_album", :category_id.in => category_ids)
+    @albums = get_sorted_and_filtered("album", :category_id.in => category_ids)
+
   end
 
   def show
-    @album = GalleryAlbum.find(params[:id])
-    @images = @album.gallery_images
+    @album = Album.find(params[:id])
+    @images = @album.album_images
     @image_content = []
     @images.each do |image|
       @image_content << {"id" => image.id.to_s, "description" => image.description_translations,"tags" => image.tagged_ids}
@@ -33,12 +34,12 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
   def new
     @categories = get_categories_for_index
     @tags = get_tags 
-    @album = GalleryAlbum.new
+    @album = Album.new
    
   end
 
   def create
-    album = GalleryAlbum.new(params[:gallery_album])
+    album = Album.new(params[:album])
     album.save!
     redirect_to panel_gallery_back_end_albums_path
   end
@@ -46,31 +47,31 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
 
 
   def destroy
-    album = GalleryAlbum.find(params[:id])
+    album = Album.find(params[:id])
     album.destroy
     redirect_to panel_gallery_back_end_albums_path
 
   end
 
   def edit
-      @album = GalleryAlbum.find(params[:id])
+      @album = Album.find(params[:id])
       @tags = get_tags
   end
 
   def set_cover
     if params[:set_cover] == "true"
-      album = GalleryAlbum.find(params[:album_id])
-      image = GalleryImage.find(params[:image_id])
+      album = Album.find(params[:album_id])
+      image = AlbumImage.find(params[:image_id])
       album.update_attributes({:cover_path => image.file.thumb.url, :cover=>params[:image_id]})
     else
-      album = GalleryAlbum.find(params[:album_id])
+      album = Album.find(params[:album_id])
       album.update_attributes({:cover_path => nil, :cover=>"default"})
     end
     render :json =>{"success"=>true}.to_json
   end
 
   def get_album_json
-    albums = GalleryAlbum.all
+    albums = Album.all
     output = Array.new
 
     albums.each do |album|
@@ -96,8 +97,8 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
   end
 
   def get_imgs_json
-    album = GalleryAlbum.find(params[:album_id])
-    images = album.gallery_images.all
+    album = Album.find(params[:album_id])
+    images = album.album_images.all
     output = Array.new
 
     images.each do |image|
@@ -119,9 +120,9 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
   end
 
   def imgs
-    @album = GalleryAlbum.find(params[:album_id])
+    @album = Album.find(params[:album_id])
     @tag_names = Array.new
-    @images = @album.gallery_images.all
+    @images = @album.album_images.all
     @output =  Array.new
     @images.each do |values|
       tags = Array.new
@@ -133,7 +134,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
                    description: values.description,
                    title: values.title,
                    file: values.file.as_json[:file],
-                   gallery_album_id: values.gallery_album_id,
+                   gallery_album_id: values.album_id,
                    tag_ids: values.tag_ids,
                    tag_names: tags}
     end
@@ -143,11 +144,11 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
 
 
   def upload_image
-    @album = GalleryAlbum.find(params[:album_id])
+    @album = Album.find(params[:album_id])
     @files = params['files']
     a = Array.new
     @files.each do |file|
-      @image = @album.gallery_images.new
+      @image = @album.album_images.new
       @image.file = file
       @image.save!
       a << {"thumbnail_url"=>@image.file.thumb.url,"url"=>panel_gallery_back_end_album_image_path(@image)}
@@ -157,21 +158,21 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
 
   def new_images 
     if params[:last_image_id] != ""
-      @lastimage = GalleryImage.find(params[:last_image_id])
-      @album = GalleryAlbum.find(params[:album_id])
-      @newimages = @album.gallery_images.where(:created_at.gt => @lastimage.created_at)
+      @lastimage = AlbumImage.find(params[:last_image_id])
+      @album = Album.find(params[:album_id])
+      @newimages = @album.album_images.where(:created_at.gt => @lastimage.created_at)
     else
-      @album = GalleryAlbum.find(params[:album_id])
-      @newimages = @album.gallery_images
+      @album = Album.find(params[:album_id])
+      @newimages = @album.album_images
     end
     render :layout=>false
   end
 
 
   def images_tags
-    album = GalleryAlbum.find(params[:album_id])
+    album = Album.find(params[:album_id])
     tags = Array.new
-    images = album.gallery_images.all
+    images = album.album_images.all
     images.each do |image|
       tags << {"id"=>image.id, "tags" => image.tag_ids}
     end
@@ -179,10 +180,10 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
   end
 
   def update
-    @album = GalleryAlbum.find(params[:id])
+    @album = Album.find(params[:id])
     tagsToDestroy = []
     tagsToAdd = []
-    new_tags = params[:gallery_album][:tag_ids]
+    new_tags = params[:album][:tag_ids]
     old_tags = @album.tagged_ids
     old_tags.each do |tag|
        if !new_tags.include?(tag)
@@ -197,14 +198,14 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
       end
     end
     update_children_image_tag(tagsToDestroy,tagsToAdd)
-    @album.update_attributes(params[:gallery_album])
+    @album.update_attributes(params[:album])
     redirect_to panel_gallery_back_end_album_path(@album)
   end
 
   def update_children_image_tag(tagsToDestroy,tagsToAdd)
       # tagsToDestroy will contain  all tag ids which have to be deleted from the galley_images
-      # tagsToAdd will contain all tag ids which ve to be added in tall gallery_images
-      @images = GalleryImage.all
+      # tagsToAdd will contain all tag ids which ve to be added in tall album_images
+      @images = AlbumImage.all
       @images.each do |image|
         image.tagged_ids.concat(tagsToAdd)
         tagsToDestroy.each do |tag|

vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb

@@ -1,16 +1,16 @@
 class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
   def index
-    @albums = GalleryAlbum.where(:category_id.in => params[:category_id])
+    @albums = Album.where(:category_id.in => params[:category_id])
   end
 
   def show
-    @album = GalleryAlbum.find(params[:id])
-    @images = @album.gallery_images
+    @album = Album.find(params[:id])
+    @images = @album.album_images
   end
 
   def imgs
-    @album = GalleryAlbum.find(params[:id])
-    @images = @album.gallery_images.all
+    @album = Album.find(params[:id])
+    @images = @album.album_images.all
     @output =  Array.new
     @images.each do |values|
       tags = Tag.find(values.tagged_ids).map{|t| t.name}
@@ -19,7 +19,7 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
                   :description => values.description,
                   :title => values.title,
                   :file => values.file.as_json[:file],
-                  :gallery_album_id => values.gallery_album_id,
+                  :gallery_album_id => values.album_id,
                   :tag_ids => values.tag_ids,
                   :tag_names => tags}
     end
@@ -27,9 +27,9 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
   end
 
   def images_tags
-    album = GalleryAlbum.find(params[:album_id])
+    album = Album.find(params[:album_id])
     tags = Array.new
-    images = album.gallery_images.all
+    images = album.album_images.all
     images.each do |image|
       tags << {"id"=>image.id, "tags" => image.tag_ids}
     end
@@ -37,10 +37,10 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
   end
 
   def theater
-    @image = GalleryImage.find(params[:id])
-    @albumid = @image.gallery_album_id
-    @album = GalleryAlbum.find(@albumid)
-    @images = @album.gallery_images.all
+    @image = AlbumImage.find(params[:image_id])
+    @albumid = @image.album_id
+    @album = Album.find(@albumid)
+    @images = @album.album_images.all
     tags = @album.tagged_ids
     @tagnames = Tag.find(tags).map{|t| t.name}
     @back_link = panel_gallery_front_end_album_path(@albumid)

vendor/built_in_modules/gallery/app/controllers/panel/gallery/widget/albums_controller.rb

@@ -6,8 +6,8 @@ class Panel::Gallery::Widget::AlbumsController < OrbitWidgetController
 		vertical = @part.widget_options['vertical'].to_i rescue 0
 		horizontal = @part.widget_options['horizontal'].to_i rescue 0
 		
-		@album = GalleryAlbum.find(@part.widget_options['album_id']) rescue nil
-		@album_images = @album.gallery_images if @album
+		@album = Album.find(@part.widget_options['album_id']) rescue nil
+		@album_images = @album.album_images if @album
 
 		
 		@settings = {"vertical"=>vertical,"horizontal"=>horizontal}   #[note] horizontal has it's limitation from 2 to 6
@@ -16,27 +16,34 @@ class Panel::Gallery::Widget::AlbumsController < OrbitWidgetController
 		@rnd = Random.new
 		@images = []
 
-		if @album_images.count > @total
-			@randoms = []
-			until @randoms.count == @total do
-				r = @rnd.rand(0...@album_images.count)
-				if !@randoms.include?r
-					@randoms << r
-					image = @album_images[r]
-					values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
+		if !@album_images.nil?
+			if @album_images.count > @total
+				@randoms = []
+				until @randoms.count == @total do
+					r = @rnd.rand(0...@album_images.count)
+					if !@randoms.include?r
+						@randoms << r
+						image = @album_images[r]
+						values = {"show_link"=>theater_panel_gallery_front_end_album_path(@album,:image_id=>image),"thumb"=>image.file.thumb.url}
+						@images << values
+					end
+				end
+			elsif @album_images.count == @total
+				@album_images.each do |image|
+					values = {"show_link"=>theater_panel_gallery_front_end_album_path(@album,:image_id=>image),"thumb"=>image.file.thumb.url}
+					@images << values
+				end
+			else
+				@album_images.each do |image|
+					values = {"show_link"=>theater_panel_gallery_front_end_album_path(@album,:image_id=>image),"thumb"=>image.file.thumb.url}
+					@images << values
+				end
+				until @images.count == @total do
+					values = {"show_link"=>"javascript:void(0);","thumb"=>"assets/gallery/nodata.jpg"}
 					@images << values
 				end
 			end
-		elsif @album_images.count == @total
-			@album_images.each do |image|
-				values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
-				@images << values
-			end
 		else
-			@album_images.each do |image|
-				values = {"show_link"=>theater_panel_gallery_front_end_album_path(image),"thumb"=>image.file.thumb.url}
-				@images << values
-			end
 			until @images.count == @total do
 				values = {"show_link"=>"javascript:void(0);","thumb"=>"assets/gallery/nodata.jpg"}
 				@images << values

vendor/built_in_modules/gallery/app/models/album.rb

@@ -1,4 +1,4 @@
-class GalleryAlbum
+class Album
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -12,7 +12,7 @@ class GalleryAlbum
   field :tag_names
 
 	# has_and_belongs_to_many :tags, :class_name => "GalleryTag"
-  has_many :gallery_images, :autosave => true, :dependent => :destroy
-  accepts_nested_attributes_for :gallery_images, :allow_destroy => true
+  has_many :album_images, :autosave => true, :dependent => :destroy
+  accepts_nested_attributes_for :album_images, :allow_destroy => true
  
 end

vendor/built_in_modules/gallery/app/models/album_image.rb

@@ -1,4 +1,4 @@
-class GalleryImage
+class AlbumImage
   include Mongoid::Document
   include Mongoid::Timestamps
   include OrbitTag::Taggable
@@ -10,6 +10,6 @@ class GalleryImage
 
 	# has_and_belongs_to_many :tags, :class_name => "GalleryTag"
 
-	belongs_to :gallery_album
+	belongs_to :album
 
 end

vendor/built_in_modules/gallery/app/models/gallery_category.rb

@@ -9,7 +9,7 @@ class GalleryCategory
 
   field :name, localize: true
 
-  has_many :gallery_albums, :autosave => true, :dependent => :destroy
+  has_many :albums, :autosave => true, :dependent => :destroy
 
   def title
     name

vendor/built_in_modules/gallery/app/uploaders/gallery_uploader.rb

@@ -53,6 +53,10 @@ class GalleryUploader < CarrierWave::Uploader::Base
     process :resize_to_fill => [200, 200]
   end
 
+  version :theater do
+    process :resize_to_limit => [1920, 1080]
+  end
+
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   # def extension_white_list

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/album_images/show.html.erb

@@ -6,7 +6,7 @@
     <div id="imgholder">
       <div class="rslide" style="position:relative; width:100%;">
         <div class="rslideinside"><div id="loading" style="display:none;"></div>
-          <div class="comp" id='main_pic' data-content='<%= @image.gallery_album_id %>'><a href="" id="nextpic" class="navN" title="下一張" onclick="return false;" ><img src="<%= @image.file.url %>" alt="" /></a></div>
+          <div class="comp" id='main_pic' data-content='<%= @image.album_id %>'><a href="" id="nextpic" class="navN" title="下一張" onclick="return false;" ><img src="<%= @image.file.theater.url %>" alt="" /></a></div>
           <div class="rslidenav">
             <a href="" class="navP" title="上一張" onclick="return false;">Prev</a>
             <a href="" class="navN" title="下一張" onclick="return false;">Next</a>
@@ -15,7 +15,7 @@
         <div class="slidelist">
           <ul id='galleryimagelist' style="display:none;">
             <% @images.each_with_index do |image,i| %>
-              <li for="<%= i %>"><a href="<%= image.id %>" class="list_element" data-content="<%= image.file.url %>" onclick="return false;"><img src="<%= image.file.thumb.url %>" alt="" onload="gallery.loadcomplete();" /></a></li>
+              <li for="<%= i %>"><a href="<%= image.id %>" class="list_element" data-content="<%= image.file.theater.url %>" onclick="return false;"><img src="<%= image.file.thumb.url %>" alt="" onload="gallery.loadcomplete();" /></a></li>
             <% end  %>
           </ul>
         </div>
@@ -30,34 +30,6 @@
       </div>
     </div>
   </div>
-
-  <% if is_admin? %> 
-  <!--  #TODO or 類別屬於他 -->
-  <!-- tag part -->
-  <div id="tag_panel" class="my_scroll">
-    <div class="scrollbar">
-      <div class="track">
-        <div class="thumb">
-          <div class="end"></div>
-        </div>
-      </div>
-    </div>
-     <% 
-        @locales = Array.new
-        @site_valid_locales.each do |locale|
-          @locales << locale
-        end
-      %>
-   
-    <%# if @authenticated %>
-     <div class="tag_search"><div class="icon-search"></div><input type="text" value="<%= t('gallery.search_tags') %>" onblur="if(this.value=='')this.value='<%= t('gallery.search_tags') %>';" onfocus="if(this.value=='<%= t("gallery.search_tags") %>')this.value='';" id="tag_search_box"> <div class="tag_save"><a class="btn bt-save"><i class="icon-ok"></i><%= I18n.t("gallery.save") %></a></div></div>
-    <%# end %>
-    
-  </div>
-
-  <%end%>
-  
-  <!-- tag end -->
   <div class="form-actions form-fixed pagination-right rghead">
   <div class="rgfn">
     <%= link_to (content_tag(:i,I18n.t("gallery.back_to_photos"),:class=>"icon-arrow-left icon-black")),"",:class=>"bt-back btn pull-left btn-primary",:title=>I18n.t("gallery.back_to_photos")%>

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/_form.html.erb

@@ -50,7 +50,7 @@
                     <div class="controls" data-toggle="buttons-checkbox">
                       <%@tags.each do |tag|%>
                           <label class="checkbox inline btn <%= 'active' if @album.tag_ids.include?(tag.id) %>">
-                            <%= check_box_tag 'gallery_album[tag_ids][]', tag.id, @album.tag_ids.include?(tag.id)%>
+                            <%= check_box_tag 'album[tag_ids][]', tag.id, @album.tag_ids.include?(tag.id)%>
                             <%= tag.name %>
                           </label>
                       <%end %>

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

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

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

@@ -6,7 +6,7 @@
     <div id="imgholder">
       <div class="rslide" style="position:relative; width:100%;">
         <div class="rslideinside"><div id="loading" style="display:none;"></div>
-          <div class="comp" id='main_pic' data-content='<%= @image.gallery_album_id %>'><a href="" id="nextpic" class="navN" title="下一張" onclick="return false;" ><img src="<%= @image.file.url %>" alt="" /></a></div>
+          <div class="comp" id='main_pic' data-content='<%= @image.album_id %>'><a href="" id="nextpic" class="navN" title="下一張" onclick="return false;" ><img src="<%= @image.file.theater.url %>" alt="" /></a></div>
           <div class="rslidenav">
             <a href="" class="navP" title="上一張" onclick="return false;">Prev</a>
             <a href="" class="navN" title="下一張" onclick="return false;">Next</a>
@@ -15,7 +15,7 @@
         <div class="slidelist">
           <ul id='galleryimagelist' style="display:none;">
             <% @images.each_with_index do |image,i| %>
-              <li for="<%= i %>"><a href="<%= image.id %>" class="list_element" data-content="<%= image.file.url %>" onclick="return false;"><img src="<%= image.file.thumb.url %>" alt="" /></a></li>
+              <li for="<%= i %>"><a href="<%= image.id %>" class="list_element" data-content="<%= image.file.theater.url %>" onclick="return false;"><img src="<%= image.file.thumb.url %>" alt="" /></a></li>
             <% end  %>
           </ul>
         </div>
@@ -57,8 +57,7 @@
   galleryAPI.prototype.locale = "<%= I18n.locale %>";
     	var gallery = new galleryAPI();
     	gallery.initialize();
-    	gallery.loadArea = "theater";
-    	gallery.loadTheater("<%= params[:id] %>");
+    	gallery.loadTheater("<%= params[:id] %>","<%= params[:image_id] %>");
 </script>
 
 

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/edit_album.html.erb

@@ -19,7 +19,7 @@
 
 			<div class="albumname_edit">
 				<label for=""><%= t("gallery.album_name") %></label>
-				<div class="inputui rginput rgih26 w380"><input type="text" name="gallery_album[name_translations][<%= locale %>]" value="<%= @album_name[locale] %>" class="txtchange" /></div>
+				<div class="inputui rginput rgih26 w380"><input type="text" name="album[name_translations][<%= locale %>]" value="<%= @album_name[locale] %>" class="txtchange" /></div>
 			</div>
 
 			<div class='description_loader'>

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/theater.html.erb

@@ -7,7 +7,7 @@
 	</div> -->
 	<div class="rslide" style="position:relative; width:100%;">
 		<div class="rslideinside"><div id="loading" style="display:none;"></div>
-			<div class="comp" id='main_pic' data-content='<%= @image.gallery_album_id %>'><a href="" id="nextpic" class="navN" title="下一張" onclick="return false;" ><img src="<%= @image.file.url %>" alt="" /></a></div>
+			<div class="comp" id='main_pic' data-content='<%= @image.album_id %>'><a href="" id="nextpic" class="navN" title="下一張" onclick="return false;" ><img src="<%= @image.file.url %>" alt="" /></a></div>
 			<div class="rslidenav">
 				<a href="" class="navP" title="上一張" onclick="return false;">Prev</a>
 				<a href="" class="navN" title="下一張" onclick="return false;">Next</a>

vendor/built_in_modules/gallery/init.rb

@@ -26,7 +26,7 @@ module Gallery
       #   image :image
       # end
 
-      categories_query 'GalleryCategory.all'
+      # categories_query 'GalleryCategory.all'
       # tags_query 'GalleryTag.all'
 
       #* customize_widget "albums","gallery.widget.albums",:fields=>[],:style=>[],:options=>{"widget1"=>{"vertical"=>[1, 2], "horizontal"=>[1, 2, 3, 4, 5, 6], "album_id"=>{"query"=>"GalleryAlbum.all", "value"=>:id, "label"=>:name}}} 
@@ -37,7 +37,7 @@ module Gallery
         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}
+        options "album_id",:i18n =>"gallery.album",:options_item => {"query"=>"Album.all", "value"=>:id, "label"=>:name}
       end
 
     end

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

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