_fields.html.haml in radiant-1.0.0.rc1

- old
+ new

@@ -1,7 +1,9 @@
+- include_javascript 'admin/page_preview'
 = fields.hidden_field :lock_version
 = fields.hidden_field :parent_id
+= fields.hidden_field :class_name
 
 = render_region :form_top, :locals => {:f => fields}
 
 - render_region :form, :locals => {:f => fields} do |form|
   - form.edit_title do
@@ -11,10 +13,11 @@
   - form.edit_extended_metadata do
     .drawer
       .drawer_contents#attributes
         %table.fieldset
           = render :partial => "meta_row", :collection => @meta, :locals => {:f => fields}
+          = render :partial => 'admin/page_fields/page_field', :collection => @page.fields
           = render_region :extended_metadata, :locals => {:f => fields}
       .drawer_handle
         %a.toggle{:href=>'#attributes', :rel=>"toggle[attributes]", :class=>"#{(meta_errors? ? 'less' : 'more')}"}= meta_label
   - form.edit_page_parts do
     #tab_control
@@ -23,32 +26,46 @@
           %a.popup{:href=> '#add_part_popup', :title=>t('add_part')}
             = image('add_tab', :alt=>t('add_part'), :title=>"")
       #pages.pages
         = render :partial => 'admin/page_parts/page_part', :collection => @page.parts
     = render_region :parts_bottom, :locals => {:f => fields}
-  - form.edit_layout_and_type do
-    .set
+
+.set
+  - render_region :layout, :locals => {:f => fields} do |layout|
+    - layout.edit_layout do
       %p
         = fields.label :layout_id, t('layout')
         = fields.select :layout_id, [[t('select.inherit') , '']] + Layout.find(:all).map { |s| [s.name, s.id] }
+    - layout.edit_type do
       %p
-        = fields.label :class_name, t('page_type')  
+        = fields.label :class_name, t('page_type')
         = fields.select :class_name, [[t('select.normal'), '']] + Page.descendants.map { |p| [p.display_name, p.name] }.sort_by { |p| p.first }
+    - layout.edit_status do
       %p
         = fields.label :status_id, t('status')
         = fields.select :status_id, status_to_display
+    - layout.edit_published_at do
       %p#published_at{:class => (@page.published? ? nil : 'hidden')}
         = fields.label :published_at, t('published_on')
         = fields.text_field :published_at, :class=> "date", :value => (@page.published_at? ? I18n.localize(@page.published_at.to_date, :format =>:long) : nil)
-      = render_region :layout_row, :locals => {:f => fields}
+    = render_region :layout_row, :locals => {:f => fields}
 
 - render_region :form_bottom, :locals => {:f => fields} do |form_bottom|
   - form_bottom.edit_buttons do
     - @buttons_partials.each do |partial|
       = render :partial => partial, :locals => {:f => fields}
-    %p.buttons{:style=>"clear: left"}
+    .buttons{:style=>"clear: left"}
       = save_model_button(@page)
       = 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
+    #preview_panel.fullcover.grey_out{:style => 'display: none;'}
+      %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src => '/loading-iframe.html', :frameborder => 0, :scrolling => "auto"}
+      .preview_tools
+        =submit_tag(t('buttons.save_changes'), :class => 'big save_changes')
+        =submit_tag(t('buttons.save_and_continue'), :class => 'big save_and_continue', :name => 'continue')
+        %span.info
+          = t('or')
+          =link_to(t('edit_page'),{}, :class => 'cancel')
   - form_bottom.edit_timestamp do
     = updated_stamp @page