imagine_cms 4.1.4 → 4.2.0

data/app/views/management/cms/_edit_page.html.erb

@@ -1,16 +1,23 @@
 <script type="text/javascript">
   attrlist = new Array(<%= @attrs.size %>)
-  
   <%- @attrs.each_with_index do |attr, i| -%>
-  attrlist[<%= i %>]="<%=h attr %>"
+  attrlist[<%= i %>]="<%=j attr %>";
+  <%- end -%>
+  
+  taglist = new Array(<%= @taglist.size %>)
+  <%- @taglist.each_with_index do |tag, i| -%>
+  taglist[<%= i %>]="<%=j tag %>";
   <%- end -%>
+  
+  jQuery(document).ready(function () {
+    jQuery('#tags').tagit({ availableTags: taglist, allowSpaces: true, caseSensitive: false, removeConfirmation: true, autocomplete: { delay: 0, minLength: 0 } });
+  });
 </script>
 
 <div id="save_errors" class="error"></div>
 
 <%= form_remote_tag :url => { :action => 'edit_page', :id => @pg },
-                    :loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';",
-                    :html => { :onsubmit => 'teardownTextFieldHints();' } do %>
+                    :loading => "$('btn_save').disabled = true; $('btn_save').value = 'Saving...';" do %>
 <table id="dlg-page-properties">
   <col width="120"><col width="*"><col width="5">
 <%- if (@pg.id || 2) > 1 -%>
@@ -67,7 +74,7 @@
       </script>
     </td>
   </tr>
-  <tr class="page-field">
+  <tr>
     <td>Article Date:</td>
     <td>
       <table border="0" cellpadding="0" cellspacing="0" width="100%">
@@ -86,7 +93,7 @@
     </td>
   </tr>
   <tr>
-    <td>Tags:</td>
+    <td valign="middle">Tags:</td>
     <td><%= text_field_tag :tags, @tags, :class => 'form', :style => 'width: 100%' %></td>
   </tr>
   <tr class="page-field">
@@ -126,18 +133,21 @@
       <%- if @pg.new_record? -%>
         A thumbnail cannot be added until you save this page.
       <%- else -%>
-      <div id="thumbnail_preview" style="width: 385px; overflow: auto;">
-        <%- if @pg.thumbnail_path.blank? -%>
-          <!-- no thumbnail image selected -->
-        <%- else -%>
-          <%= image_tag(@pg.thumbnail_path, :onclick => "jQuery('#pg_thumbnail_path').show();") %>
+        <div id="thumbnail_preview" style="width: 385px; overflow: auto;">
+          <%- if @pg.thumbnail_path.blank? -%>
+            <!-- no thumbnail image selected -->
+          <%- else -%>
+            <%= image_tag(@pg.thumbnail_path, onclick: "jQuery('#pg_thumbnail_path').toggle();") %>
+          <%- end -%>
+        </div>
+        <%= button_to_function "Select Thumbnail...",
+                               "selectThumbnail('#{url_for action: 'upload_thumb', id: @pg}');",
+                               class: 'form_button' %>
+        <%- if @pg.thumbnail_path.present? -%>
+          <%= button_to_function "Remove", "jQuery('#thumbnail_preview img').remove(); jQuery('#pg_thumbnail_path').val(''); jQuery(this).remove();", class: 'form_button' %>
         <%- end -%>
-      </div>
-      <%= button_to_function "Select Thumbnail...",
-                             "selectThumbnail('#{url_for :action => 'upload_thumb', :id => @pg}');",
-                             :class => 'form_button' %>
+        <%= text_field :pg, :thumbnail_path, class: 'form', style: 'width: 100%; display: none;' %>
       <%- end -%>
-      <%= text_field :pg, :thumbnail_path, :class => 'form', :style => 'width: 100%; display: none;' %>
     </td>
   </tr>
   <%- if @pg.respond_to?(:feature_image_path) -%>
@@ -147,18 +157,21 @@
       <%- if @pg.new_record? -%>
         A feature image cannot be added until you save this page.
       <%- else -%>
