Changeset 787
- Timestamp:
- 04/02/08 15:49:09 (5 months ago)
- Files:
-
- trunk/extensions/shards/app/views/admin/layout/_edit_form.html.erb (added)
- trunk/extensions/shards/app/views/admin/layout/_edit_form.rhtml (deleted)
- trunk/extensions/shards/app/views/admin/layout/edit.html.erb (moved) (moved from trunk/extensions/shards/app/views/admin/layout/edit.rhtml)
- trunk/extensions/shards/app/views/admin/snippet/_edit_form.html.erb (added)
- trunk/extensions/shards/app/views/admin/snippet/_edit_form.rhtml (deleted)
- trunk/extensions/shards/app/views/admin/snippet/edit.html.erb (moved) (moved from trunk/extensions/shards/app/views/admin/snippet/edit.rhtml)
- trunk/extensions/shards/app/views/admin/user (added)
- trunk/extensions/shards/app/views/admin/user/_edit_form.html.erb (added)
- trunk/extensions/shards/app/views/admin/user/edit.html.erb (copied) (copied from trunk/extensions/shards/app/views/admin/layout/edit.rhtml) (1 diff)
- trunk/extensions/shards/shards_extension.rb (modified) (3 diffs)
- trunk/extensions/shards/test/functional/shards_extension_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/extensions/shards/app/views/admin/user/edit.html.erb
r666 r787 1 1 <% render_region :main do |main| %> 2 2 <% main.edit_header do %> 3 <% if @ layout.new_record? -%>4 <h1>New Layout</h1>3 <% if @user.new_record? -%> 4 <h1>New User</h1> 5 5 <% else -%> 6 <h1>Edit Layout</h1>6 <h1>Edit User</h1> 7 7 <% end %> 8 8 <% end %> trunk/extensions/shards/shards_extension.rb
r674 r787 15 15 end 16 16 Radiant::AdminUI.class_eval do 17 attr_accessor :page, : snippet, :layout17 attr_accessor :page, :user, :snippet, :layout 18 18 end 19 19 # initialize regions for page, snippet and layout 20 20 admin.page = load_default_page_regions 21 admin.user = load_default_user_regions 21 22 admin.snippet = load_default_snippet_regions 22 23 admin.layout = load_default_layout_regions … … 51 52 end 52 53 54 def load_default_user_regions 55 returning OpenStruct.new do |user| 56 user.edit = Shards::RegionSet.new do |edit| 57 edit.main.concat %w{edit_header edit_form} 58 edit.form.concat %w{edit_table_header edit_name edit_email edit_login edit_password 59 edit_password_confirmation edit_roles edit_notes edit_table_footer 60 edit_timestamp} 61 edit.form_bottom.concat %w{edit_buttons} 62 end 63 end 64 end 65 53 66 def load_default_snippet_regions 54 67 returning OpenStruct.new do |snippet| 55 68 snippet.edit = Shards::RegionSet.new do |edit| 56 69 edit.main.concat %w{edit_header edit_form} 70 edit.form.concat %w{edit_title edit_content edit_filter edit_timestamp} 71 edit.form_bottom.concat %w{edit_buttons} 57 72 end 58 73 end … … 63 78 layout.edit = Shards::RegionSet.new do |edit| 64 79 edit.main.concat %w{edit_header edit_form} 80 edit.form.concat %w{edit_title edit_extended_metadata edit_content edit_timestamp} 81 edit.form_bottom.concat %w{edit_buttons} 65 82 end 66 83 end trunk/extensions/shards/test/functional/shards_extension_test.rb
r674 r787 58 58 assert_equal %w{edit_header edit_form}, layout.edit.main 59 59 end 60 61 def test_should_create_user_region_sets 62 admin = Radiant::AdminUI.instance 63 assert_respond_to admin, :user 64 assert_not_nil admin.layout 65 assert_kind_of OpenStruct, admin.user 66 end 67 68 def test_should_initialize_user_region_defaults 69 user = ShardsExtension.instance.send(:load_default_user_regions) 70 assert_not_nil user.edit 71 assert_equal %w{edit_header edit_form}, user.edit.main 72 end 60 73 61 74 def test_should_add_render_region_helper
