trusty-cms 2.0.9.pre.beta → 2.0.10.pre.beta

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

@@ -1,6 +1,5 @@
 body.reversed {
-  background-color: #9e9e9e;
-  color: white;
+  background-color: #737272;
 }
 
 body.single_form {

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

@@ -54,22 +54,11 @@ div.popup {
   }
   .buttons {
     border-top: 1px solid #e5e5e5;
-    background: whitesmoke;
-    font-size: 85%;
-    margin: 1.5em -20px -10px;
-    padding: 10px;
     text-align: right;
     input.button {
       font-size: 120%;
     }
     button {
-      font-size: 110%;
-      padding: 4px 15px 5px;
-      background: whitesmoke;
-      border: 1px solid #959595;
-      @include border-radius(100px);
-      @include single-box-shadow(white, 0, 2px, 0, inset);
-      @include linear-gradient(color-stops(#dddddd 0%, #eeeeee 15%, white 100%));
       &.default {
         border: 1px solid #154ca6;
         @include single-box-shadow(#c7e0f6, 0, 2px, 1px, inset);

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

@@ -6,8 +6,8 @@
     width: 100%;
     margin-right: -4px;
     .tab {
-      background-color: #cac8c0;
-      color: #7f7f7f;
+      background-color: #e4e4e4;
+      color: black;
       display: inline-block;
       font-size: 90%;
       text-align: left;
@@ -18,11 +18,11 @@
       @include border-top-radius(6px);
       &.here {
         background-color: white;
-        color: black;
+        color: #737272;
         font-weight: bold;
       }
       span:hover {
-        color: black;
+        color: #737272;
       }
       .close {
         margin-top: -4px;

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

@@ -75,3 +75,7 @@ input.big {
 table {
   border-collapse: collapse;
 }
+
+.fa{
+  color: #94BDC3;
+}

data/app/helpers/admin/node_helper.rb

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

data/app/models/trusty_cms/config.rb

@@ -71,6 +71,7 @@ module TrustyCms
     self.table_name = "config"
     after_save :update_cache
     attr_reader :definition
+    attr_accessible :key
 
     class ConfigError < RuntimeError; end
 

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

@@ -2,7 +2,7 @@
 
 - render_region :main do |main|
   - main.edit_header do
-    %h1= t('edit_page')
+    %h1= ''
   - 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,7 +9,7 @@
 .inset
   %table.index#site_map
     %tbody
-      - render_nodes @page, @page.id
+      - render_nodes @page, @page.id, nil, true
       = @rendered_html.html_safe
 
 = form_for [:admin, @page.becomes(Page)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing pages…"} do

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

@@ -7,38 +7,38 @@
 
   - main.edit_form do
     = 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
+      %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 => "warning"}

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

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

data/config/application.rb

@@ -8,6 +8,8 @@ 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
@@ -117,7 +119,6 @@ module TrustyCms
         html
       end
     end
-
     config.after_initialize do
       extension_loader.load_extensions
       extension_loader.load_extension_initalizers

data/config/boot.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 

data/config/environments/development.rb

@@ -5,6 +5,7 @@ TrustyCms::Application.configure do
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
+  config.eager_load = false
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true

data/config/environments/test.rb

@@ -6,6 +6,7 @@ TrustyCms::Application.configure do
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
+  config.eager_load = false
 
   # ensure test extensions are loaded
   # test_extension_dir = File.join(File.expand_path(TRUSTY_CMS_ROOT), 'test', 'fixtures', 'extensions')
@@ -23,9 +24,6 @@ TrustyCms::Application.configure do
   config.consider_all_requests_local = true
   config.action_controller.perform_caching             = false
 
-  # Quiet rack cache logging in test mode
-  Rails.application.middleware.delete Rack::Cache
-  Rails.application.middleware.insert 0, Rack::Cache, { verbose: false }
 
   # Raise an ActiveModel::MassAssignmentSecurity::Error any time
   # something is mass-assigned that shouldn't be for ease in debugging.
@@ -40,7 +38,7 @@ TrustyCms::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Raise exceptions instead of rendering exception templates

data/config/routes.rb

@@ -35,4 +35,5 @@ TrustyCms::Application.routes.draw do
   get 'error/404' => 'site#not_found', :as => :not_found
   get 'error/500' => 'site#error', :as => :error
   get '*url' => 'site#show_page'
+
 end

data/lib/generators/trusty_cms/templates/routes.rb.erb

@@ -1 +0,0 @@
-load File.join(TRUSTY_CMS_ROOT, "config", "routes.rb")

data/lib/tasks/database.rake

@@ -63,9 +63,7 @@ To add more extensions just add them to your Gemfile and run `bundle install`.
   end
 
   desc "Migrate the database through all available migration scripts (looks for db/migrate/* in trusty-cms, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
-  task :migrate => :environment do
-    Rake::Task['db:migrate:trusty_cms'].invoke
-    Rake::Task['db:migrate:extensions'].invoke
+  task :migrate => [:environment, 'db:migrate:trusty_cms', 'db:migrate:extensions'] do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = "2.0.9-beta"
+    VERSION = "2.0.10-beta"
   end
 end

data/spec/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -0,0 +1,5 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+TrustyCms::Application.load_tasks

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/spec/dummy/config/application.rb

@@ -0,0 +1,151 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+require 'acts_as_tree'
+require "trusty_cms"
+require 'ckeditor'
+require 'radius'
+require 'trusty_cms/extension_loader'
+require 'trusty_cms/initializer'
+require 'string_extensions/string_extensions'
+require 'active_record_extensions/active_record_extensions'
+require 'configuration_extensions/configuration_extensions'
+require 'compass'
+require 'rack/cache'
+require "sass-rails"
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module TrustyCms
+  class Application < Rails::Application
+    include TrustyCms::Initializer
+
+    config.autoload_paths += %W(#{TRUSTY_CMS_ROOT}/lib)
+    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W(#{config.root}/app/helpers)
+
+    Sass.load_paths << Compass::Frameworks['compass'].stylesheets_directory
+
+    # Initialize extension paths
+    config.initialize_extension_paths
+    extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
+    extension_loader.paths(:load).reverse_each do |path, value|
+      config.autoload_paths.unshift path
+      $LOAD_PATH.unshift path
+    end
+    # config.add_plugin_paths(extension_loader.paths(:plugin))
+    # TODO: Come back and look at this.
+    radiant_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+    config.i18n.load_path = radiant_locale_paths + extension_loader.paths(:locale)
+
+    config.encoding = 'utf-8'
+    # Skip frameworks you're not going to use (only works if using vendor/rails).
+    # To use Rails without a database, you must remove the Active Record framework
+    # config.frameworks -= [ :action_mailer ]
+
+    # Only load the extensions named here, in the order given. By default all
+    # extensions in vendor/extensions are loaded, in alphabetical order. :all
+    # can be used as a placeholder for all extensions not explicitly named.
+
+    # An example of how to add extensions:
+    # config.extensions = [ :snippets, :clipped, :layouts, :reorder, :multi_site, :rad_social]
+
+    config.extensions = []
+    config.extensions_migration_order = []
+
+    # By default, only English translations are loaded. Remove any of these from
+    # the list below if you'd like to provide any of the additional options
+    # config.ignore_extensions []
+
+    # Your secret key for verifying cookie session data integrity.
+    # If you change this key, all old sessions will become invalid!
+    # Make sure the secret is at least 30 characters and all random,
+    # no regular words or you'll be exposed to dictionary attacks.
+
+    # Comment out this line if you want to turn off all caching, or
+    # add options to modify the behavior. In the majority of deployment
+    # scenarios it is desirable to leave TrustyCms's cache enabled and in
+    # the default configuration.
+    #
+    # Additional options:
+    #  :use_x_sendfile => true
+    #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
+    #  :use_x_accel_redirect => '/some/virtual/path'
+    #    Turns on X-Accel-Redirect support for nginx. You have to provide
+    #    a path that corresponds to a virtual location in your webserver
+    #    configuration.
+    #  :entitystore => "radiant:tmp/cache/entity"
+    #    Sets the entity store type (preceding the colon) and storage
+    #   location (following the colon, relative to Rails.root).
+    #    We recommend you use radiant: since this will enable manual expiration.
+    #  :metastore => "radiant:tmp/cache/meta"
+    #    Sets the meta store type and storage location.  We recommend you use
+    #    radiant: since this will enable manual expiration and acceleration headers.
+
+    # TODO: We're not sure this is actually working, but we can't really test this until the app initializes.
+    config.middleware.use Rack::Cache,
+                          :private_headers => ['Authorization'],
+                          :entitystore => "radiant:tmp/cache/entity",
+                          :metastore => "radiant:tmp/cache/meta",
+                          :verbose => false,
+                          :allow_reload => false,
+                          :allow_revalidate => false
+    # TODO: There's got to be a better place for this, but in order for assets to work fornow, we need ConditionalGet
+    # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
+    config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
+    config.assets.enabled = true
+
+
+
+    config.filter_parameters += [:password, :password_confirmation]
+
+    # Use the database for sessions instead of the cookie-based default,
+    # which shouldn't be used to store highly confidential information
+    # (create the session table with 'rake db:sessions:create')
+    # config.action_controller.session_store = :cookie_store DEPRECATED
+
+    # Activate observers that should always be running
+    #config.active_record.observers = :user_action_observer
+
+    # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
+    # All files from config/locales/*.rb,yml are added automatically.
+    # config.i18n.load_path << Dir[File.join(Rails.root, 'my', 'locales', '*.{rb,yml}')]
+    # config.i18n.default_locale = :'en'
+
+    # Make Active Record use UTC-base instead of local time
+    config.time_zone = 'UTC'
+
+    # Set the default field error proc
+    config.action_view.field_error_proc = Proc.new do |html, instance|
+      if html !~ /label/
+        %{<span class="error-with-fieldxxxx">#{html} <span class="error">#{[instance.error_message].flatten.first}</span></span>}.html_safe
+      else
+        html
+      end
+    end
+
+    config.after_initialize do
+      extension_loader.load_extensions
+      extension_loader.load_extension_initalizers
+
+      #Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
+      #  load(initializer)
+      #end
+
+      extension_loader.activate_extensions  # also calls initialize_views
+      #config.add_controller_paths(extension_loader.paths(:controller))
+      #config.add_eager_load_paths(extension_loader.paths(:eager_load))
+
+      # Add new inflection rules using the following format:
+      ActiveSupport::Inflector.inflections do |inflect|
+        inflect.uncountable 'config'
+      end
+
+    end
+  end
+end