gluttonberg-core 2.6.4 → 3.0.0

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

@@ -5,8 +5,10 @@
       - class_name = "success"
     - elsif name.to_s == "warning"
       - class_name = ""
-      
+    
+
     .page_flash#flash.alert.alert-block{:class => "alert-#{class_name}"}
-      %a.close{ "data-dismiss" => "alert" , :href=>"#"}
-        ×
+      - if defined?(close_button)
+        %a.close{ "data-dismiss" => "alert" , :href=>"#"}
+          ×
       = msg

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

@@ -9,24 +9,15 @@
       %meta{:content => "", :name => "author"}
       = csrf_meta_tag
       / Le styles
-      %link{:href => "/assets/gb_bootstrap.css", :rel => "stylesheet"}
-      %link{:href => "/assets/gb_admin-override.css", :rel => "stylesheet"}
-      :css
-        body {
-          padding-top: 60px;
-          padding-bottom: 40px;
-        }
-        .sidebar-nav {
-          padding: 9px 0;
-        }
+      = stylesheet_link_tag "gb_bootstrap", "gb_admin-override", :media => "all"
+      = custom_stylesheet_link_tag
+
+      = javascript_include_tag "jquery-1-10-1", "gb_bootstrap"
+      = custom_javascript_include_tag
+
       /[if lt IE 9]
-        <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+        = javascript_include_tag "gb_html5"
 
   %body#login
     .container
-      = yield
-
-
-    %script{:src => "/assets/jquery.js"}
-    %script{:src => "/assets/gb_bootstrap.js"}
-    = custom_javascript_include_tag
+      = yield

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

@@ -5,32 +5,18 @@
       %title
         = "#{website_title} #{@window_title.blank? ? '' : ' : ' + @window_title}"
       %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
-      %meta{:content => "", :name => "description"}
-      %meta{:content => "", :name => "author"}
+      %meta{:content => "Updating your site is a piece of cake", :name => "description"}
+      %meta{:content => "Freerange Future", :name => "author"}
       = csrf_meta_tag
-      / Le styles
-      %link{:href => "/assets/gb_bootstrap.css", :rel => "stylesheet"}
-      %link{:href => "/assets/jcrop/css/gb_jquery-Jcrop.css", :rel => "stylesheet"}
-      %link{:href => "/assets/gb_360player.css", :rel => "stylesheet"}
-      %link{:href => "/assets/gb_admin-override.css", :rel => "stylesheet"}
 
-      = javascript_include_tag "jquery-1-7-1", "gb_bootstrap", "gb_bootstrap-datepicker", "jquery-dimensions-min" , "jquery-ui-1-8-23-custom-min" , "jquery-validate" , "gb_jquery-dragTree" , "rails" , "gb_tags" , "gb_jeditable" , "gb_ajaxfileupload" , "gb_expander" , "/assets/jcrop/js/jquery-Jcrop-min", "gb_berniecode-animator" , "gb_soundmanager2-jsmin", "gb_360player"
+      = stylesheet_link_tag "gluttonberg", :media => "all"
+      = javascript_include_tag "gluttonberg",  :charset => "utf-8"
 
-      = wysiwyg_js_css_link_tag
-      = javascript_include_tag "gb_application" ,  :charset => "utf-8"
       = custom_javascript_include_tag
       = custom_stylesheet_link_tag
 
-      :css
-        body {
-          padding-top: 60px;
-          padding-bottom: 40px;
-        }
-        .sidebar-nav {
-          padding: 9px 0;
-        }
       /[if lt IE 9]
-        <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+        = javascript_include_tag "gb_html5"
 
   %body
     .navbar.navbar-fixed-top
@@ -51,35 +37,42 @@
 
     .navbar-main
       %ul.nav
-        %li
-          = 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) )))
-
         - for entry in Gluttonberg::Components.main_nav_entries
