comfortable_mexican_sofa 1.0.40 → 1.0.41

data/VERSION

@@ -1 +1 @@
-1.0.40
+1.0.41

data/app/controllers/cms_admin/layouts_controller.rb

@@ -45,7 +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 }}'
+    @cms_layout.content ||= '{{ cms:page:content:text }}'
   end
   
   def load_cms_layout

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

@@ -11,6 +11,6 @@
   <%= form.select :app_layout, [['---- Select Application Layout ----', nil]] + options %>
 <% end %>
 
-<%= 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 ]' %>
+<%= form.text_area :content, :class => 'code' %>
+<%= form.text_area :css, :class => 'code_css' %>
+<%= form.text_area :js, :class => 'code_js' %>

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

@@ -2,11 +2,7 @@
 
 <li id='cms_layout_<%= cms_layout.id %>'>
   <div class='item'>
-    <div class='icon'>
-      <% if cms_layout.siblings.size > 0 %>
-        <div class='dragger'></div>
-      <% end %>
-    </div>
+    <div class='icon'></div>
     <div class='action_links'>
       <%= link_to 'Add Child Layout', new_cms_admin_layout_path(:parent_id => cms_layout.id) %>
       <%= link_to 'Edit', edit_cms_admin_layout_path(cms_layout) %>

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

@@ -1,4 +1,4 @@
-<%= link_to span_tag('Create New Layout'), new_cms_admin_layout_path, :class => 'big_button' %>
+<%= link_to span_tag('Create New Layout'), new_cms_admin_layout_path, :class => 'big button' %>
 <h1>Layouts</h1>
 
 <ul class='list'>

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

@@ -4,7 +4,7 @@
       <input type='checkbox'/>
       Published
     </label>
-    <button></button>
+    <a class='big button' href='#'></a>
   </div>
   <%= render :partial => 'cms_admin/uploads/index' %>
 <% end %>
@@ -29,7 +29,7 @@
 
 <%= render :partial => 'form_blocks' %>
 
-<%= form.simple_field nil, nil, :class => 'form_save' do %>
+<%= form.simple_field nil, nil, :class => 'submit_element' do %>
   <%= form.check_box :is_published, :disable_builder => true %>
   <%= form.label_for :is_published, :label => 'Published' %>
   <%= form.submit @cms_page.new_record?? 'Create Page' : 'Update Page', :disable_builder => true %>

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

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

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

@@ -1,4 +1,4 @@
-<%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big_button' %>
+<%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big button' %>
 <h1>Pages</h1>
 
 <ul class='list sortable'>

data/app/views/cms_admin/sites/index.html.erb

@@ -1,4 +1,4 @@
-<%= link_to span_tag('Create New Site'), new_cms_admin_site_path, :class => 'big_button' %>
+<%= link_to span_tag('Create New Site'), new_cms_admin_site_path, :class => 'big button' %>
 <h1>Sites</h1>
 
 <ul class='list'>

data/app/views/cms_admin/snippets/_form.html.erb

@@ -4,4 +4,4 @@
 
 <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %>
 <%= form.text_field :slug, :id => 'slug' %>
-<%= form.text_area :content %>
+<%= form.text_area :content, :class => 'code' %>

data/app/views/cms_admin/snippets/index.html.erb

@@ -1,4 +1,4 @@
-<%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big_button' %>
+<%= link_to span_tag('Create New Snippet'), new_cms_admin_snippet_path, :class => 'big button' %>
 <h1>Snippets</h1>
 
 <ul class='list'>

data/app/views/cms_admin/uploads/_index.html.erb

@@ -1,6 +1,6 @@
 <div id='file_uploads' class='box'>
   <div class='actions'>
-    <button id="uploader_button" href="#">Upload Files</button>
+    <a id='uploader_button' href='#' class='big button'>Upload Files</a>
   </div>
   <div id='uploaded_files'>
     <% CmsUpload.order('file_file_name').all.each do |file| %>

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

@@ -4,12 +4,12 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title><%= ComfortableMexicanSofa.config.cms_title %></title>
     <%= csrf_meta_tag %>
-    <%= stylesheet_link_tag :cms %>
+    <%= stylesheet_link_tag :cms, :cache => '_cms' %>
     <%= javascript_include_tag :cms %>
     <%= yield :head %>
     <%= cms_hook :html_head %>
   </head>
-  <body id='cms_admin'>
+  <body class='c_<%= params[:controller].idify %> a_<%= params[:action].idify %>'>
     <div class='body_wrapper'>
       <div class='left_column'>
         <div class='left_column_content'>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.40"
+  s.version = "1.0.41"
 
   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-28}
+  s.date = %q{2011-02-01}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -37,9 +37,6 @@ 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",
@@ -114,9 +111,18 @@ Gem::Specification.new do |s|
     "public/favicon.ico",
     "public/images/comfortable_mexican_sofa/arrow_bottom.gif",
     "public/images/comfortable_mexican_sofa/arrow_right.gif",
