comfypress 0.1.3

data/app/models/cms/snippet.rb

@@ -0,0 +1,58 @@
+class Cms::Snippet < ActiveRecord::Base
+  
+  ComfyPress.establish_connection(self)
+  
+  self.table_name = 'cms_snippets'
+  
+  cms_is_categorized
+  cms_is_mirrored
+  cms_has_revisions_for :content
+  
+  attr_accessible :identifier,
+                  :label,
+                  :content,
+                  :category_ids
+  
+  # -- Relationships --------------------------------------------------------
+  belongs_to :site
+  
+  # -- Callbacks ------------------------------------------------------------
+  before_validation :assign_label
+  before_create :assign_position
+  after_save    :clear_cached_page_content
+  after_destroy :clear_cached_page_content
+  
+  # -- Validations ----------------------------------------------------------
+  validates :site_id,
+    :presence   => true
+  validates :label,
+    :presence   => true
+  validates :identifier,
+    :presence   => true,
+    :uniqueness => { :scope => :site_id },
+    :format     => { :with => /^\w[a-z0-9_-]*$/i }
+    
+  # -- Scopes ---------------------------------------------------------------
+  default_scope order('cms_snippets.position')
+  
+protected
+  
+  def assign_label
+    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
+  end
+  
+  # Note: This might be slow. We have no idea where the snippet is used, so
+  # gotta reload every single page. Kinda sucks, but might be ok unless there
+  # are hundreds of pages.
+  def clear_cached_page_content
+    site.pages.all.each do |p|
+      Cms::Page.where(:id => p.id).update_all(:content => p.content(true))
+    end
+  end
+  
+  def assign_position
+    max = self.site.snippets.maximum(:position)
+    self.position = max ? max + 1 : 0
+  end
+  
+end

data/app/models/cms.rb

@@ -0,0 +1,5 @@
+module Cms
+  def self.table_name_prefix
+    'cms_'
+  end
+end

data/app/views/cms_admin/categories/_categories.html.haml

@@ -0,0 +1,3 @@
+- object ||= categories
+- object.categories.each do |category|
+  .category= category.label

data/app/views/cms_admin/categories/_edit.html.haml

@@ -0,0 +1,6 @@
+- category ||= edit
+
+= form_for @category, :as => :category, :url => cms_admin_site_category_path(@site, category), :remote => true, :html => {:id => dom_id(category)} do |form|
+  .input-append
+    = form.text_field :label
+    %button.btn.btn-mini= t('.save')

data/app/views/cms_admin/categories/_form.html.haml

@@ -0,0 +1,8 @@
+- object = form.object
+- if (categories = @site.categories.of_type(object.class.to_s)).present?
+  = form.element t('.label'), nil, :class => 'categories' do
+    - categories.each do |category|
+      = hidden_field_tag "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]", 0, :id => nil
+      %label.checkbox.inline
+        = check_box_tag "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]", 1, object.categories.member?(category), :id => nil
+        = category.label

data/app/views/cms_admin/categories/_index.html.haml

@@ -0,0 +1,24 @@
+- type ||= index
+
+.categories-widget
+  .categories-widget-label= t('.label')
+  
+  .action-links
+    .edit= link_to t('.edit'), '#', :class => 'btn btn-mini'
+    .done= link_to t('.done'), '#', :class => 'btn btn-mini'
+  
+  .categories.read
+    .category.all{:class => params[:category].blank?? 'active' : nil}
+      = link_to t('.all'), :category => nil
+    - @site.categories.of_type(type).each do |category|
+      = render :partial => 'cms_admin/categories/show', :object => category, :locals => { :read => true }
+  
+  .categories.editable
+    - @site.categories.of_type(type).each do |category|
+      = render :partial => 'cms_admin/categories/show', :object => category
+    
+    = form_for :category, :url => cms_admin_site_categories_path(@site), :remote => true, :html => {:id => 'new_category'} do |form|
+      = form.hidden_field :categorized_type, :value => type
+      .input-append
+        = form.text_field :label, :placeholder => 'Add Category'
+        %button.btn.btn-mini= t('.add')