-          -if entry[2].blank? || entry[2]==false || (entry[2]==true && session.user.is_super_admin)
-            %li{:class => "custom"}
-              = active_link_to(entry[0], url_for(entry[1]), :id => (entry[0].to_s.underscore).gsub(/\s/, '_') + "Nav" , :title => entry[0]  )
-
-        %li
-          = 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')  )
-
-
-        - if Gluttonberg::Member.enable_members == true
-          %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/')  )
+          - if entry[2][:enabled].blank? || entry[2][:enabled] == true || (eval(entry[2][:enabled]) != false)
+            - if (entry[2][:only_for_super_admin].blank? || entry[2][:only_for_super_admin]==false || (entry[2][:only_for_super_admin]==true && session.user.is_super_admin) )
+              - active = false
+              - enabled = true
+              - case entry[1]
+                - when "/admin/"
+                  - active = params[:controller].include?('gluttonberg/admin/main')
+                - when "/admin/pages"
+                  - active = (params[:controller].include?('gluttonberg/admin/content') || (( Gluttonberg::Components.nav_entries.collect{|c| c[1]}).include?(controller_name.to_sym) ))
+                - when "/admin/assets/all/page/1"
+                  - active = params[:controller].include?('gluttonberg/admin/asset_library')
+                - when "/admin/membership/members"
+                  - active  = /^\/admin\/membership/
+                  - enabled = Rails.configuration.enable_members
+                - when "/admin/configurations"
+                  - active = params[:controller].include?('gluttonberg/admin/settings/')
+                - else
+                  - unless @menu_section_name.blank?
+                    - active = (@menu_section_name == entry[0])
+                  - else
+                    - active = (( Gluttonberg::Components.nav_entries(entry[0]).collect{|c| c[1]}).include?(controller_name.to_sym) )
+              - if enabled && (entry[2][:can_model_name].blank? || (!entry[2][:can_model_name].blank? && can?(:manage , eval(entry[2][:can_model_name]))) ) 
+                %li{:class => "mainNavLi"}
+                  = active_link_to(entry[0], url_for(entry[1]), {:id => (entry[0].to_s.underscore).gsub(/\s/, '_') + "Nav" , :title => entry[0], :active => active } )
 
 
     .container-fluid
-      = render "/layouts/flash_messages"
+      - unless flash.blank?
+        = render "/layouts/flash_messages", :locals => {:close_button => true}
       = yield
 
       %hr
-        %footer
-          %p
-            &copy;
-            %a{:href => "http://freerangefuture.com", :target => "_blank"}
-              Freerange Future
-            #{Time.now.year}
+      %footer
+        %p
+          &copy;
+          %a{:href => "http://freerangefuture.com", :target => "_blank"}
+            Freerange Future
+          #{Time.now.year}

data/app/views/notifier/version_declined.html.haml

@@ -0,0 +1,21 @@
+%p
+  Dear #{@version.user.full_name},
+
+%p
+  The update to "#{@title}" that you submitted on #{@version.created_at.strftime("%B #{@version.created_at.day.ordinalize}")} has been declined.
+
+%p
+  Visit this URL to continue editing the version that you submitted.
+  %br
+  #{@url}
+
+%p
+  For more information on why your submission was declined please contact #{@current_user.full_name}.
+
+%p
+Thank you.
+
+%p
+  http://#{Rails.configuration.host_name}
+  %br
+  http://#{Rails.configuration.host_name}/admin

data/config/locales/en_au.yml

@@ -1,4 +1,4 @@
-en-AU:
+en:
   date:
     abbr_day_names:
     - Sun

data/config/locales/en_gb.yml

@@ -24,4 +24,5 @@ en:
   reset_my_password: "Reset my password"
   resetting_your_password: "Resetting your password..."
   change_my_password: "Change My Password"
-  login: "Login"
+  login: "Login"
+  reset_password_error: We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting thereset password process.

data/config/routes.rb

@@ -1,63 +1,54 @@
 Rails.application.routes.draw do
-
   mount_at = Gluttonberg::Engine.config.mount_at
 
   scope :module => 'gluttonberg' do
     namespace :admin do
       root :to => "main#index"
