trusty-cms 1.0.0 → 1.0.1

data/app/controllers/application_controller.rb

@@ -4,8 +4,8 @@ require 'login_system'
 class ApplicationController < ActionController::Base
   include LoginSystem
   # TODO: Add an ActionView::PathSet.new([paths]) for all extension view paths
-  prepend_view_path ("#{TRUSTY_CMS_ROOT}/app/views")
-  
+  prepend_view_path("#{TRUSTY_CMS_ROOT}/app/views")
+
   protect_from_forgery
 
   before_filter :set_current_user
@@ -18,22 +18,11 @@ class ApplicationController < ActionController::Base
   attr_accessor :trusty_config, :cache
   attr_reader :pagination_parameters
   helper_method :pagination_parameters
-  
+
   def initialize
     super
     @trusty_config = TrustyCms::Config
   end
-  
-  # helpers to include additional assets from actions or views
-  helper_method :include_stylesheet, :include_javascript
-  
-  def include_stylesheet(sheet)
-    @stylesheets << sheet
-  end
-  
-  def include_javascript(script)
-    @javascripts << script
-  end
 
   def template_name
     case self.action_name
@@ -51,7 +40,7 @@ class ApplicationController < ActionController::Base
       self.action_name
     end
   end
-    
+
   def rescue_action_in_public(exception)
     case exception
       when ActiveRecord::RecordNotFound, ActionController::UnknownController, ActionController::UnknownAction, ActionController::RoutingError
@@ -60,21 +49,21 @@ class ApplicationController < ActionController::Base
         super
     end
   end
-  
+
   private
-  
+
     def set_current_user
       UserActionObserver.instance.current_user = current_user
-    end  
-        
-    def set_user_locale      
+    end
+
+    def set_user_locale
       I18n.locale = current_user && !current_user.locale.blank? ? current_user.locale : TrustyCms::Config['default_locale']
     end
 
     def set_timezone
       Time.zone = TrustyCms::Config['local.timezone'] != nil && TrustyCms::Config['local.timezone'].empty? ? Time.zone_default : TrustyCms::Config['local.timezone']
     end
-  
+
     def set_javascripts_and_stylesheets
       @stylesheets ||= []
       @stylesheets.concat %w(admin/main)
@@ -85,7 +74,7 @@ class ApplicationController < ActionController::Base
       @body_classes ||= []
       @body_classes.concat(%w(reversed))
     end
-    
+
     # When using TrustyCms with Ruby 1.9, the strings that come in from forms are ASCII-8BIT encoded.
     # That causes problems, especially when using special chars and with certain DBs, like DB2
     # That's why we force the encoding of the params to UTF-8
@@ -94,7 +83,7 @@ class ApplicationController < ActionController::Base
     # See http://stackoverflow.com/questions/8268778/rails-2-3-9-encoding-of-query-parameters
     # See https://rails.lighthouseapp.com/projects/8994/tickets/4807
     # See http://jasoncodes.com/posts/ruby19-rails2-encodings (thanks for the following code, Jason!)
-    def force_utf8_params      
+    def force_utf8_params
       traverse = lambda do |object, block|
         if object.kind_of?(Hash)
           object.each_value { |o| traverse.call(o, block) }
@@ -110,5 +99,5 @@ class ApplicationController < ActionController::Base
       end
       traverse.call(params, force_encoding)
     end
-    
+
 end

data/app/controllers/site_controller.rb

@@ -24,8 +24,9 @@ class SiteController < ApplicationController
       process_page(@page)
       set_cache_control
       @performed_render ||= true
+      render layout: false
     else
-      render :template => 'site/not_found', :status => 404
+      render :template => 'site/not_found', :status => 404, layout: false
     end
   rescue Page::MissingRootPageError
     redirect_to welcome_url

data/app/helpers/admin/configuration_helper.rb

@@ -11,7 +11,7 @@ module Admin::ConfigurationHelper
     setting.valid?
     domkey = key.gsub(/\W/, '_')
     html = ""
-    html << content_tag(:label, t("@trusty_config.#{key}").titlecase, :for => domkey)
+    html << content_tag(:label, t("trusty_config.#{key}").titlecase, :for => domkey)
     if setting.boolean?
       value = setting.checked? ? t('yes') : t('no')
       html << content_tag(:span, value, :id => domkey, :class => "#{value} #{options[:class]}")
