gluttonberg-core 2.5 → 2.5.1

data/app/helpers/gluttonberg/asset_library.rb

@@ -146,7 +146,7 @@ module Gluttonberg
               options[:alt] = asset.alt.blank? ? asset.name : asset.alt
             end
             options[:src] = path
-            tag(:img , ""  , options)
+            tag("img" , options)
           end
        end
 
@@ -157,7 +157,7 @@ module Gluttonberg
              options[:alt] = asset.name
              options[:title] = asset.name
              options[:src] = thumbnail_type.blank? ? asset.url : asset.url_for(thumbnail_type)
-             tag(:img , "" , options)
+             tag("img" , options)
            end
        end
 
@@ -241,7 +241,7 @@ module ActionView
         def asset_tag(asset , thumbnail_type = nil)
            unless asset.blank?
              path = thumbnail_type.blank? ? asset.url : asset.url_for(thumbnail_type)
-             tag(:img , "", :class => asset.name , :alt => asset.name , :src => path)
+             tag(:img , :class => asset.name , :alt => asset.name , :src => path)
            end
         end
 

data/app/models/gluttonberg/asset.rb

@@ -10,6 +10,12 @@ module Gluttonberg
       acts_as_taggable_on :locations , :characters , :themes, :photographers
 
       include Library::AttachmentMixin
+      asset_mixins = Rails.configuration.asset_mixins
+      unless asset_mixins.blank?
+        asset_mixins.each do |mixin|
+          include mixin
+        end
+      end
 
       has_and_belongs_to_many :asset_collections     , :join_table => "gb_asset_collections_assets"
       belongs_to  :asset_type
@@ -17,7 +23,9 @@ module Gluttonberg
 
       belongs_to :user
 
-      attr_accessible :file, :name, :alt, :asset_collection_ids, :mime_type, :description, :synopsis, :copyrights, :year_of_production, :duration, :width, :height, :alt , :processed, :copied_to_s3
+      attr_accessible :file, :name, :alt, :asset_collection_ids, :mime_type
+      attr_accessible :description, :synopsis, :copyrights, :year_of_production, :duration
+      attr_accessible :artist_name, :link, :width, :height, :alt , :processed, :copied_to_s3
 
       # constants for formatted file size
       GIGA_SIZE = 1073741824.0

data/app/models/gluttonberg/member.rb

@@ -11,9 +11,14 @@ module Gluttonberg
 
     validates_presence_of :first_name , :email
     attr_accessor :return_url , :term_and_conditions
-
     attr_accessor :image_delete
 
+    member_mixins = Rails.configuration.member_mixins
+    unless member_mixins.blank?
+      member_mixins.each do |mixin|
+        include mixin
+      end
+    end
 
     clean_html [:bio]
 

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

@@ -1,7 +1,7 @@
 .row-fluid
   = form_for(  @asset , :as => :asset , :url => url_opts ,  :html => { :multipart=>true  , :method => method_name, :class => "nosubnav validation"} ) do |asset_form|
     = gb_error_messages_for(@asset)
-  
+
     - unless @asset.thumb_large_url.blank?
       %p
         %img{:src => @asset.thumb_large_url}
@@ -18,12 +18,25 @@
         %p
           = asset_form.label :alt , "Description"
           = asset_form.text_field(:alt, :class => "large" , :maxlength => 255 )
