trusty-cms 2.0.2 → 2.0.3.pre.beta

data/app/controllers/application_controller.rb.rails2

@@ -0,0 +1,113 @@
+require_dependency 'trusty_cms'
+
+class ApplicationController < ActionController::Base
+  include LoginSystem
+  
+  filter_parameter_logging :password, :password_confirmation
+  
+  protect_from_forgery
+  
+  before_filter :set_current_user
+  before_filter :set_timezone
+  before_filter :set_user_locale
+  before_filter :set_javascripts_and_stylesheets
+  before_filter :force_utf8_params if RUBY_VERSION =~ /1\.9/
+  before_filter :set_standard_body_style, :only => [:new, :edit, :update, :create]
+  
+  attr_accessor :config, :cache
+  attr_reader :pagination_parameters
+  helper_method :pagination_parameters
+  
+  def initialize
+    super
+    @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
+    when 'index'
+      'index'
+    when 'new','create'
+      'new'
+    when 'show'
+      'show'
+    when 'edit', 'update'
+      'edit'
+    when 'remove', 'destroy'
+      'remove'
+    else
+      self.action_name
+    end
+  end
+    
+  def rescue_action_in_public(exception)
+    case exception
+      when ActiveRecord::RecordNotFound, ActionController::UnknownController, ActionController::UnknownAction, ActionController::RoutingError
+        render :template => "site/not_found", :status => 404
+      else
+        super
+    end
+  end
+  
+  private
+  
+    def set_current_user
+      UserActionObserver.instance.current_user = current_user
+    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'] || Time.zone_default
+    end
+  
+    def set_javascripts_and_stylesheets
+      @stylesheets ||= []
+      @stylesheets.concat %w(admin/main)
+      @javascripts ||= []
+    end
+
+    def set_standard_body_style
+      @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
+    # That's what's happening in Rails 3, too: https://github.com/rails/rails/commit/25215d7285db10e2c04d903f251b791342e4dd6a
+    #
+    # 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      
+      traverse = lambda do |object, block|
+        if object.kind_of?(Hash)
+          object.each_value { |o| traverse.call(o, block) }
+        elsif object.kind_of?(Array)
+          object.each { |o| traverse.call(o, block) }
+        else
+          block.call(object)
+        end
+        object
+      end
+      force_encoding = lambda do |o|
+        o.force_encoding(Encoding::UTF_8) if o.respond_to?(:force_encoding)
+      end
+      traverse.call(params, force_encoding)
+    end
+    
+end

data/app/controllers/site_controller.rb

@@ -34,7 +34,7 @@ class SiteController < ApplicationController
       render :template => 'site/not_found', :status => 404, layout: false
     end
   rescue Page::MissingRootPageError
-    redirect_to welcome_path
+    redirect_to welcome_url
   end
 
   def cacheable_request?

data/app/helpers/admin/node_helper.rb

@@ -1,18 +1,18 @@
 module Admin::NodeHelper
 
-  def render_nodes(page, starting_index, parent_index = nil, simple = false)
+  def render_nodes(page, starting_index, parent_index = nil)
     @rendered_html = ""
-    render_node page, starting_index, parent_index, simple
+    render_node page, starting_index, parent_index
     @rendered_html
   end
 
-  def render_node(page, index, parent_index = nil, simple = false)
+  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: simple, branch: (page.children.count > 0) })
+                                           page: page, simple: false, branch: (page.children.count > 0) })
     index
   end
 

data/app/helpers/application_helper.rb.rails2