-
-      # Help
-      match("/help/:module_and_controller/:page" => "help#show", :module_and_controller => %r{\S+} , :as => :help)
+      get "waiting-for-approval" => "main#waiting_for_approval" , :as => :waiting_for_approval
+      get "decline-content/:object_class/:version_id" => "main#decline_content" , :as => :decline_content
+      
 
       scope :module => 'content' do
-        match "/flagged_contents" => "flag#index" , :as => :flagged_contents
+        controller :auto_save do
+          match "/autosave/:model_name/:id" => :create , :as => :autosave
+          get "/remove_autosaved_version/:model_name/:id" => :destroy , :as => :remove_autosaved_version
+          get "/retreive_changes/:model_name/:id" => :retreive_changes , :as => :retreive_changes
+        end
+
+        get "/flagged_contents" => "flag#index" , :as => :flagged_contents
         get '/flagged_contents/moderation/:id/:moderation' => "flag#moderation", :as => :flagged_contents_moderation
-        match 'content' => "main#index",      :as => :content
+
         resources :pages do
-          get 'delete', :on => :member
-          get 'duplicate', :on => :member
+          member do
+            get 'delete'
+            get 'duplicate'
+            get 'collapse'
+            get 'expand'
+          end
+          collection do
+            post 'move' =>  :move_node, :as => :move
+            post 'update_home', :as =>  :update_home
+            match 'import'
+            get 'export'
+            get 'collapse_all'
+            get 'expand_all'
+          end
+
           resources :page_localizations
-          get 'edit_home' => "pages#edit_home", :as =>  :edit_home
-          post 'update_home' => "pages#update_home", :as =>  :update_home
         end
-
         get "pages_list_for_tinymce" => "pages#pages_list_for_tinymce" , :as => :pages_list_for_tinymce
-        get "/comments/spam_detection_for_all_pending" => "comments#spam_detection_for_all_pending" , :as => :spam_detection_for_all_pending_comments
-        get "/comments/pending" => "comments#pending" , :as => :pending_comments
-        get "/comments/spam" => "comments#spam" , :as => :spam_comments
-        get "/comments/approved" => "comments#approved" , :as => :approved_comments
-        get "/comments/rejected" => "comments#rejected" , :as => :rejected_comments
-        get "/comments/moderation/:id" => "comments#moderation" , :as => :comment_moderation
-        get "/comments/delete/:id" => "comments#delete" , :as => :comment_delete
-        delete "/comments/destroy/:id" => "comments#destroy" , :as => :comment_destroy
-        get "/comments/block_comment_author/:id" => "comments#block_comment_author" , :as => :block_comment_author
-
-        resources :blogs do
-          get 'delete', :on => :member
-          resources :articles do
-            get 'delete', :on => :member
-            get 'duplicate', :on => :member
-            resources :comments do
-              get 'delete', :on => :member
-              get 'moderation', :on => :member
-            end
-          end
-        end
 
-        match "/pages/move(.:format)" => "pages#move_node" , :as=> :page_move
+        post "/pages/move(.:format)" => "pages#move_node" , :as=> :page_move
         resources :galleries do
           get 'delete', :on => :member
-          get 'add_image', :on => :member
-          get 'remove_image' , :on => :member
         end
-        match "/galleries/move(.:format)" => "galleries#move_node" , :as=> :gallery_move
+        post "/galleries/move(.:format)" => "galleries#move_node" , :as=> :gallery_move
 
       end
 
       # Settings
       scope :module => 'settings' do
-        match 'settings' => "main#index",      :as => :settings
-        match 'history' => "global_history#index",      :as => :global_history
+        get 'history' => "global_history#index",      :as => :global_history
         resources :locales do
           get 'delete', :on => :member
         end
@@ -66,25 +57,31 @@ Rails.application.routes.draw do
           get 'delete', :on => :member
         end
 
-        resources :generic_settings do
+        resources :configurations do
           get 'delete', :on => :member
         end
 
         resources :stylesheets do
           get 'delete', :on => :member
         end
