RubyGems - we5-browsercms - Versions diffs - 3.0.5.1 → 3.1.0 - Mend

we5-browsercms 3.0.5.1 → 3.1.0

Files changed (1025) hide show

data/app/models/templates.rb ADDED Viewed

@@ -0,0 +1,31 @@
+##
+# Separated into its own file so it can be required in Application Templates and Generators easier.
+module Templates
+  ##
+  # Generates a basic empty template for a page.
+  #
+  def self.default_body
+    html = <<HTML
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <title><%= page_title %></title>
+    <%= yield :html_head %>
+  </head>
+  <body style="margin: 0; padding: 0; text-align: center;">
+    <%= cms_toolbar %>
+    <div id="wrapper" style="width: 700px; margin: 0 auto; text-align: left; padding: 30px">
+      Breadcrumbs: <%= render_breadcrumbs %>
+      Main Menu: <%= render_menu %>
+      <h1><%= page_title %></h1>
+      <%= container :main %>
+    </div>
+  </body>
+</html>
+HTML
+    html
+  end
+end

data/app/models/user.rb CHANGED Viewed

@@ -17,8 +17,8 @@ class User < ActiveRecord::Base
   has_many :user_group_memberships
   has_many :groups, :through => :user_group_memberships
   has_many :tasks, :foreign_key => "assigned_to_id"
-  named_scope :active, :conditions => {:expires_at => nil }
+  named_scope :active, :conditions => ["expires_at IS NULL OR expires_at > ?", Time.now.utc]
   named_scope :able_to_edit_or_publish_content,
     :include => {:groups => :permissions},
     :conditions => ["permissions.name = ? OR permissions.name = ?", "edit_content", "publish_content"]
@@ -38,6 +38,12 @@ class User < ActiveRecord::Base
     !!@guest
   end
+  # Determines if this user should have access to the CMS administration tools. Can be overridden by specific users (like GuestUser)
+  # which may not need to check the database for that information.
+  def cms_access?
+    groups.cms_access.count > 0
+  end
   def disable
     if self.class.count(:conditions => ["expires_at is null and id != ?", id]) > 0
       self.expires_at = Time.now - 1.minutes
@@ -74,6 +80,14 @@ class User < ActiveRecord::Base
     "#{full_name} (#{login})"
   end
+  def full_name_or_login
+    if full_name.strip.blank?
+      login
+    else
+      full_name
+    end
+  end
   # This is to show a formated date on the input form. I'm unsure that
   # this is the best way to solve this, but it works.
   def expires_at_formatted
@@ -101,15 +115,27 @@ class User < ActiveRecord::Base
     end
   end
-  # Expects object to be an object or a section
-  # If it's a section, that will be used
-  # If it's not a section, it will call section on the object
-  # returns true if any of the sections of the groups the user is in matches the page's section.
+  # Determine if this user has permission to view the specific object. Permissions
+  #   are always tied to a specific section. This method can take different input parameters
+  #   and will attempt to determine the relevant section to check.
+  # Expects object to be of type:
+  #   1. Section - Will check the user's groups to see if any of those groups can view this section.
+  #   2. Path - Will look up the section based on the path, then check it.  (Note that section paths are not currently unique, so this will check the first one it finds).
+  #   3. Other - Assumes it has a section attribute and will call that and check the return value.
+  #
+  # Returns: true if the user can view this object, false otherwise.
+  # Raises: ActiveRecord::RecordNotFound if a path to a not existent section is passed in.
   def able_to_view?(object)
-    section = object.is_a?(Section) ? object : object.section
-    viewable_sections.include?(section) || groups.cms_access.count > 0
+    section = object
+    if object.is_a?(String)
+       section = Section.find_by_path(object)
+       raise ActiveRecord::RecordNotFound.new("Could not find section with path = '#{object}'") unless section
+    elsif !object.is_a?(Section)
+      section = object.section
+    end
+    viewable_sections.include?(section) || cms_access?
   end
   def able_to_modify?(object)
     case object
       when Section

