gluttonberg-core 2.6.4 → 3.0.0

data/app/observers/gluttonberg/page_localization_observer.rb

@@ -1,15 +1,16 @@
 module Gluttonberg
+  # Observe PageLocalization for any path/slug related changes
   class PageLocalizationObserver < ActiveRecord::Observer
     observe PageLocalization
 
-    # Every time the localization is updated, we need to check to see if the 
+    # Every time the localization is updated, we need to check to see if the
     # slug has been updated. If it has, we need to update it's cached path
     # and also the paths for all it's decendants.
     def before_validation(page_localization)
       if page_localization.slug_changed? || page_localization.new_record?
         page_localization.paths_need_recaching = true
-        page_localization.regenerate_path 
-      elsif page_localization.path_changed? 
+        page_localization.regenerate_path
+      elsif page_localization.path_changed?
         page_localization.paths_need_recaching = true
       end
     end
@@ -21,18 +22,27 @@ module Gluttonberg
     def after_save(page_localization)
       if page_localization.paths_need_recaching? and !page_localization.page.children.blank?
         decendant_pages = page_localization.page.children
-        
+
         decendant_pages.each do |d_p|
-          decendants = d_p.localizations.find( :all , :conditions => {:locale_id => page_localization.locale_id})          
-          unless decendants.blank?
-            decendants.each do |l| 
-              l.paths_need_recaching = true
-              l.update_attributes(:path => "#{page_localization.path}/#{l.slug || l.page.slug}") 
-            end 
-          end
-        end#loop  
+          update_decendants(page_localization, d_p)
+        end
       end
     end
+
+    private
+      def update_decendants(page_localization, d_p)
+        decendants = d_p.localizations.where(:locale_id => page_localization.locale_id).all
+        unless decendants.blank?
+          decendants.each do |l|
+            l.paths_need_recaching = true
+            if page_localization.page.home
+              l.update_attributes(:path => "#{l.slug || l.page.slug}")
+            else
+              l.update_attributes(:path => "#{page_localization.path}/#{l.slug || l.page.slug}")
+            end
+          end
+        end
+      end
   end
 end
 

data/app/observers/gluttonberg/page_observer.rb

@@ -1,56 +1,71 @@
 module Gluttonberg
+  # Observe Page, if there is any change occurred
+  # then update its related localizations and contents
   class PageObserver < ActiveRecord::Observer
 
     observe Page
 
-    # Generate a series of content models for this page based on the specified
-    # template. These models will be empty, but ready to be displayed in the 
+    # Generate a series of content model objects for this page based on the specified
+    # template. These models will be empty, but ready to be displayed in the
     # admin interface for editing.
     def after_create(page)
-      puts("Generating page localizations")
-      Locale.all.each do |locale|
-          loc = page.localizations.create(
-            :name     => page.name,
-            :locale_id   => locale.id
-          )
-      end
-        
-      unless page.description.sections.empty?
-        puts("Generating stubbed content for new page")
-        page.description.sections.each do |name, section|
-          # Create the content
-              association = page.send(section[:type].to_s.pluralize)
-              content = association.create(:section_name => name)
-              # Create each localization
-               if content.class.localized?
-                   page.localizations.all.each do |localization|
-                     content.localizations.create(:parent => content, :page_localization => localization)
-                   end
-              end
-        end
-      end
+      page.current_user_id = page.user_id
+      create_page_localizations(page)
+      create_page_contents(page)
     end
-    
-    
-    def before_update(page)    
-      # This checks to make see if we need to regenerate paths for child-pages
-      # and adds a flag if it does.
-      if page.parent_id_changed? || page.slug_changed? 
+
+    # This checks to make sure if we need to regenerate paths for child-pages
+    # and adds a flag if it does.
+    def before_update(page)
+      if page.parent_id_changed? || page.slug_changed?
         page.paths_need_recaching = true
       end
     end
 
+    # This has the page localizations regenerate their path if the slug or
+    # parent for this page has changed.
     def after_update(page)
-      # This has the page localizations regenerate their path if the slug or 
-      # parent for this page has changed.
       if page.paths_need_recaching?
         page.localizations.each { |l| l.regenerate_path! }
-      end      
+      end
     end
-    
+
     # If parent page is removed then make sure its children either orphaned or child of their grandfather
     def after_destroy(page)
-        Page.delete_all(:parent_id => page.id)  
+      Page.delete_all(:parent_id => page.id)
     end
