Change naming of 'grid_view' and 'list_view' to 'grid_format' and 'grid_view'.

(view, format and layout are already special words, and I may yet change format to something useful, but not duplicating a term used in another context)

keep the format variable as a symbol wherever it is used.

renamed configuration accessors to 'index_formats' (et al) to be clear about their function.

Author: anitagraham

images/app/controllers/refinery/admin/images_controller.rb

@@ -8,7 +8,7 @@ class ImagesController < ::Refinery::AdminController
               sortable: false,
               conditions: 'parent_id IS NULL'
 
-      before_action :change_list_mode_if_specified, :init_dialog
+      before_action :change_format_if_specified, :init_dialog
 
       def new
         @image = ::Refinery::Image.new if @image.nil?
@@ -166,9 +166,12 @@ def init_dialog
         @conditions = params[:conditions]
       end
 
-      def change_list_mode_if_specified
-        if action_name == 'index' && params[:view].present? && Refinery::Images.image_views.include?(params[:view].to_sym)
-           Refinery::Images.preferred_image_view = params[:view]
+      def change_format_if_specified
+        return unless params[:format].present?
+
+        format = params[:format].to_sym
+        if action_name == 'index' && format && Refinery::Images.index_formats.include?(format)
+           Refinery::Images.preferred_index_format = format
         end
       end
 

images/app/models/refinery/image.rb

@@ -46,7 +46,7 @@ def per_page(dialog = false, has_size_options = false)
 
     # Get a thumbnail job object given a geometry and whether to strip image profiles and comments.
     def thumbnail(options = {})
-      options = { geometry: nil, strip: false }.merge(options)
+      options = { geometry: nil, strip: false, **options}
       geometry = convert_to_geometry(options[:geometry])
       thumbnail = image
       thumbnail = thumbnail.thumb(geometry) if geometry

images/app/viewobjects/image_object.rb

@@ -15,20 +15,22 @@ def initialize(image, context, scope=nil)
   end
 
   def title
-    translated_field(image, :title)
+    translated_field(image, :image_title).titleize
   end
 
   def alt
-    translated_field(image, :alt)
+    translated_field(image, :image_alt).titleize
   end
 
-  def img_element
-    image_fu image, '149x149#c', title: ::I18n.t('edit_title', scope: i18n_scope, title: image.image_title || image.image_alt)
+  def grid_image_attributes
+    { src: image.thumbnail(geometry: Refinery::Images.admin_image_sizes[:grid], strip: true).url,
+      title: ::I18n.t('edit_title', scope: i18n_scope, title: title) }
   end
 
   def filename
     image.image_name
   end
+
   def locales_with_titles
     image.translations
          .reject { |i| i.image_title.blank? }

images/lib/refinery/images/configuration.rb

@@ -6,7 +6,7 @@ module Images
 
     config_accessor :max_image_size, :pages_per_dialog, :pages_per_admin_index,
                     :pages_per_dialog_that_have_size_options, :user_image_sizes, :user_image_ratios,
-                    :image_views, :preferred_image_view, :admin_image_sizes,
+                    :index_formats, :preferred_index_format, :admin_image_sizes,
                     :allowed_mime_types, :allowed_mime_types_msg
 
     self.max_image_size = 5_242_880
@@ -29,8 +29,8 @@ module Images
     }
     self.allowed_mime_types = %w[image/jpeg image/png image/gif image/tiff]
     self.allowed_mime_types_msg = self.allowed_mime_types.to_sentence(last_word_connector: ' or ')
-    self.image_views = [:grid, :list]
-    self.preferred_image_view = :grid
+    self.index_formats = [:grid, :list]
+    self.preferred_index_format = :grid
 
     # Images should always use these changes to the dragonfly defaults
     self.dragonfly_name         = :refinery_images