data/app/portlets/forgot_password_portlet.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 class ForgotPasswordPortlet < Portlet
   require 'digest/sha1'
   def render
     flash[:forgot_password] = {}

data/app/views/cms/blocks/_toolbar_for_member.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <% able_to? :publish_content do -%>
   <% if @block.respond_to?(:live?) && !@block.live? %>
     <%= link_to span_tag('Publish'), block_path(:publish),
-      :class => "http_put button left#{' disabled' unless current_user.able_to_publish?(@block)}",
+      :class => "http_put button left#{' disabled' unless (current_user.able_to_publish?(@block) && @block.publishable?)}",
       :id => "publish_button" %>
   <% else %>
     <%= link_to span_tag('Publish'), "#",

data/app/views/cms/blocks/edit.html.erb CHANGED Viewed

@@ -5,6 +5,10 @@
 <% page_title "Content Library / Edit #{content_type.display_name}" %>
 <% @toolbar_title = "Edit #{content_type.display_name} '#{@block.name}'" %>
 <% content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
+<% if @block.respond_to?(:deleted) && @block.deleted %>
+  <div class="header">This <%= @block.class.name %> has been deleted.</div>
+<% else %>
 <% form_for(@block, :url => block_path, :html => {:multipart => true}) do |f| %>
   <%= f.error_messages %>
   <%= render :partial => 'cms/shared/exception', :object => @exception if @exception %>
@@ -23,3 +27,4 @@
       <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
     </div>
 <% end %>
+<% end %>

data/app/views/cms/blocks/index.html.erb CHANGED Viewed

@@ -51,39 +51,32 @@
 <% @toolbar_title = "List #{content_type.display_name_plural}" %>
 <%= render :partial => 'cms/blocks/toolbar' %>
-<div class="roundedcorners">
 <table id="blocks" class="data">
   <thead>
     <tr>
       <% content_type.columns_for_index.each_with_index do |column, i| %>
-        <% attrs = if !content_type.model_class.respond_to?(:updated_at) &&
-                      !content_type.model_class.connectable? &&
-                      !content_type.model_class.publishable? &&
-                      content_type.columns_for_index.size == i + 1
-             %Q{ colspan="2" class="last"}
-           elsif i == 0
-             %Q{ colspan="2" class="name first"}
-          end %>
-        <th<%= attrs %>>
-          <div class="dividers">
-            <% if column[:order] %>
-              <%= link_to column[:label], cms_index_path_for(content_type,
-                :order => determine_order(params[:order], column[:order])) %>
-            <% else %>
-              <%= column[:label] %>
-            <% end %>
-          </div>
+        <th class="<%= column[:label].gsub(' ', '').underscore %><%= " first" if i == 0 %>">
+          <% if column[:order] %>
+            <%= link_to column[:label], cms_index_path_for(content_type,
+              :order => determine_order(params[:order], column[:order])) %>
+          <% else %>
+            <%= column[:label] %>
+          <% end %>
         </th>
       <% end %>
       <% if content_type.model_class.respond_to?(:updated_at) %>
-        <th class="updated <%= 'last" colspan="2' unless content_type.model_class.publishable? || content_type.model_class.connectable? %>"><div class="dividers">Updated</div></th>
+        <th class="updated">Updated</th>
+      <% end %>
+      <% if content_type.model_class.connectable? %>
+        <th class="used">Used</th>
+      <% end %>
+      <% if content_type.model_class.publishable? %>
+        <th class="block_status">Status</th>
       <% end %>
-      <% if content_type.model_class.connectable? %><th class="used <%= ' last" colspan="2' unless content_type.model_class.publishable? %>"><div class="dividers">Used</div></th><% end %>
-      <% if content_type.model_class.publishable? %><th colspan="2" class="block_status last">Status</th><% end %>
     </tr>
   </thead>
   <tbody>
-    <% col_ct = 2
+    <% col_ct = 0
        col_ct += content_type.columns_for_index.size
        col_ct += 1 if content_type.model_class.respond_to?(:updated_at)
        col_ct += 1 if content_type.model_class.connectable?
