trusty-cms 1.0.0 → 1.0.1

data/app/assets/stylesheets/admin/partials/_typography.scss

@@ -0,0 +1,77 @@
+body {
+  font-size: $base-font-size;
+  font-family: $base-font-family;
+  line-height: 1.4;
+}
+
+a {
+  @include default-link;
+  &.alt {
+    @include alt-link;
+  }
+}
+
+big {
+  font-size: 110%;
+}
+
+h1 {
+  font-size: 180%;
+  font-weight: bold;
+  margin: 0.75em 0;
+}
+
+h3 {
+  font-weight: bold;
+  font-size: 130%;
+  margin-top: 1.25em;
+  margin-bottom: 0.5em;
+}
+
+h4, h5, h6 {
+  font-weight: bold;
+}
+
+p {
+  margin: 1em 0;
+}
+
+td {
+  vertical-align: middle;
+}
+
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+}
+
+img {
+  border: none;
+  vertical-align: middle;
+}
+
+input[type=image] {
+  border: none;
+  vertical-align: middle;
+}
+
+input.big {
+  font-size: 120%;
+}
+
+#change_password span, span.info, span.error {
+  font-size: 80%;
+}
+
+.clear {
+  font-size: 1px;
+  clear: both;
+}
+
+.warning {
+  color: red;
+}
+
+table {
+  border-collapse: collapse;
+}

data/app/assets/stylesheets/admin/partials/_validations.scss

@@ -0,0 +1,22 @@
+#content {
+  span.error-with-field {
+    input, select {
+      background: #f3c2c2;
+    }
+  }
+  span.error {
+    line-height: 1.4;
+    background-color: #cc0000;
+    color: white;
+    padding: 3px 6px;
+    margin: 0 0 0 6px;
+    background-color: #b30000;
+    @include border-radius;
+    @include single-box-shadow;
+    a.closer {
+      margin-left: 10px;
+      color: #ffcccc;
+      text-decoration: none;
+    }
+  }
+}

data/app/controllers/admin/configuration_controller.rb

@@ -4,9 +4,9 @@ class Admin::ConfigurationController < ApplicationController
   # It accepts any set of config name-value pairs but is accessible only to administrators.
   # Note that configuration is routed as a singular resource so we only deal with show/edit/update
   # and the show and edit views determine what set of config values is shown and made editable.
-  
+
   before_filter :initialize_config
-  
+
   only_allow_access_to :edit, :update,
     :when => [:admin],
     :denied_url => { :controller => 'admin/configuration', :action => 'show' },
@@ -16,16 +16,16 @@ class Admin::ConfigurationController < ApplicationController
     @user = current_user
     render
   end
-  
+
   def edit
     render
   end
-  
+
   def update
-    if params[:config]
+    if params[:trusty_config]
       begin
         TrustyCms.config.transaction do
-          params["config"].each_pair do |key, value|
+          params[:trusty_config].each_pair do |key, value|
             @trusty_config[key] = TrustyCms::Config.find_or_create_by_key(key)
             @trusty_config[key].value = value      # validation sets errors on @trusty_config['key'] that the helper methods will pick up
           end
@@ -40,11 +40,11 @@ class Admin::ConfigurationController < ApplicationController
       end
     end
   end
-  
+
 protected
 
   def initialize_config
     @trusty_config = {}
   end
-  
-end
+
+end

data/app/controllers/admin/extensions_controller.rb

@@ -3,7 +3,7 @@ class Admin::ExtensionsController < ApplicationController
     :when => :admin,
     :denied_url => { :controller => 'pages', :action => 'index' },
     :denied_message => 'You must have administrative privileges to perform this action.'
-    
+
   def index
     @template_name = 'index' # for Admin::RegionsHelper
     @extensions = TrustyCms::Extension.descendants.sort_by { |e| e.extension_name }

data/app/controllers/admin/page_parts_controller.rb

@@ -6,4 +6,4 @@ class Admin::PagePartsController < Admin::ResourceController
     render :partial => "page_part", :object => model,
       :locals => {:page_part_counter => params[:index].to_i}
   end
-end
+end

data/app/controllers/admin/pages_controller.rb

@@ -1,16 +1,18 @@
 class Admin::PagesController < Admin::ResourceController
   before_filter :initialize_meta_rows_and_buttons, :only => [:new, :edit, :create, :update]
   before_filter :count_deleted_pages, :only => [:destroy]
-  
+
   class PreviewStop < ActiveRecord::Rollback
     def message
       'Changes not saved!'
     end
   end
 
-  responses do |r|
+  create_responses do |r|
     r.plural.js do
       @level = params[:level].to_i
