radiant 0.6.6 → 0.6.7

data/app/views/admin/page/index.html.haml

@@ -0,0 +1,28 @@
+- include_javascript 'admin/sitemap'
+
+%h1 Pages
+
+= render_region :top
+
+%table#site-map.index{:summary=>"Page hierarchy of the current site"}
+  %thead
+    %tr
+      - render_region :sitemap_head do |sitemap_head|
+        - sitemap_head.title_column_header do
+          %th.page Page
+        - sitemap_head.status_column_header do
+          %th.status Status
+        - sitemap_head.modify_column_header do
+          %th.modify{:colspan=>"2"} Modify
+  %tbody
+    - if @homepage
+      = render_node @homepage
+    - else
+      %tr
+        %td.note{:colspan => 4} No Pages
+
+= render_region :bottom
+
+- unless @homepage
+  %p
+    = link_to image('new-homepage', :alt => 'New Homepage'), homepage_new_url

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

@@ -0,0 +1,20 @@
+- pages = pluralize(@page.children.count + 1, 'Page') 
+%h1
+  Remove 
+  = pages
+
+%p
+  Are you sure you want to
+  %strong.warning permanently remove
+  the following
+  = pages.downcase + "?"
+
+%table.index#site-map{:cellpadding=>0, :cellspacing=>0, :border=>0}
+  %tbody
+    = render_node @page, :simple => true
+
+- form_tag do
+  %p.buttons
+    %input.button{:type=>"submit", :value=>"Delete Pages"}/
+    or
+    = link_to 'Cancel', page_index_url

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

@@ -0,0 +1,36 @@
+- render_region :main do |main|
+  - main.edit_header do
+    - if @snippet.new_record?
+      %h1 New Snippet
+    - else
+      %h1 Edit Snippet
+  - main.edit_form do
+    - form_tag do
+      = hidden_field 'snippet', 'lock_version'
+      = render_region :form_top
+      .form-area
+        - render_region :form do |form|
+          - form.edit_title do
+            %p.title
+              %label{:for=>"snippet_name"} Name
+              = text_field "snippet", "name", :class => 'textbox', :maxlength => 100
+          - form.edit_content do
+            %p.content
+              %label{:for=>"snippet_content"} Body
+              ~ text_area "snippet", "content", :class => "textarea", :style => "width: 100%"
+          - form.edit_filter do
+            %p
+              %label{:for=>"snippet_filter"} Filter
+              = select_tag "snippet[filter_id]", options_for_select([['none', '']] + TextFilter.descendants.map { |f| f.filter_name }.sort, @snippet.filter_id), :id => 'snippet_filter' 
+          - form.edit_timestamp do
+            = updated_stamp @snippet
+
+      = javascript_tag "$('snippet_name').activate()"
+      
+      - render_region :form_bottom do |form_bottom|
+        - form_bottom.edit_buttons do
+          %p.buttons
+            = save_model_button(@snippet)
+            = save_model_and_continue_editing_button(@snippet)
+            or
+            = link_to 'Cancel', snippet_index_url

data/app/views/admin/snippet/index.html.haml

@@ -0,0 +1,20 @@
+%h1 Snippets
+
+%p Snippets are generally small pieces of content which are included in other pages or layouts.
+
+%table#snippets.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
+  %thead
+    %tr
+      %th.snippet Snippet
+      %th.modify Modify
+  %tbody
+    - @snippets.each do |snippet|
+      %tr.node.level-1
+        %td.snippet
+          = image('snippet', :alt => 'snippet-icon')
+          %span= link_to snippet.name, snippet_edit_url(:id => snippet)
+        %td.remove
+          = link_to image('remove', :alt => 'Remove Snippet'), snippet_remove_url(:id => snippet)
+
+%p
+  = link_to image('new-snippet', :alt => 'New Snippet'), snippet_new_url

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

@@ -0,0 +1,19 @@
+%h1 Remove Snippet
+
+%p 
+  Are you sure you want to 
+  %strong.warning permanently remove
+  the following snippet?
+
+%table.index#snippets{:cellpadding=>0, :cellspacing=>0, :border=>0}
+  %tbody
+    %tr.node.level-1
+      %td.snippet
+        = image('snippet', :alt => "snippet-icon")
+        %span.title= @snippet.name
+
+- form_tag do
+  %p.buttons
+    %input.button{:type=>"submit", :value=>"Delete Snippet"}/
+    or
+    = link_to 'Cancel', snippet_index_url

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

