gluttonberg-core 2.6.4 → 3.0.0

data/app/helpers/gluttonberg/application_helper.rb

@@ -1,5 +1,9 @@
 helpers = Pathname(__FILE__).dirname.expand_path
+require File.join(helpers, "admin")
+require File.join(helpers, "asset_library")
+require File.join(helpers, "content_helpers")
 require File.join(helpers, "public")
+require File.join(helpers, "deprecated")
 module Gluttonberg
   module ApplicationHelper
     include Gluttonberg::Admin
@@ -9,15 +13,38 @@ module Gluttonberg
     include Gluttonberg::DragTree::ActionView::Helpers
 
     def current_localization_slug
-       if @locale
-         @locale.slug
-       else
-         Gluttonberg::Locale.first_default.slug
-       end
+      if @locale
+        @locale.slug
+      elsif Gluttonberg::Locale.first_default
+        Gluttonberg::Locale.first_default.slug
+      end
     end
 
-    def localized_text(english , chineese)
-      (current_localization_slug == "cn" ? chineese : english )
+    def current_domain
+      "#{request.protocol}#{request.host_with_port}/".strip
     end
+
+    def _render(opts)
+      render(opts)
+    end
+
+    def website_title
+      title = Gluttonberg::Setting.get_setting("title", current_site_config_name)
+      (title.blank?)? "Gluttonberg" : title.html_safe
+    end
+
+    def current_site_config_name
+      if Rails.configuration.multisite == false
+        nil
+      else
+        config  = Rails.configuration.multisite.find{|key, val| val == request.host_with_port}
+        if config.blank?
+          nil
+        else
+          config.first
+        end
+      end
+    end
+
   end
 end

data/app/helpers/gluttonberg/asset_library.rb

@@ -1,265 +1,40 @@
 module Gluttonberg
-    module AssetLibrary
-
-      #  nice and clean public url of assets
-      def asset_url(asset , opts = {})
-        url = ""
-        if Rails.configuration.asset_storage == :s3
-          url = asset.url
-        else
-          if Rails.env=="development"
-           url = "http://#{request.host}:#{request.port}/user_asset/#{asset.asset_hash[0..3]}/#{asset.id}"
-          else
-           url = "http://#{request.host}/user_asset/#{asset.asset_hash[0..3]}/#{asset.id}"
-          end
-
-          if opts[:thumb_name]
-           url << "/#{opts[:thumb_name]}"
-          end
+  module AssetLibrary
+
+    # nice and clean public url of assets
+    def asset_url(asset , opts = {})
+      url = ""
+      if Rails.configuration.asset_storage == :s3
+        url = asset.url
+      else
+        url = "http://#{request.host_with_port}/user_asset/#{asset.asset_hash[0..3]}/#{asset.id}"
+        if opts[:thumb_name]
+          url << "/#{opts[:thumb_name]}"
         end
