radiant 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1 +1 @@
-= Change Log
+= Change Log

data/CONTRIBUTORS

@@ -2,6 +2,12 @@
 
 The following people have submitted changes which have been applied to the core:
 
+=== 0.5.1
+* Daniel Shepherd
+* Paul Smith
+* Bodhi Philpot
+
+=== 0.5.0
 * Matt McCray
 * Paul Smith
 * Scott Walter

data/app/controllers/application.rb

@@ -1,3 +1,4 @@
+require_dependency 'radiant'
 require_dependency 'login_system'
 
 ActionView::Base.field_error_proc = Proc.new do |html, instance|

data/app/helpers/admin/page_helper.rb

@@ -1,8 +1,19 @@
 module Admin::PageHelper
   def render_node(page, locals = {})
-    locals.reverse_merge!( :level => 0, :expand => 3, :simple => false ).merge!( :page => page )
+    locals.reverse_merge!(:level => 0, :simple => false).merge!(:page => page)
     render :partial => 'node', :locals =>  locals
   end
+
+  def expanded_rows
+    case
+    when row_string = (cookies['expanded_rows'] || []).first
+      row_string.split(',').map { |x| Integer(x) rescue nil }.compact
+    when @homepage
+      [@homepage.id]
+    else
+      []
+    end     
+  end
   
   def meta_errors?
     !!(@page.errors[:slug] or @page.errors[:breadcrumb])

data/app/helpers/application_helper.rb

@@ -138,4 +138,8 @@ module ApplicationHelper
   def toggle_javascript_for(id)
     "javascript:Element.toggle('#{id}', 'more-#{id}', 'less-#{id}')"
   end
+  
+  def cookies
+    @cookies
+  end
 end

data/app/models/page_context.rb

@@ -208,7 +208,7 @@ class PageContext < Radius::Context
       contextual = boolean_attr['contextual', true]
       if inherit and contextual
         part = part_page.part(part_name)
-        page.behavior.render_snippet(part)
+        page.behavior.render_snippet(part) unless part.nil?
       else
         part_page.behavior.render_page_part(part_name)
       end

data/app/models/response_cache.rb

@@ -22,7 +22,7 @@ class ResponseCache
   # Options are as follows:
   # :directory         :: the path to the temporary cache directory
   # :expire_time       :: the number of seconds a cached response is considered valid (defaults to 5 min)
-  # :default_extension :: the extension cached files should use (defaults to '.html')
+  # :default_extension :: the extension cached files should use (defaults to '.yml')
   # :peform_caching    :: boolean value that turns caching on or off (defaults to true)
   # :logger            :: the application logging object (defaults to ActionController::Base.logger)
   #
@@ -109,4 +109,4 @@ class ResponseCache
       }.to_yaml
       cache_page(content, path)
     end
-end
+end

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

@@ -5,29 +5,29 @@
   edit it or click <code>Remove</code> to delete it.</p>
 
 <table id="layouts" class="index" cellpadding="0" cellspacing="0" border="0">
-	<thead>
-		<tr>
-			<th class="layout">Layout</th>
-			<th class="modify">Modify</th>
-		</tr>
-	</thead>
-	<tbody>
+  <thead>
+    <tr>
+      <th class="layout">Layout</th>
+      <th class="modify">Modify</th>
+    </tr>
+  </thead>
+  <tbody>
 <% unless @layouts.empty? -%>
 <% for layout in @layouts -%>
-	  <tr class="node level-1">
-	    <td class="layout">
-	      <%= image_tag 'page', :alt => 'layout-icon', :title => '', :align => 'center' %>
-	      <%= link_to layout.name, layout_edit_url(:id => layout) %>
-	    </td>
-	    <td class="remove"><%= link_to image_tag('remove', :alt => 'Remove Layout'), layout_remove_url(:id => layout) %></td>
-	  </tr>
+    <tr class="node level-1">
+      <td class="layout">
+        <%= image_tag 'layout', :alt => 'layout-icon', :title => '', :align => 'center' %>
+        <%= link_to layout.name, layout_edit_url(:id => layout) %>
+      </td>
+      <td class="remove"><%= link_to image_tag('remove', :alt => 'Remove Layout'), layout_remove_url(:id => layout) %></td>
+    </tr>
 <% end -%>
 <% else -%>
     <tr>
       <td colspan="2" class="note">No Layouts</td>
     </tr>
 <% end -%>
-	</tbody>
+  </tbody>
 </table>
 <script type="text/javascript">
 // <![CDATA[

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