@@ -20,17 +20,18 @@ module Admin::ConfigurationHelper
       html << content_tag(:span, value, :id => domkey, :class => options[:class])
     end
     html << content_tag(:span, " #{t("units.#{setting.units}")}", :class => 'units') if setting.units
-    html << content_tag(:span, " #{t('warning')}: #{[setting.errors.on(:value)].flatten.first}", :class => 'warning') if setting.errors.on(:value)
-    html
+    html << content_tag(:span, " #{t('warning')}: #{[setting.errors.get(:value)].flatten.first}", :class => 'warning') if setting.errors.get(:value)
+    Rails.logger.error(html)
+    html.html_safe
   end
-  
+
   # Renders the setting as label and appropriate input field:
   #
   #   edit_setting("admin.title")
   #   => <label for="admin_title">Admin title<label><input type="text" name="config['admin.title']" id="admin_title" value="TrustyCms CMS" />
   #
   #   edit_config("defaults.page.status")
-  #   => 
+  #   =>
   #   <label for="defaults_page_status">Default page status<label>
   #   <select type="text" name="config['defaults.page.status']" id="defaults_page_status">
   #     <option value="Draft">Draft</option>
@@ -43,38 +44,38 @@ module Admin::ConfigurationHelper
   def edit_config(key, options={})
     setting = setting_for(key)
     domkey = key.gsub(/\W/, '_')
-    name = "@trusty_config[#{key}]"
-    title = t("@trusty_config.#{key}").titlecase
+    name = "trusty_config[#{key}]"
+    title = t("trusty_config.#{key}").titlecase
     title << content_tag(:span, " (#{t("units.#{setting.units}")})", :class => 'units') if setting.units
     value = params[key.to_sym].nil? ? setting.value : params[key.to_sym]
     html = ""
     if setting.boolean?
       html << hidden_field_tag(name, 0)
       html << check_box_tag(name, 1, value, :class => 'setting', :id => domkey)
-      html << content_tag(:label, title, :class => 'checkbox', :for => domkey)
+      html << content_tag(:label, title.html_safe, :class => 'checkbox', :for => domkey)
     elsif setting.selector?
-      html << content_tag(:label, title, :for => domkey)
+      html << content_tag(:label, title.html_safe, :for => domkey)
       html << select_tag(name, options_for_select(setting.definition.selection, value), :class => 'setting', :id => domkey)
     else
-      html << content_tag(:label, title, :for => domkey)
+      html << content_tag(:label, title.html_safe, :for => domkey)
       html << text_field_tag(name, value, :class => 'textbox', :id => domkey)
     end
-    if setting.errors.on(:value)
-      html << content_tag(:span, [setting.errors.on(:value)].flatten.first, :class => 'error')
-      html = content_tag(:span, html, :class => "error-with-field")
+    if setting.errors[:value].present?
+      html << content_tag(:span, [setting.errors[:value]].flatten.first, :class => 'error')
+      html = content_tag(:span, html.html_safe, :class => "error-with-field")
     end
-    html
+    html.html_safe
   end
-  
+
   def setting_for(key)
-    @config ||= {}    # normally initialized in Admin::ConfigurationController
-    @config[key] ||= TrustyCms.config.find_or_create_by_key(key)
+    @trusty_config ||= {}    # normally initialized in Admin::ConfigurationController
+    @trusty_config[key] ||= TrustyCms.config.find_or_create_by_key(key)
   end
-  
+
   def definition_for(key)
     if setting = setting_for(key)
       setting.definition
     end
   end
 
-end
+end

data/app/helpers/admin/extensions_helper.rb

@@ -1,2 +1,2 @@
 module Admin::ExtensionsHelper
-end
+end

data/app/helpers/admin/layouts_helper.rb

@@ -1,21 +1,3 @@
 module Admin::LayoutsHelper
-  def layout_edit_javascripts
-    <<-CODE
-    var tagReferenceWindows = {};
-    function loadTagReference() {
-      var pageType = 'Page';
-      if (!tagReferenceWindows[pageType])
-        tagReferenceWindows[pageType] = new Popup.AjaxWindow("#{admin_reference_path('tags')}?class_name=" + encodeURIComponent(pageType), {reload: false});
-      var window = tagReferenceWindows[pageType];
-      if('Page' != pageType) {
-        $('tag_reference_link').highlight();
-        window.show();
-      } else {
-        window.toggle();
-      }
-      lastPageType = pageType;
-      return false;
-    }
-    CODE
-  end
+
 end

data/app/helpers/admin/node_helper.rb

@@ -1,14 +1,28 @@
 module Admin::NodeHelper
 
-  def render_node(page, locals = {})
-    @current_node = page
+  def render_nodes(page, starting_index, parent_index = nil)
+    @rendered_html = ""
+    render_node page, starting_index, parent_index
+    @rendered_html
+  end
+
+  def render_node(page, index, parent_index = nil)
+
+    @current_node = prepare_page(page)
+
+    @rendered_html += (render :partial => 'admin/pages/node',
+                              :locals =>  {level: index, index: index, parent_index: parent_index,
+                                           page: page, simple: false, branch: (page.children.count > 0) })
+    index
+  end
+
+  def prepare_page(page)
     page.extend MenuRenderer
     page.view = self
     if page.additional_menu_features?
       page.extend(*page.menu_renderer_modules)
     end
-    locals.reverse_merge!(:level => 0, :simple => false).merge!(:page => page)
-    render :partial => 'admin/pages/node', :locals =>  locals
+    page
   end
 
   def homepage
@@ -16,7 +30,7 @@ module Admin::NodeHelper
   end
 
   def show_all?
-    @controller.action_name == 'remove'
+    controller.action_name == 'remove'
   end
 
   def expanded_rows
@@ -75,7 +89,7 @@ module Admin::NodeHelper
   end
 
   def node_title
-    %{<span class="title">#{ h(@current_node.title) }</span>}
+    %{<span class="title">#{ h(@current_node.title) }</span>}.html_safe
   end
 
   def page_type
@@ -83,7 +97,7 @@ module Admin::NodeHelper
     if display_name == 'Page'
       ""
     else
-      %{<span class="info">(#{ h(display_name) })</span>}
+      %{<span class="info">(#{ h(display_name) })</span>}.html_safe
     end
   end
 

data/app/helpers/admin/pages_helper.rb

@@ -1,15 +1,15 @@
 module Admin::PagesHelper
   include Admin::NodeHelper
   include Admin::ReferencesHelper
-  
+
   def class_of_page
     @page.class
   end
-  
+
   def filter
-    @page.parts.empty? ? nil : @page.parts.first.filter
+    @page.parts.first.filter if @page.parts.respond_to?(:any?) && @page.parts.any?
   end
-  
+
   def meta_errors?
     !!(@page.errors[:slug] or @page.errors[:breadcrumb])
   end
@@ -26,92 +26,4 @@ module Admin::PagesHelper
   def clean_page_description(page)
     page.description.to_s.strip.gsub(/\t/,'').gsub(/\s+/,' ')
   end
-
-  def page_edit_javascripts
-    <<-CODE
-    function addPart(form) {
-       if (validPartName()) {
-        new Ajax.Updater(
-          $('tab_control').down('.pages'),
-          '#{admin_page_parts_path}',
-          {
-            asynchronous: true,
-            evalScripts: true,
-            insertion: 'bottom',
-            onComplete: function(request){ partAdded() },
-            onLoading: function(request){ partLoading() },
-            parameters: Form.serialize(form)
-          }
-        );
-      }
-    }
-    function removePart() {
-      if(confirm('Remove the current part?')) {
-        TabControls['tab_control'].removeSelected();
-      }
-    }
-    function partAdded() {
-      var tabControl = TabControls['tab_control'];
-      $('add_part_busy').hide();
-      $('add_part_button').disabled = false;
-      $('add_part_popup').closePopup();
-      $('part_name_field').value = '';
-      tabControl.updateTabs();
-      tabControl.select(tabControl.tabs.last());
-    }
-    function partLoading() {
-      $('add_part_button').disabled = true;
-      $('add_part_busy').appear();
-    }
-    function validPartName() {
-      var partNameField = $('part_name_field');
-      var name = partNameField.value.downcase();
-      if (name.blank()) {
-        alert('Part name cannot be empty.');
-        return false;
-      }
-      if (TabControls['tab_control'].findTabByCaption(name)) {
-        alert('Part name must be unique.');
-        return false;
-      }
-      return true;
-    }
-
-    var lastPageType = '#{@page.class.name}';
-    var tagReferenceWindows = {};
-    function loadTagReference(part) {
-      var pageType = $F('page_class_name');
-      if (!tagReferenceWindows[pageType])
-        tagReferenceWindows[pageType] = new Popup.AjaxWindow("#{admin_reference_path('tags')}?class_name=" + encodeURIComponent(pageType), {reload: false});
-      var window = tagReferenceWindows[pageType];
-      if(lastPageType != pageType) {
-        $('tag_reference_link_' + part).highlight();
-        window.show();
-      } else {
-        window.toggle();
-      }
-      lastPageType = pageType;
-      return false;
-    }
-
-    var lastFilter = '#{default_filter_name}';
-    var filterWindows = {};
-    function loadFilterReference(part) {
-      var filter = $F("part_" + part + "_filter_id");
-      if (filter != "") {
-        if (!filterWindows[filter]) filterWindows[filter] = new Popup.AjaxWindow("#{admin_reference_path('filters')}?filter_name="+encodeURIComponent(filter), {reload: false});
-        var window = filterWindows[filter];
-        if(lastFilter != filter) {
-          window.show();
-        } else {
-          window.toggle();
-        }
-        lastFilter = filter;
-      } else {
-        alert('No documentation for filter.');
-      }
-      return false;
-    }
-    CODE
-  end
 end

data/app/helpers/admin/preferences_helper.rb

@@ -1,3 +1,3 @@
 module Admin::PreferencesHelper
 
-end
+end

data/app/helpers/admin/regions_helper.rb

@@ -14,15 +14,16 @@ module Admin::RegionsHelper
       rescue ::ActionView::TemplateError => e # error in template
         raise e
       end
-    end.join
+    end.join.html_safe
+    Rails.logger.error(output)
     block_given? ? concat(output) : output
   end
 
   def lazy_initialize_region_set
     unless @region_set
-      @controller_name ||= @controller.controller_name
-      @template_name ||= @controller.template_name
+      @controller_name ||= @_controller.controller_name
+      @template_name ||= @_controller.template_name
       @region_set = admin.send(@controller_name).send(@template_name)
     end
   end
-end
+end

data/app/helpers/application_helper.rb

@@ -1,30 +1,30 @@
 module ApplicationHelper
   include Admin::RegionsHelper
-  
-  #def config
-  #  TrustyCms::Config
-  #end
-  
+
+  def trusty_config
+    TrustyCms::Config
+  end
+
   def default_page_title
     title + ' - ' + subtitle
   end
-  
+
   def title
-    @trusty_config['admin.title'] || 'TrustyCms CMS'
+    trusty_config['admin.title'] || 'Trusty CMS'
   end
-  
+
   def subtitle
-    @trusty_config['admin.subtitle'] || 'Publishing for Small Teams'
+    trusty_config['admin.subtitle'] || 'Publishing for Small Teams'
   end
-  
+
   def logged_in?
     !current_user.nil?
   end
-  
+
   def onsubmit_status(model)
     model.new_record? ? t('creating_status', :model => t(model.class.name.downcase)) : "#{I18n.t('saving_changes')}…"
   end
-  
+
   def save_model_button(model, options = {})
     model_name = model.class.name.underscore
     human_model_name = model_name.humanize.titlecase
@@ -35,11 +35,11 @@ module ApplicationHelper
     options[:accesskey] ||= 'S'
     submit_tag options.delete(:label), options
   end
-  
+
   def save_model_and_continue_editing_button(model)
     submit_tag t('buttons.save_and_continue'), :name => 'continue', :class => 'button', :accesskey => "s"
   end
-  
+
   def current_item?(item)
     if item.tab && item.tab.many? {|i| current_url?(i.relative_url) }
       # Accept only stricter URL matches if more than one matches
@@ -48,27 +48,28 @@ module ApplicationHelper
       current_url?(item.relative_url)
     end
   end
-  
+
   def current_tab?(tab)
     @current_tab ||= tab if tab.any? {|item| current_url?(item.relative_url) }
     @current_tab == tab
   end
-  
+
   def current_url?(options)
     url = case options
-    when Hash
-      url_for options
-    else
-      options.to_s
-    end
-    request.request_uri =~ Regexp.new('^' + Regexp.quote(clean(url)))
+          when Hash
+            url_for options
+          else
+            options.to_s
+          end
+    #TODO: look for other instances of request_uri
+    request.original_fullpath =~ Regexp.new('^' + Regexp.quote(clean(url)))
   end
-  
+
   def clean(url)
     uri = URI.parse(url)
     uri.path.gsub(%r{/+}, '/').gsub(%r{/$}, '')
   end
-  
+
   def nav_link_to(name, options)
     if current_url?(options)
       %{<strong>#{ link_to translate_with_default(name), options }</strong>}
@@ -76,39 +77,35 @@ module ApplicationHelper
       link_to translate_with_default(name), options
     end
   end
-  
+
   def admin?
     current_user and current_user.admin?
   end
-  
+
   def designer?
     current_user and (current_user.designer? or current_user.admin?)
   end
-  
-  def focus(field_name)
-    javascript_tag "Field.activate('#{field_name}');"
-  end
-  
+
   def updated_stamp(model)
     unless model.new_record?
       updated_by = (model.updated_by || model.created_by)
       name = updated_by ? updated_by.name : nil
       time = (model.updated_at || model.created_at)
       if name or time
-        html = %{<p class="updated_line">#{t('timestamp.last_updated')} } 
+        html = %{<p class="updated_line">#{t('timestamp.last_updated')} }
         html << %{#{t('timestamp.by')} <strong>#{name}</strong> } if name
         html << %{#{t('timestamp.at')} #{timestamp(time)}} if time
         html << %{</p>}
-        html
+        html.html_safe
       end
     end
   end
-  
+
   def timestamp(time)
     # time.strftime("%I:%M %p on %B %e, %Y").sub("AM", 'am').sub("PM", 'pm')
-    I18n.localize(time, :format => :timestamp)    
-  end 
-  
+    I18n.localize(time, :format => :timestamp)
+  end
+
   def meta_visible(symbol)
     v = case symbol
     when :meta_more
@@ -118,62 +115,63 @@ module ApplicationHelper
     end
     v ? {} : {:style => "display: none"}
   end
-  
+
   def meta_errors?
     false
   end
-  
+
   def meta_label
     meta_errors? ? 'Less' : 'More'
   end
-  
-  def toggle_javascript_for(id)
-    "Element.toggle('#{id}'); Element.toggle('more-#{id}'); Element.toggle('less-#{id}'); return false;"
-  end
-  
+
   def image(name, options = {})
     image_tag(append_image_extension("admin/#{name}"), options)
   end
-  
+
   def image_submit(name, options = {})
     image_submit_tag(append_image_extension("admin/#{name}"), options)
   end
-  
+
   def admin
     TrustyCms::AdminUI.instance
   end
-  
+
   def filter_options_for_select(selected=nil)
     options_for_select([[t('select.none'), '']] + TextFilter.descendants_names, selected)
   end
-  
+
   def body_classes
     @body_classes ||= []
   end
-  
+
   def nav_tabs
     admin.nav
   end
-  
+
   def translate_with_default(name)
     t(name.underscore.downcase, :default => name)
   end
-  
+
   def available_locales_select
     [[t('select.default'),'']] + TrustyCms::AvailableLocales.locales
   end
-  
-  def stylesheet_and_javascript_overrides
-    overrides = ''
+
+  def stylesheet_overrides
+    overrides = []
     if File.exist?("#{Rails.root}/public/stylesheets/admin/overrides.css") || File.exist?("#{Rails.root}/public/stylesheets/sass/admin/overrides.sass")
-      overrides << stylesheet_link_tag('admin/overrides')
+      overrides << 'admin/overrides'
     end
+    overrides
+  end
+
+  def javascript_overrides
+    overrides = []
     if File.exist?("#{Rails.root}/public/javascripts/admin/overrides.js")
-      overrides << javascript_include_tag('admin/overrides')
+      overrides << 'admin/overrides'
     end
     overrides
   end
-  
+
   # Returns a Gravatar URL associated with the email parameter.
   # See: http://douglasfshearer.com/blog/gravatar-for-ruby-and-ruby-on-rails
   def gravatar_url(email, options={})
@@ -190,8 +188,8 @@ module ApplicationHelper
     options[:default] ||= default_avatar_url
 
     unless email.blank?
-      # Build the Gravatar url. 
-      url = '//gravatar.com/avatar/'  
+      # Build the Gravatar url.
+      url = '//gravatar.com/avatar/'
       url << "#{Digest::MD5.new.update(email)}?"
       url << "rating=#{options[:rating]}" if options[:rating]
       url << "&size=#{options[:size]}" if options[:size]
@@ -206,9 +204,9 @@ module ApplicationHelper
       local_avatar_url
     end
   end
-  
+
   # returns the usual set of pagination links.
-  # options are passed through to will_paginate 
+  # options are passed through to will_paginate
   # and a 'show all' depagination link is added if relevant.
   def pagination_for(list, options={})
     if list.respond_to? :total_pages
@@ -227,9 +225,9 @@ module ApplicationHelper
       html
     end
   end
-  
+
   private
-  
+
     def append_image_extension(name)
       unless name =~ /\.(.*?)$/
         name + '.png'
@@ -237,5 +235,5 @@ module ApplicationHelper
         name
       end
     end
-  
+
 end