-          url
-       end
-
-
-       # Returns a link for sorting assets in the library
-       def sorter_link(name, param, url)
-         opts = {}
-         route_opts = { :order => param , :order_type => "asc" }
-         if param == params[:order] || (!params[:order] && param == 'date-added')
-           opts[:class] = "current"
-           unless params[:order_type].blank?
-             route_opts[:order_type] = (params[:order_type] == "asc" ? "desc" : "asc" )
-           else
-             route_opts[:order_type] = "desc"
-           end
-           opts[:class] << (route_opts[:order_type] == "asc" ? " desc" : " asc" )
-         end
-
-         link_to(name, url + "?" + route_opts.to_param , opts)
-       end
-
-       # Generates a link which launches the asset browser
-       # This method operates in bound or unbound mode.
-       #
-       #
-       # In unbound mode this method accepts name of the tag and an options hash.
-       #
-       # The options hash accepts the following parameters:
-       #
-       #   The following are required in unbound mode, not used in bound mode:
-       #     :id = This is the id to use for the generated hidden field to store the selected assets id.
-       #     :asset_id = The id of the currently selected asset.
-       #     :filter = Its optional. If valid filter is provided then it only brings assets of belonging to select filter type. (image,audio video)
-       #     :button_class => Html class for button
-       #     :button_text => Its a label for button. If its not provided then "Browse"
-       #   The following are optional in either mode:
-       #     < any option accepted by hidden_field() method >
-       #
-       #
-       # For Finding image assets
-       #   asset_browser_tag( name_of_tag ,  opts = { :button_class => "" , :button_text => "Select" ,  :filter => "" ,  :id => "html_id", :asset_id => content.asset_id } )
-
-       def asset_browser_tag( field_id , opts = {} )
-          _asset_browser_tag( field_id , opts  )
-       end
-
-       def _asset_browser_tag( field_id , opts = {} )
-           asset_id = nil
-           asset_id = opts[:asset_id]
-           filter = opts[:filter].blank? ? "all" : opts[:filter]
-
-           if opts[:id].blank?
-             rel = field_id.to_s + "_" + id.to_s
-             opts[:id] = rel
-           end
-           html_id = opts[:id]
-
-
-          asset_info = ""
-          asset_name = "Nothing selected"
-          unless asset_id.blank?
-            asset = Gluttonberg::Asset.find(:first , :conditions => {:id => asset_id})
-            asset_name =  asset.name if asset
-            if asset
-              if asset.category && asset.category.to_s.downcase == "image"
-                asset_info = asset_tag(asset , :small_thumb).html_safe
-              end
-            else
-              asset_name = "Asset missing!"
-            end
-          end
-
-          asset_name = content_tag(:h5, asset_name) if asset_name
-
-
-
-           # Output it all
-           thumbnail_contents = ""
-           thumbnail_contents << asset_info
-
-           thumbnail_caption = ""
-           thumbnail_caption << asset_name unless asset_name.blank?
-          thumbnail_caption << hidden_field_tag("filter_" + field_id.to_s , value=filter , :id => "filter_#{opts[:id]}" )
-          thumbnail_caption << hidden_field_tag(field_id , asset_id , { :id => opts[:id] , :class => "choose_asset_hidden_field" } )
-
-          thumbnail_p = ""
-          thumbnail_p << link_to("Select", admin_asset_browser_url + "?filter=#{filter}" , { :class =>"btn button choose_button #{opts[:button_class]}" , :rel => html_id, :style => "margin-right:5px;" , :data_url => opts[:data_url] })
-          if opts[:remove_button] != false
-            thumbnail_p << clear_asset_tag( field_id , opts )
-          end
+      end
+      url
+    end
 
-          thumbnail_caption << content_tag(:p, thumbnail_p.html_safe)
+    def asset_tag(asset , thumbnail_type = nil, options = {} )
+      asset_tag_v2(asset , options, thumbnail_type)
+    end
 
-          thumbnail_contents << content_tag(:div, thumbnail_caption.html_safe, :class => "caption")
-          thumbnail = content_tag(:div, thumbnail_contents.html_safe, :class => "thumbnail asset_selector_wrapper")
-          li_content = content_tag(:li, thumbnail, :class => "span4")
-          content_tag(:ul , li_content , :id => "title_thumb_#{opts[:id]}", :class => "thumbnails")
+    def asset_tag_v2(asset , options = {} , thumbnail_type = nil)
+      if !asset.blank? && asset.category == "image"
+        _prepare_options_for_asset_tag(asset , options , thumbnail_type)
+        tag("img" , options)
       end
+    end
 
-      def add_image_to_gallery_tag( button_text , add_url, gallery_id , opts = {})
-          opts[:class] = "" if opts[:class].blank?
-          opts[:class] << " add_image_to_gallery choose_button btn button  #{opts[:button_class]}"
-          link_contents = link_to(button_text, admin_asset_browser_url + "?filter=image" , opts.merge( :data_url => add_url ))
-          content_tag(:span , link_contents , { :class => "assetBrowserLink" } )
+    private
+      def _prepare_options_for_asset_tag(asset , options = {} , thumbnail_type = nil)
+        options[:class] = (options[:class].blank? ? asset.name.to_s.sluglize : "#{options[:class]} #{asset.name.sluglize}" )
+        options[:title] = asset.name  unless options.has_key?(:title)
+        options[:alt] = asset.alt.blank? ? asset.name : asset.alt unless options.has_key?(:alt)
+        options[:src] = asset.url_for(thumbnail_type)
       end
 