data/app/views/cms_admin/categories/_show.html.haml

@@ -0,0 +1,13 @@
+- category ||= show
+- read ||= false
+- categories = [params[:category]].flatten.compact
+- active = categories.flatten.member?(category.label)
+
+.category{:class => (read && active ? 'active' : nil), :id => dom_id(category)}
+  - if read
+    - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
+    = link_to category.label, "?#{{:category => categories}.to_param}"
+  - else
+    = link_to category.label, edit_cms_admin_site_category_path(@site, category), :remote => true
+    = link_to cms_admin_site_category_path(@site, category), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
+      %i.icon-remove-circle

data/app/views/cms_admin/categories/create.js.erb

@@ -0,0 +1,7 @@
+$('.categories-widget .categories.editable form#new_category').before(
+  '<%= escape_javascript(render :partial => "show", :object => @category ) %>'
+);
+$('.categories-widget .categories.read').append(
+  '<%= escape_javascript(render :partial => "show", :object => @category, :locals => { :read => true }) %>'
+);
+$('.categories-widget .categories.editable form#new_category input#category_label').val('');

data/app/views/cms_admin/categories/destroy.js.erb

@@ -0,0 +1,3 @@
+$('.categories .category#<%= dom_id(@category) %>').fadeOut('slow', function(){
+  $(this).remove()
+})

data/app/views/cms_admin/categories/edit.js.erb

@@ -0,0 +1,3 @@
+$('.categories.editable .category#<%= dom_id(@category) %>').replaceWith(
+  '<%= escape_javascript(render :partial => "edit", :object => @category ) %>'
+);

data/app/views/cms_admin/categories/update.js.erb

@@ -0,0 +1,6 @@
+$('.categories.editable form#<%= dom_id(@category) %>').replaceWith(
+  '<%= escape_javascript(render :partial => "show", :object => @category ) %>'
+);
+$('.categories.read .category#<%= dom_id(@category) %>').replaceWith(
+  '<%= escape_javascript(render :partial => "show", :object => @category, :locals => { :read => true } ) %>'
+);

data/app/views/cms_admin/files/_file.html.haml

@@ -0,0 +1,13 @@
+.file{:class => "#{dom_id(file)} #{file.is_image?? 'image' : nil}"}
+  .file-name
+    = link_to cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
+      %i.icon-remove-circle
+    = link_to file.file_file_name, file.file.url, :target => '_blank', :class => 'filename'
+  
+  .file-info{:data => {:url => file.file.url}}
+    .thumb
+      = image_tag file.file.url(:cms_thumb) if file.is_image?
+    .details
+      %input{:type => 'text', :value => file.file.url}
+      .file-type= file.file_content_type
+      .file-size= number_to_human_size(file.file_file_size, :locale => :en)

data/app/views/cms_admin/files/_form.html.haml

