@@ -1,6 +1,7 @@ == Change Log === Edge +* Added more render regions to layout, snippet, user, and extension views. [Sean Cribbs] * Fixed the radiant:update:scripts to find the proper directory [Jim Gay] * Factor out dev? functionality in StandardTags, allowing other tags to access it. [Sean Cribbs] CHANGELOG @@ -11,18 +11,30 @@ %h1 Extensions += render_region :top + %table#extensions.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"} %thead %tr - %th.extension Extension - %th.website Website - %th.version Version + - render_region :thead do |thead| + - thead.title_header do + %th.extension Extension + - thead.website_header do + %th.website Website + - thead.version_header do + %th.version Version %tbody - @extensions.each do |extension| %tr.node.level-1 - %td.extension - %h4= h extension.extension_name - %p= h extension.description - %td.website - = extension.url.nil? || extension.url.empty? ? "" : link_to("Website", extension.url, :target => "_blank") - %td.version= h extension.version \ No newline at end of file + - render_region :tbody do |tbody| + - tbody.title_cell do + %td.extension + %h4= h extension.extension_name + %p= h extension.description + - tbody.website_cell do + %td.website + = extension.url.nil? || extension.url.empty? ? "" : link_to("Website", extension.url, :target => "_blank") + - tbody.version_cell do + %td.version= h extension.version + += render_region :bottom \ No newline at end of file app/views/admin/extension/index.html.haml @@ -1,25 +1,34 @@ %h1 Layouts - -%p - Use layouts to apply a visual look to a Web page. Layouts can contain special tags to include - page content and other elements such as the header or footer. Click on a layout name below to - edit it or click <code>Remove</code> to delete it. +- render_region :top do |top| + - top.help_text do + %p + Use layouts to apply a visual look to a Web page. Layouts can contain special tags to include + page content and other elements such as the header or footer. Click on a layout name below to + edit it or click <code>Remove</code> to delete it. %table#layouts.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0" } %thead %tr - %th.layout - Layout - %th.modify - Modify + - render_region :thead do |thead| + - thead.title_header do + %th.layout + Layout + - thead.modify_header do + %th.modify + Modify %tbody - @layouts.each do |layout| %tr.node.level-1 - %td.layout - = image('layout', :alt => 'layout-icon') - = link_to layout.name, layout_edit_url(:id => layout) - %td.remove - = link_to image('remove', :alt => 'Remove Layout'), layout_remove_url(:id => layout) + - render_region :tbody do |tbody| + - tbody.title_cell do + %td.layout + = image('layout', :alt => 'layout-icon') + = link_to layout.name, layout_edit_url(:id => layout) + - tbody.modify_cell do + %td.remove + = link_to image('remove', :alt => 'Remove Layout'), layout_remove_url(:id => layout) -%p - = link_to image('new-layout', :alt => "New Layout"), layout_new_url +- render_region :bottom do |bottom| + - bottom.new_button do + %p + = link_to image('new-layout', :alt => "New Layout"), layout_new_url app/views/admin/layout/index.html.haml @@ -1,20 +1,30 @@ %h1 Snippets -%p Snippets are generally small pieces of content which are included in other pages or layouts. +- render_region :top do |top| + - top.help_text do + %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 + - render_region :thead do |thead| + - thead.title_header do + %th.snippet Snippet + - thead.modify_header do + %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) + - render_region :tbody do |tbody| + - tbody.title_cell do + %td.snippet + = image('snippet', :alt => 'snippet-icon') + %span= link_to snippet.name, snippet_edit_url(:id => snippet) + - tbody.modify_cell do + %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 \ No newline at end of file +- render_region :bottom do |bottom| + - bottom.new_button do + %p + = link_to image('new-snippet', :alt => 'New Snippet'), snippet_new_url \ No newline at end of file app/views/admin/snippet/index.html.haml @@ -1,23 +1,35 @@ %h1 Users += render_region :top + %table#users.index{:cellspacing=>"0", :border=>"0", :cellpadding=>"0"} %thead %tr - %th.user Name / Login - %th.roles Roles - %th.modify Modify + - render_region :thead do |thead| + - thead.title_header do + %th.user Name / Login + - thead.roles_header do + %th.roles Roles + - thead.modify_header do + %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)) + - render_region :tbody do |tbody| + - tbody.title_cell do + %td.user + = link_to user.name, user_edit_url(:id => user) + %small.login= h user.login + - tbody.roles_cell do + %td.roles= roles(user) + - tbody.modify_cell do + %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" \ No newline at end of file +- render_region :bottom do |bottom| + - bottom.new_button do + %p + = link_to image('new-user', :alt => 'New User'), user_new_url, :title => "New User" \ No newline at end of file app/views/admin/user/index.html.haml @@ -78,7 +78,7 @@ module Radiant attr_accessor :tabs # Region sets - attr_accessor :page, :snippet, :layout, :user + attr_accessor :page, :snippet, :layout, :user, :extension def initialize @tabs = TabSet.new @@ -90,6 +90,7 @@ module Radiant @snippet = load_default_snippet_regions @layout = load_default_layout_regions @user = load_default_user_regions + @extension = load_default_extension_regions end private @@ -121,6 +122,11 @@ module Radiant edit_roles edit_notes} edit.form_bottom.concat %w{edit_timestamp edit_buttons} end + user.index = RegionSet.new do |index| + index.thead.concat %w{title_header roles_header modify_header} + index.tbody.concat %w{title_cell roles_cell modify_cell} + index.bottom.concat %w{new_button} + end end end @@ -131,6 +137,12 @@ module Radiant edit.form.concat %w{edit_title edit_content edit_filter edit_timestamp} edit.form_bottom.concat %w{edit_buttons} end + snippet.index = RegionSet.new do |index| + index.top.concat %w{help_text} + index.thead.concat %w{title_header modify_header} + index.tbody.concat %w{title_cell modify_cell} + index.bottom.concat %w{new_button} + end end end @@ -141,6 +153,21 @@ module Radiant edit.form.concat %w{edit_title edit_extended_metadata edit_content edit_timestamp} edit.form_bottom.concat %w{edit_buttons} end + layout.index = RegionSet.new do |index| + index.top.concat %w{help_text} + index.thead.concat %w{title_header modify_header} + index.tbody.concat %w{title_cell modify_cell} + index.bottom.concat %w{new_button} + end + end + end + + def load_default_extension_regions + returning OpenStruct.new do |extension| + extension.index = RegionSet.new do |index| + index.thead.concat %w{title_header website_header version_header} + index.tbody.concat %w{title_cell website_cell version_cell} + end end end end lib/radiant/admin_ui.rb @@ -52,6 +52,11 @@ describe Radiant::AdminUI do snippet.edit.form.should == %w{edit_title edit_content edit_filter edit_timestamp} snippet.edit.form_bottom.should == %w{edit_buttons} + snippet.index.should_not be_nil + snippet.index.top.should == %w{help_text} + snippet.index.thead.should == %w{title_header modify_header} + snippet.index.tbody.should == %w{title_cell modify_cell} + snippet.index.bottom.should == %w{new_button} end it "should load the default layout regions" do @@ -61,6 +66,11 @@ describe Radiant::AdminUI do layout.edit.form.should == %w{edit_title edit_extended_metadata edit_content edit_timestamp} layout.edit.form_bottom.should == %w{edit_buttons} + layout.index.should_not be_nil + layout.index.top.should == %w{help_text} + layout.index.thead.should == %w{title_header modify_header} + layout.index.tbody.should == %w{title_cell modify_cell} + layout.index.bottom.should == %w{new_button} end it "should load the default user regions" do @@ -70,6 +80,17 @@ describe Radiant::AdminUI do user.edit.form.should == %w{edit_name edit_email edit_username edit_password edit_roles edit_notes} user.edit.form_bottom.should == %w{edit_timestamp edit_buttons} + user.index.should_not be_nil + user.index.thead.should == %w{title_header roles_header modify_header} + user.index.tbody.should == %w{title_cell roles_cell modify_cell} + user.index.bottom.should == %w{new_button} + end + + it "should load the default extension regions" do + ext = @admin.extension + ext.index.should_not be_nil + ext.index.thead.should == %w{title_header website_header version_header} + ext.index.tbody.should == %w{title_cell website_cell version_cell} end end spec/lib/radiant/admin_ui_spec.rb 9dc11d6f5dc65e349a92e657661b6eabf9b2b6c6 Sean Cribbs seancribbs@gmail.com http://github.com/saturnflyer/radiant/commit/f00d786d7942ecb9d2a78c380080f928fab24fc7 f00d786d7942ecb9d2a78c380080f928fab24fc7 2008-08-15T08:09:30-07:00 2008-08-15T08:09:30-07:00 Added more render regions to layout, snippet, user, and extension views. 7cdf8bf569a2f30beb66b03d2cd620cf87824bc7 Sean Cribbs seancribbs@gmail.com