gluttonberg-core 2.6.4 → 3.0.0

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

@@ -0,0 +1,7 @@
+%p
+  %label= content.section_label
+
+  - name_of_tag = "gluttonberg_page_localization[contents][#{content.association_name}][#{content.id}][text]"
+
+  = select_tag( name_of_tag, options_for_select(content.select_options_data, (content.text.blank? ? content.select_options_default_value : content.text)), :include_blank => true ,  :id => "page_select_#{content.id}", :class => "page_#{content.section_name}_select" )  
+

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

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

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

@@ -1,41 +1,50 @@
-- @page_title = "#{link_to "Content", admin_content_path} > Flagged Content"
+- @page_title = "Flagged Content"
 
-- if @flags.empty?
-  %p.empty No Flagged Content
-- else
-  %table{:cellpadding => 0, :cellspacing => 0, :summary => "Flagged Content"}
-    %thead
-      %tr
-        %th Url
-        %th Content
-        %th Reason
-        %th Description
-        %th Flagged by
-        %th
-          Flagged at
-        %th
-          Controls
+.row-fluid
+  = render :partial => "/gluttonberg/admin/content/main/sidebar"
+  .span9
+    .row-fluid
+      .page-header
+        %h1
+          = @page_title
+      .subnav
 
-    %tbody
-      - @flags.each do |flag|
-        %tr
-          %td
-            - unless flag.url.blank?
-              = link_to flag.url , flag.url
-          %td
-            = flag.flaggable_type.demodulize.humanize
-          %td
-            = flag.reason
-          %td
-            = flag.description
-          %td
-            - unless flag.user.blank?
-              = flag.user.full_name
-          %td
-            = date_format flag.created_at
-          %td
-            - if flag.moderation_required != false
-              = link_to "Approve", admin_flagged_contents_moderation_path(flag, :moderation => "approve")
-              = link_to "Disapprove", admin_flagged_contents_moderation_path(flag, :moderation => "disapprove")
-            - else
-              = flag.approved == true ? "Approved" : "Disapproved"
+      - if @flags.empty?
+        %p.empty No Flagged Content
+      - else
+        %table.table.table-bordered{:cellpadding => 0, :cellspacing => 0, :summary => "Flagged Content"}
+          %thead
+            %tr
+              %th Url
+              %th Content
+              %th Reason
+              %th Description
+              %th Flagged by
+              %th
+                Flagged at
+              %th
+                Controls
+
+          %tbody
+            - @flags.each do |flag|
+              %tr{ :class => "#{cycle("even", "odd")}"}
+                %td
+                  - unless flag.url.blank?
+                    = link_to flag.url , flag.url
+                %td
+                  = flag.flaggable_type.demodulize.humanize
+                %td
+                  = flag.reason
+                %td
+                  = flag.description
+                %td
+                /   - unless flag.user.blank?
+                /     = flag.user.full_name
+                %td
+                  = date_format flag.created_at
+                %td
+                  - if flag.moderation_required != false
+                    = link_to "Approve", admin_flagged_contents_moderation_path(flag, :moderation => "approve"), :class => "btn"
+                    = link_to "Disapprove", admin_flagged_contents_moderation_path(flag, :moderation => "disapprove"), :class => "btn btn-danger"
+                  - else
+                    = flag.approved == true ? "Approved" : "Disapproved"

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

@@ -1,30 +1,67 @@
 = form_for(@gallery, :url => url , :html => {:class => "validation"}) do  |f|
-  = gb_error_messages_for(@gallery)
+
+  - unless @gallery.errors.full_messages.blank?
+    .model-error.alert.alert-block.alert-error
+      %h4.alert-heading
+        Sorry there was an error
+      %ul
+        - @gallery.errors.full_messages.each_with_index do |error, index|
+          %li
+            - if error == "Gallery images asset can't be blank"
+              Gallery image/video can't be blank
+            - else
+              = error
   .span5
     %p
       = f.label :title
-      = f.text_field(:title, :id => "page_title" , :class => "required large")
-    %p
-      = f.label :slug
-      = f.text_field(:slug, :id => 'page_slug' , :class => "required large")
+      = f.text_field(:title, :id => "page_title" , :class => "required span5")
     %p
       = f.label :description
-      = f.text_area(:description , :class => "jwysiwyg" )
+      = f.text_area(:description , :class => "jwysiwyg span5" )
 
     - if @gallery.collection_imported == false || @gallery.gallery_images.length == 0
       %p
         = label_tag "Asset Collection"
         = select_tag(:collection_id , options_from_collection_for_select(Gluttonberg::AssetCollection.all , "id" , "name_with_number_of_images") , :include_blank => true)
         .help