+      @index = params[:index].to_i
+      @rendered_html = ""
       @template_name = 'index'
       self.models = Page.find(params[:page_id]).children.all
       response.headers['Content-Type'] = 'text/html;charset=utf-8'
@@ -28,7 +30,7 @@ class Admin::PagesController < Admin::ResourceController
     assign_page_attributes
     response_for :new
   end
-  
+
   def preview
     render_preview
   rescue PreviewStop => exception
@@ -52,7 +54,7 @@ class Admin::PagesController < Admin::ResourceController
         Page
       end
     end
-      
+
     def render_preview
       Page.transaction do
         page_class = Page.descendants.include?(model_class) ? model_class : Page
@@ -69,10 +71,11 @@ class Admin::PagesController < Admin::ResourceController
         process_with_exception(page)
       end
     end
-    
+
     def process_with_exception(page)
       page.process(request, response)
       @performed_render = true
+      render template: 'site/show_page', layout: false
       raise PreviewStop
     end
 

data/app/controllers/admin/preferences_controller.rb

@@ -1,10 +1,5 @@
 class Admin::PreferencesController < ApplicationController
-  before_filter :load_user
-
-  def initialize
-    @controller_name = 'user'
-    @template_name = 'preferences'
-  end
+  before_filter :initialize_variables
 
   def show
     set_standard_body_style
@@ -16,31 +11,19 @@ class Admin::PreferencesController < ApplicationController
   end
 
   def update
-    if valid_params?
-      if @user.update_attributes(params[:user])
-        redirect_to admin_configuration_path
-      else
-        flash[:error] = t('preferences_controller.error_updating')
-        render :edit
-      end
+    if @user.update_attributes(params[:user])
+      redirect_to admin_configuration_path
     else
-      announce_bad_data
+      flash[:error] = t('preferences_controller.error_updating')
       render :edit
     end
   end
 
   private
 
-  def load_user
-    @user = current_user
-  end
-
-  def valid_params?
-    hash = (params[:user] || {}).symbolize_keys
-    (hash.keys - User.unprotected_attributes).size == 0
-  end
-
-  def announce_bad_data
-    flash[:error] = 'Bad form data.'
+  def initialize_variables
+    @user            = current_user
+    @controller_name = 'user'
+    @template_name   = 'preferences'
   end
 end

data/app/controllers/admin/resource_controller.rb

@@ -1,8 +1,7 @@
 require 'trusty_cms/resource_responses'
-require 'will_paginate'
 class Admin::ResourceController < ApplicationController
   extend TrustyCms::ResourceResponses
-  
+
   helper_method :model, :current_object, :models, :current_objects, :model_symbol, :plural_model_symbol, :model_class, :model_name, :plural_model_name
   before_filter :populate_format
   before_filter :never_cache
@@ -12,8 +11,8 @@ class Admin::ResourceController < ApplicationController
 
   cattr_reader :paginated
   cattr_accessor :default_per_page, :will_paginate_options
-  
-  responses do |r|
+
+  create_responses do |r|
     # Equivalent respond_to block for :plural responses:
     # respond_to do |wants|
     #   wants.xml { render :xml => models }
@@ -24,7 +23,7 @@ class Admin::ResourceController < ApplicationController
 
     r.singular.publish(:xml, :json) { render format_symbol => model }
     r.singular.default { redirect_to edit_model_path if action_name == "show" }
-    
+
     r.not_found.publish(:xml, :json) { head :not_found }
     r.not_found.default { announce_not_found; redirect_to :action => "index" }
 
@@ -69,7 +68,7 @@ class Admin::ResourceController < ApplicationController
     model.destroy
     response_for :destroy
   end
-  
+
   def self.model_class(model_class = nil)
     @model_class ||= (model_class || self.controller_name).to_s.singularize.camelize.constantize
   end
@@ -91,7 +90,7 @@ class Admin::ResourceController < ApplicationController
   # the @pagination_for@ helper method calls @will_paginate_options@ unless other options are supplied.
   #
   # pagination_for(@events)
-  
+
   def will_paginate_options
     self.class.will_paginate_options || {}
   end
@@ -111,7 +110,7 @@ class Admin::ResourceController < ApplicationController
     pp = params[:pp] || TrustyCms.config['admin.pagination.per_page']
     pp = (self.class.default_per_page || 50) if pp.blank?
     {
-      :page => (params[:p] || 1).to_i, 
+      :page => (params[:p] || 1).to_i,
       :per_page => pp.to_i
     }
   end
@@ -130,7 +129,7 @@ class Admin::ResourceController < ApplicationController
         super
       end
     end