+    "public/images/comfortable_mexican_sofa/icon_layout.gif",
     "public/images/comfortable_mexican_sofa/icon_move.gif",
     "public/images/comfortable_mexican_sofa/icon_regular.gif",
+    "public/images/comfortable_mexican_sofa/icon_snippet.gif",
     "public/javascripts/comfortable_mexican_sofa/cms.js",
+    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css",
+    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
+    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror_base.js",
+    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_css.js",
+    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_html_mixed.js",
+    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_js.js",
+    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_xml.js",
     "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png",
     "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png",
     "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png",
@@ -170,6 +176,8 @@ Gem::Specification.new do |s|
     "public/javascripts/comfortable_mexican_sofa/tiny_mce/tiny_mce.js",
     "public/javascripts/comfortable_mexican_sofa/tiny_mce/tiny_mce_popup.js",
     "public/robots.txt",
+    "public/stylesheets/comfortable_mexican_sofa/content.css",
+    "public/stylesheets/comfortable_mexican_sofa/form.css",
     "public/stylesheets/comfortable_mexican_sofa/reset.css",
     "public/stylesheets/comfortable_mexican_sofa/structure.css",
     "public/stylesheets/comfortable_mexican_sofa/typography.css",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -1,6 +1,6 @@
 ComfortableMexicanSofa.configure do |config|
   # Title of the admin area
-  config.cms_title      = 'ComfortableMexicanSofa'
+  config.cms_title      = 'ComfortableMexicanSofa MicroCMS'
   
   # Module responsible for authentication. You can replace it with your own.
   # It simply needs to have #authenticate method. See http_auth.rb for reference.

data/lib/comfortable_mexican_sofa/controller_methods.rb

@@ -21,7 +21,7 @@ module ComfortableMexicanSofa::ControllerMethods
   # instance variables that can be used in partials (that are included by
   # by the cms page and/or layout)
   def render_with_cms(options = {}, locals = {}, &block)
-    if path = options.delete(:cms_page)
+    if options.is_a?(Hash) && path = options.delete(:cms_page)
       site = CmsSite.find_by_hostname(request.host.downcase)
       page = CmsPage.load_from_file(site, path) if site && ComfortableMexicanSofa.configuration.seed_data_path
       page ||= site && site.cms_pages.find_by_full_path(path)

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -16,19 +16,18 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def default_field(type, field, options = {}, &block)
+    errors = if object.errors[field].present?
+      "<div class='errors'>#{[object.errors[field]].flatten.first}</div>"
+    end
     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>
-      )
+      desc = "<div class='desc'>#{desc}</div>"
     end
     %(
-      <div class='form_element #{type}_element'>
+      <div class='form_element #{type}_element #{'errors' if errors}'>
         <div class='label'>#{label_for(field, options)}</div>
-        <div class='value'>#{yield}</div> #{desc}
+        <div class='value'>#{yield}</div>
+        #{desc}
+        #{errors}
       </div>
     ).html_safe
   end
@@ -51,11 +50,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   def submit(value, options = {}, &block)
     return super if options.delete(:disable_builder)
     extra_content = @template.capture(&block) if block_given?
-    %(
-      <div class='form_element submit_element'>
-        #{super(value, options)} #{extra_content}
-      </div>
-    ).html_safe
+    simple_field(nil, "#{super(value, options)} #{extra_content}", :class => 'submit_element')
   end
   
   # -- Tag Field Fields -----------------------------------------------------
@@ -63,10 +58,15 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     label     = options[:label] || tag.label.to_s.titleize
     css_class = options[:css_class] || tag.class.name.underscore.downcase.idify
     
+    field_css_class = case tag
+      when CmsTag::PageRichText                 then 'rich_text'
+      when CmsTag::PageText, CmsTag::FieldText  then 'code'
+    end
+    
     options[:content_field_method] ||= :text_field_tag
     field = 
       options[:field] || 