@@ -5,12 +5,12 @@
 <% end -%>
 
 <form method="post">
-	<div class="form-area">
-		<p class="title">
-			<label for="layout_name">Name</label>
-			<%= text_field "layout", "name", :class => 'textbox', :maxlength => 100 %>
-		</p>
-		<div id="extended-metadata" class="row"<%= meta_visible(:meta) %>>
+  <div class="form-area">
+    <p class="title">
+      <label for="layout_name">Name</label>
+      <%= text_field "layout", "name", :class => 'textbox', :maxlength => 100 %>
+    </p>
+    <div id="extended-metadata" class="row"<%= meta_visible(:meta) %>>
       <table class="fieldset" cellpadding="0" cellspacing="0" border="0">
         <tr>
           <td><label for="layout_content_type">Content-Type</label></td>
@@ -24,14 +24,14 @@
         <a id="less-extended-metadata" href="<%= toggle_javascript_for('extended-metadata') %>"<%= meta_visible(:meta_less) %>>Less</a>
       </small>
     </p>
-		<p class="content">
-		  <label for="layout_content">Body</label>
-		  <%= text_area "layout", "content", :class => "textarea", :style => "width: 100%" %></p>
+    <p class="content">
+      <label for="layout_content">Body</label>
+      <%= text_area "layout", "content", :class => "textarea", :style => "width: 100%" %></p>
     <%= updated_stamp @layout %>
-	</div>
-	<p class="buttons">
-		<%= save_model_button(@layout) %> <%= save_model_and_continue_editing_button(@layout) %> or <%= link_to "Cancel", layout_index_url %>
-	</p>
+  </div>
+  <p class="buttons">
+    <%= save_model_button(@layout) %> <%= save_model_and_continue_editing_button(@layout) %> or <%= link_to "Cancel", layout_index_url %>
+  </p>
 </form>
 
 <%= focus 'layout_name' %>

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

@@ -2,16 +2,16 @@
 <p>Are you sure you want to <strong class="warning">permanently remove</strong> the following layout?</p>
 
 <table id="site-map" class="index" cellpadding="0" cellspacing="0" border="0">
-	<tbody>
-	  <tr class="node level-1" onmouseover="Element.addClassName(this, 'highlight');" onmouseout="Element.removeClassName(this, 'highlight');">
-	    <td class="layout">
-	      <%= image_tag 'page', :alt => 'layout-icon', :title => '', :align => 'center' %>
-	      <%= @layout.name %>
-	    </td>
-	  </tr>
-	</tbody>
+  <tbody>
+    <tr class="node level-1" onmouseover="Element.addClassName(this, 'highlight');" onmouseout="Element.removeClassName(this, 'highlight');">
+      <td class="layout">
+        <%= image_tag 'layout', :alt => 'layout-icon', :title => '', :align => 'center' %>
+        <%= @layout.name %>
+      </td>
+    </tr>
+  </tbody>
 </table>
 
 <form method="post">
-	<p class="buttons"><%= submit_tag "Delete Layout", :class => 'button' %> or <%= link_to 'Cancel', layout_index_url %></p>
+  <p class="buttons"><%= submit_tag "Delete Layout", :class => 'button' %> or <%= link_to 'Cancel', layout_index_url %></p>
 </form>

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

@@ -1,8 +1,7 @@
 <%
 count = page.children.count
 children = count > 0
-expand = expand - 1
-expanded = expand > 0
+expanded = expanded_rows.include?(page.id)
 padding_left = (level * 22) + 4
 
 children_class = children ? (expanded ? ' children-visible' : ' children-hidden') : ' no-children'