-        match "/stylesheets/move(.:format)" => "stylesheets#move_node" , :as=> :stylesheet_move
+        post "/stylesheets/move(.:format)" => "stylesheets#move_node" , :as=> :stylesheet_move
+
+        resources :embeds do
+          get 'delete', :on => :member
+          get 'list-for-redactor' => :list_for_redactor, :on => :collection
+        end
       end
 
       namespace :membership do
         root :to =>  "main#index"
-        match "/groups/move(.:format)" => "groups#move_node" , :as=> :group_move
-        match "members/export" => "members#export" , :as => :members_export
-        match 'members/new_bulk'  => "members#new_bulk" , :as => :members_import
-        match 'members/create_bulk' => "members#create_bulk" , :as => :members_bulk_create
+        post "/groups/move(.:format)" => "groups#move_node" , :as=> :group_move
+        get "members/export" => "members#export" , :as => :members_export
+        get 'members/new_bulk'  => "members#new_bulk" , :as => :members_import
+        post 'members/create_bulk' => "members#create_bulk" , :as => :members_bulk_create
         resources :members do
           get 'delete', :on => :member
           get 'welcome' , :on => :member
+          get 'group/:id' => "members#group", :on => :collection, :as => :group_members
         end
         resources :groups do
           get 'delete', :on => :member
@@ -94,62 +91,50 @@ Rails.application.routes.draw do
 
       scope :module => 'asset_library' do
         # asset library related routes
-          resources :assets do
-            get 'delete', :on => :member
-            get 'crop', :on => :member
-            post 'save_crop', :on => :member
-          end
-          match "library" => "assets#index" , :as => :library
-          match "search_assets" => "assets#search" , :as => :library_search
-          match "add_asset_using_ajax"  => "assets#ajax_new" , :as => :add_asset_using_ajax
-          match "add_assets_in_bulk"  => "assets#add_assets_in_bulk" , :as => :add_assets_in_bulk
-          match "create_assets_in_bulk"  => "assets#create_assets_in_bulk" , :as => :create_assets_in_bulk
-          match "destroy_assets_in_bulk"  => "assets#destroy_assets_in_bulk" , :as => :destroy_assets_in_bulk
-          match "browser"  => "assets#browser" , :as => :asset_browser
-          match "browser-collection/:id"  => "assets#browser_collection" , :as => :asset_browser_collection
-          match "browse/:category/page/:page"  => "assets#category" , :as => :asset_category
-          match "collections/:id/page/:page"  => "collections#show" , :as => :asset_collection
-          resources :collections  do
-            get 'delete', :on => :member
-          end
+        resources :assets do
+          get 'delete', :on => :member
+          get 'crop', :on => :member
+          post 'save_crop', :on => :member
+        end
+        get "library" => "assets#index" , :as => :library
+        get "search_assets" => "assets#search" , :as => :library_search
+        post "add_asset_using_ajax"  => "assets_ajax#create" , :as => :add_asset_using_ajax
+        get "add_assets_in_bulk"  => "assets_bulk#add_assets_in_bulk" , :as => :add_assets_in_bulk
+        post "create_assets_in_bulk"  => "assets_bulk#create_assets_in_bulk" , :as => :create_assets_in_bulk
+        post "destroy_assets_in_bulk"  => "assets_bulk#destroy_assets_in_bulk" , :as => :destroy_assets_in_bulk
+        get "browser"  => "assets#browser" , :as => :asset_browser
+        get "browser-collection/:id"  => "assets_ajax#browser_collection" , :as => :asset_browser_collection
+        get "filter_assets_by_date"  => "assets_ajax#filter_assets_by_date" , :as => :filter_assets_by_date
+        get "assets/:category/page/:page"  => "assets#category" , :as => :asset_category
+        get "collections/:id/page/:page"  => "collections#show" , :as => :asset_collection
+        resources :collections  do
+          get 'delete', :on => :member
+        end
       end
 
       resources :password_resets
 
-      get "login" => "user_sessions#new"
+      get "login" => "user_sessions#new", :as => :login
       post "login" => "user_sessions#create"