-    
+
     def model_class
       self.class.model_class
     end
@@ -184,7 +183,7 @@ class Admin::ResourceController < ApplicationController
     def continue_url(options)
       options[:redirect_to] || (params[:continue] ? {:action => 'edit', :id => model.id} : index_page_for_model)
     end
-    
+
     def index_page_for_model
       parts = {:action => "index"}
       if paginated? && model && i = model_class.all.index(model)
@@ -205,19 +204,19 @@ class Admin::ResourceController < ApplicationController
 
     def announce_removed
       ActiveSupport::Deprecation.warn("announce_removed is no longer encouraged in TrustyCms 0.9.x.", caller)
-      flash[:notice] = t("resource_controller.removed", :humanized_model_name => humanized_model_name)    
+      flash[:notice] = t("resource_controller.removed", :humanized_model_name => humanized_model_name)
     end
-    
+
     def announce_not_found
-      flash[:notice] = t("resource_controller.not_found", :humanized_model_name => humanized_model_name)    
+      flash[:notice] = t("resource_controller.not_found", :humanized_model_name => humanized_model_name)
     end
 
     def announce_update_conflict
-      flash.now[:error] =  t("resource_controller.update_conflict", :humanized_model_name => humanized_model_name)  
+      flash.now[:error] =  t("resource_controller.update_conflict", :humanized_model_name => humanized_model_name)
     end
 
     def clear_model_cache
-      TrustyCms::Cache.clear if defined?(TrustyCms::Cache)
+      Rails.cache.clear
     end
 
     def format_symbol
@@ -227,19 +226,19 @@ class Admin::ResourceController < ApplicationController
     def format
       params[:format] || 'html'
     end
-    
-    
+
+
     # I would like to set this to expires_in(1.minute, :private => true) to allow for more fluid navigation
     # but the annoyance for concurrent authors would be too great.
     def never_cache
       expires_now
     end
-    
+
     # Assist with user agents that cause improper content-negotiation
     # warn "Remove default HTML format, Accept header no longer used. (#{__FILE__}: #{__LINE__})" if Rails.version !~ /^2\.1/
     def populate_format
       params[:format] ||= 'html' unless request.xhr?
     end
-    
-    
+
+
 end

data/app/controllers/admin/users_controller.rb

@@ -6,11 +6,11 @@ class Admin::UsersController < Admin::ResourceController
     :denied_message => 'You must have administrative privileges to perform this action.'
 
   before_filter :ensure_deletable, :only => [:remove, :destroy]
-  
+
   def show
     redirect_to edit_admin_user_path(params[:id])
   end
-  
+
   def update
     user_params = params[model_symbol]
     if user_params && user_params['admin'] == false && model == current_user
@@ -20,20 +20,20 @@ class Admin::UsersController < Admin::ResourceController
     model.update_attributes!(user_params)
     response_for :update
   end
-  
+
   def ensure_deletable
     if current_user.id.to_s == params[:id].to_s
       announce_cannot_delete_self
       redirect_to admin_users_url
     end
   end
-  
+
   private
-  
+
     def announce_cannot_delete_self
       flash[:error] = t('users_controller.cannot_delete_self')
-    end  
-    
+    end
+
     def annouce_cannot_remove_self_from_admin_role
       flash[:error] = 'You cannot remove yourself from the admin role.'
     end

data/app/controllers/admin/welcome_controller.rb

@@ -2,11 +2,11 @@ class Admin::WelcomeController < ApplicationController
   no_login_required
   before_filter :never_cache
   skip_before_filter :verify_authenticity_token
-  
+
   def index
     redirect_to admin_pages_url
   end
-  
+
   def login
     if request.post?
       @username_or_email = params[:username_or_email]
@@ -18,11 +18,11 @@ class Admin::WelcomeController < ApplicationController
         current_user.remember_me
         set_session_cookie
       end
-      redirect_to (session[:return_to] || welcome_url)
+      redirect_to(session[:return_to] || welcome_url)
       session[:return_to] = nil
     end
   end
-  
+
   def logout
     request.cookies[:session_token] = { :expires => 1.day.ago.utc }
     self.current_user.forget_me if self.current_user
@@ -30,19 +30,19 @@ class Admin::WelcomeController < ApplicationController
     announce_logged_out
     redirect_to login_url
   end
-  
+
   private
-  
+
     def never_cache
       expires_now
     end
-  
+
     def announce_logged_out
       flash[:notice] = t('welcome_controller.logged_out')
     end
-    
+
     def announce_invalid_user
       flash.now[:error] = t('welcome_controller.invalid_user')
     end
-    
+
 end