comfortable_mexican_sofa 1.0.40 → 1.0.41

data/public/stylesheets/comfortable_mexican_sofa/typography.css

@@ -8,7 +8,7 @@ h1 {
   padding-bottom: 5px;
   color: #1C1F22;
   text-shadow: #fff 1px 1px;
-  border-bottom: 2px groove #ccc;
+  border-bottom: 2px solid #9f9f9f;
 }
 a {
   text-decoration: none;

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -20,7 +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_equal '{{ cms:page:content:text }}', assigns(:cms_layout).content
     assert_template :new
     assert_select 'form[action=/cms-admin/layouts]'
   end

data/test/functional/cms_content_controller_test.rb

@@ -22,7 +22,7 @@ class CmsContentControllerTest < ActionController::TestCase
     cms_layouts(:default).update_attribute(:app_layout, 'cms_admin.html.erb')
     get :render_html, :cms_path => ''
     assert_response :success
-    assert_select 'body[id=cms_admin]'
+    assert_select "body[class='c_cms_content a_render_html']"
   end
   
   def test_render_page_not_found

data/test/integration/render_cms_test.rb

@@ -6,7 +6,9 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     Rails.application.routes.draw do
       get '/render-implicit'  => 'render_test#implicit'
       get '/render-explicit'  => 'render_test#explicit'
-      get '/seed_data_page'   => 'render_test#seed_data_page'
+      get '/seed-data-page'   => 'render_test#seed_data_page'
+      get '/render-text'      => 'render_test#render_text'
+      get '/render-update'    => 'render_test#render_update'
     end
     super
   end
@@ -25,6 +27,14 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     def seed_data_page
       render :cms_page => '/'
     end
+    def render_text
+      render :text => 'rendered text'
+    end
+    def render_update
+      render :update do |page|
+        page.alert('rendered text')
+      end
+    end
   end
   
   def test_get_with_no_template
@@ -58,4 +68,14 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     end
   end
   
+  def test_get_render_text
+    get '/render-text'
+    assert_response :success
+  end
+  
+  def test_get_render_update
+    get '/render-update'
+    assert_response :success
+  end
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 40
-  version: 1.0.40
+  - 41
+  version: 1.0.41
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -05:00
+date: 2011-02-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,9 +164,6 @@ 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
@@ -241,9 +238,18 @@ files:
 - 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
@@ -297,6 +303,8 @@ files:
 - 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
@@ -368,7 +376,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3484483560763039212
+      hash: 1503786614433025882
       segments: 
       - 0
       version: "0"

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

@@ -1,25 +0,0 @@
-<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

@@ -1 +0,0 @@
-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

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