@@ -0,0 +1,80 @@
+- render_region :main do |main|
+  - main.edit_header do
+    - if @user.new_record?
+      %h1 New User
+    - else
+      %h1 Edit User
+  - main.edit_form do
+    - form_tag do
+      = hidden_field 'user', 'lock_version'
+      = render_region :form_top
+      %table.fieldset{:cellpadding=>0, :cellspacing=>0, :border=>0}
+        - render_region :form do |form|
+          - form.edit_name do
+            %tr
+              %th.label
+                %label{:for=>"user_name"} Name
+              %td.field
+                = text_field "user", "name", :class => 'textbox', :maxlength => 100 
+              %td.help Required.
+          - form.edit_email do
+            %tr
+              %th.label
+                %label.optional{:for=>"user_email"} E-mail
+              %td.field
+                = text_field "user", "email", :class => 'textbox', :maxlength => 255
+              %td.help
+                Optional. Please use a valid e-mail address.
+          - form.edit_username do
+            %tr
+              %th.label
+                %label{:for=>"user_login"} Username
+              %td.field
+                = text_field "user", "login", :class => 'textbox', :maxlength => 40 
+              %td.help
+                At least 3 characters. Must be unique.
+          - form.edit_password do
+            %tr
+              %th.label
+                %label{:for=>"user_password"} Password
+              %td.field
+                = password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40
+              %td.help{:rowspan=>2}
+                At least 5 characters.
+                - unless @user.new_record?
+                  Leave password blank for it to remain unchanged.
+            %tr
+              %th.label
+                %label{:for=>"user_password_confirmation"} Confirm Password
+              %td.field
+                = password_field "user", "password_confirmation", :class => 'textbox', :value => '', :maxlength => 40
+          - form.edit_roles do
+            %tr
+              %th.label
+                %label{:for=>"user_admin"} Roles
+              %td.field
+                %span.checkbox
+                  = check_box "user", "admin" 
+                  %label{:for=> "user_admin"} Administrator
+                %span.checkbox
+                  = check_box "user", "developer" 
+                  %label{:for=> "user_developer"} Developer
+              %td.help
+                Roles restrict user privileges and turn parts of the administrative interface on or off.
+          - form.edit_notes do
+            %tr
+              %th.label
+                %label.optional{:for=>"user_notes"} Notes
+              %td.field
+                ~ text_area "user", "notes", :size => '40x4', :class => "textarea" 
+              %td.help
+                Optional.
+      - render_region :form_bottom do |form_bottom|
+        - form_bottom.edit_timestamp do
+          = updated_stamp @user  
+        - form_bottom.edit_buttons do
+          %p.buttons
+            = save_model_button(@user)
+            = save_model_and_continue_editing_button(@user)
+            or 
+            = link_to "Cancel", user_index_url

data/app/views/admin/user/index.html.haml

@@ -0,0 +1,23 @@
+%h1 Users
+
+%table#users.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"}
+  %thead
+    %tr
+      %th.user Name / Login
+      %th.roles Roles
+      %th.modify Modify
+  %tbody
+    - @users.each do |user|
+      %tr.node.level-1
+        %td.user
+          = link_to user.name, user_edit_url(:id => user)
+          %small.login= h user.login
+        %td.roles= roles(user)
+        %td.remove
+          - if user == current_user
+            = image('remove-disabled', :alt => 'Remove')
+          - else
+            = link_to(image('remove', :alt => 'Remove User'), user_remove_url(:id => user)) 
+
+%p
+  = link_to image('new-user', :alt => 'New User'), user_new_url, :title => "New User"

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

@@ -0,0 +1,28 @@
+%h1 User Preferences
+
+- form_tag do
+  %table.fieldset{:cellpadding=>0, :cellspacing=>0, :border=>0}
+    %tr
+      %th.label
+        %label{:for=>"user_password"} Password
+      %td.field
+        = password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40
+      %td.help{:rowspan=>2}
+        At least 5 characters. Leave password blank for it to remain unchanged.
+    %tr
+      %th.label
+        %label{:for=>"user_password_confirmation"} Confirm Password
+      %td.field
+        = password_field "user", "password_confirmation", :class => 'textbox', :value => '', :maxlength => 40
+    %tr
+      %th.label
+        %label{:for=>"user_email"} E-mail
+      %td.field
+        = text_field "user", "email", :class => 'textbox', :maxlength => 255
+      %td.help Optional.
+  %p.buttons
+    = save_model_button @user
+    or
+    = link_to 'Cancel', admin_url
+
+= javascript_tag "$('user_password').activate();"

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