-       def clear_asset_tag( field_id , opts = {} )
-         asset_id = nil
-         asset_id = opts[:asset_id]
-         if opts[:id].blank?
-           rel = field_id.to_s + "_" + id.to_s
-           opts[:id] = rel
-         end
-         html_id = opts[:id]
-         link_to("Remove", "Javascript:;" , { :class => "btn btn-danger button remove #{opts[:button_class]}"  , :onclick => "$('##{html_id}').val('');$('#title_thumb_#{opts[:id]} h5').html('');$('#title_thumb_#{opts[:id]} img').remove();" })
-
-
-       end
-
-       def asset_panel(assets, name_or_id , type )
-          render :partial => "/gluttonberg/admin/shared/asset_panel" , :locals => {:assets => assets , :name_or_id => name_or_id , :type => type} , :formats => [:html]
-       end
-
-
-       def asset_tag(asset , thumbnail_type = nil, options = {} )
-          unless asset.blank?
-            path = thumbnail_type.blank? ? asset.url : asset.url_for(thumbnail_type)
-
-            unless options.has_key?(:alt)
-              options[:alt] = asset.alt.blank? ? asset.name : asset.alt
-            end
-            options[:src] = path
-            tag("img" , options)
-          end
-       end
-
-       def asset_tag_v2(asset , options = {} , thumbnail_type = nil)
-           unless asset.blank?
-             options[:class] = "" if options[:class].blank?
-             options[:class] << " #{asset.name}"
-             options[:alt] = asset.name
-             options[:title] = asset.name
-             options[:src] = thumbnail_type.blank? ? asset.url : asset.url_for(thumbnail_type)
-             tag("img" , options)
-           end
-       end
-
-       def gallery_images_ul(id , gallery_thumb_image , gallery_large_image ,html_opts_for_ul = {})
-         gallery = Gluttonberg::Gallery.find(id)
-         unless gallery.blank? || gallery.gallery_images.blank?
-           options = ""
-           gallery.gallery_images.each do |g_image|
-             li_html = link_to(asset_tag(g_image.image , gallery_thumb_image).html_safe , asset_url(g_image.image , :thumb_name => gallery_large_image) , :class => "thumb")
-             unless g_image.image.alt.blank?
-               image_desc_html = content_tag(:div , g_image.image.alt  , :class => "image-desc")
-               li_html << content_tag(:div , image_desc_html , :class => "caption")
-             end
-             options << content_tag(:li , li_html , :id => "image_#{g_image.id}").html_safe
-           end
-           content_tag(:ul  , options.html_safe , html_opts_for_ul)
-         end
-       end
-
-
-    end # Assets
+  end # Assets
 end # Gluttonberg
 
 
-# Luke I need your help to improve this method.
-# Ideally i should be able to call asset_browser_tag( field_id , opts = {} ) method from here.
-module ActionView
-  module Helpers
-    class FormBuilder
-        include ActionView::Helpers
-
-        def asset_browser( field_id , opts = {} )
-          asset_id = self.object.send(field_id.to_s)
-          filter = opts[:filter].blank? ? "all" : opts[:filter]
-
-          opts[:id] = "#{field_id}_#{asset_id}" if opts[:id].blank?
-          html_id = opts[:id]
-
-          # Find the asset so we can get the name
-          asset_info = ""
-          asset_name = "Nothing selected"
-          unless asset_id.blank?
-            asset = Gluttonberg::Asset.find(:first , :conditions => {:id => asset_id})
-            asset_name =  asset.name if asset
-            if asset
-              if asset.category && asset.category.to_s.downcase == "image"
-                asset_info = asset_tag(asset , :small_thumb).html_safe
-              end
-            else
-              asset_name = "Asset missing!"
-            end
-          end
-
-          asset_name = content_tag(:h5, asset_name) if asset_name
-
-          #hack for url
-          admin_asset_browser_url = "/admin/browser"
-
-          thumbnail_contents = ""
-          thumbnail_contents << asset_info
-
-          thumbnail_caption = ""
-          if asset && asset.category == "audio"
-            thumbnail_caption << "<div class='sm2-inline-list'><div class='ui360'><a href='#{asset.url}'>#{asset_name}</a></div></div>"
-          else
-            thumbnail_caption << asset_name unless asset_name.blank?
-          end
-          thumbnail_caption << hidden_field_tag("filter_#{html_id}"  , value=filter  )
-          thumbnail_caption << self.hidden_field(field_id , { :id => html_id , :class => "choose_asset_hidden_field" } )
-
-          thumbnail_p = ""
-          thumbnail_p << link_to("Select", admin_asset_browser_url + "?filter=#{filter}" , { :class =>"btn button choose_button #{opts[:button_class]}" , :rel => html_id, :style => "margin-right:5px;" })
-          if opts[:remove_button] != false
-            thumbnail_p << self.clear_asset( field_id , opts )
-          end
-
-          thumbnail_caption << content_tag(:p, thumbnail_p.html_safe)
-
-          thumbnail_contents << content_tag(:div, thumbnail_caption.html_safe, :class => "caption")
-          thumbnail = content_tag(:div, thumbnail_contents.html_safe, :class => "thumbnail asset_selector_wrapper")
-          li_content = content_tag(:li, thumbnail, :class => "span4")
-          content_tag(:ul , li_content , :id => "title_thumb_#{opts[:id]}", :class => "thumbnails")
-        end
-
-        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)
-           end
-        end
-
-        def clear_asset( field_id , opts = {} )
-          asset_id = self.object.send(field_id.to_s)
-          opts[:id] = "#{field_id}_#{asset_id}" if opts[:id].blank?
-          html_id = opts[:id]
-          button_text = opts[:button_text].blank? ? "Browse" : opts[:button_text]
-          opts[:button_class] = "" if opts[:button_class].blank?
-          link_to("Remove", "Javascript:;" , { :class => "btn btn-danger button remove #{opts[:button_class]}"  , :onclick => "$('##{html_id}').val('');$('#title_thumb_#{opts[:id]} h5').html('');$('#title_thumb_#{opts[:id]} img').remove();" })
-        end
-    end
-  end
-end