-      match "logout" => "user_sessions#destroy"
+      get "logout" => "user_sessions#destroy", :as => :logout
     end
 
     scope :module => 'public' do
-      match "/user_asset/:hash/:id(/:thumb_name)" => "public_assets#show" , :as => :public_asset
-      match "/_public/page" => "pages#show"
-      match "/restrict_site_access" => "pages#restrict_site_access" , :as => :restrict_site_access
-      match "sitemap" => "pages#sitemap" , :as => :sitemap
-      # Blog Stuff
-
-      scope "(/:locale)" do
-        resources :blogs do
-          resources :articles do
-            resources :comments
-            get "preview"
-          end
-        end
-      end
-
+      get "/user_asset/:hash/:id(/:thumb_name)" => "public_assets#show" , :as => :public_asset
+      get "/_public/page" => "pages#show"
+      get "/restrict_site_access" => "pages#restrict_site_access" , :as => :restrict_site_access
+      get "sitemap" => "pages#sitemap" , :as => :sitemap
 
-      match "/mark_as_flag/:flaggable_type/:flaggable_id" => "flag#new" , :as => :mark_as_flag
-      match "/save_mark_as_flag" => "flag#create" , :as => :save_mark_as_flag
-      match "/articles/tag/:tag" => "articles#tag" , :as => :articles_by_tag
-      match "/articles/unsubscribe/:reference" => "articles#unsubscribe" , :as => :unsubscribe_article_comments
+      get "/mark_as_flag/:flaggable_type/:flaggable_id" => "flag#new" , :as => :mark_as_flag
+      post "/save_mark_as_flag" => "flag#create" , :as => :save_mark_as_flag
       get "(/:locale)/member/login" => "member_sessions#new" , :as => :member_login
       post "(/:locale)/member/login" => "member_sessions#create"  , :as => :member_login
-      match "(/:locale)/member/logout" => "member_sessions#destroy", :as => :member_logout
+      get "(/:locale)/member/logout" => "member_sessions#destroy", :as => :member_logout
       get "(/:locale)/member/confirm/:key" => "members#confirm", :as => :member_confirmation
       get "(/:locale)/member/resend_confirmation" => "members#resend_confirmation", :as => :member_resend_confirmation
       put "(/:locale)/member/profile" => "members#update"
       get "(/:locale)/member/profile" => "members#show", :as => :member_profile
-      match "(/:locale)/member/profile/edit" => "members#edit", :as => :member_profile_edit
+      get "(/:locale)/member/profile/edit" => "members#edit", :as => :member_profile_edit
 
       scope "(/:locale)" do
         resources :members

data/db/migrate/20130801050257_create_repeater.rb

@@ -0,0 +1,14 @@
+class CreateRepeater < ActiveRecord::Migration
+  def change
+    create_table :gb_repeater do |t|
+      t.text :title
+      t.integer :repeatable_id
+      t.string  :repeatable_type
+      t.integer :itemable_id
+      t.string  :itemable_type
+      t.integer :position 
+      t.string  :type
+      t.timestamps
+    end
+  end
+end

data/lib/audio_job.rb

@@ -1,17 +1,19 @@
-class AudioJob < Struct.new(:audio)
-  
-  def perform
-    asset = Gluttonberg::Asset.find(audio)
+require 'sidekiq'
+
+class AudioJob
+  include Sidekiq::Worker
+
+  def perform(audio_id)
+    asset = Gluttonberg::Asset.find(audio_id)
     if Gluttonberg::Setting.get_setting("audio_assets") == "Enable"
       if !Gluttonberg::Setting.get_setting("s3_key_id").blank? && !Gluttonberg::Setting.get_setting("s3_access_key").blank? && !Gluttonberg::Setting.get_setting("s3_server_url").blank? && !Gluttonberg::Setting.get_setting("s3_bucket").blank?
         asset.copy_audios_to_s3
-      end  
-        
-    end #setting enabled  
+      end
+    end
   end
-  
+
   def save_asset_to(asset)
     Rails.root.to_s + "/public" + asset.asset_folder_path
   end
-  
+
 end