browsercmsi 3.1.0

data/app/portlets/forgot_password_portlet.rb

@@ -0,0 +1,29 @@
+class ForgotPasswordPortlet < Portlet
+  require 'digest/sha1'  
+
+  enable_template_editor true
+
+  def render
+    flash[:forgot_password] = {}
+
+    return unless request.method == :post
+    user = User.find_by_email(params[:email])
+    
+    unless user
+      flash[:forgot_password][:error] = I18n.t("portlets.forgot_password.unable_to_verify")
+      return
+    end
+    
+    user.reset_token = generate_reset_token
+    if user.save
+      flash[:forgot_password][:notice] = I18n.t("portlets.forgot_password.password_sent", :email => params[:email])
+      ForgotPasswordMailer.deliver_reset_password(self.reset_password_url + '?token=' + user.reset_token, user.email)
+    end
+  end
+
+  private
+  def generate_reset_token
+    Digest::SHA1.hexdigest(Time.now.to_s.split(//).sort_by {rand}.join)
+  end
+
+end

data/app/portlets/login_portlet.rb

@@ -0,0 +1,10 @@
+class LoginPortlet < Portlet
+  
+  def render
+    @success_url = (flash[:success_url] || self.success_url)
+    @failure_url = self.failure_url
+    @login = flash[:login] || params[:login]
+    @remember_me = flash[:remember_me] || params[:remember_me]
+  end
+    
+end

data/app/portlets/reset_password_portlet.rb

@@ -0,0 +1,28 @@
+class ResetPasswordPortlet < Portlet
+
+  def render
+    flash[:reset_password] = {}
+    
+    unless params[:token]
+      flash[:reset_password][:error] = I18n.t("portlets.reset_password.no_token")
+      return
+    end
+
+    @user = User.find_by_reset_token(params[:token])
+
+    unless @user
+      flash[:reset_password][:notice] = I18n.t("portlets.reset_password.invalid_token")   
+      return
+    end
+
+    if request.method == :post
+      @user.password = params[:password]
+      @user.password_confirmation = params[:password_confirmation]
+      
+      if @user.save
+        flash[:reset_password][:notice] = I18n.t("portlets.reset_password.reset")
+      end
+    end
+  end
+
+end

data/app/portlets/tag_cloud_portlet.rb

@@ -0,0 +1,13 @@
+class TagCloudPortlet < Portlet
+  
+  def self.default_sizes
+    (0..4).map{|n| "size-#{n}" }.join(" ")
+  end
+  
+  def render
+    @sizes = self.sizes.blank? ? self.class.default_sizes : self.sizes
+    @limit = self.limit.blank? ? 50 : self.limit
+    @cloud = Tag.cloud(:sizes => @sizes.size, :limit => @limit)
+  end
+    
+end

data/app/views/cms/blocks/_hidden_fields.html.erb

@@ -0,0 +1,10 @@
+<% if params[:_redirect_to] %>
+  <%= hidden_field_tag :_redirect_to, params[:_redirect_to] %>
+<% end -%>
+<% if @block.respond_to?(:lock_version) %>
+  <%= f.hidden_field :lock_version, :value => (@other_version ? @other_version.lock_version : @block.lock_version) %>
+<% end -%>
+<% if @block.class.connectable? %>
+  <%= f.hidden_field :connect_to_page_id %>
+  <%= f.hidden_field :connect_to_container %>
+<% end -%>

data/app/views/cms/blocks/_toolbar.html.erb

@@ -0,0 +1,9 @@
+<%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
+
+<% content_for :functions do %>
+  <% if @block && !@block.new_record? %>
+    <%= render :partial => 'cms/blocks/toolbar_for_member' %>
+  <% else %>
+    <%= render :partial => 'cms/blocks/toolbar_for_collection' %>
+  <% end %>
+<% end %>

data/app/views/cms/blocks/_toolbar_for_collection.html.erb

@@ -0,0 +1,26 @@
+<% able_to? :publish_content do -%>
+  <%= link_to span_tag(t "blocks.toolbar_for_collection.publish"), "#", 
+    :class => "http_put button disabled left", 
+    :id => "publish_button" %>
+<% end -%>
+
+<%= link_to span_tag(t "blocks.toolbar_for_collection.view_content"), "#", 
+  :id => "view_button", 
+  :class => "button disabled#{ ' off' if action_name == 'show'} middle" %>
+  
+<%= link_to span_tag(t "blocks.toolbar_for_collection.edit_content"), "#", 
+  :id => "edit_button", 
+  :class => "button disabled#{ ' off' if action_name == 'edit'} right" %>
+
+<%= link_to span_tag(t "blocks.toolbar_for_collection.add_content"), cms_new_path_for(content_type), 
+  :id => "add_button", 
+  :class => "spacer button#{ ' off' if action_name == 'new'}" %>
+  
+<%= link_to span_tag(t "blocks.toolbar_for_collection.list_versions"), "#", 
+  :id => "revisions_button", 
+  :class => "button #{ action_name == 'revisions' ? ' off' : ' disabled'}" %>
+  
+<%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>#{t "blocks.toolbar_for_collection.delete"}"), "#", 
+  :id => "delete_button", 
+  :class => "spacer button disabled http_delete confirm_with_title", 
+  :title => t("blocks.toolbar_for_collection.confirm") %>

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

@@ -0,0 +1,38 @@
+<% able_to? :publish_content do -%>
+  <% if @block.respond_to?(:live?) && !@block.live? %>
+    <%= link_to span_tag(t "blocks.toolbar_for_member.publish"), block_path(:publish), 
+      :class => "http_put button left#{' disabled' unless (current_user.able_to_publish?(@block) && @block.publishable?)}", 
+      :id => "publish_button" %>
+  <% else %>
+    <%= link_to span_tag(t "blocks.toolbar_for_member.publish"), "#", 
+      :class => "http_put button disabled left", 
+      :id => "publish_button" %>
+  <% end %>
+<% end -%>
+
+<%= link_to span_tag(t "blocks.toolbar_for_member.view_content"), block_path, 
+  :class => "button middle#{ ' off' if action_name == 'show'}", 
+  :id => "view_button" %>
+  
+<%= link_to span_tag(t "blocks.toolbar_for_member.edit_content"), block_path(:edit), 
+  :class => "button right#{ ' off' if action_name == 'edit'}#{' disabled' unless current_user.able_to_edit?(@block)}", 
+  :id => "edit_button" %>
+  
+<%= link_to span_tag(t "blocks.toolbar_for_member.add_content"), new_block_path, 
+  :class => "button#{ ' off' if action_name == 'new'}", 
+  :id => "add_button" %>
+
+<% if @block.class.versioned? %>
+  <%= link_to span_tag(t "blocks.toolbar_for_member.list_versions"), block_path(:versions),
+    :class => "button#{ ' off' if action_name == 'revisions'}", 
+    :id => "list_versions" %>
+<% else %>
+  <%= link_to span_tag(t "blocks.toolbar_for_member.list_versions"), '#', 
+    :class => "button disabled", 
+    :id => "list_versions" %>
+<% end %>
+
+<%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>#{t "blocks.toolbar_for_member.delete"}"), block_path, 
+  :class => "http_delete confirm_with_title button#{' disabled' unless current_user.able_to_publish?(@block)}", 
+  :title => t("blocks.toolbar_for_member.confirm"), 
+  :id => "delete_button" %>

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

@@ -0,0 +1,30 @@
+<% content_for :html_head do %>
+  <%= stylesheet_link_tag('cms/form_layout') %>
+  <%= stylesheet_link_tag('cms/content_library') %>
+<% end %>
+<% page_title "#{t "blocks.edit.page_title"} #{content_type.display_name}" %>
+<% @toolbar_title = "#{t "blocks.edit.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"><%= t "blocks.edit.deleted_message", class_name => @block.class.human_name %></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 %>  
+  <% if @other_version %>
+    <%= render :partial => 'cms/shared/version_conflict_error', :locals => {:other_version => @other_version, :your_version => @block} %>
+  <% end %>  
+  <%= render :partial => 'cms/blocks/hidden_fields', :locals => { :f => f } %>
+  <%= render :partial => block_form, :locals => {:f => f} %>
+  <% if @other_version %>
+    <%= render :partial => "cms/shared/version_conflict_diff", :locals => {:other_version => @other_version, :your_version => @block} %>
+  <% end %>
+    <div class="buttons">
+      <% if current_user.able_to?(:publish_content) && @block.publishable? %>
+        <%= lt_button_wrapper(%Q{<button type="submit" name="#{@block.content_block_type}[publish_on_save]" value="true" class="submit" tabindex="#{next_tabindex}"><span>#{t "blocks.edit.save_and_publish"}</span></button>}) %>
+      <% end %>
+      <%= lt_button_wrapper(f.submit(t("blocks.edit.save"), :class => "submit", :tabindex => next_tabindex)) %>
+    </div>
+<% end %>
+<% end %>

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

@@ -0,0 +1,128 @@
+<% content_for(:html_head) do %>
+<%= javascript_include_tag "cms/content_library" %>
+  <% javascript_tag do %>
+    jQuery(function($){
+      var collectionName = '<%= content_type.model_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 type = match[1]
+        var id = match[2]
+        var editable = !$(this).hasClass("non-editable")
+        var publishable = !$(this).hasClass("non-publishable")
+        $('table.data tbody tr').removeClass('selected')
+        $(this).addClass('selected')
+        $('#functions .button').addClass('disabled').attr('href','#')
+        $('#add_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/new')
+        $('#view_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id)
+        if (editable) $('#edit_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/edit')
+        <% if content_type.model_class.versioned? %>
+          $('#revisions_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/versions')
+        <% else %>
+          $('#revisions_button').addClass('disabled')
+            .attr('title', '<%= content_type.display_name.pluralize.titleize %> are not versioned')          
+        <% end %>
+        var cannot_be_deleted_message = $(this).find('.cannot_be_deleted_message')
+        if(cannot_be_deleted_message.length > 0) {
+          $('#delete_button').addClass('disabled')
+            .attr('title', $.trim(cannot_be_deleted_message.text()))
+        } else {
+          if (publishable) {
+            $('#delete_button').removeClass('disabled')
+              .attr('href', '/cms/'+collectionName+'/'+id)  
+              .attr('title', 'Are You Sure You Want To Delete This Record?')
+          }
+        }        
+        <% able_to? :publish_content do -%>
+          if($(this).hasClass('draft') && publishable) {
+            $('#publish_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/publish?_redirect_to='+location.href)        
+          }
+        <% end %>  
+      })   
+    })
+  <% end %>
+<%= stylesheet_link_tag "cms/content_library" %>
+<% end %>
+<% page_title "#{t "blocks.index.page_title"} #{content_type.display_name_plural}" %>
+<% @toolbar_title = "#{t "blocks.index.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>
+      <% 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"><%=t "blocks.index.updated" %></div></th>
+      <% end %>
+      <% if content_type.model_class.connectable? %><th class="used <%= ' last" colspan="2' unless content_type.model_class.publishable? %>"><div class="dividers"><%=t "blocks.index.used" %></div></th><% end %>
+      <% if content_type.model_class.publishable? %><th colspan="2" class="block_status last"><%=t "blocks.index.status" %></th><% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% col_ct = 2
+       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?
+       col_ct += 1 if content_type.model_class.publishable? %>
+    <% @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) %>>
+            <%= 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>
+      </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"><%=t "blocks.index.no_results" %> '<%= params[:search][:term] %>'</div>
+<% elsif @blocks.total_pages > 1 %>
+  <%= render_pagination @blocks, content_type.content_block_type, :order => params[:order], :search => params[:search] %>
+<% end %>

data/app/views/cms/blocks/new.html.erb

@@ -0,0 +1,21 @@
+<% content_for :html_head do %>
+  <%= stylesheet_link_tag('cms/form_layout') %>
+  <%= stylesheet_link_tag('cms/content_library') %>
+<% end %>
+<% page_title "#{t "blocks.new.page_title"} #{content_type.display_name}" %>
+<% @toolbar_title = "#{t "blocks.new.add"} #{content_type.display_name}" %>
+<% content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
+<% form_for(@block, :url => blocks_path, :html => {:multipart => true}) do |f| %>
+  <%= f.error_messages %>
+  <%= render :partial => 'cms/shared/exception', :object => @exception if @exception %>
+  <%= render :partial => 'cms/blocks/hidden_fields', :locals => {:f => f} %>
+  <%= render :partial => block_form, :locals => {:f => f} %>
+  <% unless @hide_buttons %>
+    <div class="buttons">
+      <% if current_user.able_to?(:publish_content) && @block.publishable? %>
+        <%= lt_button_wrapper(%Q{<button type="submit" name="#{@block.content_block_type}[publish_on_save]" value="true" class="submit" tabindex="#{next_tabindex}"><span>#{t "blocks.new.save_and_publish"}</span></button>}) %>
+      <% end %>
+      <%= lt_button_wrapper(f.submit(t("blocks.new.save"), :class => "submit", :tabindex => next_tabindex)) %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,43 @@
+<% page_title "#{t "blocks.show.page_title"} #{content_type.display_name}" %>
+<% @toolbar_title = "#{t "blocks.show.view"} #{content_type.display_name} '#{ @block.name }'" %>
+<% content_for :html_head do %>
+  <%= stylesheet_link_tag('cms/form_layout') %>
+  <%= stylesheet_link_tag('cms/block') %>
+  <%= stylesheet_link_tag('cms/content_library') %>
+  <style type="text/css">
+    .content img {
+      max-width: 785px;
+    }
+  </style>
+<% end %>
+<%= content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
+
+<div id="block_content">
+  <% if @block.respond_to?(:deleted) && @block.deleted %>
+  <div class="header"><%= t "blocks.show.deleted_message", class_name => @block.class.name %></div>
+  <% end %>
+  <% if @block.class.publishable? %>
+    <% block_published_status = (@block.live? ? 'published' : 'draft') %>
+    <div class="status">
+      <div class="header"><%= t "blocks.show.status" %></div> 
+      <%= status_icon(block_published_status) %> 
+      <div class="block_published_status"><%= block_published_status %></div>
+    </div>
+  <% end %>
+  <% if @block.class.connectable? %>
+    <div class="nv_pair">
+      <div class="header"><%= t "blocks.show.used_on" %></div> 
+      <div><%= link_to_usages(@block) %> <%= t "blocks.show.page", :count => @block.connected_pages.count %></div>
+    </div>
+  <% end -%>
+  <% if @block.respond_to?(:draft_version?) && !@block.draft_version? %>
+    <div class="nv_pair">
+      <div class="header"><%= t "blocks.show.version" %></div> 
+      <div>v. <%= @block.version %> ( <%= link_to t("blocks.show.current"), [:cms, @block] %> )</div>
+    </div>
+  <% end -%>
+  <% if @block.class.renderable? %>
+    <div class="header"><%= t "blocks.show.block_contents" %></div>
+    <div class="content"><%= render_connectable(@block) %></div>
+  <% end %>
+</div>

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

@@ -0,0 +1,44 @@
+<% page_title t("blocks.usages.page_title") %>
+<% @toolbar_title = t("blocks.usages.toolbar_title", :content_type_name => content_type.display_name, :block_name => @block.name) %>
+<% content_for :html_head do %>
+  <%= stylesheet_link_tag("cms/content_library") %>
+  <% javascript_tag do %>
+    jQuery(function($) {
+      $('#functions .button').addClass('disabled').attr('href','#');
+      $('#view_button').removeClass('disabled')
+        .attr('href', '<%= cms_connectable_path(@block)%>')
+      $('#edit_button').removeClass('disabled')
+        .attr('href', '<%= edit_cms_connectable_path(@block)%>')
+    })
+  <% end %>
+<% end %>
+
+<%= render :partial => 'cms/blocks/toolbar' %>
+<div class="roundedcorners">
+  <table id="blocks" class="data">
+  <thead>
+    <tr>
+      <th colspan="2" class="first"><div class="dividers"><%=t "blocks.usages.page_name" %></div></th>
+      <th><div class="dividers"><%=t "blocks.usages.path" %></div></th>
+      <th colspan="2" class="last"><div class="dividers"><%=t "blocks.usages.page_status" %></div></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 %>
+      <tr>
+        <td colspan="8" class="buffer"></td>
+      </tr>
+  </table>
+  <div class="tl"></div>
+  <div class="tr"></div>
+  <div class="bl"></div>
+  <div class="br"></div>
+</div>

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

@@ -0,0 +1,90 @@
+<% page_title "Content Library / List of Versions" %>
+<% @toolbar_title = "#{t "blocks.versions.list_versions"} / #{content_type.display_name}' #{@block.name}' " %>
+<% content_for :html_head do %>
+<%= stylesheet_link_tag("cms/content_library") %>
+  <% 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 id = match[2]
+        $('table.data tbody tr').removeClass('selected')
+        $(this).addClass('selected')
+        $('#functions .button').addClass('disabled').attr('href','#')
+        $('#functions .off span').css('color', '#FFFFFF')
+        $('#add_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/new')
+        $('#view_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/<%= @block.id %>/version/'+id)
+        if($(this).find('.current').length > 0) {
+          $('#view_button').attr('href', '/cms/'+collectionName+'/<%= @block.id %>')
+          $('#edit_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/<%= @block.id %>/edit')
+        } else {
+          $('#revert_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/<%= @block.id %>/revert_to/'+id)
+        }
+      })
+    })
+  <% end %>
+
+<% end %>
+
+<% content_for :functions do %>
+  <%= render :partial => 'cms/blocks/toolbar' %>
+  <%= link_to span_tag(t "blocks.versions.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"><%= t "blocks.versions.version" %></div></th>
+        <th>
+          <div class="dividers"><%= t "blocks.versions.comment" %></div>
+        </th>
+        <th>
+          <div class="dividers"><%= t "blocks.versions.date" %></div>
+        </th>
+        <th class="last" colspan="2">
+          <div class="dividers"><%= t "blocks.versions.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}" %>
+              <%= "(#{t("blocks.versions.live")})" if @block.version == r.version %>
+              <%= "<span class=\"current\">(#{t("blocks.versions.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>
+      </tr>
+    </tbody>
+  </table>
+  <div class="tl"></div>
+  <div class="tr"></div>
+  <div class="bl"></div>
+  <div class="br"></div>
+</div>
+

data/app/views/cms/cache/show.html.erb

@@ -0,0 +1,12 @@
+<% page_title @toolbar_title = t("cache.toolbar_title") %>
+
+<% content_for :html_head do %>
+  <%= stylesheet_link_tag("cms/form_layout") %>
+<% end %>
+
+<% content_for :functions do %>
+  <%= link_to(span_tag(t "cache.clear_cache"), cms_cache_path, 
+    :class => "button http_delete") %>
+<% end %>
+
+<p style="font-size: larger; margin: 10px; line-height: 20px;"><%=t "cache.message" %></p>

data/app/views/cms/categories/_form.html.erb

@@ -0,0 +1,36 @@
+<% if CategoryType.count > 0 %>
+  <% content_for :html_head do %>
+    <script type="text/javascript">
+      jQuery(function($){
+        var categoriesByType = <%= CategoryType.category_map.to_json %>
+        $("#category_category_type_id").change(function(){
+          $("#category_parent_id option").remove()
+          $.each(categoriesByType[$(this).val()], function(){        
+            $("#category_parent_id").append($.createElement("option", this[0], {value: this[1]}))
+          })
+        })
+      })
+    </script>
+  <% end %>
+
+  <% @block.category_type ||= (Category.last(:include => :category_type) && Category.last.category_type) %>  
+  <%= f.cms_drop_down :category_type_id, CategoryType.all(:order => "name").map{|c| [c.name, c.id]}, :prompt => t("categories.form.type_prompt"), :label => Category.human_attribute_name("type") %>
+
+  <% categories = @block.category_type ? @block.category_type.category_list.map{|c| [c.path, c.id]} : [] %>
+  <% unless categories.empty? %>
+    <%= f.cms_drop_down :parent_id, categories, :include_blank => true %>
+  <% end %>
+  
+  <%= f.cms_text_field :name, :label => Category.human_attribute_name("name") %>
+
+<% else %>
+  <% page_title t("categories.form.page_title") %>
+  <% content_for :html_head do %>
+    <script type="text/javascript">
+      jQuery(function($){
+        $('.buttons').remove()
+      })
+    </script>
+  <% end %>
+  <p><%= t("categories.form.message", :link =>  link_to(t("categories.form.create_category_type"), new_cms_category_type_path)) %></p>
+<% end %>

data/app/views/cms/category_types/_form.html.erb

@@ -0,0 +1 @@
+<%= f.cms_text_field :name, :label => CategoryType.human_attribute_name("name") %>