@@ -0,0 +1,242 @@
+module ApplicationHelper
+  include LocalTime
+  include Admin::RegionsHelper
+  
+  def config
+    TrustyCms::Config
+  end
+  
+  def default_page_title
+    title + ' - ' + subtitle
+  end
+  
+  def title
+    config['admin.title'] || 'TrustyCms CMS'
+  end
+  
+  def subtitle
+    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
+    options[:label] ||= model.new_record? ?
+      t('buttons.create', :name => t(model_name, :default => human_model_name), :default => 'Create ' + human_model_name) :
+      t('buttons.save_changes', :default => 'Save Changes')
+    options[:class] ||= "button"
+    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
+      current_page?(item.url)
+    else
+      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)))
+  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>}
+    else
+      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 << %{#{t('timestamp.by')} <strong>#{name}</strong> } if name
+        html << %{#{t('timestamp.at')} #{timestamp(time)}} if time
+        html << %{</p>}
+        html
+      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 
+  
+  def meta_visible(symbol)
+    v = case symbol
+    when :meta_more
+      not meta_errors?
+    when :meta, :meta_less
+      meta_errors?
+    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 = ''
+    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')
+    end
+    if File.exist?("#{Rails.root}/public/javascripts/admin/overrides.js")
+      overrides << javascript_include_tag('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={})
+    # Default to highest rating. Rating can be one of G, PG, R X.
+    options[:rating] ||= "G"
+
+    # Default size of the image.
+    options[:size] ||= "32px"
+
+    # Default image url to be used when no gravatar is found
+    # or when an image exceeds the rating parameter.
+    local_avatar_url = "/images/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
+    default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{local_avatar_url}"
+    options[:default] ||= default_avatar_url
+
+    unless email.blank?
+      # 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]
+      url << "&default=#{options[:default]}" if options[:default]
+      # Test the Gravatar url
+      require 'open-uri'
+      begin; open "http:#{url}", :proxy => true
+      rescue; local_avatar_url
+      else; url
+      end
+    else
+      local_avatar_url
+    end
+  end
+  
+  # returns the usual set of pagination links.
+  # 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
+      options = {
+        :max_per_page => config['pagination.max_per_page'] || 500,
+        :depaginate => true
+      }.merge(options.symbolize_keys)
+      depaginate = options.delete(:depaginate)                                     # supply :depaginate => false to omit the 'show all' link
+      depagination_limit = options.delete(:max_per_page)                           # supply :max_per_page => false to include the 'show all' link no matter how large the collection
+      html = will_paginate(list, will_paginate_options.merge(options))
+      if depaginate && list.total_pages > 1 && (!depagination_limit.blank? || list.total_entries <= depagination_limit.to_i)
+        html << content_tag(:div, link_to(t('show_all'), :pp => 'all'), :class => 'depaginate')
+      elsif depaginate && list.total_entries > depagination_limit.to_i
+        html = content_tag(:div, link_to("paginate", :p => 1), :class => 'pagination')
+      end
+      html
+    end
+  end
+  
+  private
+  
+    def append_image_extension(name)
+      unless name =~ /\.(.*?)$/
+        name + '.png'
+      else
+        name
+      end
+    end
+  
+end

data/app/models/trusty_cms/config.rb

@@ -71,7 +71,6 @@ module TrustyCms
     self.table_name = "config"
     after_save :update_cache
     attr_reader :definition
-    attr_accessible :key
 
     class ConfigError < RuntimeError; end
 
@@ -89,7 +88,7 @@ module TrustyCms
 
       def []=(key, value)
         if table_exists?
-          setting = where(key: key).first_or_initialize
+          setting = find_or_initialize_by(key: key)
           setting.value = value
         end
       end

data/app/views/admin/configuration/edit.html.haml

@@ -6,7 +6,7 @@
     %h1 Configuration
 
   - main.edit_form do
-    = form_for :trusty_config, :url => admin_configuration_path, :html => {"data-onsubmit_status"=>"Saving changes…", :method => :put} do |f|
+    = form_for :trusty_config, :url => admin_configuration_url, :html => {"data-onsubmit_status"=>"Saving changes…", :method => :put} do |f|
       = render_region :form_top
       - render_region :form do |form|
         - form.edit_site do
@@ -35,4 +35,4 @@
           .buttons
             %input.button{:type=>"submit", :value=>"Save Changes"}/
             or
-            = link_to "Cancel", admin_configuration_path, class: 'alt'
+            = link_to "Cancel", admin_configuration_url

data/app/views/admin/configuration/show.html.haml

@@ -39,7 +39,7 @@
       %h3
         - if admin?
           .actions
-            = button_to t("edit_configuration"), edit_admin_configuration_path, :method => :get
+            = button_to t("edit_configuration"), edit_admin_configuration_url, :method => :get
         Configuration
       - TrustyCms.config.site_settings.each do |site_setting|
         %p.ruled

data/app/views/admin/layouts/_form.html.haml

@@ -33,6 +33,6 @@
         = save_model_button @layout
         = save_model_and_continue_editing_button @layout
         = t('or')
-        = link_to t('cancel'), admin_layouts_path, class: 'alt'
+        = link_to t('cancel'), admin_layouts_url
     - form_bottom.edit_timestamp do
       = updated_stamp @layout

data/app/views/admin/layouts/remove.html.haml

@@ -13,4 +13,4 @@
   .buttons
     %input.button{:type => "submit", :value => t('delete_layout')  }/
     = t('or')
-    = link_to t('cancel'), admin_layouts_path, class: 'alt'
+    = link_to t('cancel'), admin_layouts_url

data/app/views/admin/pages/_fields.html.haml

@@ -57,7 +57,7 @@
       = save_model_and_continue_editing_button(@page)
       = submit_tag(t('preview', :default => 'Preview'), :class => 'button', :id => 'show-preview')
       = t('or')
-      = link_to t('cancel'), admin_pages_url, class: 'alt'
+      = link_to t('cancel'), admin_pages_url
     #preview_panel.fullcover.grey_out{:style => 'display: none;'}
       %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src =>  ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => "auto"}
       .preview_tools

data/app/views/admin/pages/_node.html.haml

@@ -7,7 +7,7 @@
             = icon
             = node_title
           - else
-            = (link_to("#{icon} #{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
+            = (link_to("#{icon} #{node_title}".html_safe, edit_admin_page_url(page), :title => page.path)).html_safe
             = page_type
             = spinner
     - node.status_column do
@@ -18,4 +18,4 @@
       - unless simple
         %td.actions
           = page.add_child_option
-          = page.remove_option
+          = page.remove_option

data/app/views/admin/pages/edit.html.haml

@@ -2,7 +2,7 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1= ''
+    %h1= t('edit_page')
   - main.edit_form do
     = form_for @page, :as => :page, :url => admin_page_path(@page), :html => {:method => :put, :multipart => true, :id => 'edit_page', 'data-onsubmit_status'=>t('saving_changes')} do |fields|
       = render :partial => "fields", :object => fields

data/app/views/admin/pages/remove.html.haml

@@ -9,11 +9,11 @@
 .inset
   %table.index#site_map
     %tbody
-      - render_nodes @page, @page.id, nil, true
+      - render_nodes @page, @page.id
       = @rendered_html.html_safe
 
 = form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing pages…"} do
   .buttons
     %input.button{:type=>"submit", :value => t('delete_pages', :pages => pages) }/
     = t('or')
-    = link_to t('cancel'), admin_pages_path, class: 'alt'
+    = link_to t('cancel'), admin_pages_url

data/app/views/admin/preferences/edit.html.haml

@@ -6,39 +6,39 @@
     %h1= t('personal_preferences')
 
   - main.edit_form do
-    = form_for @user, :url => admin_preferences_path, :html => { :method => :put, 'data-onsubmit_status' => "#{t('saving_preferences')}…" } do |f|
-      %fieldset
-        = render :partial => 'admin/users/avatar'
-
-        = render_region :form_top, :locals => {:f => f}
-
-        - render_region :form, :locals => {:f => f} do |form|
-          - form.edit_name do
-            %p
-              = f.label :name, t("name")
-              = f.text_field :name, :class => "textbox", :size => 32, :maxlength => 100
-
-          - form.edit_email do
-            %p
-              = f.label :email,  t("email_address"), :class => "optional"
-              = f.text_field "email", :class => 'textbox', :size => 32, :maxlength => 255
-
-          - form.edit_username do
-            %p
-              = f.label :login, t("username")
-              = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40, :required => true
-
-          - form.edit_password do
-            = render "admin/users/password_fields", :f => f
-
-          - form.edit_locale do
-            %p
-              = f.label :locale, t('language')
-              = f.select "locale", available_locales_select
-
-        - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
-          - form_bottom.edit_buttons do
-            .buttons
-              = save_model_button @user
-              = t('or')
-              = link_to t('cancel'), admin_url, class: 'alt'
+    = form_for @user, :url => admin_preferences_url, :html => { :method => :put, 'data-onsubmit_status' => "#{t('saving_preferences')}…" } do |f|
+
+      = render :partial => 'admin/users/avatar'
+
+      = render_region :form_top, :locals => {:f => f}
+
+      - render_region :form, :locals => {:f => f} do |form|
+        - form.edit_name do
+          %p
+            = f.label :name, t("name")
+            = f.text_field :name, :class => "textbox", :size => 32, :maxlength => 100
+
+        - form.edit_email do
+          %p
+            = f.label :email,  t("email_address"), :class => "optional"
+            = f.text_field "email", :class => 'textbox', :size => 32, :maxlength => 255
+
+        - form.edit_username do
+          %p
+            = f.label :login, t("username")
+            = f.text_field "login", :class => "textbox", :size => 32, :maxlength => 40, :required => true
+
+        - form.edit_password do
+          = render "admin/users/password_fields", :f => f
+
+        - form.edit_locale do
+          %p
+            = f.label :locale, t('language')
+            = f.select "locale", available_locales_select
+
+      - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
+        - form_bottom.edit_buttons do
+          .buttons
+            = save_model_button @user
+            = t('or')
+            = link_to t('cancel'), admin_url

data/app/views/admin/users/_form.html.haml

@@ -48,6 +48,6 @@
         = save_model_button(@user)
         = save_model_and_continue_editing_button(@user)
         = t('or')
-        = link_to t('cancel'), admin_users_path, class: 'alt'
+        = link_to t('cancel'), admin_users_path
     - form_bottom.edit_timestamp do
       = updated_stamp @user

data/app/views/admin/users/_password_fields.html.haml

@@ -13,6 +13,6 @@
     - unless @user.new_record?
       %span
         = t('or')
-        %a{:href=>"#", :class=>"warning", :onclick=>" $('#display_password').show(); $('#change_password').hide()"}= t('cancel', class: 'alt')
+        %a{:href=>"#", :onclick=>" $('#display_password').show(); $('#change_password').hide()"}= t('cancel')
 
 

data/app/views/admin/users/remove.html.haml

@@ -13,4 +13,4 @@
   .buttons
     %input.button{:type=>"submit", :value => t('delete_user')}/
     = t('or')
-    = link_to t('cancel'), admin_users_path, class: 'alt'
+    = link_to t('cancel'), admin_users_path

data/app/views/admin/welcome/login.html.haml

@@ -3,7 +3,7 @@
 #single_form
   %h1= t('please_login')
 
-  = form_tag login_path do
+  = form_tag login_url do
     %p
       %label{:for=>"username_or_email"}= t('username_or_email')
       = text_field_tag "username_or_email", @username_or_email, :class => 'textbox', :maxlength => 40, :size => 40

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

@@ -31,24 +31,22 @@
     #page
       #header
         - if logged_in?
-          = render_region :before_nav
-          - render_region :navigation do |navigation|
-            #site_links
-              = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path}   (#{link_to t('log_out'), logout_path})}.html_safe
-               
-              = link_to t('view_site'), root_path, :id=>"view_site"
-            %ul#navigation
-              - nav_tabs.each do |tab|
-                - if tab.visible?(current_user)
-                  %li{:class=>('current ' if current_tab?(tab)).to_s}
-                    = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
-            #toolbar
-              - if @current_tab and @current_tab.size > 1
-                %ul#secondary_navigation
-                  - @current_tab.each do |sub_item|
-                    - if sub_item.visible?(current_user)
-                      %li= link_to translate_with_default(sub_item.name), sub_item.relative_url, :class=>('current' if current_item?(sub_item))
-              = yield :toolbar
+          #site_links
+            = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path}   (#{link_to t('log_out'), logout_path})}.html_safe
+             
+            = link_to t('view_site'), root_path, :id=>"view_site"
+          %ul#navigation
+            - nav_tabs.each do |tab|
+              - if tab.visible?(current_user)
+                %li{:class=>('current ' if current_tab?(tab)).to_s}
+                  = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
+          #toolbar
+            - if @current_tab and @current_tab.size > 1
+              %ul#secondary_navigation
+                - @current_tab.each do |sub_item|
+                  - if sub_item.visible?(current_user)
+                    %li= link_to translate_with_default(sub_item.name), sub_item.relative_url, :class=>('current' if current_item?(sub_item))
+            = yield :toolbar
       #main
         - if flash[:notice]
           #notice

data/config/application.rb

@@ -8,8 +8,6 @@ require 'trusty_cms/extension_loader'
 require 'trusty_cms/initializer'
 require 'compass'
 require 'rack/cache'
-require 'trustygems'
-
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
@@ -119,6 +117,7 @@ module TrustyCms
         html
       end
     end
+
     config.after_initialize do
       extension_loader.load_extensions
       extension_loader.load_extension_initalizers