beef-pages 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/app/controllers/admin/pages_controller.rb

@@ -86,17 +86,22 @@ class Admin::PagesController < Admin::BaseController
 
   def destroy
     @page = Page.find(params[:id])
-    @page.destroy
-  
-    respond_to do |format|
-      format.html {
-          if params[:page].nil?
-            redirect_to(admin_pages_url)
-          else
-            redirect_to(admin_page_pages_url(@page.parent))
-          end
-      }
-      format.xml  { head :ok }
+    if @page.lock_level >0
+      flash[:notice] = 'This Page is locked.'
+      redirect_to(:back)
+    else
+      @page.destroy
+    
+      respond_to do |format|
+        format.html {
+            if params[:page].nil?
+              redirect_to(admin_pages_url)
+            else
+              redirect_to(admin_page_pages_url(@page.parent))
+            end
+        }
+        format.xml  { head :ok }
+      end
     end
   end
   

data/app/models/page.rb

@@ -38,6 +38,10 @@ class Page < ActiveRecord::Base
   def featured?
     !features.empty?
   end
+  
+  def lock_level
+    read_attribute(:lock_level) || 0
+  end
 
   private
 

data/app/views/admin/pages/_page.html.erb

@@ -1,5 +1,5 @@
     <tr id="pages-<%= page.id %>">
-      <td class="title"><%= link_to page.title, admin_page_pages_path(page) %></td>
+      <td class="title"><%= link_to page.title, admin_page_path(page) %></td>
       <td><%= link_to pluralize(page.children.count, "sub page"), admin_page_pages_path(page) %></td>
       <td><%= content_status(page) %></td>
       <td><%= page.author %><br />(<%= page.created_at.to_formatted_s(:short) %>)</td>
@@ -9,7 +9,7 @@
       <td><%= link_to 'Show', page_path(page.permalink), :class => 'show' if page.published? %></td>
       <td><%= link_to 'Add page', new_admin_page_page_path(page), :class => 'add', :title => "Add a sub-page under #{page.title}" %></td>
       <td><%= link_to 'Edit', [:admin, page], :class => 'edit' %></td>
-      <td><%= link_to('Destroy', admin_page_path(page), :confirm => 'Are you sure?', :method => :delete, :class => 'delete') unless page.parent_id.nil? || !current_user.admin? %></td>
+      <td><%= link_to('Destroy', admin_page_path(page), :confirm => 'Are you sure?', :method => :delete, :class => 'delete') unless page.lock_level >=1 || !current_user.admin? %></td>
       <td>
         <%= link_to 'up', move_up_admin_page_path(page), { :class => "page_up" } if current_user.admin? && !page.first? %>
         <%= link_to 'down', move_down_admin_page_path(page), { :class => 'page_down' } if current_user.admin? && !page.last? %>

data/app/views/admin/pages/index.html.erb

@@ -2,16 +2,13 @@
 
 <ul class="choices">
 <% unless @parent.nil? %>
-    <li><%= link_to 'New page', new_admin_page_page_path(@parent), :class => "button", :title => "Add a sub-page under #{@parent.title}" %></li>
-
+  <li><%= link_to 'New page', new_admin_page_page_path(@parent), :class => "button", :title => "Add a sub-page under #{@parent.title}" %></li>
 <%   if @parent.parent.nil? %>
-      <li><%= link_to "All top pages", admin_pages_path(), :class => "up button" %></li>
+  <li><%= link_to "All top pages", admin_pages_path(), :class => "up button" %></li>
 <%   else %>
-      <li><%= link_to "Up to #{@parent.parent.title}", admin_page_pages_path(@parent.parent), :class => "up button" %></li>
+  <li><%= link_to "Up to #{@parent.parent.title}", admin_page_pages_path(@parent.parent), :class => "up button" %></li>
 <%   end %>
-
 <% end %>
-
 </ul>  
 
 <%= hidden_field_tag 'form_authenticity_token', "#{form_authenticity_token}" %> 
