radiant 0.6.3 → 0.6.4

data/app/views/admin/extension/index.rhtml

@@ -17,7 +17,7 @@
     <thead>
       <tr>
         <th class="extension">Extension</th>
-        <th class="website">Website</td>
+        <th class="website">Website</th>
         <th class="version">Version</th>
         <th class="enabled">Enabled</th>
       </tr>
@@ -42,4 +42,4 @@
 // <![CDATA[
   new RuledTable('extensions');
 // ]]>
-</script>
+</script>

data/app/views/admin/layout/edit.rhtml

@@ -4,7 +4,7 @@
 <h1>Edit Layout</h1>
 <% end -%>
 
-<form method="post">
+<form method="post" action="">
   <%= hidden_field "layout", "lock_version" %>
   <div class="form-area">
     <p class="title">
@@ -36,4 +36,4 @@
   </p>
 </form>
 
-<%= focus 'layout_name' %>
+<%= focus 'layout_name' %>

data/app/views/admin/layout/remove.rhtml

@@ -12,6 +12,6 @@
   </tbody>
 </table>
 
-<form method="post">
+<form method="post" action="">
   <p class="buttons"><%= submit_tag "Delete Layout", :class => 'button' %> or <%= link_to 'Cancel', layout_index_url %></p>
-</form>
+</form>

data/app/views/admin/page/_node.rhtml