-      <div id="feature_image_preview" style="width: 385px; overflow: auto;">
-        <%- if @pg.feature_image_path.blank? -%>
-          <!-- no feature image selected -->
-        <%- else -%>
-          <%= image_tag(@pg.feature_image_path, :onclick => "jQuery('#pg_feature_image_path').show();") %>
+        <div id="feature_image_preview" style="width: 385px; overflow: auto;">
+          <%- if @pg.feature_image_path.blank? -%>
+            <!-- no feature image selected -->
+          <%- else -%>
+            <%= image_tag(@pg.feature_image_path, onclick: "jQuery('#pg_feature_image_path').toggle();") %>
+          <%- end -%>
+        </div>
+        <%= button_to_function "Select Feature Image...",
+                               "selectThumbnail('#{url_for action: 'upload_feature_image', id: @pg}');",
+                               class: 'form_button' %>
+        <%- if @pg.feature_image_path.present? -%>
+          <%= button_to_function "Remove", "jQuery('#feature_image_preview img').remove(); jQuery('#pg_feature_image_path').val(''); jQuery(this).remove();", class: 'form_button' %>
         <%- end -%>
-      </div>
-      <%= button_to_function "Select Feature Image...",
-                             "selectThumbnail('#{url_for :action => 'upload_feature_image', :id => @pg}');",
-                             :class => 'form_button' %>
+        <%= text_field :pg, :feature_image_path, class: 'form', style: 'width: 100%; display: none;' %>
       <%- end -%>
-      <%= text_field :pg, :feature_image_path, :class => 'form', :style => 'width: 100%; display: none;' %>
     </td>
   </tr>
   <%- end -%>
@@ -175,16 +188,17 @@
         <tr>
           <td>Add an attribute: &nbsp;</td>
           <td>
-            <%= text_field_tag :custom_attribute_name, '', :class => 'form', :style => 'margin-bottom: 4px;' %>
-            <%= javascript_tag "addTextFieldHint('custom_attribute_name', '[ attribute name ]'); setupTextFieldHints(); "%>
-            <div id="custom_attribute_name_auto_complete" class="auto_complete" style="display: none;"></div>
-            <%= javascript_tag "$('custom_attribute_name').onkeydown = disableEnterKey; new Autocompleter.Local('custom_attribute_name', 'custom_attribute_name_auto_complete', attrlist, { frequency: 0.1, minChars: 1 });" %>
-            
-            <%= button_to_function 'Add', "new Ajax.Updater('custom_attributes', '/manage/cms/page_attribute?name=' + $('custom_attribute_name').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('custom_attribute_name').value = ''; return false;", :class => 'form_button', :style => 'margin-bottom: 5px;' %>
+            <div style="position: relative;">
+              <%= text_field_tag :custom_attribute_name, '', :class => 'form', :style => 'margin-bottom: 4px;', :placeholder => '[ attribute name ]' %>
+              <div id="custom_attribute_name_auto_complete" class="auto_complete" style="display: none;"></div>
+              <%= javascript_tag "$('custom_attribute_name').onkeydown = disableEnterKey; new Autocompleter.Local('custom_attribute_name', 'custom_attribute_name_auto_complete', attrlist, { frequency: 0.1, minChars: 1 });" %>
+              
+              <%= button_to_function 'Add', "new Ajax.Updater('custom_attributes', '/manage/cms/page_attribute?name=' + $('custom_attribute_name').value, {asynchronous:true, method:'get', evalScripts:true, insertion:Insertion.Bottom}); $('custom_attribute_name').value = ''; return false;", :class => 'form_button', :style => 'margin-bottom: 5px;' %>
+            </div>
           </td>
         </tr>
       </table>
-      <div id="custom_attributes" style="background-color: white; height: 80px; overflow: auto; border: 1px solid #aaaaaa">
+      <div id="custom_attributes" style="background-color: white; min-height: 40px; overflow: auto; border: 1px solid #aaaaaa">
         <%- @page_objects.each do |key,val| -%>
           <%- key =~ /^obj-(\w+?)-(.+?)$/ -%>
           <%= render :partial => 'page_attribute', :locals => { :name => $2 } if $1 == 'attribute' %>

data/app/views/management/cms/_gallery_index.html.erb

@@ -1,10 +1,10 @@
 <div id="images_container">
   <div id="images">
-    <%= render :partial => 'image', :collection => @images, :locals => { :id => @pg, :path => @pg.path, :gallery_id => params[:gallery_id] } %>
+    <%= render partial: 'image', collection: @images, locals: { id: @pg, path: @pg.path, gallery_id: params[:gallery_id] } %>
   </div>
 </div>
 
-<%= form_remote_tag(:update => 'gallery_container', :html => { :id => 'mainform_gallery' },
-                    :url => { :action => 'gallery_management', :id => @pg, :gallery_id => params[:gallery_id] }) do -%>
-  <%= text_field_tag :dirname, '', :style => 'display: none' %>
+<%= form_remote_tag(update: 'gallery_container', html: { id: 'mainform_gallery' },
+                    url: { action: 'gallery_management', id: @pg, gallery_id: params[:gallery_id] }) do -%>
+  <%= text_field_tag :dirname, '', style: 'display: none' %>
 <%- end -%>