@@ -22,7 +19,7 @@
       <th>Title</th>
       <th># Sub Pages</th>
       <th>Status</th>
-      <th>Author</      th>
+      <th>Author</th>
       <th>Updater</th>
       <th>Published At</th>
       <th>Published To</th>

data/app/views/admin/pages/show.html.erb

@@ -3,30 +3,45 @@
   <%= stylesheet_link_tag 'lightwindow' %>
 <% end -%>
 
-<h1><%= @page.new_record? ? 'New' : 'Editing' %> page</h1>
+<h1><%= @page.new_record? ? 'New' : 'Editing a' %> Page</h1>
 
 <% form_for([:admin, @page], :html => { :id => 'has-assets-form' }) do |f| %>
   <%= f.error_messages %>
 
   <%= f.hidden_field :parent_id %>
+  
+<% if @page.lock_level < 3 %>
   <p>
-    <%= f.label :title %><br/>
+    <%= f.label :title, 'Title*' %><br/>
     <%= f.text_field :title, :class => 'title' %>
   </p>
-  
+<% else %>
+  <p>
+    <%= f.label :title %><br/>
+    <%= @page.title %> (locked)
+  </p>
+<% end %>
+
+<% if @page.lock_level < 2 %>
   <p>
     <%= f.label :permalink, "URL" %><br/>
     <%= root_url %><%= f.text_field :permalink %>
     <p>URLs are most efficient if they closely reflect the title or main subject of this content. Changing the permalink will make search engines think it is a different page resulting in a loss of page rank, only change if very necessary. Leave blank to use the title.</p>
   </p>
+<% else %>
+  <p>
+    <%= f.label :permalink, "URL" %><br/>
+    <%= root_url %><%= @page.permalink %> (locked)
+  </p>
+<% end %>
 
   <p>
-    <%= f.label :description, "Description for search engines" %><br/>
+    <%= f.label :description, "Description for search engines*" %><br/>
     <%= f.text_area :description, "rows" => 4 %>
   </p>
 
   <p>
-    <%= f.label :tag_list, "Keywords (comma seperated) - used by search engines" %><br/>
+    <%= f.label :tag_list, "Keywords (used by search engines) & Tags - comma separated*" %><br/>
     <%= f.text_field :tag_list, :class => 'long' %>
   </p>
   
@@ -37,7 +52,7 @@
   </p>
 
   <p>
-    <%= f.label :body %><br/>
+    <%= f.label :body, 'Body*' %><br/>
     <%= f.text_area 'body', :class => 'editor'  %>
   </p>
 
@@ -62,4 +77,5 @@
 <h2>Asset Upload</h2>
 <%= asset_upload_form %>
 
+<%= flickr_select %>
 <% end %>

data/generators/pages_migration/templates/migration.rb

@@ -10,6 +10,7 @@ class CreatePages < ActiveRecord::Migration
       t.string :template, :limit => 20
       t.integer :position, :default => 0
       t.references :created_by, :updated_by, :parent
+      t.integer :lock_level, :default => 0
 
       t.timestamps
     end

data/lib/pages.rb

@@ -3,12 +3,15 @@ module Beef
     module HelperMethods
       def get_template_names
         templates = []
-        Dir.glob("#{RAILS_ROOT}/app/views/pages/templates/*"){|f| match = /\/([^\/]+)\.html\.erb$/.match(f); templates << match[1] unless match.nil? }
+        Dir.glob("#{RAILS_ROOT}/app/views/pages/templates/*") do |f| 
+          match = /\/([^\/]+)\.html\.erb$/.match(f)
+          templates << match[1] unless match.nil?
+        end
         # Move default to top if it exists
         if default = templates.delete('default')
           templates.insert(0, default)
         end 
-        templates.sort
+        templates
       end
     end
   end

data/pages.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pages}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-09-03}
+  s.date = %q{2009-09-10}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-pages
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: []