trusty-cms 2.0.2.pre.beta → 2.0.2

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/controllers/admin/pages_controller.rb

@@ -47,7 +47,7 @@ class Admin::PagesController < Admin::ResourceController
 
     def model_class
       if Page.descendants.any? { |d| d.to_s == params[:page_class] }
-        params[:page_class].constantize
+        verify_page_class(params[:page_class])
       elsif params[:page_id]
         Page.find(params[:page_id]).children
       else
@@ -89,4 +89,12 @@ class Admin::PagesController < Admin::ResourceController
       @meta << {:field => "slug", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 100}]}
       @meta << {:field => "breadcrumb", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 160}]}
     end
+
+  def verify_page_class(page_class)
+    if page_class.constantize.ancestors.include?(Page)
+      page_class.constantize
+    else
+      raise "I'm not allowed to constantize #{page_class}!"
+    end
+  end
 end

data/app/controllers/admin/references_controller.rb

@@ -1,7 +1,14 @@
 class Admin::ReferencesController < ApplicationController
   def show
     respond_to do |format|
-      format.any { render :action => params[:type], :content_type => "text/html", :layout => false }
+      render_allowed_type(params[:type])
+      format.any { render :action => @type, :content_type => "text/html", :layout => false }
     end
   end
+
+  private
+
+  def render_allowed_type(type)
+    @type = type
+  end
 end

data/app/controllers/admin/users_controller.rb

@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ResourceController
   def ensure_deletable
     if current_user.id.to_s == params[:id].to_s
       announce_cannot_delete_self
-      redirect_to admin_users_url
+      redirect_to admin_users_path
     end
   end
 

data/app/controllers/admin/welcome_controller.rb

@@ -4,7 +4,7 @@ class Admin::WelcomeController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
   def index
-    redirect_to admin_pages_url
+    redirect_to admin_pages_path
   end
 
   def login
@@ -18,7 +18,7 @@ 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_path)
       session[:return_to] = nil
     end
   end
@@ -28,7 +28,7 @@ class Admin::WelcomeController < ApplicationController
     self.current_user.forget_me if self.current_user
     self.current_user = nil
     announce_logged_out
-    redirect_to login_url
+    redirect_to login_path
   end
 
   private

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_url
+    redirect_to welcome_path
   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)
+  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
 
@@ -88,7 +89,7 @@ module TrustyCms
 
       def []=(key, value)
         if table_exists?
-          setting = find_or_initialize_by(key: key)
+          setting = where(key: key).first_or_initialize
           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_url, :html => {"data-onsubmit_status"=>"Saving changes…", :method => :put} do |f|
+    = form_for :trusty_config, :url => admin_configuration_path, :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_url
+            = link_to "Cancel", admin_configuration_path, class: 'alt'

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

@@ -39,7 +39,7 @@
       %h3
         - if admin?
           .actions
-            = button_to t("edit_configuration"), edit_admin_configuration_url, :method => :get
+            = button_to t("edit_configuration"), edit_admin_configuration_path, :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_url
+        = link_to t('cancel'), admin_layouts_path, class: 'alt'
     - 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_url
+    = link_to t('cancel'), admin_layouts_path, class: 'alt'

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
+      = link_to t('cancel'), admin_pages_url, class: 'alt'
     #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_url(page), :title => page.path)).html_safe
+            = (link_to("#{icon} #{node_title}".html_safe, edit_admin_page_path(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= 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,11 +9,11 @@
 .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
   .buttons
     %input.button{:type=>"submit", :value => t('delete_pages', :pages => pages) }/
     = t('or')
-    = link_to t('cancel'), admin_pages_url
+    = link_to t('cancel'), admin_pages_path, class: 'alt'

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_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
+    = 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'

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
+        = link_to t('cancel'), admin_users_path, class: 'alt'
     - 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=>"#", :onclick=>" $('#display_password').show(); $('#change_password').hide()"}= t('cancel')
+        %a{:href=>"#", :class=>"warning", :onclick=>" $('#display_password').show(); $('#change_password').hide()"}= t('cancel', class: 'alt')
 
 

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
+    = link_to t('cancel'), admin_users_path, class: 'alt'

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

@@ -3,7 +3,7 @@
 #single_form
   %h1= t('please_login')
 
-  = form_tag login_url do
+  = form_tag login_path 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,22 +31,24 @@
     #page
       #header
         - if logged_in?
-          #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
+          = 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
       #main
         - if flash[:notice]
           #notice

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