@@ -91,38 +84,32 @@
     <% @blocks.each do |b| %>
       <% block = b.class.versioned? ? b.as_of_draft_version : b %>
       <tr id="<%= block.class.name.underscore %>_<%= block.id %>" class="<%= block.class.name.underscore %> <%= block.class.publishable? && !block.published? ? 'draft' : 'published' %> <%= 'non-editable' unless current_user.able_to_edit?(block) %> <%= 'non-publishable' unless current_user.able_to_publish?(block) %>">
-  <td class="first"></td>
         <% content_type.columns_for_index.each_with_index do |column, i| %>
-          <td class="<%= column[:label].gsub(' ', '').underscore %>">
-            <div<%= ' class="dividers"' if (i + 3 < col_ct) %>>
+          <td class="<%= column[:label].gsub(' ', '').underscore %><%= " first" if i == 0 %>">
             <%= respond_to?(column_helper = "#{controller_name.underscore}_#{column[:method]}_column") ? send(column_helper, block) : block.send(column[:method]) %>
             <% if i.zero? && block.respond_to?(:cannot_be_deleted_message) && block.cannot_be_deleted_message %>
               <div class="cannot_be_deleted_message" style="display: none">
                 <%=h block.cannot_be_deleted_message %>
               </div>
             <% end %>
-            </div>
           </td>
         <% end %>
-        <% if content_type.model_class.respond_to?(:updated_at) %><td class="updated"><div class="dividers"><%= block.updated_at.to_s(:date) %></div></td><% end %>
-        <% if content_type.model_class.connectable? %><td class="used"><div class="dividers"><%= block.connected_pages.count %></div></td><% end %>
-        <% if content_type.model_class.publishable? %><td class="block_status"><%= status_icon(block.status) %> <div><%= block.status %></div></td><% end %>
-  <td class="last"></td>
+        <% if content_type.model_class.respond_to?(:updated_at) %>
+          <td class="updated"><%= block.updated_at.to_s(:date) %></td>
+        <% end %>
+        <% if content_type.model_class.connectable? %>
+          <td class="used"><%= block.connected_pages.count %></td>
+        <% end %>
+        <% if content_type.model_class.publishable? %>
+          <td class="block_status"><%= status_icon(block.status) %> <div><%= block.status %></div></td>
+        <% end %>
       </tr>
     <% end %>
-    <tr>
-      <td colspan="<%= col_ct %>" class="buffer"></td>
-    </tr>
   </tbody>
 </table>
-<div class="tl"></div>
-<div class="tr"></div>
-<div class="bl"></div>
-<div class="br"></div>
-</div>
 <% if params[:search] && @blocks.size == 0 %>
   <div class="pagination">No results found for '<%= params[:search][:term] %>'</div>
 <% elsif @blocks.total_pages > 1 %>
-  <%= render_pagination @blocks, content_type.content_block_type, :order => params[:order] %>
+  <%= render_pagination @blocks, content_type.content_block_type, :order => params[:order], :search => params[:search] %>
 <% end %>

data/app/views/cms/blocks/show.html.erb CHANGED Viewed

@@ -13,6 +13,9 @@
 <%= content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
 <div id="block_content">
+  <% if @block.respond_to?(:deleted) && @block.deleted %>
+  <div class="header">This <%= @block.class.name %> has been deleted.</div>
+  <% end %>
   <% if @block.class.publishable? %>
     <% block_published_status = (@block.live? ? 'published' : 'draft') %>
     <div class="status">

data/app/views/cms/blocks/usages.html.erb CHANGED Viewed

@@ -14,31 +14,26 @@
 <% end %>
 <%= render :partial => 'cms/blocks/toolbar' %>
-<div class="roundedcorners">
-  <table id="blocks" class="data">
+<table id="blocks" class="data">
   <thead>
     <tr>
-      <th colspan="2" class="first"><div class="dividers">Page Name</div></th>
-      <th><div class="dividers">Path</div></th>
-      <th colspan="2" class="last"><div class="dividers">Page Status</div></th>
+      <th class="first">Page Name</th>
+      <th>Path</th>
+      <th>Page Status</th>
     </tr>
   </thead>