+
+    private
+      def create_page_localizations(page)
+        Locale.all.each do |locale|
+          loc = page.localizations.create(
+            :name     => page.name,
+            :locale_id   => locale.id
+          )
+        end
+      end
+
+      def create_page_contents(page)
+        unless page.description.sections.empty?
+          page.description.sections.each do |name, section|
+            # Create the content
+            create_page_content(page, name, section)
+          end
+        end
+      end
+
+      def create_page_content(page, name, section)
+        association = page.send(section[:type].to_s.pluralize)
+        content = association.new(:section_name => name)
+        content.page.current_user_id = page.current_user_id
+        content.save
+        # Create each localization
+         if content.class.localized?
+          page.localizations.all.each do |localization|
+            localization.page.current_user_id = page.current_user_id
+            content.localizations.create(:parent => content, :page_localization => localization)
+          end
+        end
+      end
   end
 end

data/app/views/gluttonberg/admin/asset_library/assets/_browser_root.html.haml

@@ -40,10 +40,7 @@
     - unless @collections.empty?
       .accordion#accordion_for_collections
         - for collection in @collections
-          - unless @category.blank? || @category.asset_type_ids.blank?
-            - assets = collection.assets.where({:asset_type_id => @category.asset_type_ids })
-          - else
-            - assets = collection.assets
+          - assets = Gluttonberg::AssetCategory.find_assets_by_category_and_collection(@category_filter, collection)
           - if assets.count > 0
             .accordion-group
               .accordion-heading
@@ -55,20 +52,28 @@
 
   #upload.tab-pane
     - @asset  = Gluttonberg::Asset.new
-    = form_for( @asset , :as => :asset , :url => admin_add_asset_using_ajax_path  ,  :html => { :multipart=>true  , :method => "POST", :class => "nosubnav validation" , :id => "ajax_new_asset_form"} ) do |asset_form|
-      = block("Asset") do
+    = form_for( @asset , :as => :asset , :url => admin_add_asset_using_ajax_path  ,  :html => { :multipart=>true  , :method => "POST", :class => "nosubnav " , :id => "ajax_new_asset_form"} ) do |asset_form|
+      %legend
+        Upload
+      %p.file_to_upload
         = asset_form.label :file , "File to upload"
-        = asset_form.file_field(:file , :class => "required")
+        = asset_form.file_field(:file , :class => "required", :id => "ajax_asset_file")
+      %p
         = asset_form.label :name , "Name"
         = asset_form.text_field(:name, :class => "large required")
-        %br
+
       = render :partial => "collection_select_form" , :locals => {:asset_form => asset_form }
 
       .controls
-        = asset_form.submit("Upload" , :id => "ajax_image_upload", :class => "button button_upload" )
+        = asset_form.submit("Upload" , :id => "ajax_image_upload", :class => "btn btn-success button_upload" )
+        %span.ajax-upload-progress
+          Please wait while file is uploading. 
+          = image_tag("/assets/gb_spinner.gif" )
   #search_tab.tab-pane
+    %p
+      Search by keyword : 
     = render :partial => "search_form"
+    %p
+      Search by date : 
+      = text_field_tag :asset_date_filter, nil, :class => "asset_date_filter", "data-datepicker" => "bsdatepicker"
     #search_tab_results
-
-:javascript
-  //$(".collapse").collapse({parent: "#accordion_for_collections"})

data/app/views/gluttonberg/admin/asset_library/assets/_form.html.haml

@@ -18,11 +18,9 @@
         %p
           = asset_form.label :alt , "Description"
           = asset_form.text_field(:alt, :class => "large" , :maxlength => 255 )
-          - if Rails.configuration.enable_gallery == true
-            .help
-              "Description" field is also used for image caption in photo galleries.
+
         %p
-          = asset_form.label :artist_name
+          = asset_form.label :artist_name, "Credits"
           = asset_form.text_field(:artist_name, :class => "large" , :maxlength => 255 )
 
         - if Rails.configuration.enable_gallery == true
@@ -30,9 +28,9 @@
             = asset_form.label :link
             = asset_form.text_field(:link, :class => "large" , :maxlength => 255 )
 
-          - if Rails.configuration.enable_gallery == true
-            .help
-              "link" field is also used for image target url in photo galleries.
+        - if @asset.category == "video" || @asset.category == "audio"
+          = asset_form.label :poster_image_id
+          = asset_form.asset_browser :poster_image_id , :class => "attr_poster_image " , :filter => "image"
       .span6
 
         = render :partial => "collection_select_form" , :locals => {:asset_form => asset_form }

data/app/views/gluttonberg/admin/asset_library/assets/browser.html.haml

@@ -1,14 +1,14 @@
 #assetsDialog.modal
   .modal-header
-  
-    %a.close#cancel.button
+
+    %a.close.cancel.button
       ×
     %h3
       Asset Library
-      
+
   .modal-body
     = render :partial => "browser_root"
-    
+
   .modal-footer
-    %a#cancel.btn.btn-danger
+    %a.cancel.btn.btn-danger
       Close