@@ -0,0 +1,18 @@
+%h1 Remove User
+
+%p 
+  Are you sure you want to 
+  %strong.warning permanently remove
+  the following user?
+
+%table.index#users{:cellpadding=>0, :cellspacing=>0, :border=>0}
+  %tbody
+    %tr.node.level-1
+      %td.user
+        %span.title= @user.name
+
+- form_tag do
+  %p.buttons
+    %input.button{:type=>"submit", :value=>"Delete User"}/
+    or
+    = link_to 'Cancel', user_index_url

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

@@ -0,0 +1,44 @@
+- content_for 'page_css' do
+  :sass
+    #content
+      text-align: center
+      #login
+        background-color: #f5f1e2
+        border: 5px solid #efead3
+        text-align: left
+        margin: 2em
+        margin-left: auto
+        margin-right: auto
+        padding-left: 20px
+        width: 23.5em
+        h1
+          font-size: 140%    
+          margin: 0
+          margin-top: 18px
+          margin-bottom: 18px
+        label
+          float: left
+          clear: left
+          margin-top: 4px
+          width: 6em
+        input.textbox
+          font-size: 100%
+          width: 16em
+        .buttons
+          margin-top: 15px
+          margin-bottom: 20px
+
+#login
+  %h1 Please Login
+  
+  - form_tag login_url do
+    %p
+      %label{:for=>"user_login"} Username
+      = text_field "user", "login", :class => 'textbox', :value => '', :maxlength => 40 
+    %p
+      %label{:for=>"user_password"} Password
+      = password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 
+    %p.buttons
+      %input.button{:type=>"submit", :value=>"Login"}/
+  
+= javascript_tag "$('user_login').activate();"

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

@@ -0,0 +1,54 @@
+!!!
+%html{html_attrs}
+  %head
+    %meta{"http-equiv"=>"Content-type", :content=>"text/html; charset=utf-8"}/
+    %title= @page_title || default_page_title
+    - @stylesheets.uniq.each do |stylesheet|
+      = stylesheet_link_tag stylesheet
+    - @javascripts.uniq.each do |javascript|
+      = javascript_include_tag javascript
+    /[if lt IE 7]
+      %script{:type=>"text/javascript", :src=>"/admin/javascripts/pngfix.js"}
+    - if @content_for_page_scripts
+      = javascript_tag @content_for_page_scripts
+    - if @content_for_page_css
+      %style{:type => "text/css"}= @content_for_page_css
+  %body
+    #page
+      #header
+        #site-title= link_to_unless_current title, admin_url
+        #site-subtitle= subtitle
+        - if logged_in?
+          #navigation= links_for_navigation
+      %hr{:class=>"hidden"}/
+      #main
+        - if flash[:notice]
+          #notice
+            %p= flash[:notice]
+        - if flash[:error]
+          #error
+            %p= flash[:error]
+        #content
+          = yield
+      %hr{:class=>"hidden"}/
+      #footer
+        %p 
+          This site was made with Ruby and is powered by 
+          %a{:href=>"http://radiantcms.org"} Radiant CMS
+          version 
+          = Radiant.loaded_via_gem? ? "#{Radiant::Version} (gem)." : "#{Radiant::Version}."
+        %p#site-links
+          - if logged_in?
+            - if admin?
+              = nav_link_to 'Users', user_index_url
+              %span.separator=" | "
+              = nav_link_to 'Extensions', extension_index_url
+            - else
+              = nav_link_to 'Preferences', user_preferences_url
+            %span.separator=" | "
+            = nav_link_to 'Log Out', logout_url
+            %span.separator=" | "
+            = link_to image('view-site.gif', :alt => "View Site", :title => ''), homepage_url
+      - if @content_for_popups
+        #popups
+          = yield :popups

data/app/views/site/not_found.html.haml