-      .span6
+          - 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.text_field(:artist_name, :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 :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.
+      .span6
+
         = render :partial => "collection_select_form" , :locals => {:asset_form => asset_form }
-          
+
     .row-fluid
       .span6
         %legend Publish

data/app/views/gluttonberg/admin/content/articles/_form.html.haml

@@ -6,6 +6,19 @@
   = gb_error_messages_for(@article_localization)
   .span5
     .tabbable
+      .versions.page_content_form
+        - unless action_name == "new" || action_name == "create"
+          - if Gluttonberg.localized? && Gluttonberg::Locale.all.length > 1
+            .btn-group
+              %a{ :class => "btn dropdown-toggle" , "data-toggle" => "dropdown", :href => "#"}
+                Editing #{@article_localization.locale.name} Content
+                %span.caret
+              %ul.dropdown-menu
+                - for locale in Gluttonberg::Locale.all
+                  - localization = Gluttonberg::ArticleLocalization.find(:first , :conditions => { :article_id => @article.id , :locale_id => locale.id } )
+                  %li
+                    %a{:href => edit_admin_blog_article_path(@blog, @article , :localization_id => localization.id) ,:id=>"edit_content_tab",:class=>"button"}
+                      = "Edit #{localization.locale.name}"
       %ul.nav.nav-tabs
         %li.active
           %a{:href => "#content", "data-toggle" => "tab" }
@@ -17,14 +30,14 @@
         .tab-pane.active#content
           .pad
             %p
-              = f.fields_for :article , @article do |article_form|  
+              = f.fields_for :article , @article do |article_form|
                 %p
                   = article_form.hidden_field(:user_id, :value => current_user.id) if @article.user_id.blank?
                   = article_form.hidden_field(:blog_id, :value => @blog.id) if @article.blog_id.blank?
               %p
                 = f.label :title
                 = f.text_field(:title, :id => "page_title" , :class => "required")
-              
+
               %p
                 #page_slug_holder
                   %span.domain
@@ -35,15 +48,15 @@
                     = f.text_field(:slug, :id => 'page_hidden_slug')
               .clear
 
-              
-              = f.fields_for :article , @article do |article_form|  
+
+              = f.fields_for :article , @article do |article_form|
                 %p
                   = article_form.label :author
                   = article_form.select("author_id" ,  @authors.collect{|a| [a.email , a.id] } , :class => "required" )
               %p
                 = f.label :featured_image_id
-                = f.asset_browser( :featured_image_id ,  opts = { :filter => "image"   } )  
-                
+                = f.asset_browser( :featured_image_id ,  opts = { :filter => "image"   } )
+
               %p
                 = f.label :excerpt
                 = f.text_area(:excerpt  , :class => "jwysiwyg" )
@@ -53,7 +66,7 @@
 
         .tab-pane#seo
           .pad
-            = f.fields_for :article , @article do |article_form|  
+            = f.fields_for :article , @article do |article_form|
               .seo_body
                 %p
                   = article_form.label :slug
@@ -74,29 +87,29 @@
 
   .span4
 
-    = f.fields_for :article , @article do |article_form| 
+    = f.fields_for :article , @article do |article_form|
       %legend Categories & Tags
       %p
         = article_form.label :article_category_list , "Categories"
-        = article_form.text_field(:article_category_list, :class => "tags" , :rel => tags_string("article_category") ) 
+        = article_form.text_field(:article_category_list, :class => "tags" , :rel => tags_string("article_category") )
       %p
         = article_form.label :tag_list , "Tags"
-        = article_form.text_field(:tag_list, :class => "tags" , :rel => tags_string("tag") ) 
+        = article_form.text_field(:tag_list, :class => "tags" , :rel => tags_string("tag") )
       %p
-        %em seperate categories & tags with  a comma  
-      
+        %em seperate categories & tags with  a comma
+
       %legend Comments
       %p
         = article_form.label :disable_comments
-        = article_form.check_box(:disable_comments)  
+        = article_form.check_box(:disable_comments)
       -# - unless @article.blank?
       -#   %p
       -#     = link_to "View Comments", admin_blog_article_comments_path(@blog, @article) , :class => "btn"
-    - if can? :publish , Gluttonberg::Article  
+    - if can? :publish , Gluttonberg::Article
       %legend
         Publish
-      = f.fields_for :article , @article do |article_form| 
-        = article_form.publisable_dropdown 
+      = f.fields_for :article , @article do |article_form|
+        = article_form.publisable_dropdown
     = form_controls(admin_blog_articles_path(@blog))
 
 = enable_jwysiwyg_on_class("jwysiwyg")

data/app/views/gluttonberg/admin/content/articles/edit.html.haml

@@ -7,11 +7,5 @@
       .page-header
         %h1
           = @page_title.html_safe
-      - if Gluttonberg.localized? && @article.localizations &&  @article.localizations.length > 1
-        .subnav
-          = sub_nav do        
-            - for localization in @article.localizations
-              %li{:class => "#{ (@article_localization.locale.id ==  localization.locale.id ) ? 'ui-tabs-selected ui-state-active' : '' }"}
-                %a{:href => edit_admin_blog_article_path(@blog, @article , :localization_id => localization.id) ,:id=>"edit_content_tab",:class=>"button"}
-                  = "Edit #{localization.locale.name}"
+
       = render :partial => "form", :locals => {:url => admin_blog_article_path(@blog, @article , :localization_id => params[:localization_id])}

data/app/views/gluttonberg/admin/content/articles/index.html.haml

@@ -49,7 +49,14 @@
                       %span.caret
                     %ul.dropdown-menu
                       %li
-                        = link_to "Edit", edit_admin_blog_article_path(@blog, article) , :class => " "
+                        - if Gluttonberg.localized? &&  article.localizations.length > 1
+                          - for locale in Gluttonberg::Locale.all
+                            - localization = Gluttonberg::ArticleLocalization.find(:first , :conditions => { :article_id => article.id , :locale_id => locale.id } )
+                            %li
+                              %a{:href => edit_admin_blog_article_path(@blog, article , :localization_id => localization.id) ,:id=>"edit_content_tab",:class=>"button"}
+                                = "Edit #{localization.locale.name}"
+                        - else
+                          = link_to "Edit", edit_admin_blog_article_path(@blog, article) , :class => " "
 
 
                       %li.divider

data/app/views/gluttonberg/admin/content/page_localizations/_form.html.haml

@@ -1,13 +1,22 @@
 - @page = @page_localization.page
 = form_for(@page_localization, :url => url) do  |f|
-  
+
   = gb_error_messages_for(@page_localization)
 
-  
-    
+
+
   .span5
     .tabbable
-      .versions
+      .versions.page_content_form
+        - if Gluttonberg.localized? && Gluttonberg::Locale.all.length > 1
+          .btn-group
+            %a{ :class => "btn dropdown-toggle" , "data-toggle" => "dropdown", :href => "#"}
+              Editing #{@page_localization.locale.name} Content
+              %span.caret
+            %ul.dropdown-menu
+              - for locale in Gluttonberg::Locale.all
+                - localization = Gluttonberg::PageLocalization.find(:first , :conditions => { :page_id => @page.id , :locale_id => locale.id } )
+                %li= link_to("Edit #{locale.name} Content", edit_admin_page_page_localization_path( :page_id => @page.id, :id => localization.id), :class => "")
         - unless @page_localization.contents.blank?
           = version_listing(@page_localization.contents.first.versions , @version )
     %ul.nav.nav-tabs
@@ -22,7 +31,7 @@
         .pad
           %p
             = f.label :name
-            = f.text_field(:name, :id => "page_title", :class => "span5")    
+            = f.text_field(:name, :id => "page_title", :class => "span5")
           %p
             #page_slug_holder
               %span.domain
@@ -66,17 +75,16 @@
     %legend
       Page Settings
     %p
-      = f.fields_for :page , @page do |page_form|  
+      = f.fields_for :page , @page do |page_form|
         = render :partial => "/gluttonberg/admin/content/pages/page_settings" , :locals => {:f => page_form}
 
     %legend
       Publish
-      
+
     %p
       - if @page.published?
         = submit_tag "Update", :class => "btn btn-success"
         = submit_tag "Unpublish", :class => "btn btn-danger"
       - else
         = submit_tag "Publish", :class => "btn btn-success"
-        = submit_tag "Save as a draft", :class => "btn btn-inverse"    
-    
+        = submit_tag "Save as a draft", :class => "btn btn-inverse"

data/app/views/gluttonberg/admin/content/page_localizations/edit.html.haml

@@ -1,7 +1,7 @@
 - @window_title = "Content"
 - select_page_title = @page.name.blank? ? "Edit Content" : "#{@page.name}"
 - if(Gluttonberg.localized? && @page.localizations &&  @page.localizations.length > 1)
-  - select_page_title = "Edit #{@page_localization.locale.slug} Content"
+  - select_page_title = "Edit #{@page_localization.locale.name} Content"
 - @page_title = "#{link_to "Pages", admin_pages_path} > #{select_page_title}"
 
 .row-fluid#edit-form

data/app/views/gluttonberg/admin/content/pages/_row.html.haml

@@ -6,14 +6,14 @@
       = link_to("#{page.home ? "#{default_localization.name} (Home page)" : default_localization.name}", edit_admin_page_page_localization_path( :page_id => page.id, :id => default_localization.id))
   %td.author{:style => "width:15%"}
     = page.user.full_name
-  
+
   %td.published_state{:class=>"#{page.publishing_status.downcase}", :style => "width:15%"}
     = page.publishing_status
     - unless page.published_at.blank?
       %br
       %span.date
         = page.published_at.strftime("%d/%m/%Y")
-    
+
   %td{:style => 'width:35%'}
     .btn-group
       %a{ :class => "btn dropdown-toggle" , "data-toggle" => "dropdown" , :href => "#"}
@@ -21,13 +21,15 @@
         %span.caret
       %ul.dropdown-menu
         - if Gluttonberg.localized? &&  page.localizations.length > 1
+          - for locale in Gluttonberg::Locale.all
+            - localization = Gluttonberg::PageLocalization.find(:first , :conditions => { :page_id => page.id , :locale_id => locale.id } )
+            %li= link_to("Edit #{locale.name} Content", edit_admin_page_page_localization_path( :page_id => page.id, :id => localization.id), :class => "")
+        - else
           %li= link_to("Edit", edit_admin_page_page_localization_path( :page_id => page.id, :id => default_localization.id), :class => "")
-        - else        
-          %li= link_to("Edit", edit_admin_page_page_localization_path( :page_id => page.id, :id => default_localization.id), :class => "")
-          %li= link_to("Preview", default_localization.public_path, :class => "", :target => "_blank") 
+          %li= link_to("Preview", default_localization.public_path, :class => "", :target => "_blank")
 
-        %li.divider  
-        %li= link_to("Duplicate", duplicate_admin_page_path( :id => page.id), :class => "")  
+        %li.divider
+        %li= link_to("Duplicate", duplicate_admin_page_path( :id => page.id), :class => "")
 
         - if can? :destroy , Gluttonberg::Page
           %li.divider

data/app/views/layouts/gluttonberg.html.haml

@@ -49,11 +49,11 @@
     .navbar-main
       %ul.nav
         %li
-          = active_link_to("Dashboard", admin_root_path, :id => "dashboard_nav" , :title => "Dashboard", :active => params[:controller].include?('Gluttonberg/admin/main'))
+          = active_link_to("Dashboard", admin_root_path, :id => "dashboard_nav" , :title => "Dashboard", :active => params[:controller].include?('gluttonberg/admin/main'))
         %li
-          = active_link_to("Content", admin_pages_path, :id => "content_nav" , :title => "Content", :active => (params[:controller].include?('Gluttonberg/admin/Content') || (( Gluttonberg::Components.nav_entries.collect{|c| c[1]}).include?(controller_name.to_sym) )))
+          = active_link_to("Content", admin_pages_path, :id => "content_nav" , :title => "Content", :active => (params[:controller].include?('gluttonberg/admin/content') || (( Gluttonberg::Components.nav_entries.collect{|c| c[1]}).include?(controller_name.to_sym) )))
         %li
-          = active_link_to("Library", admin_asset_category_path(:category => 'all' , :page => 1 ), :id => "library_nav" , :title => "Library" , :active => params[:controller].include?('Gluttonberg/admin/AssetLibrary')  )
+          = active_link_to("Library", admin_asset_category_path(:category => 'all' , :page => 1 ), :id => "library_nav" , :title => "Library" , :active => params[:controller].include?('gluttonberg/admin/asset_library')  )
 
         - for entry in Gluttonberg::Components.main_nav_entries
           -if entry[2].blank? || entry[2]==false || (entry[2]==true && session.user.is_super_admin)
@@ -63,7 +63,7 @@
           %li
             = active_link_to("Members", admin_membership_members_path, :id => "membership_nav" , :title => "Members" , :active => /^\/admin\/membership/)
         %li
-          = active_link_to("Settings", admin_generic_settings_path, :id => "settings_nav" , :title => "Settings" , :active => params[:controller].include?('Gluttonberg/admin/Settings/')  )
+          = active_link_to("Settings", admin_generic_settings_path, :id => "settings_nav" , :title => "Settings" , :active => params[:controller].include?('gluttonberg/admin/settings/')  )
 
 
     .container-fluid

data/db/migrate/20121106025800_add_artist_and_link_to_assets.rb

@@ -0,0 +1,6 @@
+class AddArtistAndLinkToAssets < ActiveRecord::Migration
+  def change
+    add_column :gb_assets , :artist_name , :string
+    add_column :gb_assets , :link , :string
+  end
+end

data/lib/engine.rb

@@ -8,7 +8,7 @@ module Gluttonberg
     config.widget_factory_name = "default factory name"
     config.mount_at = '/'
     config.admin_path = '/admin'
-    config.app_name = 'Gluttonberg 2.1'
+    config.app_name = 'Gluttonberg 2.5'
     config.localize = false
     config.flagged_content = false
     config.active_record.observers = ['gluttonberg/page_observer' , 'gluttonberg/page_localization_observer' , 'gluttonberg/locale_observer' ]
@@ -27,6 +27,8 @@ module Gluttonberg
     #use this to provide additional processor for assets
     #in first stage I am going to use it with Tv
     config.asset_processors = []
+    config.asset_mixins = []
+    config.member_mixins = []
     config.search_models = {
         "Gluttonberg::Page" => [:name],
         "Gluttonberg::Blog" => [:name , :description],

data/lib/gluttonberg/components.rb

@@ -1,6 +1,6 @@
 module Gluttonberg
   # This module allows custom controllers to be registered wtih Gluttonberg’s
-  # administration. Typically, these controllers will be registered in the 
+  # administration. Typically, these controllers will be registered in the
   # application’s before_app_loads block.
   module Components
     @@components  = {}
@@ -9,8 +9,8 @@ module Gluttonberg
     @@main_nav_entries = []
     @@registered  = nil
     Component     = Struct.new(:name, :label , :admin_url, :only_for_super_admin )
-    
-    # Registers a controller — or set of controllers — based on the URLs 
+
+    # Registers a controller — or set of controllers — based on the URLs
     # specified in the routes.
     #
     #   Components.register(:forum, :label => "Forum", :admin_url => url) do |scope|
@@ -21,42 +21,43 @@ module Gluttonberg
       @@components[name] = opts
       @@routes[name] = routes if block_given?
     end
-    
-    
+
+
     # Returns a hash of the registered components, keyed to their label.
     def self.registered
       @@registered ||= @@components.collect {|k, v| Component.new(k.to_s, v[:label] , v[:only_for_super_admin])}
     end
-    
+
     # Returns an array of components that have been given a nav_label —
     # the label implicitly registers them as nav entries. Components without
     # a label won’t turn up.
-    def self.nav_entries      
-      @@nav_entries ||= @@components.collect do |k, v| 
-        
+    def self.nav_entries(section_name="")
+      temp = @@components.find_all{|k,v| (section_name.blank? && (!v.has_key?(:section_name) || v[:section_name].blank?)) || (!section_name.blank? && v[:section_name] == section_name) }
+      nav_entries = temp.collect do |k, v|
+
         url = if v[:admin_url]
           if v[:admin_url].is_a? Symbol
             v[:admin_url]
           else
             v[:admin_url]
           end
-        end 
+        end
         [v[:label], k, url , v[:only_for_super_admin]]
       end
     end
-    
-   
+
+
    def self.register_for_main_nav(name , url , only_for_super_admin = false )
       @@main_nav_entries << [name , url , only_for_super_admin]
-    end 
-    
+    end
+
    # Returns an array of components that have been given a nav_label —
     # the label implicitly registers them as nav entries. Components without
     # a label won’t turn up.
-    def self.main_nav_entries      
-      @@main_nav_entries 
+    def self.main_nav_entries
+      @@main_nav_entries
     end
 
-    
+
   end
 end