data/app/views/gluttonberg/admin/asset_library/assets/show.html.haml

@@ -27,14 +27,20 @@
             .row-fluid
               .span6
                 %div#preview
-                  %img{:src => @asset.thumb_large_url}
+                  - if @asset.category == 'image'
+                    %img{:src => @asset.thumb_small_url  }
+                  - elsif @asset.category == 'video'
+                    - unless @asset.poster_image.blank?
+                      %img{:src => @asset.poster_image.thumb_small_url  }
                 %br
-                %a{:href=>"#{edit_admin_asset_url(@asset)+breadcrumbs_val}", :class=>"btn"}
-                  Edit
-                %a{:href=>"#{crop_admin_asset_url(@asset)}", :class=>"btn"}
-                  Crop
-                %a{:href=>"#{delete_admin_asset_url(@asset)}", :class=>"btn btn-danger"}
-                  Delete
+                - if can? :edit , @asset
+                  %a{:href=>"#{edit_admin_asset_url(@asset)+breadcrumbs_val}", :class=>"btn"}
+                    Edit
+                  %a{:href=>"#{crop_admin_asset_url(@asset)}", :class=>"btn"}
+                    Crop
+                - if can? :destroy , @asset
+                  %a{:href=>"#{delete_admin_asset_url(@asset)}", :class=>"btn btn-danger"}
+                    Delete
 
               .span4
                 %div.pageBlock

data/app/views/gluttonberg/admin/asset_library/assets/show.json.rabl

@@ -0,0 +1,3 @@
+object @asset
+attributes :id, :name
+node(:small_thumb) { |m| @asset.url_for(:small_thumb) } 

data/app/views/gluttonberg/admin/asset_library/{assets → assets_bulk}/add_assets_in_bulk.html.haml

@@ -26,26 +26,12 @@
             = form_for( @asset , :as => :asset , :url => { :action => :create_assets_in_bulk } ,  :html => { :multipart=>true  , :method => "post", :id => 'asset_bulk',  :class => "nosubnav validation"} ) do |asset_form|
               = gb_error_messages_for(@asset)
 
-              = render :partial => "collection_select_form" , :locals => {:asset_form => asset_form }
+              = render :partial => "/gluttonberg/admin/asset_library/assets/collection_select_form" , :locals => {:asset_form => asset_form }
 
-              = block("File") do
+              %legend
+                File
+              %p
                 = asset_form.label :file , "Please upload a zip folder. System will automatically give names to assets based on file names"
                 = asset_form.file_field(:file , :class => "required")
-
-                %br
-
-              = form_controls(admin_assets_url)
-
-
-      / = form_for( @asset , :as => :asset , :url => { :action => :create_assets_in_bulk } ,  :html => { :multipart=>true  , :method => "post", :class => "nosubnav validation"} ) do |asset_form|
-      /   = gb_error_messages_for(@asset)
-      /
-      /   = render :partial => "collection_select_form" , :locals => {:asset_form => asset_form }
-      /
-      /   = block("File") do
-      /     = asset_form.label :file , "Please upload a zip folder. System will automatically give names to assets based on file names"
-      /     = asset_form.file_field(:file , :class => "required")
-      /
-      /     %br
-      /
-      /   = form_controls(admin_assets_url)
+              %p
+                = form_controls(admin_assets_url)

data/app/views/gluttonberg/admin/asset_library/collections/_form.html.haml

@@ -1,9 +1,12 @@
 = form_for( @collection , :as => :collection , :url => url_opts ,  :html => { :method => method_name, :class => "nosubnav validation"} ) do |collection_form|
   = gb_error_messages_for(@collection)
-  = block("Collection") do
+  %legend
+    Collection
+  %p
     = collection_form.label :name
     = collection_form.text_field(:name , :class => "required")
-  
-  = submit_tag "Create", :class => "btn btn-success"
-  %a{:href => admin_asset_category_path(:category => 'all' , :page => 1 ), :class => "btn btn-danger"}
-    Cancel
+
+  %p
+    = submit_tag "Create", :class => "btn btn-success"
+    %a{:href => admin_asset_category_path(:category => 'all' , :page => 1 ), :class => "btn btn-danger"}
+      Cancel

data/app/views/gluttonberg/admin/asset_library/shared/_asset_browser.html.haml