data/app/views/management/cms/_image.html.erb

@@ -1,6 +1,6 @@
 <%-
   thumb = "assets/content/#{path}/#{gallery_id}/management/#{image}.jpg"
 -%>
-<%= link_to_remote image_tag("/#{thumb}?#{File.mtime(File.join(Rails.root, 'public', thumb)).to_i}", :size => '90x90'),
-                   :url => { :action => 'image_details', :id => id, :path => path, :gallery_id => gallery_id, :image => image.to_s + '.jpg' },
-                   :update => 'gallery_window' %>
+<%= link_to_remote image_tag("/#{thumb}?#{File.mtime(File.join(Rails.root, 'public', thumb)).to_i}", size: '90x90'),
+                   url: { action: 'image_details', id: id, gallery_id: gallery_id, image: "#{image}.jpg" },
+                   update: 'gallery_window' %>

data/app/views/management/cms/_image_details.html.erb

@@ -1,23 +1,24 @@
+<%- img = "content/#{@pg.path}/#{params[:gallery_id]}/#{params[:image]}" -%>
 <table>
   <tr valign="top">
-    <td><%= image_tag "content/#{params[:path]}/#{params[:gallery_id]}/#{params[:image]}" %></td>
+    <td><%= image_tag "#{img}?#{File.mtime(File.join(Rails.root, 'public', 'assets', img)).to_i}" %></td>
     <td style="padding-left: 10px;">
       <div id="caption_container" style="margin-bottom: 20px;">
         <strong>Caption</strong><br/>
-        <%= form_remote_tag :url => { :action => 'update_caption', :id => params[:id], :path => params[:path], :gallery_id => params[:gallery_id], :image => params[:image] },
-                            :update => 'gallery_container' do -%>
+        <%= form_remote_tag url: { action: 'update_caption', id: params[:id], gallery_id: params[:gallery_id], image: params[:image] },
+                            update: 'gallery_container' do -%>
           <%= text_area_tag "caption", @caption %><br/>
           <%= submit_tag "Save" %> or <%= link_to_remote "cancel",
-                                                         :url => { :action => 'gallery_management', :id => params[:id], :gallery_id => params[:gallery_id] },
-                                                         :update => 'gallery_container' %>
+                                                         url: { action: 'gallery_management', id: params[:id], gallery_id: params[:gallery_id] },
+                                                         update: 'gallery_container' %>
         <%- end -%>
       </div>
       
       <div id="delete_container">
         <strong>Delete Photo</strong><br/>
-        <%= form_remote_tag :url => { :action => 'delete_photo', :id => params[:id], :path => params[:path], :gallery_id => params[:gallery_id], :image => params[:image] },
-                            :update => 'gallery_container',
-                            :confirm => "This action cannot be undone. Continue?" do -%>
+        <%= form_remote_tag url: { action: 'delete_photo', id: params[:id], gallery_id: params[:gallery_id], image: params[:image] },
+                            update: 'gallery_container',
+                            confirm: "This action cannot be undone. Continue?" do -%>
           <%= submit_tag "Delete" %>
         <%- end -%>
       </div>

data/app/views/management/cms/_list_page.html.erb

@@ -1,7 +1,7 @@
-<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>'; $('new_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page %>', 'Create New Page under /<%= list_page.path %>'); return false; }; $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit' %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page %>'; $('delete_form').action = '<%=raw url_for :action => 'delete_page', :id => list_page.id %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id %>\');', 200);" ondblclick="$('edit_content_form').onsubmit(); $('edit_content_form').submit();">
+<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>'; $('new_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page %>', 'Create New Page under /<%= list_page.path %>'); return false; }; $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit' %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page %>'; $('delete_link').href = '<%=raw url_for :action => 'delete_page', :id => list_page.id %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id %>\');', 200);" ondblclick="$('edit_content_link').click();">
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
-      <td valign="top"><img src="/assets/management/icon_page.gif" style="margin: 2px 5px 0 0; "/></td>
+      <td valign="top"><%= image_tag 'management/icon_page.gif', style: 'margin: 2px 5px 0 0;' %></td>
       <td<%= list_page.published_version >= 0 ? '' : ' style="color: gray"'.html_safe %>><%= list_page.name %></td>
     </tr>
   </table>

data/app/views/management/cms/_list_page_select.html.erb