@@ -0,0 +1,3 @@
+- @page_title = 'Page Not Found'
+%h1=@page_title
+%p The page you were looking for could not be located on this site.

data/db/migrate/019_add_salt_to_users.rb

@@ -0,0 +1,11 @@
+class AddSaltToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :salt, :string
+    User.reset_column_information
+    User.update_all :salt => "sweet harmonious biscuits"
+  end
+
+  def self.down
+    remove_column :users, :salt
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 18) do
+ActiveRecord::Schema.define(:version => 19) do
 
   create_table "config", :force => true do |t|
     t.string "key",   :limit => 40, :default => "", :null => false
@@ -96,6 +96,7 @@ ActiveRecord::Schema.define(:version => 18) do
     t.boolean  "developer",                    :default => false, :null => false
     t.text     "notes"
     t.integer  "lock_version",                 :default => 0
+    t.string   "salt"
   end
 
   add_index "users", ["login"], :name => "login", :unique => true

data/lib/login_system.rb

@@ -38,6 +38,7 @@ module LoginSystem
           flash[:error] = permissions[:denied_message] || 'Access denied.'
           redirect_to permissions[:denied_url] || { :action => :index }
         else
+          session[:return_to] = request.request_uri
           redirect_to login_url
         end
         false

data/lib/radiant.rb

@@ -5,7 +5,7 @@ unless defined? Radiant::Version
     module Version
       Major = '0'
       Minor = '6'
-      Tiny  = '6'
+      Tiny  = '7'
 
       class << self
         def to_s

data/lib/radiant/admin_ui.rb

@@ -1,7 +1,10 @@
 require 'simpleton'
+require 'ostruct'
 
 module Radiant
   class AdminUI
+    # This may be loaded before ActiveSupport, so do an explicit require
+    require 'radiant/admin_ui/region_set'
     
     class DuplicateTabNameError < StandardError; end
     
@@ -74,9 +77,71 @@ module Radiant
     
     attr_accessor :tabs
     
+    # Region sets
+    attr_accessor :page, :snippet, :layout, :user
+    
     def initialize
       @tabs = TabSet.new
+      load_default_regions
     end
     
+    private
+
+    def load_default_regions
+      @page = load_default_page_regions
+      @snippet = load_default_snippet_regions
+      @layout = load_default_layout_regions
+      @user = load_default_user_regions
+    end
+      
+    def load_default_page_regions
+      returning OpenStruct.new do |page|
+        page.edit = RegionSet.new do |edit|
+            edit.main.concat %w{edit_header edit_form edit_popups}
+            edit.form.concat %w{edit_title edit_extended_metadata
+                                  edit_page_parts}
+            edit.form_bottom.concat %w{edit_buttons}
+            edit.parts_bottom.concat %w{edit_layout_and_type edit_timestamp}
+        end
+        page.index = RegionSet.new do |index|
+          index.sitemap_head.concat %w{title_column_header status_column_header
+                                      modify_column_header}
+          index.node.concat %w{title_column status_column add_child_column remove_column}
+        end
+        page.remove = page.children = page.index
+        page._part = page.edit
+      end
+    end
+
+    def load_default_user_regions
+      returning OpenStruct.new do |user|
+        user.edit = RegionSet.new do |edit|
+          edit.main.concat %w{edit_header edit_form}
+          edit.form.concat %w{edit_name edit_email edit_username edit_password 
+                              edit_roles edit_notes}
+          edit.form_bottom.concat %w{edit_timestamp edit_buttons}
+        end
+      end
+    end
+
+    def load_default_snippet_regions
+      returning OpenStruct.new do |snippet|
+        snippet.edit = RegionSet.new do |edit|
+          edit.main.concat %w{edit_header edit_form}
+          edit.form.concat %w{edit_title edit_content edit_filter edit_timestamp}
+          edit.form_bottom.concat %w{edit_buttons}
+        end
+      end
+    end
+
+    def load_default_layout_regions
+      returning OpenStruct.new do |layout|
+        layout.edit = RegionSet.new do |edit|
+          edit.main.concat %w{edit_header edit_form}
+          edit.form.concat %w{edit_title edit_extended_metadata edit_content edit_timestamp}
+          edit.form_bottom.concat %w{edit_buttons}
+        end
+      end
+    end
   end
 end