-          Use care when selecting a collection to add to a gallery. Once a collection is added it cannot be deleted, and you will need to make a new gallery.
+          Use care when selecting a collection to add to a gallery. Once a collection is added it cannot be deleted, and you will need to individually delete images.
 
   .span4
+
+    %legend{ :class => "expandable" , "rel"=>".seo_body"}
+      SEO
+    .seo_body
+      %p
+        = f.label :slug
+        = f.text_field :slug , :class => "span4 " , :id => "page_slug" , :donotmodify => slug_donotmodify_val
+      %p
+        = f.label :seo_title
+        = f.text_field :seo_title , :class => "span4 "
+      %p
+        = f.label :seo_keywords , "Keywords"
+        = f.text_area :seo_keywords , :class => "span4 "   , :rows => 3
+      %p
+        = f.label :seo_description , "Description"
+        = f.text_area :seo_description , :class => "span4 " , :rows => 3
+      %p
+        = f.label :fb_icon_id , "Facebook Icon"
+        = f.asset_browser :fb_icon_id , :class => "" , :filter => "image"
+    
+    %legend
+      Publishing
     - if can? :publish , Gluttonberg::Gallery
       %p
         #publish_meta
           = f.publisable_dropdown
     = form_controls(admin_galleries_path)
 
-  .clear
+  %div
+    = render :partial => "image_repeater", :locals => {:f => f}
+    .clear
+    %br
 
-= enable_jwysiwyg_on_class("jwysiwyg")
+= enable_redactor("jwysiwyg")
+:javascript
+  $(document).ready(function(){
+    initGalleryImageRepeater();
+  });

data/app/views/gluttonberg/admin/content/galleries/_image_repeater.html.haml

@@ -0,0 +1,30 @@
+%legend
+  Images/Videos
+.form-repeater-wrapper.form_field_wrapper{"data-field" => "gallery_images"}
+  %ul
+    - index = 0
+    = f.fields_for :gallery_images do |repeater_form|
+      - repeater_form.object.position = index
+      - index += 1
+      %li.row-fluid.gallery_image_repeater_form
+        %span.repeater-drag-node
+        .span4
+          = repeater_form.label :asset_id, "Image/Video"
+          = repeater_form.asset_browser :asset_id , :class => "attr_image " , :filter => "image,video"
+        .span6
+          = repeater_form.label :caption
+          = repeater_form.text_field :caption, :class => "caption-field"
+          .clear
+          = repeater_form.label :credits
+          = repeater_form.text_field :credits, :class => "credits-field"
+          .clear
+          = repeater_form.label :link
+          = repeater_form.text_field :link
+          .clear
+        .repeater-delete-wrapper
+          = repeater_form.hidden_field :position, :class => "_position"
+          = repeater_form.hidden_field :_destroy, :class => "_destroy"
+          = link_to "Remove", "Javascript:;", :class => "_destroy_button btn btn-danger"
+          
+
+  = link_to "Add Image/Video", "Javascript:;", "data-count" => @gallery.gallery_images.length, :class => "btn add_gallery_image"

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

@@ -1,4 +1,4 @@
-- @page_title = "#{link_to "Content", admin_content_path} > #{link_to "Galleries", admin_galleries_path} > Edit #{@gallery.name}"
+- @page_title = "#{link_to "Galleries", admin_galleries_path} > Edit #{@gallery.name}"
 
 .row-fluid
   = render :partial => "/gluttonberg/admin/content/main/sidebar"
@@ -8,16 +8,5 @@
         %h1
           = @page_title.html_safe
       .subnav
-
-
-
       = render :partial => "form", :locals => {:url => admin_gallery_path(@gallery)}
-      %p
-        %span.thumbnails
-          = add_image_to_gallery_tag( "Attach an image" , add_image_admin_gallery_path(@gallery) , @gallery.id )
-
-      #images_container
-        = render :partial => "images_list"
 
-:javascript
-  initEditGalleryList();

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

@@ -1,4 +1,4 @@
-- @page_title = "#{link_to "Content", admin_content_path} > Galleries"
+- @page_title = "Galleries"
 
 .row-fluid
   = render :partial => "/gluttonberg/admin/content/main/sidebar"
@@ -11,7 +11,7 @@
         = sub_nav do
           - if can? :manage, Gluttonberg::Gallery
             = nav_link('New', new_admin_gallery_path)
