RubyGems - comfortable_mexican_sofa - Versions diffs - 1.0.37 → 1.0.38 - Mend

comfortable_mexican_sofa 1.0.37 → 1.0.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

data/LICENSE +20 -0
data/README.md +4 -18
data/VERSION +1 -1
data/app/controllers/cms_admin/base_controller.rb +16 -4
data/app/controllers/cms_admin/layouts_controller.rb +1 -0
data/app/controllers/cms_admin/pages_controller.rb +26 -0
data/app/models/cms_layout.rb +0 -9
data/app/models/cms_page.rb +13 -1
data/app/views/cms_admin/common/desc/_layout_content.html.erb +25 -0
data/app/views/cms_admin/common/desc/_layout_css.html.erb +1 -0
data/app/views/cms_admin/common/desc/_layout_js.html.erb +1 -0
data/app/views/cms_admin/layouts/_form.html.erb +4 -3
data/app/views/cms_admin/pages/_index_branch.html.erb +18 -6
data/app/views/cms_admin/pages/form_blocks.js.erb +1 -1
data/app/views/cms_admin/pages/index.html.erb +1 -1
data/app/views/cms_admin/pages/toggle_branch.js.erb +11 -0
data/app/views/layouts/cms_admin.html.erb +3 -1
data/comfortable_mexican_sofa.gemspec +11 -3
data/config/initializers/comfortable_mexican_sofa.rb +4 -1
data/config/routes.rb +6 -2
data/lib/comfortable_mexican_sofa/acts_as_tree.rb +5 -0
data/lib/comfortable_mexican_sofa/configuration.rb +4 -0
data/lib/comfortable_mexican_sofa/form_builder.rb +10 -1
data/lib/comfortable_mexican_sofa/view_methods.rb +0 -1
data/public/images/comfortable_mexican_sofa/arrow_bottom.gif +0 -0
data/public/images/comfortable_mexican_sofa/arrow_right.gif +0 -0
data/public/images/comfortable_mexican_sofa/icon_move.gif +0 -0
data/public/javascripts/comfortable_mexican_sofa/cms.js +19 -0
data/public/stylesheets/comfortable_mexican_sofa/structure.css +117 -48
data/public/stylesheets/comfortable_mexican_sofa/typography.css +8 -2
data/test/functional/cms_admin/layouts_controller_test.rb +1 -0
data/test/functional/cms_admin/pages_controller_test.rb +49 -0
data/test/integration/sites_test.rb +44 -5
data/test/test_helper.rb +13 -7
data/test/unit/cms_layout_test.rb +0 -8
data/test/unit/cms_page_test.rb +11 -0
metadata +13 -5
data/public/images/comfortable_mexican_sofa/body_bg.jpg +0 -0

data/LICENSE ADDED

@@ -0,0 +1,20 @@
+Copyright (c) 2010-2011 Oleg Khabarov, The Working Group Inc
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md CHANGED

@@ -19,27 +19,13 @@ Then from the Rails project's root run:
     rails g cms
     rake db:migrate