-  <% @pages.each do |page| %>
-    <% status = page.archived? ? :archived : page.status %>
-    <tr>
-      <td class="first"></td>
-      <td class="page_name"><%=  page.name %></td>
-      <td class="path"><%=  link_to page.path, page.path %></td>
-      <td class="block_status"><%= status_icon(status) %> <div><%= status %></div></td>
-      <td class="last"></td>
-    </tr>
-  <% end %>
+  <tbody>
+    <% @pages.each do |page| %>
+      <% status = page.archived? ? :archived : page.status %>
       <tr>
-        <td colspan="8" class="buffer"></td>
+        <td class="page_name first"><%=  page.name %></td>
+        <td class="path"><%= link_to page.path, page.path %></td>
+        <td class="block_status"><%= status_icon(status) %> <div><%= status %></div></td>
       </tr>
-  </table>
-  <div class="tl"></div>
-  <div class="tr"></div>
-  <div class="bl"></div>
-  <div class="br"></div>
-</div>
+    <% end %>
+    <tr>
+      <td colspan="3" class="buffer"></td>
+    </tr>
+  </tbody>
+</table>

data/app/views/cms/blocks/versions.html.erb CHANGED Viewed

@@ -5,13 +5,13 @@
   <% javascript_tag do %>
     jQuery(function($){
       var collectionName = '<%= @block.class.name.underscore.pluralize %>'
       $('table.data tbody tr').hover(function(){
         $(this).addClass('hover')
       }, function(){
         $(this).removeClass('hover')
       }).click(function(){
-        var match = this.id.match(/(.*)_(\d+)/)
+        var match = this.id.match(/(.*)_(\d+)/)
         var id = match[2]
         $('table.data tbody tr').removeClass('selected')
         $(this).addClass('selected')
@@ -36,55 +36,27 @@
   <%= link_to span_tag("Revert"), "#", :id => "revert_button", :class => "http_put button disabled"  %>
 <% end %>
-<div class="roundedcorners">
-  <table id="blocks" class="data">
-    <thead>
-      <tr>
-        <th colspan="2" class="first"><div class="dividers">Version</div></th>
-        <th>
-          <div class="dividers">Comment</div>
-        </th>
-        <th>
-          <div class="dividers">Date</div>
-        </th>
-        <th class="last" colspan="2">
-          <div class="dividers">Editor</div>
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @block.versions.all(:order => "version desc").each_with_index do |r, i| %>
-        <tr id="<%= @block.class.name.underscore %>_<%= r.version %>">
-          <td class="first"></td>
-          <td>
-            <div class="dividers">
-              <%= "v. #{r.version}" %>
-              <%= '(LIVE)' if @block.version == r.version %>
-              <%= '<span class="current">(CURRENT)</span>' if i == 0 %>
-            </div>
-          </td>
-          <td>
-            <div class="dividers"><%=  r.version_comment %></div>
-          </td>
-          <td>
-            <div class="dividers">
-              <%= r.created_at.strftime("%b %d, %Y %I:%M %p") if r.created_at %>
-            </div>
-          </td>
-          <td>
-            <div><%= r.updated_by.login if r.updated_by %></div>
-          </td>
-          <td class="last"></td>
-        </tr>
-      <% end %>
-      <tr>
-        <td colspan="8" class="buffer"></td>
+<table id="blocks" class="data">
+  <thead>
+    <tr>
+      <th class="first">Version</th>
+      <th>Comment</th>
+      <th>Date</th>
+      <th>Editor</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @block.versions.all(:order => "version desc").each_with_index do |r, i| %>
+      <tr id="<%= @block.class.name.underscore %>_<%= r.version %>">
+        <td class="first">
+          <%= "v. #{r.version}" %>
+          <%= '(LIVE)' if @block.version == r.version %>
+          <%= '<span class="current">(CURRENT)</span>' if i == 0 %>
+        </td>
+        <td><%=  r.version_comment %></td>
+        <td><%= r.created_at.strftime("%b %d, %Y %I:%M %p") if r.created_at %></td>
+        <td><%= r.updated_by.login if r.updated_by %></td>
       </tr>
-    </tbody>
-  </table>
-  <div class="tl"></div>
-  <div class="tr"></div>
-  <div class="bl"></div>
-  <div class="br"></div>
-</div>
+    <% end %>
+  </tbody>
+</table>

data/app/views/cms/connectors/new.html.erb CHANGED Viewed

@@ -50,20 +50,20 @@
     </label>
   </div>
 <% end %>
 <%= error_messages_for :connector %>
 <table class="data">
   <thead>
     <tr>
-      <th class="name first"><div class="dividers">Name</div></th>
-      <th class="updated"><div class="dividers">Updated</div></th>
-      <th class="used last">Uses</th>
+      <th class="name first">Name</th>
+      <th class="updated">Updated</th>
+      <th class="used">Uses</th>
     </tr>
   </thead>
   <% @blocks.each do |block| %>
     <tr id="<%= block.class.name.underscore %>_<%= block.id %>">
-      <td class="name"><%= block.name %></td>
+      <td class="name first"><%= block.name %></td>
       <td class="updated"><%= block.updated_at.to_formatted_s(:date) %></td>
       <td class="used"><%= link_to_usages(block) %></td>
     </tr>

data/app/views/cms/dashboard/_page_drafts.html.erb CHANGED Viewed

@@ -2,48 +2,37 @@
   <h2 class="left">Page Drafts</h2>
   <% form_tag publish_cms_pages_path, :method => :put do %>
-    <div class="roundedcorners" style="position: relative">
-      <table class="data">
-        <thead>
+    <table class="data">
+      <thead>
+        <tr>
+          <th class="first"></th>
+          <th>Name</th>
+          <th>User</th>
+          <th>Date</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% if @unpublished_pages.empty? %>
           <tr>
-            <th class="select first unbordered">&nbsp;</th>
-            <th colspan="2"><div class="dividers">Name</div></th>
-            <th><div class="dividers">User</div></th>
-	          <th class="last" colspan="2">Date</th>
+            <td colspan="3">All pages are published</td>
           </tr>
-        </thead>
-        <tbody>
-          <% if @unpublished_pages.empty? %>
-            <tr><td colspan="3">All pages are published</td></tr>
-          <% else %>
-            <% @unpublished_pages.each do |page| %>
-              <tr>
-                <td class="first"></td>
-                <td class="select"><%= check_box_tag "page_ids[]", page.id, false, :id => "publish_page_#{page.id}" %></td>
-                <td class="name">
-                  <div class="dividers">
-                    <%= link_to h(page.name_with_section_path), page.path %>
-                  </div>
-                </td>
-                <td class="updated_by">
-                  <div class="dividers">
-                    <%= h(page.updated_by ? page.updated_by.login : nil) %>
-                  </div>
-                </td>
-                <td class="updated_at"><%= page.updated_at.strftime("%b %d") %></td>
-                <td class="last"></td>
-              </tr>
-            <% end %>
+        <% else %>
+          <% @unpublished_pages.each do |page| %>
             <tr>
-              <td colspan="5"><%= lt_button_wrapper(submit_tag("Publish Selected", :class => "submit")) %></td>
+              <td class="select"><%= check_box_tag "page_ids[]", page.id, false, :id => "publish_page_#{page.id}" %></td>
+              <td class="name">
+                <%= link_to h(page.name_with_section_path), page.path %>
+              </td>
+              <td class="updated_by">
+                <%= h(page.updated_by ? page.updated_by.login : nil) %>
+              </td>
+              <td class="updated_at"><%= page.updated_at.strftime("%b %d") %></td>
             </tr>
           <% end %>
-        </tbody>
-      </table>
-      <div class="tl"></div>
-      <div class="tr"></div>
-      <div class="bl"></div>
-      <div class="br"></div>
-    </div>
+        <% end %>
+      </tbody>
+    </table>
+    <%= lt_button_wrapper(submit_tag("Publish Selected", :class => "submit")) %>
   <% end %>
 </div>