-    
+
       - if @galleries.empty?
         %p.empty No Galleries
       - else
@@ -19,18 +19,27 @@
           %thead
             %tr
               %th Gallery
-              %th 
-                Created By          
+              %th
+                Slug
+              %th
+                Published At
+              %th
+                Created At
               %th.controls Controls
           %tbody
             - @galleries.each do |gallery|
               %tr
                 %td
-                  = gallery.title
+                  = link_to gallery.title, edit_admin_gallery_path(gallery)
+                %td
+                  = gallery.slug
+                %td
+                  - unless gallery.published_at.blank?
+                    = gallery.published_at.strftime("%d/%m/%Y")
                 %td
-                  - unless gallery.user.blank?
-                    = gallery.user.full_name  
+                  - unless gallery.created_at.blank?
+                    = gallery.created_at.strftime("%d/%m/%Y")
                 %td.controls
-                  = link_to "Edit", edit_admin_gallery_path(gallery), :class => "btn " 
-                  - if can? :destroy , Gluttonberg::Gallery  
+                  = link_to "Edit", edit_admin_gallery_path(gallery), :class => "btn "
+                  - if can? :destroy , gallery
                     = link_to "Delete", delete_admin_gallery_path(gallery), :class => "btn btn-danger"

data/app/views/gluttonberg/admin/content/galleries/new.html.haml

@@ -1,4 +1,4 @@
-- @page_title = "#{link_to "Content", admin_content_path} > #{link_to "Galleries", admin_galleries_path} > Add New Gallery"
+- @page_title = "#{link_to "Galleries", admin_galleries_path} > Add New Gallery"
 
 .row-fluid
   = render :partial => "/gluttonberg/admin/content/main/sidebar"

data/app/views/gluttonberg/admin/content/main/_sidebar.html.haml

@@ -1,23 +1,35 @@
+- @menu_section_name = Gluttonberg::Components.section_name_for_controller(controller_name)
 .span3
   .well.sidebar-nav
     %ul.nav.nav-list
       %li.nav-header
-        Content
-      %li
-        = active_link_to("Pages", admin_pages_path, :title => "Pages", :class => "pages")
-      - if Gluttonberg::Blog.table_exists?
-        %li
-          = active_link_to("Blogs", admin_blogs_path, :title => "Blogs", :class => "blog")
-        %li
-          = active_link_to("Comments", admin_pending_comments_path, :title => "Comments", :class => "comments", :active => /^\/admin\/comments/)
+        - if @menu_section_name
+          = @menu_section_name
+        - else
+          Content
 
-      - if Rails.configuration.enable_gallery == true
+      - unless @menu_section_name.blank?
+        - for entry in Gluttonberg::Components.nav_entries(@menu_section_name)
+          -if entry[3].blank? || entry[3]==false || (entry[3]==true && session.user.is_super_admin)
+            %li
+              = active_link_to(entry[0], url_for(entry[2]),  {:id => (entry[0].to_s.underscore).gsub(/\s/, '_') + "Nav" , :title => entry[0] } )
+      - else
         %li
-          = active_link_to("Photo Galleries", admin_galleries_path, :title => "Photo galleries", :class => "gallery")
-      - for entry in Gluttonberg::Components.nav_entries
-        -if entry[3].blank? || entry[3]==false || (entry[3]==true && session.user.is_super_admin)
+          = active_link_to("Pages", admin_pages_path, :title => "Pages", :class => "pages")
+        - if Gluttonberg.constants.include?(:Blog)
           %li
-            = active_link_to(entry[0], url_for(entry[2]),  {:id => (entry[0].to_s.underscore).gsub(/\s/, '_') + "Nav" , :title => entry[0] } )
-      - if Rails.configuration.flagged_content == true
-        %li
-          = active_link_to("Flagged Content", admin_flagged_contents_path, :id => "flaggedNav" , :title => "Flagged Content")
+            = active_link_to("Blogs", admin_blogs_path, :title => "Blogs", :class => "blog")
+          %li
+            = active_link_to("Comments", admin_comments_pending_path, :title => "Comments", :class => "comments", :active => /^\/admin\/comments/)
+
+        - if Rails.configuration.enable_gallery == true && can?(:manage_model , "Gluttonberg::Gallery")
+          %li
+            = active_link_to("Galleries", admin_galleries_path, :title => "Galleries", :class => "gallery")
+        - for entry in Gluttonberg::Components.nav_entries
+          - if entry[3].blank? || entry[3]==false || (entry[3]==true && session.user.is_super_admin)
+            - if (entry[4].blank? || can?(:manage_model , entry[4]))  
+              %li
+                = active_link_to(entry[0], url_for(entry[2]),  {:id => (entry[0].to_s.underscore).gsub(/\s/, '_') + "Nav" , :title => entry[0] } )
+        - if Rails.configuration.flagged_content == true
+          %li
+            = active_link_to("Flagged Content", admin_flagged_contents_path, :id => "flaggedNav" , :title => "Flagged Content")

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