-At this point you should have database structure created, some assets copied to /public directory and initializer set up:
-    ComfortableMexicanSofa.configure do |config|
-      config.cms_title      = 'ComfortableMexicanSofa'
-      config.authentication = 'ComfortableMexicanSofa::HttpAuth'
-    end
-    # Credentials for HttpAuth
-    ComfortableMexicanSofa::HttpAuth.username = 'username'
-    ComfortableMexicanSofa::HttpAuth.password = 'password'
-For a full list of available configuration options and their defaults take a peek in here: [configuration.rb](http://https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/lib/comfortable_mexican_sofa/configuration.rb)
+At this point you should have database structure created, some assets copied to /public directory and [initializer](https://github.com/twg/comfortable-mexican-sofa/blob/master/config/initializers/comfortable_mexican_sofa.rb) set up.
 Usage
 -----
 Now you should be able to navigate to http://yoursite/cms-admin
-### Step 1: Create Site
-CMS allows you to run multiple sites from a single installation. Each site is attached to a hostname. For the first time you'll be prompted to set up the initial site. Hostname will be pre-populated so just choose a label.
-### Step 2: Create Layout
+### Step 1: Create Layout
 Before creating pages and populating them with content we need to create a layout. Layout is the template of your pages. It defines some reusable content (like header and footer, for example) and places where the content goes. A very simple layout can look like this:
     <html>
@@ -88,7 +74,7 @@ are exactly that. You don't want to do IRB inside CMS so there's a handy tag:
     {{ cms:partial:path/to/partial:x:y }} # gets translated to <%= render :partial => 'path/to/partial',
                                           # :locals => { :param_1 => 'x', :param_2 => 'y'} %>
-### Step 3: Create Page
+### Step 2: Create Page
 Now you're ready to create a page. Based on how you defined your layout, you should have form inputs ready to be populated.
 Save a page, and it will be accessible from the public side.
@@ -131,7 +117,7 @@ Then it's a matter of populating the content. Few rules to remember:
 - parent pages are identified by full_path (slug for layouts)
 - folder structure reflects tree structure of the site
-Example fixture files for a [layout](https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/layouts/nested.yml), [page](https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/pages/child/subchild.yml) and [snippet](https://github.com/theworkinggroup/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/snippets/default.yml)
+Example fixture files for a [layout](https://github.com/twg/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/layouts/nested.yml), [page](https://github.com/twg/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/pages/child/subchild.yml) and [snippet](https://github.com/twg/comfortable-mexican-sofa/blob/master/test/cms_seeds/test.host/snippets/default.yml)
 **Note:** If ComfortableMexicanSofa.config.seed\_data\_path is set no content is loaded from database. Only fixture files are used.

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.0.37
1	+ 1.0.38

data/app/controllers/cms_admin/base_controller.rb CHANGED

@@ -11,12 +11,24 @@ class CmsAdmin::BaseController < ActionController::Base
   layout 'cms_admin'
 protected
   def load_admin_cms_site
     @cms_site = CmsSite.find_by_hostname!(request.host.downcase)
   rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'No Site defined for this hostname. Create it now.'
-    redirect_to new_cms_admin_site_path
+    if ComfortableMexicanSofa.config.auto_manage_sites
+      if CmsSite.count == 0
+        @cms_site = CmsSite.create!(:label => 'Default Site', :hostname => request.host.downcase)
+      elsif CmsSite.count == 1
+        @cms_site = CmsSite.first
+        @cms_site.update_attribute(:hostname, request.host.downcase)
+      end
+    end
+    unless @cms_site
+      flash[:error] = 'No Site defined for this hostname. Create it now.'
+      return redirect_to(cms_admin_sites_path)
+    end
   end
 end

data/app/controllers/cms_admin/layouts_controller.rb CHANGED

@@ -45,6 +45,7 @@ protected
   def build_cms_layout
     @cms_layout = @cms_site.cms_layouts.new(params[:cms_layout])
     @cms_layout.parent ||= CmsLayout.find_by_id(params[:parent_id])
+    @cms_layout.content ||= '{{ cms:page:content }}'
   end
   def load_cms_layout

data/app/controllers/cms_admin/pages_controller.rb CHANGED

@@ -1,5 +1,6 @@
 class CmsAdmin::PagesController < CmsAdmin::BaseController
+  before_filter :check_for_layouts, :only => [:new, :edit]
   before_filter :build_cms_page,    :only => [:new, :create]
   before_filter :load_cms_page,     :only => [:edit, :update, :destroy]
   before_filter :preview_cms_page,  :only => [:create, :update]
@@ -47,7 +48,32 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
     @cms_page.cms_layout = @cms_site.cms_layouts.find_by_id(params[:layout_id])
   end
+  def toggle_branch
+    @cms_page = @cms_site.cms_pages.find(params[:id])
+    s   = (session[:cms_page_tree] ||= [])
+    id  = @cms_page.id.to_s
+    s.member?(id) ? s.delete(id) : s << id
+  rescue ActiveRecord::RecordNotFound
+    # do nothing
+  end
+  def reorder
+    (params[:cms_page] || []).each_with_index do |id, index|
+      if (cms_page = CmsPage.find_by_id(id))
+        cms_page.update_attribute(:position, index)
+      end
+    end
+    render :nothing => true
+  end
 protected
+  def check_for_layouts
+    if CmsLayout.count == 0
+      flash[:error] = 'No Layouts found. Please create one.'
+      redirect_to new_cms_admin_layout_path
+    end
+  end
   def build_cms_page
     @cms_page = @cms_site.cms_pages.new(params[:cms_page])

data/app/models/cms_layout.rb CHANGED

@@ -93,14 +93,6 @@ class CmsLayout < ActiveRecord::Base
     end
   end
-  def merged_css
-    self.parent ? [self.parent.merged_css, self.css].join("\n") : self.css.to_s
-  end
-  def merged_js
-    self.parent ? [self.parent.merged_js, self.js].join("\n") : self.js.to_s
-  end
 protected
   def check_content_tag_presence
@@ -115,7 +107,6 @@ protected
   def clear_cache
     FileUtils.rm File.expand_path("cms-css/#{self.slug}.css", Rails.public_path), :force => true
     FileUtils.rm File.expand_path("cms-js/#{self.slug}.js",   Rails.public_path), :force => true
-    self.children.each{ |child| child.save! }
   end
   # Forcing page content reload. This will happen in cascade due to #clear_cache mathod above.

data/app/models/cms_page.rb CHANGED

@@ -16,7 +16,8 @@ class CmsPage < ActiveRecord::Base
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_parent,
-                    :assign_full_path
+                    :assign_full_path,
+                    :assign_position
   before_save       :set_cached_content
   after_save        :sync_child_pages
@@ -115,6 +116,11 @@ class CmsPage < ActiveRecord::Base
     @cms_tags ||= []
   end
+  # Full url for a page
+  def url
+    "http://#{self.cms_site.hostname}#{self.full_path}"
+  end
 protected
   def assign_parent
@@ -125,6 +131,12 @@ protected
     self.full_path = self.parent ? "#{self.parent.full_path}/#{self.slug}".squeeze('/') : '/'
   end
+  def assign_position
+    return unless self.parent
+    max = self.parent.children.maximum(:position)
+    self.position = max ? max + 1 : 0
+  end
   def validate_target_page
     return unless self.target_page
     p = self

data/app/views/cms_admin/common/desc/_layout_content.html.erb ADDED

@@ -0,0 +1,25 @@
+<table>
+  <tr>
+    <td>
+      <strong>Renderable Page Elements:</strong>
+      <br/>{{ cms:page:<em>some_label</em>:text }}
+      <br/>{{ cms:page:<em>some_label</em>:rich_text }}
+      <br/>{{ cms:page:<em>some_label</em>:string }}
+      <br/>{{ cms:page:<em>some_label</em>:datetime }}
+      <br/>{{ cms:page:<em>some_label</em>:integer }}
+    </td>
+    <td>
+      <strong>Internal Field Elements:</strong>
+      <br/>{{ cms:field:<em>some_label</em>:text }}
+      <br/>{{ cms:field:<em>some_label</em>:string }}
+      <br/>{{ cms:field:<em>some_label</em>:datetime }}
+      <br/>{{ cms:field:<em>some_label</em>:integer }}
+    </td>
+    <td>
+      <strong>Snippets, Helpers and Partials:</strong>
+      <br/>{{ cms:snippet:<em>slug</em> }}
+      <br/>{{ cms:helper:<em>method_name</em> }}
+      <br/>{{ cms:partial:<em>path/to/partial</em> }}
+    </td>
+  </tr>
+</table>

data/app/views/cms_admin/common/desc/_layout_css.html.erb ADDED

	@@ -0,0 +1 @@
1	+ CSS is available at <%= auto_link cms_css_url((@cms_layout.slug \|\| 'layout-slug'), :format => 'css'), :html => { :target => '_blank' } %>

data/app/views/cms_admin/common/desc/_layout_js.html.erb ADDED

	@@ -0,0 +1 @@
1	+ JS is available at <%= auto_link cms_js_url((@cms_layout.slug \|\| 'layout-slug'), :format => 'css'), :html => { :target => '_blank' } %>

data/app/views/cms_admin/layouts/_form.html.erb CHANGED

@@ -10,6 +10,7 @@
 <% if (options = CmsLayout.app_layouts_for_select).present? %>
   <%= form.select :app_layout, [['---- Select Application Layout ----', nil]] + options %>
 <% end %>
-<%= form.text_area :content %>
-<%= form.text_area :css %>
-<%= form.text_area :js %>
+<%= form.text_area :content, :desc => render(:partial => '/cms_admin/common/desc/layout_content'), :desc_toggle => '[ help ]' %>
+<%= form.text_area :css, :desc => render(:partial => '/cms_admin/common/desc/layout_css'), :desc_toggle => '[ help ]' %>
+<%= form.text_area :js, :desc => render(:partial => '/cms_admin/common/desc/layout_js'), :desc_toggle => '[ help ]' %>

data/app/views/cms_admin/pages/_index_branch.html.erb CHANGED

@@ -1,10 +1,22 @@
-<% cms_page ||= index_branch %>
+<%
+  cms_page    ||= index_branch
+  has_children  = cms_page.children.present?
+  has_siblings  = cms_page.siblings.present?
+  branch_open   = (session[:cms_page_tree] || []).member?(cms_page.id.to_s) || cms_page.root?
+%>
-<li id='cms_page_<%= cms_page.id %>'>
+<li id='<%= dom_id(cms_page) %>'>
   <div class='item'>
+    <div class='toggle <%= 'open' if branch_open %>'>
+      <%=
+        if has_children && !cms_page.root?
+          link_to span_tag('toggle'), toggle_branch_cms_admin_page_path(cms_page), :remote => true
+        end
+      %>
+    </div>
     <div class='icon'>
-      <% if cms_page.siblings.size > 0 %>
-        <div class='dragger'></div>
+      <% if has_siblings %>
+        <div class='dragger'><span>drag</span></div>
       <% end %>
     </div>
     <div class='action_links'>
@@ -15,11 +27,11 @@
     <div class='label'>
       <%= link_to cms_page.label, edit_cms_admin_page_path(cms_page) %>
       <div class='sublabel'>
-        <%= link_to cms_page.full_path, cms_page.full_path %>
+        <%= link_to cms_page.url, cms_page.full_path, :target => '_blank' %>
       </div>
     </div>
   </div>
-  <% if cms_page.children.present? %>
+  <% if has_children && branch_open %>
     <ul>
       <%= render :partial => 'index_branch', :collection => cms_page.children %>
     </ul>

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

	@@ -1 +1 @@
1	- $('#form_blocks').replaceWith('<%= escape_javascript(render(:partial => "form_blocks")) %>')
1	+ $('#form_blocks').replaceWith('<%= escape_javascript(render(:partial => "form_blocks")) %>');

data/app/views/cms_admin/pages/index.html.erb CHANGED

@@ -1,6 +1,6 @@
 <%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big_button' %>
 <h1>Pages</h1>
-<ul class='list'>
+<ul class='list sortable'>
   <%= render :partial => 'index_branch', :collection => @cms_pages %>
 </ul>

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

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

data/app/views/layouts/cms_admin.html.erb CHANGED

@@ -13,7 +13,9 @@
     <div class='body_wrapper'>
       <div class='left_column'>
         <div class='left_column_content'>
-          <%= active_link_to 'Sites', cms_admin_sites_path %>
+          <% unless ComfortableMexicanSofa.config.auto_manage_sites %>
+            <%= active_link_to 'Sites', cms_admin_sites_path %>
+          <% end %>
           <%= active_link_to 'Layouts', cms_admin_layouts_path %>
           <%= active_link_to 'Pages', cms_admin_pages_path %>
           <%= active_link_to 'Snippets', cms_admin_snippets_path %>

data/comfortable_mexican_sofa.gemspec CHANGED

@@ -5,19 +5,21 @@
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.37"
+  s.version = "1.0.38"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-01-07}
+  s.date = %q{2011-01-28}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
+    "LICENSE",
     "README.md"
   ]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
+    "LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -35,6 +37,9 @@ Gem::Specification.new do |s|
     "app/models/cms_site.rb",
     "app/models/cms_snippet.rb",
     "app/models/cms_upload.rb",
+    "app/views/cms_admin/common/desc/_layout_content.html.erb",
+    "app/views/cms_admin/common/desc/_layout_css.html.erb",
+    "app/views/cms_admin/common/desc/_layout_js.html.erb",
     "app/views/cms_admin/layouts/_form.html.erb",
     "app/views/cms_admin/layouts/_index_branch.html.erb",
     "app/views/cms_admin/layouts/edit.html.erb",
@@ -47,6 +52,7 @@ Gem::Specification.new do |s|
     "app/views/cms_admin/pages/form_blocks.js.erb",
     "app/views/cms_admin/pages/index.html.erb",
     "app/views/cms_admin/pages/new.html.erb",
+    "app/views/cms_admin/pages/toggle_branch.js.erb",
     "app/views/cms_admin/sites/_form.html.erb",
     "app/views/cms_admin/sites/edit.html.erb",
     "app/views/cms_admin/sites/index.html.erb",
@@ -106,7 +112,9 @@ Gem::Specification.new do |s|
     "public/422.html",
     "public/500.html",
     "public/favicon.ico",
-    "public/images/comfortable_mexican_sofa/body_bg.jpg",
+    "public/images/comfortable_mexican_sofa/arrow_bottom.gif",
+    "public/images/comfortable_mexican_sofa/arrow_right.gif",
+    "public/images/comfortable_mexican_sofa/icon_move.gif",
     "public/images/comfortable_mexican_sofa/icon_regular.gif",
     "public/javascripts/comfortable_mexican_sofa/cms.js",
     "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png",

data/config/initializers/comfortable_mexican_sofa.rb CHANGED

@@ -11,12 +11,15 @@ ComfortableMexicanSofa.configure do |config|
   #   config.admin_route_prefix = 'cms-admin'
   # Path: /cms-admin redirects to /cms-admin/pages but you can change it
-  # to something else like:
+  # You don't need to change it when changing admin_route_prefix
   #   config.admin_route_redirect = '/cms-admin/pages'
   # Location of YAML files that can be used to render pages instead of pulling
   # data from the database. Not active if not specified.
   #   config.seed_data_path = File.expand_path('db/cms_seeds', Rails.root)
+  # Let CMS handle site creation and management. Enabled by default.
+  #   config.auto_manage_sites = true
 end
 # Default credentials for ComfortableMexicanSofa::HttpAuth

data/config/routes.rb CHANGED

@@ -5,6 +5,10 @@ Rails.application.routes.draw do
     resources :pages do
       member do
         match :form_blocks
+        match :toggle_branch
+      end
+      collection do
+        match :reorder
       end
     end
     resources :sites
@@ -14,8 +18,8 @@ Rails.application.routes.draw do
   end
   scope :controller => :cms_content do
-    get '/cms-css/:id'  => :render_css,   :as => 'cms_css',   :format => 'css'
-    get '/cms-js/:id'   => :render_js,    :as => 'cms_js',    :format => 'js'
+    get '/cms-css/:id'  => :render_css,   :as => 'cms_css'
+    get '/cms-js/:id'   => :render_js,    :as => 'cms_js'
     get '/'             => :render_html,  :as => 'cms_html',  :path => '(*cms_path)'
   end

data/lib/comfortable_mexican_sofa/acts_as_tree.rb CHANGED

@@ -78,6 +78,11 @@ module ComfortableMexicanSofa::ActsAsTree
       node
     end
+    # Checks if this node is a root
+    def root?
+      !self.parent
+    end
     # Returns all siblings of the current node.
     #
     #   subchild1.siblings # => [subchild2]

data/lib/comfortable_mexican_sofa/configuration.rb CHANGED

@@ -18,6 +18,9 @@ class ComfortableMexicanSofa::Configuration
   # to something else
   attr_accessor :admin_route_redirect
+  # Let CMS handle site creation and management. Enabled by default.
+  attr_accessor :auto_manage_sites
   # Configuration defaults
   def initialize
     @cms_title            = 'ComfortableMexicanSofa'
@@ -25,6 +28,7 @@ class ComfortableMexicanSofa::Configuration
     @seed_data_path       = nil
     @admin_route_prefix   = 'cms-admin'
     @admin_route_redirect = "/#{@admin_route_prefix}/pages"
+    @auto_manage_sites    = true
   end
 end

data/lib/comfortable_mexican_sofa/form_builder.rb CHANGED

@@ -16,10 +16,19 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   def default_field(type, field, options = {}, &block)
+    if desc = options.delete(:desc)
+      desc_toggle = options.delete(:desc_toggle)
+      desc_toggle = "<div class='desc_toggle'>#{desc_toggle}</div>" if desc_toggle
+      desc = %(
+        <div class='desc #{desc_toggle ? 'with_toggle' : nil}'>
+          #{desc_toggle} <div class='desc_content'>#{desc}</div>
+        </div>
+      )
+    end
     %(
       <div class='form_element #{type}_element'>
         <div class='label'>#{label_for(field, options)}</div>
-        <div class='value'>#{yield}</div>
+        <div class='value'>#{yield}</div> #{desc}
       </div>
     ).html_safe
   end

data/lib/comfortable_mexican_sofa/view_methods.rb CHANGED

@@ -36,7 +36,6 @@ module ComfortableMexicanSofa::ViewMethods
     return '' unless block = page.cms_blocks.find_by_label(block_label)
     block.content.to_s.html_safe
   end
 end
 ActionView::Base.send :include, ComfortableMexicanSofa::ViewMethods

data/public/images/comfortable_mexican_sofa/arrow_bottom.gif ADDED

Binary file

data/public/images/comfortable_mexican_sofa/arrow_right.gif ADDED

Binary file

data/public/images/comfortable_mexican_sofa/icon_move.gif ADDED

Binary file

data/public/javascripts/comfortable_mexican_sofa/cms.js CHANGED

@@ -9,6 +9,8 @@ $.CMS = function(){
     $.CMS.load_page_blocks();
     $.CMS.enable_rich_text();
     $.CMS.enable_date_picker();
+    $.CMS.enable_desc_toggle();
+    $.CMS.enable_sortable_list();
     if($('form.new_cms_page, form.edit_cms_page').get(0)) $.CMS.enable_page_save_form();
     if($('#page_save').get(0))        $.CMS.enable_page_save_widget();
     if($('#uploader_button').get(0))  $.CMS.enable_uploader();
@@ -17,6 +19,16 @@ $.CMS = function(){
   return {
+    enable_sortable_list: function(){
+      $('ul.sortable, ul.sortable ul').sortable({
+        handle: 'div.dragger',
+        axis: 'y',
+        update: function(){
+          $.post(current_path + '/reorder', '_method=put&'+$(this).sortable('serialize'));
+        }
+      })
+    },
     slugify: function(){
       $('input#slugify').bind('keyup.cms', function() {
         $('input#slug').val( slugify( $(this).val() ) );
@@ -70,6 +82,13 @@ $.CMS = function(){
       $('input[type=datetime]').datepicker();
     },
+    enable_desc_toggle: function(){
+      $('.form_element .desc .desc_toggle').click(function(){
+        $(this).toggle();
+        $(this).siblings('.desc_content').toggle();
+      })
+    },
     tree_methods: function(){
       $('a.tree_toggle').bind('click.cms', function() {
         $(this).siblings('ul').toggle();

data/public/stylesheets/comfortable_mexican_sofa/structure.css CHANGED

@@ -1,7 +1,7 @@
 /* -- Containers --------------------------------------------------------- */
 html, body {
   height: 100%;
-  background: url(/images/comfortable_mexican_sofa/body_bg.jpg);
+  background-color: #252525;
 }
 .body_wrapper {
   height: 100%;
@@ -13,11 +13,10 @@ html, body {
 .center_column {
   margin: 0px 250px 0px 175px;
   min-height: 100%;
-  background-color: #ececec;
   overflow: hidden;
-  box-shadow: inset 0px 0px 3px #000;
-  -moz-box-shadow: inset 0px 0px 3px #000;
-  -webkit-box-shadow: inset 0px 0px 3px #000;
+  background-color: #D8D8D8;
+  border-left: 1px solid #484844;
+  border-right: 1px solid #484848;
 }
 .center_column_content {
   padding: 25px;
@@ -38,19 +37,22 @@ html, body {
 }
 .left_column_content a {
   display: block;
-  background-color: #fff;
-  padding: 0px 10px;
+  padding: 3px 10px;
   margin-bottom: 5px;
-  font: 15px/25px Georgia, serif;
-  color: #1C1F22;
+  font: 15px/25px 'Lucida Grande', 'Tahoma', serif;
   border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px ;
+  border-bottom-left-radius: 4px;
   -moz-border-radius-topleft: 4px;
   -moz-border-radius-bottomleft: 4px;
-  opacity: 0.8;
+  background: #2D2D2D;
+  background: -moz-linear-gradient(left, #2D2D2D 0%, #3A3A3A 100%);
+  background: -webkit-gradient(linear, left top, right top, color-stop(0%,#2D2D2D), color-stop(100%,#3A3A3A));
+  color: #fff;
+  opacity: 0.3;
 }
 .left_column_content a:hover,
 .left_column_content a.active {
+  color: #fff;
   opacity: 1;
 }
 /* -- Right Column ------------------------------------------------------- */
@@ -126,16 +128,18 @@ html, body {
 }
 .big_button {
   float: right;
-  padding: 6px 10px;
+  padding: 4px 10px;
   font-size: 10px;
+  font-weight: bold;
   text-transform: uppercase;
-  background: url(/images/comfortable_mexican_sofa/body_bg.jpg);
   border-radius: 3px;
   -moz-border-radius: 3px;
+  border: 1px solid #9f9f9f;
+  background: -moz-linear-gradient(top, #F9F9F9 0%, #D5D5D5 34%, #B4B4B4 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(34%,#D5D5D5), color-stop(100%,#B4B4B4));
+  text-shadow: #f5f5f5 1px 1px;
   letter-spacing: 0.5px;
-}
-.big_button span {
-  color: #fff;
+  color: #1b1b1b;
 }
 /* -- Forms -------------------------------------------------------------- */
@@ -147,7 +151,7 @@ html, body {
   width: 137px;
   float: left;
   text-align: right;
-  font: 15px/21px Georgia, serif;
+  font: 15px/21px 'Lucida Grande', 'Tahoma', serif;
   text-shadow: #fff 1px 1px;
   padding-right: 10px;
   background-color: #e0e0e0;
@@ -164,14 +168,16 @@ html, body {
 .form_element .value input[type='password'],
 .form_element .value textarea,
 .form_element .value select {
-  width: 98%;
+  width: 100%;
 }
 .form_element .value input[type='text'],
 .form_element .value input[type='password'],
 .form_element .value select,
 .form_element .value textarea {
-  border: 1px solid #ccc;
-  padding: 2px;
+  border: 0px;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  padding: 2px 0px;
   font-family: 'Courier New', Courier, monospace;
 }
 .form_element .value textarea {
@@ -220,62 +226,125 @@ html, body {
 .form_element.form_save label {
   margin: 0px 5px;
 }
+.form_element .desc {
+  margin: 3px 0px 0px 160px;
+  font-size: 11px;
+  color: #777;
+}
+.form_element .desc .desc_toggle {
+  float: right;
+}
+.form_element .desc .desc_toggle:hover {
+  text-decoration: underline;
+  cursor: pointer;
+}
+.form_element .desc .desc_content {
+  background-color: #fff;
+  padding: 5px;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+}
+.form_element .desc.with_toggle .desc_content {
+  display: none;
+}
+.form_element .desc.with_toggle .desc_content table td {
+  vertical-align: top;
+  padding: 5px;
+}
 /* -- Listings ----------------------------------------------------------- */
 ul.list li .item {
   overflow: hidden;
   padding: 5px;
-  border-bottom: 1px solid #fff;
+  background-color: #ececec;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  margin-bottom: 5px;
 }
-ul.list li .icon {
+ul.list li .item .toggle {
+  float: left;
+  height: 28px;
+  width: 28px;
+}
+ul.list li .item .toggle a {
+  display: block;
+  height: 28px;
+  width: 28px;
+  background: url(/images/comfortable_mexican_sofa/arrow_right.gif) center center no-repeat;
+}
+ul.list li .item .toggle a span {
+  display: none;
+}
+ul.list li .item .toggle.open a {
+  background-image: url(/images/comfortable_mexican_sofa/arrow_bottom.gif);
+}
+ul.list li .item .icon {
+  float: left;
   width: 28px;
   height: 28px;
   background: url(/images/comfortable_mexican_sofa/icon_regular.gif);
-  float: left;
 }
-ul.list li .action_links {
-  float: right;
-  opacity: 0.1;
+ul.list li .item .icon .dragger {
+  width: 28px;
+  height: 28px;
+  background: url(/images/comfortable_mexican_sofa/icon_move.gif);
+  display: none;
 }
-table.formatted td.action_links a {
-  opacity: 0.1;
+ul.list li .item .icon:hover .dragger {
+  display: block;
+}
+ul.list li .item .icon .dragger span {
+  display: none;
+}
+ul.list li .item .label {
+  margin-left: 60px;
+  font-size: 14px;
+  font-weight: bold;
+}
+ul.list li .item .label .sublabel {
+  font-size: 10px;
+  font-weight: normal;
+}
+ul.list li ul {
+  margin-left: 28px;
 }
 ul.list .action_links a,
 table.formatted td.action_links a {
   margin-left: 3px;
-  background-color: #272A2D;
-  color: #fff;
+  background-color: #b4b4b4;
+  color: #1b1b1b;
   padding: 3px 5px;
   font-size: 9px;
   text-transform: uppercase;
   border-radius: 3px;
   -moz-border-radius: 3px;
+  border: 1px solid #9f9f9f;
+  background: -moz-linear-gradient(top, #F9F9F9 0%, #D5D5D5 34%, #B4B4B4 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(34%,#D5D5D5), color-stop(100%,#B4B4B4));
+  text-shadow: #f5f5f5 1px 1px;
+}
+ul.list .action_links a:hover,
+table.formatted td.action_links a:hover {
+  box-shadow: inset 0px 0px 5px #aaa;
+  -moz-box-shadow: inset 0px 0px 5px #aaa;
+  -webkit-box-shadow: inset 0px 0px 5px #aaa;
+  border-color: #484848;
 }
-ul.list li .label,
-table.formatted td .label {
-  margin-left: 35px;
-  font: 16px/18px Georgia, serif;
-  color: #1C1F22;
-}
-table.formatted td .label {
-  margin-left: 0px;
+ul.list li .action_links {
+  float: right;
+  opacity: 0.2;
 }
-ul.list li .label .sublabel {
-  margin-left: 15px;
-  font: 11px/14px Arial, sans-serif;
-  color: #1C1F22;
+table.formatted td.action_links a {
+  opacity: 0.2;
 }
-ul.list li ul {
-  margin-left: 30px;
+ul.list li .item:hover .action_links,
+table.formatted tr:hover td.action_links a {
+  opacity: 1;
 }
 ul.list li .item:hover,
 table.formatted tr:hover td {
   background-color: #fff;
 }
-ul.list li .item:hover .action_links,
-table.formatted tr:hover td.action_links a {
-  opacity: 1;
-}
 table.formatted {
   clear: both;
 }

data/public/stylesheets/comfortable_mexican_sofa/typography.css CHANGED

@@ -1,9 +1,9 @@
 body {
-  font: 13px Arial, sans-serif;
+  font: 13px 'Lucida Grande', 'Tahoma', sans-serif;
 }
 h1 {
-  font: bold 25px/25px Georgia, serif;
+  font: bold 25px/25px 'Lucida Grande', 'Tahoma', serif;
   margin-bottom: 25px;
   padding-bottom: 5px;
   color: #1C1F22;
@@ -16,4 +16,10 @@ a {
 }
 a:hover {
   color: #1C2733;
+}
+strong {
+  font-weight: bold;
+}
+em {
+  font-style: italic;
 }

data/test/functional/cms_admin/layouts_controller_test.rb CHANGED

@@ -20,6 +20,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     get :new
     assert_response :success
     assert assigns(:cms_layout)
+    assert_equal '{{ cms:page:content }}', assigns(:cms_layout).content
     assert_template :new
     assert_select 'form[action=/cms-admin/layouts]'
   end

data/test/functional/cms_admin/pages_controller_test.rb CHANGED

@@ -282,4 +282,53 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       assert_not_equal 'Updated Label', page.label
     end
   end
+  def test_get_new_with_no_layout
+    CmsLayout.destroy_all
+    get :new
+    assert_response :redirect
+    assert_redirected_to new_cms_admin_layout_path
+    assert_equal 'No Layouts found. Please create one.', flash[:error]
+  end
+  def test_get_edit_with_no_layout
+    CmsLayout.destroy_all
+    page = cms_pages(:default)
+    get :edit, :id => page
+    assert_response :redirect
+    assert_redirected_to new_cms_admin_layout_path
+    assert_equal 'No Layouts found. Please create one.', flash[:error]
+  end
+  def test_get_toggle_branch
+    page = cms_pages(:default)
+    get :toggle_branch, :id => page, :format => :js
+    assert_response :success
+    assert_equal [page.id.to_s], session[:cms_page_tree]
+    get :toggle_branch, :id => page, :format => :js
+    assert_response :success
+    assert_equal [], session[:cms_page_tree]
+  end
+  def test_reorder
+    page_one = cms_pages(:child)
+    page_two = cms_sites(:default).cms_pages.create!(
+      :parent     => cms_pages(:default),
+      :cms_layout => cms_layouts(:default),
+      :label      => 'test',
+      :slug       => 'test'
+    )
+    assert_equal 0, page_one.position
+    assert_equal 1, page_two.position
+    post :reorder, :cms_page => [page_two.id, page_one.id]
+    assert_response :success
+    page_one.reload
+    page_two.reload
+    assert_equal 1, page_one.position
+    assert_equal 0, page_two.position
+  end
 end

data/test/integration/sites_test.rb CHANGED

@@ -2,16 +2,55 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 class SitesTest < ActionDispatch::IntegrationTest
-  def test_get_admin_pages_index
+  def test_get_admin
     http_auth :get, cms_admin_pages_path
     assert_response :success
   end
-  def test_get_admin_pages_index_with_no_site
+  def test_get_admin_with_no_site
     CmsSite.delete_all
-    http_auth :get, cms_admin_pages_path
-    assert_response :redirect
-    assert_redirected_to new_cms_admin_site_path
+    assert_difference 'CmsSite.count' do
+      http_auth :get, cms_admin_pages_path
+      assert_response :redirect
+      assert_redirected_to new_cms_admin_page_path
+      site = CmsSite.first
+      assert_equal 'test.host', site.hostname
+      assert_equal 'Default Site', site.label
+    end
+  end
+  def test_get_admin_with_wrong_site
+    site = cms_sites(:default)
+    site.update_attribute(:hostname, 'remote.host')
+    assert_no_difference 'CmsSite.count' do
+      http_auth :get, cms_admin_pages_path
+      assert_response :success
+      site.reload
+      assert_equal 'test.host', site.hostname
+    end
+  end
+  def test_get_admin_with_two_wrong_sites
+    CmsSite.delete_all
+    CmsSite.create!(:label => 'Site1', :hostname => 'site1.host')
+    CmsSite.create!(:label => 'Site2', :hostname => 'site2.host')
+    assert_no_difference 'CmsSite.count' do
+      http_auth :get, cms_admin_pages_path
+      assert_response :redirect
+      assert_redirected_to cms_admin_sites_path
+      assert_equal 'No Site defined for this hostname. Create it now.', flash[:error]
+    end
+  end
+  def test_get_admin_with_no_site_and_no_auto_manage
+    ComfortableMexicanSofa.config.auto_manage_sites = false
+    CmsSite.delete_all
+    assert_no_difference 'CmsSite.count' do
+      http_auth :get, cms_admin_pages_path
+      assert_response :redirect
+      assert_redirected_to cms_admin_sites_path
+      assert_equal 'No Site defined for this hostname. Create it now.', flash[:error]
+    end
   end
   def test_get_public_page_for_non_existent_site

data/test/test_helper.rb CHANGED

@@ -3,15 +3,23 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 class ActiveSupport::TestCase
   fixtures :all
   include ActionDispatch::TestProcess
   def setup
-    # resetting default configuration
+    reset_config
+  end
+  # resetting default configuration
+  def reset_config
     ComfortableMexicanSofa.configure do |config|
-      config.cms_title      = 'ComfortableMexicanSofa'
-      config.authentication = 'ComfortableMexicanSofa::HttpAuth'
-      config.seed_data_path = nil
+      config.cms_title            = 'ComfortableMexicanSofa'
+      config.authentication       = 'ComfortableMexicanSofa::HttpAuth'
+      config.seed_data_path       = nil
+      config.admin_route_prefix   = 'cms-admin'
+      config.admin_route_redirect = "/cms-admin/pages"
+      config.auto_manage_sites    = true
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'
@@ -69,9 +77,7 @@ class ActionDispatch::IntegrationTest
   def setup
     host! 'test.host'
-    ComfortableMexicanSofa.config.seed_data_path = nil
-    ComfortableMexicanSofa::HttpAuth.username = 'username'
-    ComfortableMexicanSofa::HttpAuth.password = 'password'
+    reset_config
   end
   # Attaching http_auth stuff with request. Example use:

data/test/unit/cms_layout_test.rb CHANGED

@@ -84,14 +84,6 @@ class CmsLayoutTest < ActiveSupport::TestCase
     assert_equal '{{cms:page:content}}', child_layout.merged_content
   end
-  def test_merged_css
-    assert_equal "nested_css\nchild_css", cms_layouts(:child).merged_css
-  end
-  def test_merged_js
-    assert_equal "nested_js\nchild_js", cms_layouts(:child).merged_js
-  end
   def test_load_from_file
     assert !CmsLayout.load_from_file(cms_sites(:default), 'default')

data/test/unit/cms_page_test.rb CHANGED

@@ -57,6 +57,7 @@ class CmsPageTest < ActiveSupport::TestCase
         ]
       )
       assert page.is_published?
+      assert_equal 1, page.position
     end
   end
@@ -231,6 +232,16 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal 1, CmsPage.published.count
   end
+  def test_root?
+    assert cms_pages(:default).root?
+    assert !cms_pages(:child).root?
+  end
+  def test_url
+    assert_equal 'http://test.host/', cms_pages(:default).url
+    assert_equal 'http://test.host/child-page', cms_pages(:child).url
+  end
 protected
   def new_params(options = {})

metadata CHANGED

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 1
   - 0
-  - 37
-  version: 1.0.37
+  - 38
+  version: 1.0.38
 platform: ruby
 authors:
 - Oleg Khabarov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-01-07 00:00:00 -05:00
+date: 2011-01-28 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -141,10 +141,12 @@ executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE
 - README.md
 files:
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -162,6 +164,9 @@ files:
 - app/models/cms_site.rb
 - app/models/cms_snippet.rb
 - app/models/cms_upload.rb
+- app/views/cms_admin/common/desc/_layout_content.html.erb
+- app/views/cms_admin/common/desc/_layout_css.html.erb
+- app/views/cms_admin/common/desc/_layout_js.html.erb
 - app/views/cms_admin/layouts/_form.html.erb
 - app/views/cms_admin/layouts/_index_branch.html.erb
 - app/views/cms_admin/layouts/edit.html.erb
@@ -174,6 +179,7 @@ files:
 - app/views/cms_admin/pages/form_blocks.js.erb
 - app/views/cms_admin/pages/index.html.erb
 - app/views/cms_admin/pages/new.html.erb
+- app/views/cms_admin/pages/toggle_branch.js.erb
 - app/views/cms_admin/sites/_form.html.erb
 - app/views/cms_admin/sites/edit.html.erb
 - app/views/cms_admin/sites/index.html.erb
@@ -233,7 +239,9 @@ files:
 - public/422.html
 - public/500.html
 - public/favicon.ico
-- public/images/comfortable_mexican_sofa/body_bg.jpg
+- public/images/comfortable_mexican_sofa/arrow_bottom.gif
+- public/images/comfortable_mexican_sofa/arrow_right.gif
+- public/images/comfortable_mexican_sofa/icon_move.gif
 - public/images/comfortable_mexican_sofa/icon_regular.gif
 - public/javascripts/comfortable_mexican_sofa/cms.js
 - public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
@@ -359,7 +367,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 1225201023293296474
+      hash: 1387758075576454082
       segments:
       - 0
       version: "0"

data/public/images/comfortable_mexican_sofa/body_bg.jpg DELETED

Binary file