@@ -1,7 +1,7 @@
 <div id="<%= "cb_item_#{list_page_select.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('page_browser_selection').value = '/<%= list_page_select.path %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages_select', :level => @page_level + 1, :parent_id => list_page_select.id %>\');', 200);" ondblclick="return false;">
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
-      <td valign="top"><img src="/assets/management/icon_page.gif" style="margin: 2px 5px 0 0; "/></td>
+      <td valign="top"><%= image_tag 'management/icon_page.gif', style: 'margin: 2px 5px 0 0;' %></td>
       <td<%= list_page_select.published_version >= 0 ? '' : ' style="color: gray"'.html_safe %>><%= list_page_select.name %></td>
     </tr>
   </table>

data/app/views/management/cms/_page_list.html.erb

@@ -1,11 +1,11 @@
-<div id="page_list_container_<%= key %>" style="border: 1px solid gray; padding: 8px; background-color: #dddddd; width: 170px; text-align: center;">
+<%- options ||= {} -%>
+<div id="page_list_container_<%= key %>" class="page_list_dialog" style="border: 1px solid gray; padding: 8px; background-color: #dddddd; width: 170px; text-align: center;">
   Page List: <%= name %><br/>
   <button class="form_button" onclick="showDojoDialog('page_list_<%= key %>'); return false;">Configure</button>
 </div>
-
 <div dojoType="ModalFloatingPane" id="page_list_<%= key %>" title="Page List: <%= name %>"
      hasShadow="true" resizable="true" followScroll="false" displayCloseAction="true" appendToBody="false"
-     style="width: 600px; height: 580px; display: none">
+     style="width: 620px; height: 600px; display: none">
   <div class="ccs-page-list-form">
     <fieldset>
       <legend>Sources</legend>
@@ -14,29 +14,29 @@
       
       <div id="page_list_<%= key %>-source-list" style="margin: 10px;">
         <%- @page_objects["#{key}-sources-folder-count"].to_i.times do |i| -%>
-          <%= render :partial => 'page_list_source_folder', :locals => { :i => i, :key => key } %>
+          <%= render partial: 'page_list_source_folder', locals: { i: i, key: key } %>
         <%- end -%>
         <%- @page_objects["#{key}-sources-tag-count"].to_i.times do |i| -%>
-          <%= render :partial => 'page_list_source_tag', :locals => { :i => i, :key => key } %>
+          <%= render partial: 'page_list_source_tag', locals: { i: i, key: key } %>
         <%- end -%>
         <%-
           @page_objects["#{key}-sources-tag-count"] ||= 0
           @page_objects["#{key}-sources-folder-count"] ||= 0
         -%>
-        <%= text_field(:page_objects, "#{key}-sources-tag-count", :style => 'display: none;') %>
-        <%= text_field(:page_objects, "#{key}-sources-folder-count", :style => 'display: none;') %>
+        <%= text_field :page_objects, "#{key}-sources-tag-count", style: 'display: none;' %>
+        <%= text_field :page_objects, "#{key}-sources-folder-count", style: 'display: none;' %>
       </div>
       
       <table>
         <tr>
-          <td><%= button_to_function('Add Folder', "new Ajax.Updater('page_list_#{key}-source-list', '/manage/cms/page_list_add_folder?key=#{key}&i=' + $('page_objects_#{key}-sources-folder-count').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('page_objects_#{key}-sources-folder-count').value++;", :class => 'form_button') %></td>
+          <td><%= button_to_function('Add Page/Folder', "new Ajax.Updater('page_list_#{key}-source-list', '/manage/cms/page_list_add_folder?key=#{key}&i=' + $('page_objects_#{key}-sources-folder-count').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('page_objects_#{key}-sources-folder-count').value++;", :class => 'form_button') %></td>
           <td><%= button_to_function('Add Tag', "new Ajax.Updater('page_list_#{key}-source-list', '/manage/cms/page_list_add_tag?key=#{key}&i=' + $('page_objects_#{key}-sources-tag-count').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('page_objects_#{key}-sources-tag-count').value++;", :class => 'form_button') %></td>
           <td>
-            <%= check_box(:page_objects, "#{key}-include-expired", { :class => 'form', :style => '' }, 'true', 'false') %>
+            <%= check_box :page_objects, "#{key}-include-expired", { class: 'form', style: '' }, 'true', 'false' %>
             <label for="page_objects_<%= key %>-include-expired">Include expired items</label>
           </td>
           <td>
-            <%= check_box(:page_objects, "#{key}-exclude-current", { :class => 'form', :style => '' }, 'true', 'false') %>
+            <%= check_box :page_objects, "#{key}-exclude-current", { class: 'form', style: '' }, 'true', 'false' %>
             <label for="page_objects_<%= key %>-exclude-current">Exclude current page</label>
           </td>
         </tr>