@@ -1,10 +1,6 @@
-- @page = @page_localization.page
-= form_for(@page_localization, :url => url) do  |f|
-
+= form_for(@page_localization, :url => url, :html => {:class => "auto_save"}) do  |f|
   = gb_error_messages_for(@page_localization)
 
-
-
   .span5
     .tabbable
       .versions.page_content_form
@@ -15,10 +11,10 @@
               %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 } )
+                - localization = Gluttonberg::PageLocalization.where(:page_id => @page.id , :locale_id => locale.id).first
                 %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 )
+          = version_listing(@page_localization.versions , (@version.blank? ? @page_localization.version : @version ))
     %ul.nav.nav-tabs
       %li.active
         %a{:href => "#content", "data-toggle" => "tab" }
@@ -35,13 +31,18 @@
           %p
             #page_slug_holder
               %span.domain
-                = current_domain
+                #{current_domain}#{@page_localization.path_without_self_slug}
               #page_slug
                 %span{:donotedit => true}
-                  = @page_localization.slug
+                  = @page_localization.slug || @page.slug
+                - if f.object.slug.blank?
+                  - f.object.slug = @page.slug
                 = f.text_field(:slug, :id => 'page_hidden_slug')
                 .edit.btn.btn-mini
                   Edit URL
+
+                = link_to("View Page", @page.current_localization.public_path, :class => "btn btn-mini", :target => "_blank")
+                = link_to("Preview", "Javascript:;", :class => "btn btn-mini preview-page", :target => "_blank", "data-url" => "#{@page.current_localization.public_path}?preview=true")
           .clear
           %p
             = f.label :navigation_label
@@ -77,14 +78,4 @@
     %p
       = 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_and_publish_controls(page_form, @page, can?(:publish , Gluttonberg::Page), false)

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

@@ -12,4 +12,11 @@
         = @page_title.html_safe
 
     .row-fluid
+      = auto_save(@page_localization)
+      - unless @page_localization.blank?
+        = version_alerts(@page_localization.versions , (@version.blank? ? @page_localization.version : @version ), can?(:publish , Gluttonberg::Page) )
+
+      - unless @page_localization.contents.blank?
+        = previous_version_warning(@page_localization.contents.first.versions , @version)
+
       = render :partial => "form" , :locals => { :url => admin_page_page_localization_path( :page_id => params[:page_id], :id => @page_localization) }

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

@@ -9,7 +9,7 @@
               = f.label :name
               = f.text_field(:name, :id => "page_title", :class=>"span5 required")
                     
-            -#- if Gluttonberg::Member.enable_members == true
+            - if Gluttonberg::Member.enable_members == true
               %p
                 = f.label :groups 
                 = f.select("group_ids" ,  Gluttonberg::Group.order("position ASC").collect{|cc| [cc.name , cc.id] }   , { :include_blank => true  } , { :multiple => true , :class => "large" } )
@@ -17,10 +17,17 @@
       %fieldset
         %p
           %label Please select a page template
-          - if( action_name == "new" )
-            = f.select(:description_name, @descriptions , { :include_blank => true } , {:class => "required"} ) 
+          - if( action_name == "new" || action_name == "create" )
+            %br
+            = f.select(:description_name, page_description_options , { :prompt => "Select Page Template" } , {:class => "required chzn-select span5"} ) 
           - else
-            = f.select(:description_name, @descriptions , { :include_blank => true } , {:disabled => "disabled"})       
+            = f.select(:description_name, page_description_options , { :prompt => "Select Page Template" } , {:disabled => "disabled", :class => "chzn-select span5"})
+
+      %fieldset
+        %p
+          = f.label :parent_id , "Parent page", :class => "block_label"
+          %br
+          = f.select(:parent_id, pages_lists_options(@pages), {:prompt => "No Parent"}, {:class=>" chzn-select span5"})
       %hr
       %p
         - if @page.published?