data/app/helpers/gluttonberg/content_helpers.rb

@@ -1,22 +1,5 @@
 module Gluttonberg
     module ContentHelpers
-      # Finds the matching content block and determines the helper it needs
-      # to execute to actually write the contents to page.
-      # TODO: if there is no way to to render the content, freak out and raise
-      # an error
-      def render_content_for(section_name, opts = {})
-        # At present this generates a bunch of queries. Eventually we should
-        # look at caching section names to save some DB hits.
-        content = gb_content_for(section_name)
-        render_method = :"render_#{content.content_type}"
-        if respond_to? render_method
-          send(:"render_#{content.content_type}", content, opts)
-        elsif content.respond_to? :text
-          content.text
-        else
-          # raise Gluttonberg::ContentRenderError, "Don't know how to render this content"
-        end
-      end
 
       # Returns the content record for the specified section. It will include
       # the relevant localized version based the current locale/dialect
@@ -25,39 +8,10 @@ module Gluttonberg
         @page.localized_contents.pluck {|c| c.section[:name] == section_name}
       end
 
-      # Render html content. Actually just looks for the text
-      # property on the content model.
-      def render_html_content(content, opts = nil)
-        if content.current_localization.text
-          content.current_localization.text.html_safe
-        else
-          ""
-        end
-      end
-
-
-      # Renders an image tag with the src set to the associated asset. If the
-      # asset is missing it returns nil.
-      def render_image_content(content, opts = {})
-        if content.asset
-          if opts[:url_for].blank?
-            image_tag(content.asset.url, opts.merge!(:alt => content.asset.name))
-          else
-            image_tag(content.asset.url_for(opts[:url_for].to_sym), opts.merge!(:alt => content.asset.name))
-          end
-        end
-      end
-
-      # Renders an image url, allows the designer to specify who they want to handle the image.
+      # Renders an image url, allows the designer to
+      # specify who they want to handle the image.
       def gb_image_url(section_name, opts = {})
-        content = gb_content_for(section_name)
-        if content.asset
-          if opts[:url_for].blank?
-            content.asset.url
-          else
-            content.asset.url_for(opts[:url_for].to_sym)
-          end
-        end
+        @page.easy_contents(section_name, opts)
       end
 
       def gb_image_alt_text(section_name, opts = {})
@@ -67,34 +21,28 @@ module Gluttonberg
         end
       end
 
-      # Simple as it gets, it just pulles the text property from the content
-      # record
-      def render_plain_text_content(content, opts = nil)
-        content.current_localization.text
-      end
-
-      # Looks for a matching partial in the templates directory. Failing that,
-      # it falls back to Gluttonberg's view dir — views/content/editors
-      def content_editor(content_class)
-        locals  = {:content => content_class}
-        type    = content_class.content_type
+      # Looks for a matching partial in the templates directory.
+      # Failing that, it falls back to Gluttonberg's view dir — views/content/editors
+      def content_editor(content)
+        locals  = {:content => content}
+        type    = content.content_type
         render :partial => Gluttonberg::Templates.editor_template_path(type) , :locals => locals
       end
 
-      # generate javascript code to enable tinymce on it. textArea need to have class = jwysiwyg
-      def enable_jwysiwyg_on_class(html_class)
-        if Gluttonberg::Setting.get_setting("enable_WYSIWYG") == "Yes"
-          content = "enable_jwysiwyg_on('.#{html_class}'); \n"
-          javascript_tag(content)
-        end
-      end
 
-      # generate javascript code to enable tinymce on it. textArea need to have class = jwysiwyg
       def enable_slug_management_on(html_class)
         javascript_tag("enable_slug_management_on('#{html_class}')" )
       end
 
-
+      # generate javascript code to enable tinymce on it.
+      def enable_redactor(html_class)
+        if Gluttonberg::Setting.get_setting("enable_WYSIWYG") == "Yes"
+          link_count = Page.published.count
+          link_count += Gluttonberg::Blog::Article.published.count if Gluttonberg.constants.include?(:Blog)
+          content = "enableRedactor('.#{html_class}', #{link_count}); \n"
+          javascript_tag(content)
+        end
+      end
 
     end # Content
 end # Gluttonberg