@@ -0,0 +1,14 @@
+= form.text_field :label
+= form.file_field :file, :multiple => @file.new_record?
+
+- unless @file.new_record?
+  = form.element t('.current_file') do
+    = image_tag @file.file.url if @file.is_image?
+    = link_to @file.file.url, @file.file.url, :target => '_blank'
+
+= form.text_area :description
+
+= render :partial => 'cms_admin/categories/form', :object => form
+
+.form-actions
+  = form.submit t(@file.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/files/_index.html.haml

@@ -0,0 +1,14 @@
+- type ||= nil
+- files_scope = (type == 'image') ? @site.files.images : @site.files
+
+.box.file-uploader
+  = form_for :file, :url => cms_admin_site_files_path(@site, :ajax => true), :html => {:multipart => true, :target => 'file-upload-frame'} do |form|
+    %span.btn.btn-file
+      = t('.button')
+      = form.file_field :file, :multiple => true, :id => nil
+  
+  .uploaded-files
+    - files_scope.order(:label).each do |file|
+      = render :partial => 'cms_admin/files/file', :object => file
+      
+  %iframe#file-upload-frame{:name => 'file-upload-frame', :src => ''}

data/app/views/cms_admin/files/_page_form.html.haml

@@ -0,0 +1,9 @@
+- block ||= page_form
+
+- if (files = block.files).present?
+  .files
+    - files.each do |file|
+      .file{:class => dom_id(file)}
+        = link_to file.file_file_name, file.file.url, :target => '_blank'
+        = link_to cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' do
+          %i.icon-remove-circle

data/app/views/cms_admin/files/destroy.js.coffee

@@ -0,0 +1,2 @@
+$(".file.<%= dom_id(@file) %>").fadeOut 'slow', ->
+  $(this).remove()

data/app/views/cms_admin/files/edit.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @file, :as => :file, :url => {:action => :update} do |form|
+  = render form

data/app/views/cms_admin/files/index.html.haml

@@ -0,0 +1,28 @@
+.page-header
+  = link_to t('.new_link'), new_cms_admin_site_file_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+= render :partial => 'cms_admin/categories/index', :object => 'Cms::File'
+
+%table.table.table-hover.table-bordered
+  %tbody.sortable
+    - @files.each do |file|
+      %tr{:id => dom_id(file)}
+        %td
+          - if file.is_image?
+            - icon_style = "background: url('#{file.file.url(:cms_thumb)}') no-repeat center"
+          .icon{:style => icon_style}
+            - if !params[:category].present? && @site.files.count > 1
+              .dragger
+                %span ⇅
+        %td.main
+          .item-title
+            = link_to file.label, edit_cms_admin_site_file_path(@site, file)
+            = render :partial => '/cms_admin/categories/categories', :object => file
+          .item-meta
+            = link_to file.file_file_name, file.file.url, :target => '_blank'
+            
+        %td
+          .btn-group
+            = link_to t('.edit'), edit_cms_admin_site_file_path(@site, file), :class => 'btn btn-small'
+            = link_to t('.delete'), cms_admin_site_file_path(@site, file), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'

data/app/views/cms_admin/files/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @file, :as => :file, :url => {:action => :create}, :html => {:multipart => true} do |form|
+  = render form

data/app/views/cms_admin/layouts/_form.html.haml

@@ -0,0 +1,17 @@
+- content_for :right_column do
+  = render :partial => 'cms_admin/files/index'
+
+= form.text_field :label, :data => {:slugify => @layout.new_record?}
+= form.text_field :identifier, :data => {:slug => true}
+- if (options = Cms::Layout.options_for_select(@site, @layout)).present?
+  = form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options
+
+- if (options = Cms::Layout.app_layouts_for_select).present?
+  = form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options
+
+= form.text_area :content, :data => {:cm_mode => 'text/html'}
+= form.text_area :css, :data => {:cm_mode => 'css'}
+= form.text_area :js, :data => {:cm_mode => 'javascript'}
+
+.form-actions
+  = form.submit t(@layout.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/layouts/_index_branch.html.haml

@@ -0,0 +1,23 @@
+- layout      ||= index_branch
+- has_siblings  = layout.siblings.select{|l| l.site_id == @site.id}.size > 0
+
+%li{:id => dom_id(layout)}
+  .item
+    .icon
+      - if !params[:category].present? && has_siblings
+        .dragger
+          %span ⇅
+          
+    .btn-group
+      = link_to t('.add_child_layout'), new_cms_admin_site_layout_path(@site, :parent_id => layout.id), :class => 'btn btn-small'
+      = link_to t('.edit'), edit_cms_admin_site_layout_path(@site, layout), :class => 'btn btn-small'
+      = link_to t('.delete'), cms_admin_site_layout_path(@site, layout), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+    
+    .item-content
+      .item-title
+        = link_to layout.label, edit_cms_admin_site_layout_path(@site, layout)
+      .item-meta
+        = layout.identifier
+
+  - if layout.children.present?
+    %ul= render :partial => 'index_branch', :collection => layout.children

data/app/views/cms_admin/layouts/edit.html.haml

@@ -0,0 +1,9 @@
+.page-header
+  = link_to pluralize(@layout.revisions.count, t('.revision')), cms_admin_site_layout_revisions_path(@site, @layout), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors', :object => @layout
+
+= comfy_form_for @layout, :as => :layout, :url => {:action => :update} do |form|
+  = render form

data/app/views/cms_admin/layouts/index.html.haml

@@ -0,0 +1,9 @@
+.page-header
+  = link_to t('.new_link'), new_cms_admin_site_layout_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors'
+
+%ul.list.sortable
+  = render :partial => 'index_branch', :collection => @layouts

data/app/views/cms_admin/layouts/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @layout, :as => :layout, :url => {:action => :create} do |form|
+  = render form

data/app/views/cms_admin/menu_items/_form.html.haml

@@ -0,0 +1,22 @@
+- content_for :right_column do
+  = render :partial => 'cms_admin/files/index'
+
+= form.text_field :label
+.control-group
+  = form.label :menu_item_type, class: 'control-label'
+  .controls.menu-type-wrapper
+    %div
+      = label_tag 'menu_item_menu_item_type_page', class: 'radio inline' do
+        = radio_button_tag 'menu_item[menu_item_type]', 'page', @menu_item.menu_item_type == 'page', {data: {show: '.menu-type-page', hide: '.menu-type-link'}}
+        Page
+      = label_tag 'menu_item_menu_item_type_link', class: 'radio inline' do
+        = radio_button_tag 'menu_item[menu_item_type]', 'link', @menu_item.menu_item_type == 'link', {data: {show: '.menu-type-link', hide: '.menu-type-page'}}
+        link
+.hidden.menu-type-link
+  = form.text_field :link
+- if (options = Cms::Page.options_for_select(@site)).present?
+  .hidden.menu-type-page
+    = form.select :page_id, options, {:prompt => "Select page"}
+
+.form-actions
+  = form.submit t(@menu_item.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/menu_items/edit.html.haml

@@ -0,0 +1,8 @@
+.page-header
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors', :object => @menu
+
+= comfy_form_for @menu_item, :as => :menu_item, :url => {:action => :update} do |form|
+  = render form

data/app/views/cms_admin/menu_items/index.html.haml

@@ -0,0 +1,24 @@
+.page-header
+  = link_to t('.new_link'), new_cms_admin_site_menu_menu_item_path(@site, @menu), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors'
+
+%table.table.table-hover.table-bordered
+  %tbody.sortable
+    -  @menu_items.try(:each) do |menu_item|
+      %tr{:id => dom_id(menu_item)}
+        %td
+          .icon
+            - if !params[:category].present? && @menu.menu_items.count > 1
+              .dragger
+                %span ⇅
+        %td.main
+          .item-title
+            = link_to menu_item.label, edit_cms_admin_site_menu_menu_item_path(@site, @menu, menu_item)
+        %td
+          .btn-group
+            = link_to t('.edit'), edit_cms_admin_site_menu_menu_item_path(@site, @menu, menu_item), :class => 'btn btn-small'
+           
+            = link_to t('.delete'), cms_admin_site_menu_menu_item_path(@site, @menu, menu_item), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'

data/app/views/cms_admin/menu_items/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @menu_item, :as => :menu_item, :url => {:action => :create} do |form|
+  = render form

data/app/views/cms_admin/menus/_form.html.haml

@@ -0,0 +1,8 @@
+- content_for :right_column do
+  = render :partial => 'cms_admin/files/index'
+
+= form.text_field :label, :data => {:slugify => @menu.new_record?}
+= form.text_field :identifier, :data => {:slug => true}
+
+.form-actions
+  = form.submit t(@menu.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/menus/edit.html.haml

@@ -0,0 +1,8 @@
+.page-header
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors', :object => @menu
+
+= comfy_form_for @menu, :as => :menu, :url => {:action => :update} do |form|
+  = render form

data/app/views/cms_admin/menus/index.html.haml

@@ -0,0 +1,24 @@
+.page-header
+  = link_to t('.new_link'), new_cms_admin_site_menu_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors'
+
+%table.table.table-hover.table-bordered
+  %tbody.sortable
+    - @menus.each do |menu|
+      %tr{:id => dom_id(menu)}
+        %td
+          .icon
+            - if !params[:category].present? && @site.menus.count > 1
+              .dragger
+                %span ⇅
+        %td.main
+          .item-title
+            = link_to menu.label, edit_cms_admin_site_menu_path(@site, menu)
+        %td
+          .btn-group
+            = link_to t('.edit'), edit_cms_admin_site_menu_path(@site, menu), :class => 'btn btn-small'
+            = link_to t('.menu_items'), cms_admin_site_menu_menu_items_path(@site, menu), :class => 'btn btn-small'
+            = link_to t('.delete'), cms_admin_site_menu_path(@site, menu), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'

data/app/views/cms_admin/menus/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @menu, :as => :menu, :url => {:action => :create} do |form|
+  = render form

data/app/views/cms_admin/pages/_form.html.haml

@@ -0,0 +1,38 @@
+- content_for :right_column do
+  #form-save.box
+    %label.checkbox.inline
+      %input{:type => 'checkbox'}
+      = Cms::Page.human_attribute_name(:is_published)
+    %button.btn.btn-small.btn-primary.pull-right
+  = render :partial => 'cms_admin/files/index'
+
+= form.text_field :label, :data => {:slugify => @page.new_record?}
+
+- unless @site.pages.count == 0 || @site.pages.root == @page
+  = form.text_field :slug, :data => {:slug => true}
+  - unless @page.new_record?
+    = form.text_field :full_path, :id => 'full-path', :disabled => true
+
+- if (options = Cms::Layout.options_for_select(@site)).present?
+  = form.select :layout_id, options, {}, 'data-url' => form_blocks_cms_admin_site_page_path(@site, @page.id.to_i)
+  
+- if (options = Cms::Page.options_for_select(@site, @page)).present?
+  = form.select :parent_id, options
+
+- if (options = Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
+  = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
+
+- if (options = Cms::Menu.options_for_select(@site)).present?
+  = form.select :menu_id, options, {:prompt => "Select menu"}
+   
+= cms_hook :page_form, :object => form
+
+= render :partial => 'cms_admin/categories/form', :object => form
+
+= render :partial => 'form_blocks'
+
+= form.check_box :is_published, :label => t('.is_published')
+
+.form-actions
+  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn'
+  = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/pages/_form_blocks.html.haml

@@ -0,0 +1,28 @@
+- namespace = { }
+- tags = @page.tags(true).select{ |t| t.is_cms_block? }.uniq_by{|t| t.identifier} 
+- tags.each do |tag|
+  - namespace[tag.namespace || 'default'] ||= []
+  - namespace[tag.namespace || 'default'] << tag
+
+#form-blocks
+  - if tags.empty?
+    .no-tags
+      = link_to @page.layout.label, edit_cms_admin_site_layout_path(@site, @page.layout)
+      = t('.no_tags').html_safe
+  
+  - else
+    = fields_for :blocks, nil, :builder => ComfyPress::FormBuilder do |cms_blocks|
+      
+      .tabbable
+        - if namespace.size > 1
+          %ul.nav.nav-tabs
+            - namespace.each_with_index do |(name, tags), index|
+              %li{:class => index == 0 ? 'active' : nil}
+                = link_to name.humanize, "#ns-#{name}", :data => {:toggle => 'tab'}
+        .tab-content
+          - block_index = 0
+          - namespace.each_with_index do |(name, tags), index|
+            .tab-pane{:id => "ns-#{name}", :class => index == 0 ? 'active' : nil}
+              - tags.each do |tag|
+                = cms_blocks.send(tag.class.to_s.demodulize.underscore, tag, block_index) rescue nil
+                - block_index += 1

data/app/views/cms_admin/pages/_index_branch.html.haml

@@ -0,0 +1,35 @@
+- page        ||= index_branch
+- children      = @pages_by_parent[page.id]
+- siblings      = @pages_by_parent[page.parent_id]
+- has_children  = children.present?
+- has_siblings  = siblings.size > 1
+- branch_open   = (session[:cms_page_tree] || []).member?(page.id.to_s) || page.root?
+- category_view = params[:category].present?
+
+%li{:id => dom_id(page)}
+  .item
+    .toggle{:class => branch_open ? 'open' : nil}
+      - if !category_view && has_children && !page.root?
+        = link_to toggle_branch_cms_admin_site_page_path(@site, page), :remote => true do
+          %span= t('.toggle')
+        
+    .icon{:class => page.is_published?? 'published' : 'draft'}
+      - if !category_view && has_siblings
+        .dragger
+          %span ⇅
+          
+    .btn-group
+      = link_to t('.add_child_page'), new_cms_admin_site_page_path(@site, :parent_id => page.id), :class => 'btn btn-small'
+      = link_to t('.edit'), edit_cms_admin_site_page_path(@site, page), :class => 'btn btn-small'
+      = link_to t('.delete'), cms_admin_site_page_path(@site, page), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+      
+    .item-content
+      .item-title
+        = link_to page.label, edit_cms_admin_site_page_path(@site, page), :class => 'item-label'
+        = render :partial => '/cms_admin/categories/categories', :object => page
+      .item-meta
+        = link_to page.url, page.url, :target => '_blank'
+        
+  - if !category_view && has_children && branch_open
+    %ul.children.sortable
+      = render :partial => 'index_branch', :collection => children

data/app/views/cms_admin/pages/edit.html.haml

@@ -0,0 +1,9 @@
+.page-header
+  = link_to pluralize(@page.revisions.count, t('.revision')), cms_admin_site_page_revisions_path(@site, @page), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors', :object => @page
+
+= comfy_form_for @page, :as => :page, :url => {:action => :update}, :html => {:multipart => true} do |form|
+  = render form

data/app/views/cms_admin/pages/form_blocks.js.erb

@@ -0,0 +1,2 @@
+$('#form-blocks').replaceWith('<%= escape_javascript(render(:partial => "form_blocks")) %>');
+CMS.codemirror();

data/app/views/cms_admin/pages/index.html.haml

@@ -0,0 +1,11 @@
+.page-header
+  = link_to t('.new_link'), new_cms_admin_site_page_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors'
+
+= render :partial => 'cms_admin/categories/index', :object => 'Cms::Page'
+
+%ul.list.sortable
+  = render :partial => 'index_branch', :collection => @pages

data/app/views/cms_admin/pages/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t('.title')
+
+= comfy_form_for @page, :as => :page, :url => {:action => :create}, :html => {:multipart => true} do |form|
+  = render form

data/app/views/cms_admin/pages/toggle_branch.js.erb

@@ -0,0 +1,11 @@
+var li = $('li#cms_page_<%=@page.id%>');
+li.find('.item .toggle').first().toggleClass('open');
+
+<% if session[:cms_page_tree].member?(@page.id.to_s) %>
+  if(!li.find('ul.children')[0]) {
+    li.append('<ul class="children sortable"><%= escape_javascript(render :partial => "index_branch", :collection => @page.children) %></ul>');
+    CMS.sortable_list();
+  }
+<% else %>
+  li.find('ul.children').remove();
+<% end %>

data/app/views/cms_admin/revisions/show.html.haml

@@ -0,0 +1,28 @@
+.page-header
+  %h2
+    = t('.title')
+    = @record.class.to_s.demodulize
+  %h4
+    = @record.is_a?(Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.identifier}"
+
+- content_for :right_column do
+  .box.revisions
+    - @record.revisions.each do |revision|
+      = active_link_to l(revision.created_at), :id => revision.id
+      
+
+%table.table
+  %tr
+    %th
+    %th= t('.current')
+    %th= l(@revision.created_at)
+
+  - @current_content.each do |label, content|
+    %tr
+      %th= Cms::Layout.human_attribute_name(label)
+      %td.main= content
+      %td.main= @versioned_content[label]
+  
+= comfy_form_for @revision, :url => {:action => :revert} do |form|
+  .form-actions
+    = form.submit t('.update'), :class => 'btn btn-primary'