Update galleries_controller.rb

merge change with eric's

app/controllers/galleries_controller.rb

@@ -17,53 +17,49 @@ class GalleriesController < ApplicationController
     tags << tag0
     tags << tag1
   end
-	def index
+  def index
-      albums = Album.filter_by_categories.filter_by_tags.asc(:order)
+    albums = Album.filter_by_categories.filter_by_tags.asc(:order)
-      galleries = albums.collect do |a|
+    galleries = albums.collect do |a|
-        doc = Nokogiri::HTML(a.description.to_s)
+      doc = Nokogiri::HTML(a.description.to_s)
-        alt_text = doc.text.empty? ? 'gallery image' : doc.text
+      alt_text = doc.text.empty? ? 'gallery image' : doc.text
-        {
+      {
-          "album-name" => a.name,
+        "album-name" => a.name,
-          "album-description" => a.description,
+        "album-description" => a.description,
-          "alt_title" => alt_text,
+        "alt_title" => alt_text,
-          "link_to_show" =>  OrbitHelper.url_to_show(a.to_param),
+        "link_to_show" =>  OrbitHelper.url_to_show(a.to_param),
-          "thumb-src" => a.cover_path || "/assets/gallery/default.jpg"
+        "thumb-src" => a.cover_path || "/assets/gallery/default.jpg"
-        }
+      }
-      end
+    end
     {
       "albums" => galleries,
       "extras" => {"widget-title"=>"Gallery"},
       "total_pages" => albums.total_pages
     }
-
   end
-
   def show
     params = OrbitHelper.params
     album = Album.find_by_param(params[:uid])
     flag = show_desc?
-  	images = album.album_images.asc(:order).collect do |a|
+    images = album.album_images.asc(:order).collect do |a|
       alt_text = (a.description.nil? || a.description == "" ? "gallery image" : a.description)
-	    {
+      {
         "image-description" => a.description,
         "alt_title" => alt_text,
-	      "link_to_show" =>  "/xhr/galleries/theater/" + a.id.to_s,
+        "link_to_show" =>  "/xhr/galleries/theater/" + a.id.to_s,
-	      "thumb-src" => a.file.thumb.url
+        "thumb-src" => a.file.thumb.url
-	    }
-	   end
-      {
-        "images" => images,
-        "data" => {"album-title"=>album.name,
-                  "album-description" => (flag ? "<p><span>#{album.description}</span></p>" : "")}
       }
+    end
+    {
+      "images" => images,
+      "data" => {"album-title"=>album.name,
+                 "album-description" => (flag ? "<p><span>#{album.description}</span></p>" : "")}
+    }
   end
-
   def widget
     tags = OrbitHelper.widget_tags.empty? ? ["all"] : OrbitHelper.widget_tags
     albums = Album.filter_by_widget_categories.filter_by_tags(tags)
     params = OrbitHelper.params
     counts = OrbitHelper.widget_data_count
-    
     images = []
     total_images = 0
     if !albums.blank?
@@ -84,7 +80,6 @@ class GalleriesController < ApplicationController
     end
     images = images.collect do |a|
       alt_text = (a.description.nil? || a.description == "" ? "gallery image" : a.description)
-
       {
         "link_to_show" =>  OrbitHelper.widget_more_url + "/" + a.album.to_param + "#" + a.id.to_s,
         "alt_title" => alt_text,
@@ -93,7 +88,8 @@ class GalleriesController < ApplicationController
         "thumb-large-src" => a.file.thumb_large.url,
         "image_description" => a.description,
         "mobile-src" => a.file.mobile.url,
-        "theater-src" => a.file.theater.url
+        "theater-src" => a.file.theater.url,
+        "album-name" => a.album.name_translations[I18n.locale]
       }
     end
     {
@@ -101,53 +97,50 @@ class GalleriesController < ApplicationController
       "extras" => {"widget-title"=>"Gallery","more_url" => OrbitHelper.widget_more_url}
     }
   end
-
   def imgs(album_id)
     album = Album.find(album_id)
     tag_names = Array.new
     images = album.album_images.asc(:order)
     output =  Array.new
     images.each do |values|
-        alt_text = (values.description.nil? || values.description == "" ? "gallery image" : values.description)
+      alt_text = (values.description.nil? || values.description == "" ? "gallery image" : values.description)
-        output << { _id:  values.id.to_s,
+      output << { _id:  values.id.to_s,
-                     description: values.description,
+                  description: values.description,
-                     title: values.title,
+                  title: values.title,
-                     alt_title: alt_text,
+                  alt_title: alt_text,
-                     url: values.file.url,
+                  url: values.file.url,
-                     file: values.file.as_json[:file],
+                  file: values.file.as_json[:file],
-                     gallery_album_id: values.album_id,
+                  gallery_album_id: values.album_id,
-                     tags: values.tags}
+                  tags: values.tags}
     end
     return output
   end
-
   def theater
     image = AlbumImage.find(params[:id])
     albumid = image.album_id
     album = Album.find(albumid)
     images = album.album_images.asc(:order)
-     data = {
+    data = {
       "album" => album,
       "image" => image.id.to_s,
       "images" => imgs(albumid)
-     }
+    }
-
+    render :json => {"data" => data}.to_json
-   render :json => {"data" => data}.to_json
   end
   private
-    def show_desc?
+  def show_desc?
-        tags = OrbitHelper.page_tags if tags.blank?
+    tags = OrbitHelper.page_tags if tags.blank?
-        tags = [tags].flatten.uniq
+    tags = [tags].flatten.uniq
+    flag = true
+    tag_temp = Tag.all.select{|value| tags.include? value.id.to_s}
+    tag_temp_length = 0
+    tag_temp.each do |value|
+      if value.name==I18n.t('gallery.show_desc')
         flag = true
-        tag_temp = Tag.all.select{|value| tags.include? value.id.to_s}
+      elsif value.name==I18n.t('gallery.not_show_desc')
-        tag_temp_length = 0
+        flag = false
-        tag_temp.each do |value| 
+      end
-          if value.name==I18n.t('gallery.show_desc')
-            flag = true
-          elsif value.name==I18n.t('gallery.not_show_desc')
-            flag = false
-          end
-        end
-        flag
     end
+    flag
+  end
 end