@@ -0,0 +1,34 @@
+%ul.thumbnails{:id => "title_thumb_#{opts[:id]}"}
+  %li.span4
+    %span.thumbnail.asset_selector_wrapper
+      - unless asset.blank?
+        - if asset.category && asset.category.to_s.downcase == "image"
+          = asset_tag(asset , :small_thumb)
+        - elsif asset.category && asset.category.to_s.downcase == "video"
+          - unless asset.poster_image.blank?
+            = asset_tag(asset.poster_image , :small_thumb)
+      %span.caption
+        - title = if opts[:asset_id].blank?
+          - "Nothing selected"
+        - elsif asset.blank?
+          - "Asset missing!"
+        - else
+          - asset.name
+        %h5{:title => title}
+          = title
+
+        = hidden_field_tag("filter_#{field_name}", opts[:filter] , :id => "filter_#{opts[:id]}" )
+        - html_opts = { :id => opts[:id] , :class => "choose_asset_hidden_field" }
+        - if defined?(form) && form
+          = form.hidden_field(field_name , html_opts )
+        - else
+          = hidden_field_tag(field_name , opts[:asset_id], html_opts )
+
+        %p
+          = link_to("Select", "/admin/browser?filter=#{opts[:filter]}" , { :class =>"btn button choose_button #{opts[:button_class]}" , :rel => opts[:id], :style => "margin-right:5px;" , :data_url => opts[:data_url] })
+
+          - if opts[:remove_button] != false
+            - if defined?(form) && form
+              = form.clear_asset( field_name , opts )
+            - else
+              = clear_asset_tag( field_name , opts )

data/app/views/gluttonberg/admin/asset_library/shared/_asset_panels.html.haml

@@ -31,18 +31,20 @@
       - for asset in @assets
         %tr
           %td
-            - unless breadcrumbs_val.blank?
+            - if !breadcrumbs_val.blank? && can?(:destroy , asset)
               = check_box_tag "select_asset_#{asset.id}" , nil, false, :rel => "#{asset.id}" , :class => "select_asset_checkbox"
           %td
-
             - if asset.category == 'audio'
-              /.sm2-inline-block
               .ui360
                 %a{:href => "#{asset_url(asset)}", :target => "_blank" , :class => ""}
                   Play
             - elsif asset.category == 'image'
               %a{:href => admin_asset_url(asset), :class => "thumbnail"}
-              %img{:src => asset.thumb_small_url  }
+                %img{:src => asset.thumb_small_url  }
+            - elsif asset.category == 'video'
+              - unless asset.poster_image.blank?
+                %a{:href => admin_asset_url(asset), :class => "thumbnail"}
+                  %img{:src => asset.poster_image.thumb_small_url  }
 
           %td
             %a{:href => "#{admin_asset_url(asset)}#{breadcrumbs_val}", :class => "assetLink"}
@@ -54,15 +56,17 @@
           %td.date
             %span.controls
               - unless breadcrumbs_val.blank?
-                %a{:href => "#{edit_admin_asset_url(asset)}#{breadcrumbs_val}" , :class => "assetLink btn"}
-                  Edit
-                %a{:href => "#{crop_admin_asset_url(asset)}#{breadcrumbs_val}" , :class => "assetLink btn"}
-                  Crop
-                %a{:href => "#{delete_admin_asset_url(asset)}#{breadcrumbs_val}" , :class => "assetLink btn btn-danger"}
-                  Delete
+                - if can? :edit , asset
+                  %a{:href => "#{edit_admin_asset_url(asset)}#{breadcrumbs_val}" , :class => "assetLink btn"}
+                    Edit
+                  %a{:href => "#{crop_admin_asset_url(asset)}#{breadcrumbs_val}" , :class => "assetLink btn"}
+                    Crop
+                - if can? :destroy , asset
+                  %a{:href => "#{delete_admin_asset_url(asset)}#{breadcrumbs_val}" , :class => "assetLink btn btn-danger"}
+                    Delete
 
 %a{:href => "#",  :class => "delete_selected_assets btn btn-danger"} Delete Selected Assets
-%form#delete_selected_assets_form{ :action => admin_destroy_assets_in_bulk_path}
+%form#delete_selected_assets_form{ :action =>admin_destroy_assets_in_bulk_path , :method => "POST" }
   %input{ :type => "hidden" , :value =>"", :name => "asset_ids"}
 - if @assets.respond_to?(:total_pages)
   = will_paginate(@assets)

data/app/views/gluttonberg/admin/content/editors/_html_content.html.haml

@@ -1,7 +1,7 @@
 %p
   - id_of_text_area = "gluttonberg_page_localization[contents][#{content.association_name}][#{content.id}][text]"
   - unique_class =  "gb_page_contents_content_#{content.id}"
-  = enable_jwysiwyg_on_class(unique_class)
 
   %label.block_label= content.section_label
-  = text_area_tag(id_of_text_area , content.text, :class => "large tall #{unique_class}", :width => "490", :height => "200")
+  = text_area_tag(id_of_text_area , content.text, :class => "large tall jwysiwyg #{unique_class}", :width => "490", :height => "400")
+  = enable_redactor(unique_class)