@@ -52,28 +52,28 @@
           <td>Format:</td>
           <td colspan="2">
             <%- @page_objects["#{key}-style-display-as"] ||= 'list' -%>
-            <%= radio_button :page_objects, "#{key}-style-display-as", 'list', :onclick => "$$('.page_list_#{key}_list_option').each(function (e) { Element.show(e) }); $$('.page_list_#{key}_calendar_option').each(function (e) { Element.hide(e) });" %><label for="page_objects_<%= key %>-style-display-as_list">List</label>&nbsp;
-            <%= radio_button :page_objects, "#{key}-style-display-as", 'calendar', :onclick => "$$('.page_list_#{key}_calendar_option').each(function (e) { Element.show(e) }); $$('.page_list_#{key}_list_option').each(function (e) { Element.hide(e) });" %><label for="page_objects_<%= key %>-style-display-as_calendar">Calendar</label>
+            <%= radio_button :page_objects, "#{key}-style-display-as", 'list' %><label for="page_objects_<%= key %>-style-display-as_list">List</label>&nbsp;
+            <%= radio_button :page_objects, "#{key}-style-display-as", 'calendar' %><label for="page_objects_<%= key %>-style-display-as_calendar">Calendar</label>
           </td>
         </tr>
         <tr class="page_list_<%= key %>_list_option">
-          <td>Number:</td>
+          <td valign="top"><div style="margin-top: 2px;">Number:</div></td>
           <td>
-            Display <%= text_field(:page_objects, "#{key}-max-item-count", :class => 'form', :style => 'margin: 0; width: 20px') %> items,
-            but skip the first <%= text_field(:page_objects, "#{key}-item-offset", :class => 'form', :style => 'margin: 0; width: 20px;') %>
-            <br/>
+            Display <%= text_field :page_objects, "#{key}-max-item-count", placeholder: options[:item_count].to_s, class: 'form', style: 'margin: 0; width: 20px;' %> items,
+            but skip the first <%= text_field :page_objects, "#{key}-item-offset", placeholder: (options[:item_offset] || 0).to_s, class: 'form', style: 'margin: 0; width: 20px;' %>
+            <br>
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <%= check_box :page_objects, "#{key}-use-pagination" %>
             <label for="page_objects_<%= key %>-use-pagination">Show multiple list segments</label>
-            <br/>
+            <br>
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <%= check_box :page_objects, "#{key}-use-randomization" %>
             <label for="page_objects_<%= key %>-use-randomization">Select randomly from the top</label>
-              <%= text_field(:page_objects, "#{key}-random-pool-size", :class => 'form', :style => 'margin: 0; width: 20px') %> items
+              <%= text_field(:page_objects, "#{key}-random-pool-size", class: 'form', style: 'margin: 0; width: 20px') %> items
           </td>
         </tr>
         <tr class="page_list_<%= key %>_list_option">
-          <td>Sort:</td>
+          <td>Sort Order:</td>
           <td>
             First by
             <%= select(:page_objects, "#{key}-sort-first-field",
@@ -93,30 +93,21 @@
                        :class => 'form', :style => 'margin: 0; border: 1px solid gray;') %>
           </td>
         <tr class="page_list_<%= key %>_list_option">
-          <td>Date:</td>
+          <td>Dates:</td>
           <td>
             <%-
               @page_objects["#{key}-date-range"] ||= 'all'
             -%>
-            <%= radio_button :page_objects, "#{key}-date-range", 'all' %><label for="page_objects_<%= key %>-date-range_all">All Dates</label>&nbsp;&nbsp;
-            <%= radio_button :page_objects, "#{key}-date-range", 'past' %><label for="page_objects_<%= key %>-date-range_past">Past</label>&nbsp;&nbsp;
-            <%= radio_button :page_objects, "#{key}-date-range", 'future' %><label for="page_objects_<%= key %>-date-range_future">Future</label>&nbsp;&nbsp;
+            <%= radio_button :page_objects, "#{key}-date-range", 'all' %><label for="page_objects_<%= key %>-date-range_all">All Dates</label>&nbsp;
+            <%= radio_button :page_objects, "#{key}-date-range", 'past' %><label for="page_objects_<%= key %>-date-range_past">Past</label>&nbsp;
+            <%= radio_button :page_objects, "#{key}-date-range", 'future' %><label for="page_objects_<%= key %>-date-range_future">Future</label>&nbsp;
             <%= radio_button :page_objects, "#{key}-date-range", 'custom' %><label for="page_objects_<%= key %>-date-range_custom">Range:</label>
