maybe mixing documentation inside the app is not a good idea
Oleg
committed Feb 01, 2011
commit 7b0e629ca2ae2fb3f299e950cea69013242f2a05
Showing 7
changed files with
6 additions
and 39 deletions
app/controllers/cms_admin/layouts_controller.rb
+1
-1
| @@ | @@ -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 | |
app/views/cms_admin/common/desc/_layout_content.html.erb
+0
-25
| @@ | @@ -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> |
| \ No newline at end of file | |
app/views/cms_admin/common/desc/_layout_css.html.erb
+0
-1
| @@ | @@ -1 +0,0 @@ |
| - | CSS is available at <%= auto_link cms_css_url((@cms_layout.slug || 'layout-slug'), :format => 'css'), :html => { :target => '_blank' } %> |
| \ No newline at end of file | |
app/views/cms_admin/common/desc/_layout_js.html.erb
+0
-1
| @@ | @@ -1 +0,0 @@ |
| - | JS is available at <%= auto_link cms_js_url((@cms_layout.slug || 'layout-slug'), :format => 'css'), :html => { :target => '_blank' } %> |
| \ No newline at end of file | |
app/views/cms_admin/layouts/_form.html.erb
+3
-3
| @@ | @@ -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 %> |
| + | <%= form.text_area :css %> |
| + | <%= form.text_area :js %> |
comfortable_mexican_sofa/form_builder.rb b/lib/comfortable_mexican_sofa/form_builder.rb
+1
-7
| @@ | @@ -17,13 +17,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder |
| 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> |
| - | ) |
| + | desc = "<div class='desc'>#{desc}</div>" |
| end | |
| %( | |
| <div class='form_element #{type}_element'> | |
test/functional/cms_admin/layouts_controller_test.rb
+1
-1
| @@ | @@ -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 | |