@@ -20,32 +19,32 @@ behavior = behavior_id.empty? ? '' : %{<small class="info">(#{ behavior_id })</s
 
 spinner = image_tag("spinner.gif", :class => 'busy', :id => "busy-#{page.id}", :alt => "", :title => "", :align => "center", :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">
-			  <span class="w1">
+    <tr id="page-<%= page.id %>" class="node level-<%= level %><%= children_class %><%= virtual_class %>">
+      <td class="page" style="padding-left: <%= padding_left %>px">
+        <span class="w1">
 <% if simple -%>
           <%= icon %>
           <%= title %>
 <% else -%>
           <%= expander %><a href="<%= page_edit_url(:id => page) %>"><%= icon %> <%= title %></a> 
-			 	  <%= behavior %>
-			 	  <%= spinner %>
+          <%= behavior %>
+          <%= spinner %>
 <% end -%>
         </span>
-			</td>
+      </td>
 <% unless simple -%>
-			<td class="status <%= page.status.name.downcase %>-status"><%= page.status.name %></td>
-			<td class="add-child"><%= link_to image_tag('add-child', :alt => 'add child'), page_new_url(:parent_id => page) %></td>
-			<td class="remove"><%= link_to image_tag('remove', :alt => 'remove page'), page_remove_url(:id => page) %></td>
+      <td class="status <%= page.status.name.downcase %>-status"><%= page.status.name %></td>
+      <td class="add-child"><%= link_to image_tag('add-child', :alt => 'add child'), page_new_url(:parent_id => page) %></td>
+      <td class="remove"><%= link_to image_tag('remove', :alt => 'remove page'), page_remove_url(:id => page) %></td>
 <% end -%>
-		</tr>
+    </tr>
 <% level = level + 1 -%>
 <%
 if expanded
   page.children.each do |child|
 -%>
-<%= render_node child, :level => level, :expand => expand, :simple => simple -%>
+<%= render_node child, :level => level, :simple => simple -%>
 <%
   end
 end
--%>
+-%>

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

@@ -3,14 +3,14 @@
 @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 %>
-		<p>
-			<label for="part[<%= @index - 1 %>}][filter_id]">Filter</label>
-			<%= select_tag "part[#{@index - 1}][filter_id]", options_for_select([['<none>', '']] + TextFilter.find_all.map { |s| s.registered_id }, @part.filter_id) %>
-		</p>
-		<div><%= text_area_tag "part[#{@index - 1}][content]", h(@part.content), :class => "textarea", :style => "width: 100%" %></div>
-	</div>
+  <div class="part" id="part-<%= @index %>">
+    <%= hidden_field_tag "part[#{@index - 1}][name]", @part.name %>
+    <p>
+      <label for="part[<%= @index - 1 %>}][filter_id]">Filter</label>
+      <%= select_tag "part[#{@index - 1}][filter_id]", options_for_select([['<none>', '']] + TextFilter.find_all.map { |s| s.registered_id }, @part.filter_id) %>
+    </p>
+    <div><%= text_area_tag "part[#{@index - 1}][content]", h(@part.content), :class => "textarea", :style => "width: 100%" %></div>
+  </div>
 </div>
 <%
 @index += 1;

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

@@ -2,6 +2,8 @@
     var SiteMap = Class.create();
     SiteMap.prototype = Object.extend({}, RuledTable.prototype); // Inherit from RuledTable
     Object.extend(SiteMap.prototype, {
+    
+      expandedRows: <%= expanded_rows.to_json %>,
 
       onRowSetup: function(row) {
         Event.observe(row, 'click', this.onMouseClickRow.bindAsEventListener(this), false);
@@ -50,7 +52,11 @@
           expanders.push(image);
         }.bind(this));
         return expanders.first();
-      },      
+      },     
+      
+      saveExpandedCookie: function() {
+        document.cookie = "expanded_rows="+this.expandedRows.join(",")+"; path=/admin";
+      }, 
       
       hideBranch: function(row, img) {
         var level = this.extractLevel(row);
@@ -62,6 +68,13 @@
           }
           sibling = sibling.nextSibling;
         }
+        var pageId = this.extractPageId(row);
+        var newExpanded = [];
+        for(i=0; i < this.expandedRows.length; i++)
+            if(this.expandedRows[i] != pageId)
+                newExpanded.push(this.expandedRows[i]);
+        this.expandedRows = newExpanded;
+        this.saveExpandedCookie();
         if (img == null)
           img = this.getExpanderImageForRow(row);
         img.src = img.src.replace(/collapse/, 'expand');
@@ -69,17 +82,22 @@
         Element.addClassName(row, 'children-hidden');
       },
       