-      @template.send(options[:content_field_method], 'cms_page[cms_blocks_attributes][][content]', tag.content, :id => nil)
+      @template.send(options[:content_field_method], 'cms_page[cms_blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
     
     %(
       <div class='form_element #{css_class}'>

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -48,11 +48,14 @@ ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => [
   'comfortable_mexican_sofa/tiny_mce/jquery.tinymce',
   'comfortable_mexican_sofa/plupload/plupload.min',
   'comfortable_mexican_sofa/plupload/plupload.html5.min',
+  'comfortable_mexican_sofa/codemirror/codemirror.js',
   'comfortable_mexican_sofa/cms'
 ]
 ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => [
   'comfortable_mexican_sofa/reset',
   'comfortable_mexican_sofa/structure',
   'comfortable_mexican_sofa/typography',
+  'comfortable_mexican_sofa/form',
+  'comfortable_mexican_sofa/content',
   '/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui'
 ]

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -2,19 +2,19 @@ $.CMS = function(){
   var current_path = window.location.pathname;
   var admin_path_prefix = current_path.split('/')[1]
   
-  $(document).ready(function(){
+  $(function(){
     
     $.CMS.slugify();
     $.CMS.tree_methods();
     $.CMS.load_page_blocks();
     $.CMS.enable_rich_text();
+    $.CMS.enable_codemirror();
     $.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();
-    
   });
   
   return {
@@ -63,7 +63,7 @@ $.CMS = function(){
     },
     
     enable_rich_text: function(){
-      $('.form_element.cms_tag_page_rich_text textarea, textarea.rich_text').tinymce({
+      $('textarea.rich_text').tinymce({
          theme : "advanced",
          plugins: "",
          theme_advanced_buttons1 : "formatselect,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,link,unlink,anchor,image,|,code",
@@ -75,7 +75,42 @@ $.CMS = function(){
          theme_advanced_statusbar_location : "bottom",
          theme_advanced_resizing : true,
          theme_advanced_resize_horizontal : false
-       })
+       });
+    },
+    
+    enable_codemirror: function(){
+      $('textarea.code').each(function(i, element){
+        CodeMirror.fromTextArea(element, {
+          basefiles: [
+            "/javascripts/comfortable_mexican_sofa/codemirror/codemirror_base.js",
+            "/javascripts/comfortable_mexican_sofa/codemirror/parse_xml.js",
+            "/javascripts/comfortable_mexican_sofa/codemirror/parse_css.js",
+            "/javascripts/comfortable_mexican_sofa/codemirror/parse_js.js",
+            "/javascripts/comfortable_mexican_sofa/codemirror/parse_html_mixed.js"
+          ],
+          stylesheet: "/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css"
+        });
+      });
+      
+      $('textarea.code_css').each(function(i, element){
+        CodeMirror.fromTextArea(element, {
+          basefiles: [
+            "/javascripts/comfortable_mexican_sofa/codemirror/codemirror_base.js",
+            "/javascripts/comfortable_mexican_sofa/codemirror/parse_css.js"
+          ],
+          stylesheet: "/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css"
+        });
+      });
+      
+      $('textarea.code_js').each(function(i, element){
+        CodeMirror.fromTextArea(element, {
+          basefiles: [
+            "/javascripts/comfortable_mexican_sofa/codemirror/codemirror_base.js",
+            "/javascripts/comfortable_mexican_sofa/codemirror/parse_js.js"
+          ],
+          stylesheet: "/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css"
+        });
+      });
     },
     
     enable_date_picker: function(){
@@ -110,15 +145,15 @@ $.CMS = function(){
     
     enable_page_save_widget : function(){
       $('#page_save input').attr('checked', $('input#cms_page_is_published').is(':checked'));
-      $('#page_save button').html($('input#cms_page_submit').val());
+      $('#page_save a').html($('input#cms_page_submit').val());
       
-      $('#page_save input').bind('click', function(){
+      $('#page_save a').bind('click', function(){
         $('input#cms_page_is_published').attr('checked', $(this).is(':checked'));
       })
       $('input#cms_page_is_published').bind('click', function(){
-        $('#page_save input').attr('checked', $(this).is(':checked'));
+        $('#page_save a').attr('checked', $(this).is(':checked'));
       })
-      $('#page_save button').bind('click', function(){
+      $('#page_save a').bind('click', function(){
         $('input#cms_page_submit').click();
       })
     },

data/public/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css

@@ -0,0 +1,102 @@
+html {
+  cursor: text;
+}
+.editbox {
+  margin: .4em;
+  padding: 0;
+  font: 13px 'Courier New', Courier, monospace;
+  color: #000;
+}
+.editbox p {
+  margin: 0;
+}
+
+span.xml-tagname {
+  color: #A0B;
+}
+span.xml-attribute {
+  color: #281;
+}
+span.xml-punctuation {
+  color: black;
+}
+span.xml-attname {
+  color: #00F;
+}
+span.xml-comment {
+  color: #A70;
+}
+span.xml-cdata {
+  color: #48A;
+}
+span.xml-processing {
+  color: #999;
+}
+span.xml-entity {
+  color: #A22;
+}
+span.xml-error {
+ color: #F00 !important;
+}
+span.xml-text {
+  color: black;
+}
+
+span.css-at {
+  color: #708;
+}
+span.css-unit {
+  color: #281;
+}
+span.css-value {
+  color: #708;
+}
+span.css-identifier {
+  color: black;
+}
+span.css-selector {
+  color: #11B;
+}
+span.css-important {
+  color: #00F;
+}
+span.css-colorcode {
+  color: #299;
+}
+span.css-comment {
+  color: #A70;
+}
+span.css-string {
+  color: #A22;
+}
+
+span.js-punctuation {
+  color: #666666;
+}
+span.js-operator {
+  color: #666666;
+}
+span.js-keyword {
+  color: #770088;
+}
+span.js-atom {
+  color: #228811;
+}
+span.js-variable {
+  color: black;
+}
+span.js-variabledef {
+  color: #0000FF;
+}
+span.js-localvariable {
+  color: #004499;
+}
+span.js-property {
+  color: black;
+}
+span.js-comment {
+  color: #AA7700;
+}
+span.js-string {
+  color: #AA2222;
+}