-            <%= date_picker :page_objects, "#{key}-date-range-custom-start", :default_value => (@page_objects["#{key}-date-range-custom-start"] || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %> &ndash;
-            <%= date_picker :page_objects, "#{key}-date-range-custom-end", :default_value => (@page_objects["#{key}-date-range-custom-end"] || Time.now), :start_date => Time.utc(2006, 1, 1), :end_date => 5.years.from_now %>
+            <%= date_picker :page_objects, "#{key}-date-range-custom-start", default_value: (@page_objects["#{key}-date-range-custom-start"] || Time.now), start_date: Time.utc(2006, 1, 1), end_date: 5.years.from_now %> &ndash;
+            <%= date_picker :page_objects, "#{key}-date-range-custom-end", default_value: (@page_objects["#{key}-date-range-custom-end"] || Time.now), start_date: Time.utc(2006, 1, 1), end_date: 5.years.from_now %>
           </td>
         </tr>
       </table>
     </fieldset>
-    <script type="text/javascript">
-        if ($('page_objects_<%= key %>-style-display-as_list').checked) {
-            $$('.page_list_<%= key %>_list_option').each(function(e) { Element.show(e) } );
-            $$('.page_list_<%= key %>_calendar_option').each(function(e) { Element.hide(e) } );
-        } else {
-            $$('.page_list_<%= key %>_calendar_option').each(function(e) { Element.show(e) } );
-            $$('.page_list_<%= key %>_list_option').each(function(e) { Element.hide(e) } );
-        }
-    </script>
     
     <fieldset>
       <legend>Item Template</legend>
@@ -126,21 +117,32 @@
       </div>
       
       <div style="float: right">
-        <%- system_attrs = @pg.attributes.map { |c| c.first }.
-                                          reject { |c| [ 'cms_template_id',
-                                                         'cms_template_version',
-                                                         'position' ].include?(c) }.sort -%>
+        <%-
+          system_attrs = {
+            'article_date_month'  => 'Article Date - Month',
+            'article_date_mon'    => 'Article Date - Month Abbr',
+            'article_date_day'    => 'Article Date - Day',
+            'article_date_year'   => 'Article Date - Year',
+            'article_date_yr'     => 'Article Date - Year Abbr',
+            'tags'                => 'Tags',
+            'tags_as_css_classes' => 'Tags as CSS Classes',
+          }
+          @pg.attributes.each do |attr, value|
+            next if [ 'cms_template_id', 'cms_template_version' ].include?(attr)
+            system_attrs[attr] ||= attr.titleize
+          end
+        -%>
         <select class="form" style="width: 150px;" onchange="insertAtCaret($('page_objects_<%= key %>-template'), '<# ' + this.value + ' #>'); this.value = '';">
           <option value="">-- Insert Attribute --</option>
-          <%- system_attrs.each do |attr| -%>
-            <option value="<%=h attr %>"><%=h attr.titleize %></option>
+          <%- system_attrs.sort.each do |attr, label| -%>
+            <option value="<%= attr %>"><%= label %></option>
           <%- end -%>
         </select>
       </div>
       
-      <br clear="all" />
+      <br clear="all">
       
-      <%= text_area(:page_objects, "#{key}-template", :style => 'border: 1px solid gray; width: 100%;', :rows => '6') %>
+      <%= text_area :page_objects, "#{key}-template", placeholder: options[:template].to_s.gsub(/\s+/, ' '), style: 'border: 1px solid gray; width: 99%;', rows: '6' %>
     </fieldset>
     
     <div id="page_list_<%= key %>-advanced">
@@ -149,12 +151,12 @@
         
         <table width="100%">
           <tr>
-            <td valign="top">Start:</td>
-            <td><%= text_area(:page_objects, "#{key}-header", :style => 'border: 1px solid gray; width: 100%;', :rows => '4') %></td>
+            <td valign="top">Before:</td>
+            <td><%= text_area :page_objects, "#{key}-header", placeholder: options[:header].to_s.gsub(/\s+/, ' '), style: 'border: 1px solid gray; width: 99%; height: 32px;' %></td>
           </tr>
           <tr>
-            <td valign="top">End:</td>
-            <td><%= text_area(:page_objects, "#{key}-footer", :style => 'border: 1px solid gray; width: 100%;', :rows => '4') %></td>
+            <td valign="top">After:</td>
+            <td><%= text_area :page_objects, "#{key}-footer", placeholder: options[:footer].to_s.gsub(/\s+/, ' '), style: 'border: 1px solid gray; width: 99%; height: 32px;' %></td>
           </tr>
         </table>
       </fieldset>
@@ -164,12 +166,31 @@
         
         <p>This message is displayed when no pages match the search criteria.</p>
         
-        <%= text_area(:page_objects, "#{key}-empty_message", :style => 'border: 1px solid gray; width: 100%;', :rows => '4') %>
+        <%= text_area :page_objects, "#{key}-empty_message", placeholder: options[:empty_message].to_s.gsub(/\s+/, ' '), style: 'border: 1px solid gray; width: 99%; height: 24px;' %>
       </fieldset>
     </div>
     
-    <br/>
+    <br>
     
     <center><button class="form_button" onclick="hideDojoDialog('page_list_<%= key %>'); return false;">Close</button></center>
   </div>
 </div>
+
+<script type="text/javascript">
+  var displayAsList = jQuery('#page_objects_<%= key %>-style-display-as_list').checked;
+  jQuery('.page_list_<%= key %>_list_option').toggle(displayAsList);
+  jQuery('.page_list_<%= key %>_calendar_option').toggle(!displayAsList);
+  
+  // reattach to a safe place in the DOM (away from styled regions)
+  jQuery(document).ready(function () {
+    jQuery('#page_list_<%= key %>').appendTo(jQuery('#page_content_form')[0]);
+    jQuery('#page_objects_<%= key %>-style-display-as_list').click(function () {
+      jQuery('.page_list_<%= key %>_list_option').show();
+      jQuery('.page_list_<%= key %>_calendar_option').hide();
+    });
+    jQuery('#page_objects_<%= key %>-style-display-as_calendar').click(function () {
+      jQuery('.page_list_<%= key %>_list_option').hide();
+      jQuery('.page_list_<%= key %>_calendar_option').show();
+    });
+  });
+</script>

data/app/views/management/cms/_page_list_source_folder.html.erb

@@ -4,9 +4,9 @@
 -%>
 <div style="border: 1px solid #f0f0f0;">
   <table width="100%">
-    <col width="70" /><col width="*" /><col width="80" />
+    <col width="100" /><col width="*" /><col width="80" />
     <tr>
-      <td valign="top">Folder <%= i.to_i + 1 %>:</td>
+      <td valign="top">Page/Folder <%= i.to_i + 1 %>:</td>
       <td>
         <%= text_field(:page_objects, "#{key}-sources-folder#{i}", :class => 'form', :style => 'margin: 0; padding: 2px; border: 1px solid gray; width: 98%;') %><br/>
         <%= check_box(:page_objects, "#{key}-sources-folder#{i}-expand-folders", { :class => 'form', :style => '' }, 'true', 'false') %>

data/app/views/management/cms/_template_options.html.erb

@@ -3,16 +3,16 @@
   <%- @template_options.each do |name, type| -%>
     <%- key = name.gsub(/[^\w\d]/, '_') -%>
     <table width="100%">
-      <col width="45%" /><col width="55%" />
+      <col width="55%" /><col width="45%" />
       <tr>
         <td><%= name %></td>
         <td>
           <%=
             case type
             when :checkbox
-              check_box :page_objects, "obj-option-checkbox-#{key}"
-            when :string, :text
-              text_field :page_objects, "obj-option-string-#{key}", :style => 'width: 100%;'
+              check_box :page_objects, "obj-option-#{type}-#{key}"
+            else
+              text_field :page_objects, "obj-option-#{type}-#{key}", :style => 'width: 96%;'
             end
           %>
         </td>

data/app/views/management/cms/_template_reference.html.erb

@@ -1,5 +1,5 @@
 <table width="100%">
-  <col width="100" />
+  <col width="20" />
   <tr>
     <td></td>
     <td>
@@ -10,28 +10,26 @@
           <tr>
             <td valign="top">
 <pre>
-&lt;%= insert_object('Content', :text) %&gt;
-&lt;%= insert_object('Top Nav', :snippet) %&gt;
-&lt;%= insert_object('My Page List', :page_list,
-                  :header => 'html', :footer => 'html',
-                  :template => 'html', :folders => 'f1,f2',
-                  :include_tags => 't1,t2',
-                  :exclude_tags => 't3,t4',
-                  :require_tags => 't5,t6',
-                  :primary_sort_key => 'article_date',
-                  :primary_sort_direction => 'asc',
-                  :item_count => 5, :item_offset => 1) %&gt;
+&lt;%= text_editor('Content') %&gt;
+&lt;%= snippet('Top Nav') %&gt;
+&lt;%= page_list('My Page List',
+                  template: 'html', header: 'html', footer: 'html',
+                  folders: 'f1,f2', include_tags: 't1,t2',
+                  exclude_tags: 't3,t4', require_tags: 't5,t6',
+                  primary_sort_key: 'article_date', primary_sort_direction: 'asc',
+                  item_count: 5, item_offset: 1, use_pagination: 1,
+                  empty_message: 'Coming soon!') %&gt;
 </pre>
             </td>
             <td valign="top">
 <pre>
 &lt;%= template_option('Caption', :string) %&gt;
 
-&lt;% if template_option('Use sidebar?', :checkbox) %&gt;
+&lt;%- if template_option('Use sidebar?', :checkbox) -%&gt;
     ...
-&lt;% else %&gt;
+&lt;%- else -%&gt;
     ...
-&lt;% end %&gt;
+&lt;%- end -%&gt;
 </pre>
             </td>
           </tr>

data/app/views/management/cms/edit_page_content.html.erb

@@ -1,6 +1,6 @@
-<%= form_tag({}, :id => 'page_content_form') do %>
-  <%= submit_tag 'Save', :id => 'btn_save', :style => 'display: none' %>
-  <%= render :inline => @template_content %>
+<%= form_tag({}, id: 'page_content_form') do %>
+  <%= submit_tag 'Save', id: 'btn_save', style: 'display: none' %>
+  <%= render inline: @template_content %>
 <% end %>
 
 <script type="text/javascript">

data/app/views/management/cms/edit_snippet.html.erb

@@ -2,46 +2,24 @@
 
 <h2>Edit Snippet</h2>
 
-<%= form_tag({}, { :onsubmit => "snip_content.toggleEditor();" }) do %>
-<table width="100%" height="100%">
-  <col width="100" />
-  <tr>
-    <td>Name:</td>
-    <td><%= text_field :snip, :name %></td>
-  </tr>
-  <tr>
-    <td valign="top"><div style="margin-top: 2px">Content:</div></td>
-    <td>
-      <%= text_area :snip, :content, :class => 'codepress html autocomplete-off', :style => 'width: 100%; height: 600px;' %>
-    </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-      <%= submit_tag 'Save Snippet', :class => 'form_button' %>
-      <button onclick="$('preview_frame').scrollIntoView(); snip_content.toggleEditor(); $('preview_content').value = $('snip_content_cp').value; $('preview_form').submit(); snip_content.toggleEditor(); return false;" class="form_button">Preview</button>
-      <%= link_to 'Cancel', :action => 'snippets' %>
-    </td>
-  </tr>
-</table>
-<br/>
-
-<%= render :partial => 'template_reference' %>
-<br/>
-
-<table width="100%">
-  <col width="100" />
-  <tr>
-    <td valign="top"><div style="margin-top: 2px">Preview:</div></td>
-    <td>
-      <iframe id="preview_frame" name="preview_frame" style="width: 100%; height: 600px; border: 1px solid gray;"></iframe>
-      <%= submit_tag 'Save Snippet', :class => 'form_button' %>
-    </td>
-  </tr>
-</table>
+<%= form_tag do %>
+  <%= text_field :snip, :name, :placeholder => 'Snippet Name', :size => '50' %>
+  <div class="codemirror-html-container">
+    <%= text_area :snip, :content, :class => 'codemirror-html autocomplete-off' %>
+  </div>
+  <%= submit_tag 'Save Snippet', :class => 'form_button' %>
+  <button onclick="jQuery('#preview_frame').show(); jQuery('#preview_frame')[0].scrollIntoView(); jQuery('#preview_content').val(jQuery('#snip_content').val()); jQuery('#preview_form').submit(); return false;" class="form_button">Preview</button>
+  <%= link_to 'Cancel', :action => 'sniplates' %>
+  <br/>
+  
+  <br/>
+  <%= render :partial => 'template_reference' %>
+  <br/>
+  
+  <iframe id="preview_frame" name="preview_frame"></iframe>
 <% end %>
 
-
-<form id="preview_form" action="<%= url_for :controller => '/cms/content', :action => 'preview_template' %>" target="preview_frame">
-  <textarea id="preview_content" name="temp[content]" style="display: none;"></textarea>
-</form>
+<%= form_tag({ :controller => '/cms/content', :action => 'preview_template' }, :id => 'preview_form', :target => 'preview_frame') do %>
+  <%= text_area_tag 'temp[content]', '', :id => 'preview_content', :style => 'display: none;' %>
+  <%= hidden_field_tag 'mode', 'preview' %>
+<% end %>