@@ -24,8 +24,6 @@ %p.content = f.label :layout_content, "Body" ~ f.text_area 'content', :size => '40x20', :style => 'width: 100%', :class => "textarea" - - form.edit_timestamp do - = updated_stamp @layout = javascript_tag "$('layout_name').activate()" - render_region :form_bottom do |form_bottom| - form_bottom.edit_buttons do @@ -33,4 +31,7 @@ = save_model_button @layout = save_model_and_continue_editing_button @layout or - = link_to "Cancel", admin_layouts_url \ No newline at end of file + = link_to "Cancel", admin_layouts_url + - form_bottom.edit_timestamp do + = updated_stamp @layout + \ No newline at end of file app/views/admin/layouts/_form.html.haml @@ -47,8 +47,6 @@ = fields.datetime_select :published_at, :disabled => true = render_region :layout_row, :locals => {:f => fields} %span.clear   - - parts_bottom.edit_timestamp do - = updated_stamp @page - render_region :form_bottom do |form_bottom| - form_bottom.edit_buttons do - @buttons_partials.each do |partial| @@ -57,4 +55,7 @@ = save_model_button(@page) = save_model_and_continue_editing_button(@page) or - = link_to 'Cancel', admin_pages_url \ No newline at end of file + = link_to 'Cancel', admin_pages_url + - form_bottom.edit_timestamp do + = updated_stamp @page + \ No newline at end of file app/views/admin/pages/_fields.html.haml @@ -16,9 +16,6 @@ %p %label{:for=>"snippet_filter_id"} Filter = f.select :filter_id, [['none', '']] + TextFilter.descendants.map { |f| f.filter_name }.sort, :id => 'snippet_filter' - - form.edit_timestamp do - %p.updated_line - = updated_stamp @snippet - render_region :form_bottom do |form_bottom| - form_bottom.edit_buttons do %p.buttons{:style=>"clear: left"} @@ -26,3 +23,6 @@ = save_model_and_continue_editing_button(@snippet) or = link_to 'Cancel', admin_snippets_url + - form_bottom.edit_timestamp do + %p.updated_line + = updated_stamp @snippet app/views/admin/snippets/_form.html.haml @@ -104,8 +104,8 @@ module Radiant 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} + edit.form_bottom.concat %w{edit_buttons edit_timestamp} + edit.parts_bottom.concat %w{edit_layout_and_type} end page.index = RegionSet.new do |index| index.sitemap_head.concat %w{title_column_header status_column_header @@ -128,7 +128,7 @@ module Radiant 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} + edit.form_bottom.concat %w{edit_buttons edit_timestamp} end user.index = RegionSet.new do |index| index.thead.concat %w{title_header roles_header modify_header} @@ -143,8 +143,8 @@ module Radiant 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} + edit.form.concat %w{edit_title edit_content edit_filter} + edit.form_bottom.concat %w{edit_buttons edit_timestamp} end snippet.index = RegionSet.new do |index| index.top.concat %w{help_text} @@ -160,8 +160,8 @@ module Radiant 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} + edit.form.concat %w{edit_title edit_extended_metadata edit_content} + edit.form_bottom.concat %w{edit_buttons edit_timestamp} end layout.index = RegionSet.new do |index| index.top.concat %w{help_text} lib/radiant/admin_ui.rb @@ -34,8 +34,8 @@ describe Radiant::AdminUI do page.edit.main.should == %w{edit_header edit_form edit_popups} page.edit.form.should == %w{edit_title edit_extended_metadata edit_page_parts} - page.edit.parts_bottom.should == %w{edit_layout_and_type edit_timestamp} - page.edit.form_bottom.should == %w{edit_buttons} + page.edit.parts_bottom.should == %w{edit_layout_and_type} + page.edit.form_bottom.should == %w{edit_buttons edit_timestamp} page.index.sitemap_head.should == %w{title_column_header status_column_header modify_column_header} @@ -51,9 +51,8 @@ describe Radiant::AdminUI do snippet = @admin.snippet snippet.edit.should_not be_nil snippet.edit.main.should == %w{edit_header edit_form} - snippet.edit.form.should == %w{edit_title edit_content edit_filter - edit_timestamp} - snippet.edit.form_bottom.should == %w{edit_buttons} + snippet.edit.form.should == %w{edit_title edit_content edit_filter} + snippet.edit.form_bottom.should == %w{edit_buttons edit_timestamp} snippet.index.should_not be_nil snippet.index.top.should == %w{help_text} snippet.index.thead.should == %w{title_header modify_header} @@ -68,8 +67,8 @@ describe Radiant::AdminUI do layout.edit.should_not be_nil layout.edit.main.should == %w{edit_header edit_form} layout.edit.form.should == %w{edit_title edit_extended_metadata - edit_content edit_timestamp} - layout.edit.form_bottom.should == %w{edit_buttons} + edit_content} + layout.edit.form_bottom.should == %w{edit_buttons edit_timestamp} layout.index.should_not be_nil layout.index.top.should == %w{help_text} layout.index.thead.should == %w{title_header modify_header} @@ -85,7 +84,7 @@ describe Radiant::AdminUI do user.edit.main.should == %w{edit_header edit_form} 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.edit.form_bottom.should == %w{edit_buttons edit_timestamp} 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} spec/lib/radiant/admin_ui_spec.rb 7eba20f2647e757520d468dd0e81b8b1f89f6abc Sean Cribbs seancribbs@gmail.com http://github.com/radiant/radiant/commit/e3476a24fbcd51b08c37e4ace4242d9b0787bf6c e3476a24fbcd51b08c37e4ace4242d9b0787bf6c 2009-07-01T16:54:03-07:00 2009-07-01T16:54:03-07:00 Move that updated stamp. 0e5e98bf600f98e82cc168fc9be63ac17b5fb38b Sean Cribbs seancribbs@gmail.com