@@ -1,32 +1,11 @@
-<%
-count = page.children.count
-children = count > 0
-expanded = show_all? || expanded_rows.include?(page.id)
-padding_left = (level * 22) + 4
-
-children_class = children ? (expanded ? ' children-visible' : ' children-hidden') : ' no-children'
-virtual_class = page.virtual? ? " virtual": ""
-
-expander = children ? image((expanded ? "collapse" : "expand"), :class => "expander", :alt => 'toggle children', :title => '') : ""
-
-icon_name = page.virtual? ? "virtual-page" : "page"
-icon = image(icon_name, :class => "icon", :alt => 'page-icon', :title => '')
-
-title = %{<span class="title">#{ page.title }</span>}
-
-display_name = page.class.display_name
-page_type = display_name == 'Page' ? '' : %{<small class="info">(#{ display_name })</small>}
-
-spinner = image('spinner.gif', :class => 'busy', :id => "busy-#{page.id}", :alt => "", :title => "", :style => 'display: none;')
--%>
     <tr id="page-<%= page.id %>" class="node level-<%= level %><%= children_class %><%= virtual_class %>">
-      <td class="page" style="padding-left: <%= padding_left %>px">
+      <td class="page" style="padding-left: <%= padding_left(level) %>px">
         <span class="w1">
 <% if simple -%>
           <%= icon %>
-          <%= title %>
+          <%= node_title %>
 <% else -%>
-          <%= expander %><a href="<%= page_edit_url(:id => page) %>" title="<%= page.url %>"><%= icon %> <%= title %></a> 
+          <%= expander %><a href="<%= page_edit_url(:id => page) %>" title="<%= page.url %>"><%= icon %> <%= node_title %></a> 
           <%= page_type %>
           <%= spinner %>
 <% end -%>
@@ -38,12 +17,11 @@ spinner = image('spinner.gif', :class => 'busy', :id => "busy-#{page.id}", :alt
       <td class="remove"><%= link_to image('remove', :alt => 'remove page'), page_remove_url(:id => page) %></td>
 <% end -%>
     </tr>
-<% level = level + 1 -%>
 <%
 if expanded
   page.children.each do |child|
 -%>
-<%= render_node child, :level => level, :simple => simple -%>
+<%= render_node child, :level => level + 1, :simple => simple -%>
 <%
   end
 end

data/app/views/admin/page/_part.rhtml

@@ -1,18 +1,13 @@
-<%
-@part = part
-@index = (params[:index] || @index || 1).to_i
--%>
-<div class="page" id="page-<%= @index %>">
-  <div class="part" id="part-<%= @index %>">
-    <%= hidden_field_tag "part[#{@index - 1}][name]", @part.name %>
+<% @index ||= 0 -%>
+<div class="page" id="page-<%= @index + 1 %>">
+  <div class="part" id="part-<%= @index + 1 %>">
+    <%= hidden_field_tag "part[#{@index}][name]", part.name, :id => "part_#{@index}_name" %>
     <p>
-      <label for="part[<%= @index - 1 %>][filter_id]">Filter</label>
-      <%= select_tag "part[#{@index - 1}][filter_id]", options_for_select([['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort, @part.filter_id) %>
-      <span id="reference-links">Reference: <span id="filter-reference-link-<%= @index-1 %>"><%= link_to_function "Filter", "load_filter_reference(#{@index - 1})" %></span> <span id="tag-reference-link-<%= @index -1 %>"><%= link_to_function 'Available Tags', "load_tag_reference(#{@index-1});" %></span></span>
+      <label for="part_<%= @index %>_filter_id">Filter</label>
+      <%= select_tag "part[#{@index}][filter_id]", options_for_select([['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort, part.filter_id), :id => "part_#{@index}_filter_id" %>
+      <span id="reference-links">Reference: <span id="filter-reference-link-<%= @index %>"><%= link_to_function "Filter", "load_filter_reference(#{@index})" %></span> <span id="tag-reference-link-<%= @index %>"><%= link_to_function 'Available Tags', "load_tag_reference(#{@index});" %></span></span>
     </p>
-    <div><%= text_area_tag "part[#{@index - 1}][content]", h(@part.content), :class => "textarea", :style => "width: 100%" %></div>
+    <div><%= text_area_tag "part[#{@index}][content]", h(part.content), :class => "textarea", :style => "width: 100%", :id => "part_#{@index}_content" %></div>
   </div>
 </div>
-<%
-@index += 1;
--%>
+<% @index += 1 -%>

data/app/views/admin/page/edit.rhtml

@@ -1,87 +1,34 @@
 <% content_for('page_scripts') do -%>
-      function part_added() {
-        var partNameField = $('part-name-field');
-        var partIndexField = $('part-index-field');
-        var index = parseInt(partIndexField.value);
-        var tab = 'tab-' + index;
-        var caption = partNameField.value;
-        var page = 'page-' + index;
-        tabControl.addTab(tab, caption, page);
-        Element.hide('add-part-popup');
-        Element.hide('busy');
-        partNameField.value = '';
-        partIndexField.value = (index + 1).toString();
-        $('add-part-button').disabled = false;
-        Field.focus(partNameField);
-        tabControl.select(tab);
-      }
-      function part_loading() {
-        $('add-part-button').disabled = true;
-        new Effect.Appear('busy');
-      }
-      function valid_part_name() {
-        var partNameField = $('part-name-field');
-        var name = partNameField.value.downcase().strip();
-        var result = true;
-        if (name == '') {
-          alert('Part name cannot be empty.');
-          return false;
-        }
-        tabControl.tabs.each(function(pair){
-          if (tabControl.tabs[pair.key].caption == name) {
-            result = false;
-            alert('Part name must be unique.');
-            throw $break;
-          }
-        })
-        return result;
-      }
-      function center(element) {
-        var header = $('header')
-        element = $(element);
-        element.style.position = 'absolute';
-        var dim = Element.getDimensions(element);
-        var top = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop;
-        element.style.top = (top + 200) + 'px';
-        element.style.left = ((header.offsetWidth - dim.width) / 2) + 'px';
-      }
-      function toggle_add_part_popup() {
-        var popup = $('add-part-popup');
-        var partNameField = $('part-name-field');
-        center(popup);
-        Element.toggle(popup);
-        Field.focus(partNameField);
-      }
-      var last_type = "<%= @page.class_name %>";
-      function load_tag_reference(part) {
-        page_type = $F('page_class_name');
-        popup = $('tag-reference-popup');
-        if(last_type != page_type) {
-          url = "<%= tag_reference_url %>";
-          params = "class_name=" + page_type;
-          new Effect.Highlight('tag-reference-link-'+ part);
-          req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true });
-        } else {
-           center(popup);
-           Element.toggle(popup);
-        }
-        return false;
-      }
-      var last_filter = "<%= default_filter_name %>";
-      function load_filter_reference(part) {
-        filter_type = $F("part[" + part + "][filter_id]");
-        popup = $('filter-reference-popup');
-        if(last_filter != filter_type) {
-          url = "<%= filter_reference_url %>";
-          params = "filter_name=" + filter_type;
-          new Effect.Highlight('filter-reference-link-'+ part);
-          req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true });
-        } else {
-          center(popup);
-          Element.toggle(popup);
-        }
-        return false;
-      }
+  var last_type = "<%= @page.class_name %>";
+  function load_tag_reference(part) {
+    page_type = $F('page_class_name');
+    popup = $('tag-reference-popup');
+    if(last_type != page_type) {
+      url = "<%= tag_reference_url %>";
+      params = "class_name=" + page_type;
+      new Effect.Highlight('tag-reference-link-'+ part);
+      req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true });
+    } else {
+       center(popup);
+       Element.toggle(popup);
+    }
+    return false;
+  }
+  var last_filter = "<%= default_filter_name %>";
+  function load_filter_reference(part) {
+    filter_type = $F("part_" + part + "_filter_id");
+    popup = $('filter-reference-popup');
+    if(last_filter != filter_type) {
+      url = "<%= filter_reference_url %>";
+      params = "filter_name=" + filter_type;
+      new Effect.Highlight('filter-reference-link-'+ part);
+      req = new Ajax.Request(url, { method: 'get', parameters: params, evalScripts: true });
+    } else {
+      center(popup);
+      Element.toggle(popup);
+    }
+    return false;
+  }
 <% end -%>
 
 <% content_for :page_css do %>
@@ -107,7 +54,7 @@
 <h1 id="edit_page">Edit Page</h1>
 <% end -%>
 
-<form method="post" enctype="multipart/form-data">
+<form method="post" action="" enctype="multipart/form-data">
   <%= hidden_field "page", "lock_version" %>
   <div class="form-area">
     <p class="title">
@@ -115,25 +62,11 @@
       <%= text_field "page", "title", :class => 'textbox', :maxlength => 255 %>
     </p>
     <div id="extended-metadata" class="row"<%= meta_visible(:meta) %>>
-      <table class="fieldset" cellpadding="0" cellspacing="0" border="0">
+      <table class="fieldset">
         <% for meta in @meta %>
             <%= render :partial => "meta_row", :object => meta %>
         <% end %>
-      </table>
-      <script type="text/javascript">
-      // <![CDATA[
-        $title = $('page_title');
-        $slug = $('page_slug');
-        $breadcrumb = $('page_breadcrumb');
-        $old_title = $title.value || '';
-        function title_updated() {
-          if ($old_title.toSlug() == $slug.value) $slug.value = $title.value.toSlug();
-          if ($old_title == $breadcrumb.value) $breadcrumb.value = $title.value;
-          $old_title = $title.value;
-        }
-        new Form.Element.Observer('page_title', 0.15, title_updated);
-      // ]]>
-      </script>
+      </table>
     </div>
     <p class="more-or-less">
       <small>
@@ -152,21 +85,7 @@
 <%= render :partial => 'part', :collection => @page.parts %>
       </div>
     </div>
-    <script type="text/javascript">
-    // <![CDATA[
-      var tabControl = new TabControl('tab-control');
-<%
-@index = 0
-for @part in @page.parts do
-  @index += 1
--%>
-      tabControl.addTab('tab-<%= @index %>', '<%= @part.name %>', 'page-<%= @index %>');
-<%
-end
--%>
-      tabControl.select(tabControl.firstTab());
-    // ]]>
-    </script>
+
     <div class="row">
       <p><label for="page_layout_id">Layout</label>
         <%= select "page", "layout_id", [['<inherit>', '']] + Layout.find(:all).map { |s| [s.name, s.id] } %></p>
@@ -199,15 +118,15 @@ end
       :condition => 'valid_part_name()'
     ) do %> 
       <div>
-        <%= hidden_field_tag 'index', @index + 1, :id => 'part-index-field' %>
+        <%= hidden_field_tag 'index', @index, :id => 'part-index-field' %>
         <%= text_field_tag "part[name]", "", :id => 'part-name-field', :maxlength => 100 %> 
         <%= submit_tag "Add Part", :id => 'add-part-button' %>
       </div>
-      <p><%= link_to_function 'Close', "Element.hide('add-part-popup')", :class => 'close-link' %></p>
+      <p><%= link_to_function 'Close', "$(this).up('.popup').hide()", :class => 'close-link' %></p>
     <% end %>
   </div>
   <div class="popup" id="tag-reference-popup" style="display:none;">
-    <div style="float:right">Search Tags: <input type="text" id="search-tag-reference"></div>
+    <div style="float:right">Search Tags: <input type="text" id="search-tag-reference" /></div>
     <%= javascript_tag "new Form.Element.Observer('search-tag-reference', 0.5, observeTagSearch);" %>
     <h3>Available Tags for <span id="page-type"><%= @page.class.display_name %></span></h3>
     <div id="tag-reference"><%= tag_reference(@page.class.name) %></div>
@@ -218,6 +137,4 @@ end
     <div id="filter-reference"><%= filter_reference(default_filter_name) %></div>
     <p><%= link_to_function 'Close', "Element.hide('filter-reference-popup')", :class => 'close-link' %></p>
   </div>
-<% end -%>
-
-<%= focus 'page_title' %>
+<% end -%>

data/app/views/admin/page/index.rhtml

@@ -2,7 +2,7 @@
 
 <h1>Pages</h1>
 
-<table id="site-map" class="index" cellpadding="0" cellspacing="0" border="0">
+<table id="site-map" class="index" summary="Page hierarchy of the current site">
   <thead>
     <tr>
       <th class="page">Page</th>
@@ -20,11 +20,7 @@
 <% end -%>
   </tbody>
 </table>
-<script type="text/javascript">
-// <![CDATA[
-  new SiteMap('site-map', <%= expanded_rows.to_json %>);
-// ]]>
-</script>
+
 <form action="<%= clear_cache_url %>" method="post">
   <p>
 <% unless @homepage -%>

data/app/views/admin/page/remove.rhtml

@@ -9,6 +9,6 @@
   </tbody>
 </table>
 
-<form method="post">
+<form method="post" action="">
   <p class="buttons"><%= submit_tag "Delete #{pages}", :class => 'button' %> or <%= link_to 'Cancel', page_index_url %></p>
-</form>
+</form>

data/app/views/admin/snippet/edit.rhtml

@@ -4,7 +4,7 @@
 <h1>Edit Snippet</h1>
 <% end -%>
 
-<form method="post">
+<form method="post" action="">
   <%= hidden_field "snippet", "lock_version" %>
   <div class="form-area">
     <p class="title">
@@ -17,7 +17,7 @@
       <%= text_area "snippet", "content", :class => "textarea", :style => "width: 100%" %></p>
     <p>
       <label for="snippet_filter">Filter</label>
-      <%= select_tag "snippet[filter_id]", options_for_select([['none', '']] + TextFilter.descendants.map { |f| f.filter_name }.sort, @snippet.filter_id) %>
+      <%= select_tag "snippet[filter_id]", options_for_select([['none', '']] + TextFilter.descendants.map { |f| f.filter_name }.sort, @snippet.filter_id), :id => 'snippet_filter' %>
     </p>
     <%= updated_stamp @snippet %>
   </div>
@@ -26,4 +26,4 @@
   </p>
 </form>
 
-<%= focus 'snippet_name' %>
+<%= focus 'snippet_name' %>

data/app/views/admin/snippet/index.rhtml

@@ -15,7 +15,7 @@
     <tr class="node level-1">
       <td class="snippet">
         <%= image "snippet", :class => "icon", :alt => 'snippet-icon', :title => '' %>
-        <%= link_to snippet.name, snippet_edit_url(:id => snippet) %></span>
+        <span><%= link_to snippet.name, snippet_edit_url(:id => snippet) %></span>
       </td>
       <td class="remove"><%= link_to image('remove', :alt => 'Remove Snippet'), snippet_remove_url(:id => snippet) %></td>
     </tr>
@@ -33,4 +33,4 @@
 // ]]>
 </script>
 
-<p><%= link_to image('new-snippet', :alt => 'New Snippet'), snippet_new_url %></p>
+<p><%= link_to image('new-snippet', :alt => 'New Snippet'), snippet_new_url %></p>

data/app/views/admin/snippet/remove.rhtml

@@ -11,6 +11,6 @@
   </tbody>
 </table>
 
-<form method="post">
+<form method="post" action="">
   <p class="buttons"><%= submit_tag "Delete Snippet", :class => 'button' %> or <%= link_to 'Cancel', snippet_index_url %></p>
-</form>
+</form>

data/app/views/admin/user/edit.rhtml

@@ -4,7 +4,7 @@
 <h1>Edit User</h1>
 <% end -%>
 
-<form method="post">
+<form method="post" action="">
   <%= hidden_field "user", "lock_version" %>
   <table class="fieldset" cellpadding="0" cellspacing="0" border="0">
     <tr>
@@ -34,8 +34,8 @@
     <tr>
       <td class="label"><label for="user_admin">Roles</label></td>
       <td class="field">
-        <span class="checkbox"><%= check_box "user", "admin" %>&nbsp;Administrator</span>
-        <span class="checkbox"><%= check_box "user", "developer" %>&nbsp;Developer</span>
+        <span class="checkbox"><%= check_box "user", "admin" %>&nbsp;<label for="user_admin">Administrator</label></span>
+        <span class="checkbox"><%= check_box "user", "developer" %>&nbsp;<label for="user_developer">Developer</label></span>
       </td>
       <td class="help">Roles restrict user privileges and turn parts of the administrative interface on or off.</td>
     </tr>
@@ -51,4 +51,4 @@
   </p>
 </form>
 
-<%= focus 'user_name' %>
+<%= focus 'user_name' %>

data/app/views/admin/user/preferences.rhtml

@@ -1,6 +1,6 @@
 <h1>User Preferences</h1>
 
-<form method="post">
+<form method="post" action="">
   <table class="fieldset" cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td class="label"><label for="user_password">Password</label></td>
@@ -26,4 +26,4 @@
 // <![CDATA[
   Field.focus('user_password');
 // ]]>
-</script>
+</script>

data/app/views/admin/welcome/login.rhtml

@@ -37,7 +37,7 @@
 <div id="login">
   <h1>Please Login</h1>
 
-  <form method="post">
+  <form method="post" action="">
     <p><label for="user_login">Username</label>
       <%= text_field "user", "login", :class => 'textbox', :value => '', :maxlength => 40 %></p>
     <p><label for="user_password">Password</label>