-      showBranch: function(row, img) {
+      showBranchInternal: function(row, img) {
         var level = this.extractLevel(row);
         var sibling = row.nextSibling;
         var children = false;
+        var childOwningSiblings = [];        
         while(sibling != null) {
           if (this.isRow(sibling)) {
             var siblingLevel = this.extractLevel(sibling);
             if (siblingLevel <= level) break;
             if (siblingLevel == level + 1) {
               Element.show(sibling);
-              this.hideBranch(sibling);
+              if(sibling.className.match(/children-visible/)) {
+                childOwningSiblings.push(sibling);
+              } else {
+                this.hideBranch(sibling);
+              }
             }
             children = true;
           }
@@ -88,12 +106,21 @@
         if (!children)
           this.getBranch(row);
         if (img == null)
-          img = this.getExpanderImageForRow(row);
+          img = this.getExpanderImageForRow(row);          
         img.src = img.src.replace(/expand/, 'collapse');
+        for(i=0; i < childOwningSiblings.length; i++) {
+            this.showBranch(childOwningSiblings[i], null);            
+        }        
         Element.removeClassName(row, 'children-hidden');
         Element.addClassName(row, 'children-visible');
       },
       
+      showBranch: function(row, img) {
+        this.showBranchInternal(row, img);
+        this.expandedRows.push(this.extractPageId(row));
+        this.saveExpandedCookie();
+      },
+      
       getBranch: function(row) {
         var level = this.extractLevel(row).toString();
         var id = this.extractPageId(row).toString();
@@ -140,22 +167,22 @@
 <h1>Pages</h1>
 
 <table id="site-map" class="index" cellpadding="0" cellspacing="0" border="0">
-	<thead>
-		<tr>
-			<th class="page">Page</th>
-			<th class="status">Status</th>
-			<th class="modify" colspan="2">Modify</th>
-		</tr>
-	</thead>
-	<tbody>
+  <thead>
+    <tr>
+      <th class="page">Page</th>
+      <th class="status">Status</th>
+      <th class="modify" colspan="2">Modify</th>
+    </tr>
+  </thead>
+  <tbody>
 <% if @homepage -%>
 <%= render_node @homepage -%>
 <% else -%>
-	<tr>
-		<td colspan="4" class="note">No Pages</td>
-	</tr>
+  <tr>
+    <td colspan="4" class="note">No Pages</td>
+  </tr>
 <% end -%>
-	</tbody>
+  </tbody>
 </table>
 <script type="text/javascript">
 // <![CDATA[
@@ -169,4 +196,4 @@
 <% end -%>
     <%= image_submit_tag 'clear-page-cache' %>
   </p>
-</form>
+</form>

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

@@ -4,11 +4,11 @@
 <p>Are you sure you want to <strong class="warning">permanently remove</strong> the following <%= pages.downcase %>?</p>
 
 <table id="site-map" class="index" cellpadding="0" cellspacing="0" border="0">
-	<tbody>
+  <tbody>
 <%= render_node @page, :simple => true -%>
-	</tbody>
+  </tbody>
 </table>
 
 <form method="post">
-	<p class="buttons"><%= submit_tag "Delete #{pages}", :class => 'button' %> or <%= link_to 'Cancel', page_index_url %></p>
+  <p class="buttons"><%= submit_tag "Delete #{pages}", :class => 'button' %> or <%= link_to 'Cancel', page_index_url %></p>
 </form>

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

@@ -3,29 +3,29 @@
 <p>Snippets are generally small pieces of content which are included in other pages or layouts.</p>
 
 <table id="snippets" class="index" cellpadding="0" cellspacing="0" border="0">
-	<thead>
-		<tr>
-			<th class="snippet">Snippet</th>
-			<th class="modify">Modify</th>
-		</tr>
-	</thead>
-	<tbody>
+  <thead>
+    <tr>
+      <th class="snippet">Snippet</th>
+      <th class="modify">Modify</th>
+    </tr>
+  </thead>
+  <tbody>
 <% unless @snippets.empty? -%>
 <% for snippet in @snippets -%>
-	  <tr class="node level-1">
-	    <td class="snippet">
-	      <%= image_tag "snippet", :class => "icon", :alt => 'snippet-icon', :title => '', :align => 'center' %>
-	      <%= link_to snippet.name, snippet_edit_url(:id => snippet) %></span>
-	    </td>
-	    <td class="remove"><%= link_to image_tag('remove', :alt => 'Remove Snippet'), snippet_remove_url(:id => snippet) %></td>
-	  </tr>
+    <tr class="node level-1">
+      <td class="snippet">
+        <%= image_tag "snippet", :class => "icon", :alt => 'snippet-icon', :title => '', :align => 'center' %>
+        <%= link_to snippet.name, snippet_edit_url(:id => snippet) %></span>
+      </td>
+      <td class="remove"><%= link_to image_tag('remove', :alt => 'Remove Snippet'), snippet_remove_url(:id => snippet) %></td>
+    </tr>
 <% end -%>
 <% else -%>
     <tr>
       <td colspan="2" class="note">No Snippets</td>
     </tr>
 <% end -%>
-	</tbody>
+  </tbody>
 </table>
 <script type="text/javascript">
 // <![CDATA[