liquid_cms 0.2.2.0 → 0.3.0

data/app/views/cms/assets/_form.html.erb

@@ -1,68 +1,6 @@
-<% simple_form_for @asset, :html => {:multipart => true} do |f| %>
-  <% unless f.object.new_record? %>
-  <div class="details">
-    <p><span class="label">Original</span> <%= link_to @asset.asset_file_name, @asset.asset.url %></p>
-    <p><span class="label">Filesize</span> <%= number_to_human_size(@asset.asset_file_size) %></p>
-    <p><span class="label">Last Updated</span> <%= @asset.asset_updated_at.to_formatted_s(:long) %></p>
-  </div>
+<div class="formContainer form">
+  <%= simple_form_for @asset, :html => {:multipart => true} do |f| %>
+    <%= f.input :asset, :as => :file %>
+    <%= f.commit_button_or_cancel %>
   <% end %>
-
-  <% if f.object.image? %>
-  <div class="preview">
-    <span class="label">Preview</span>
-    <%= image_tag @asset.asset.url(:large) %>
-  </div>
-  <% end %>
-
-  <%= f.input :asset, :as => :file %>
-
-  <% if f.object.editable? %>
-    <p class="break">
-      <em>or edit the contents...</em>
-    </p>
-
-    <div class="text required">
-      <%= f.input :file_content, :as => :text, :input_html => {:rows => 40, :cols => nil} %>
-    </div>
-
-    <%= codemirror_edit Cms::Editable::content_type(@asset.asset_file_name), 'form.simple_form', 'cms_asset_file_content', !@asset.new_record? %>
-  <% end %>
-
-  <div class="dimensions">
-    <%= f.label :custom_size, :required => false %>
-    <%= f.input :custom_width, :label => false, :required => false, :input_html => {:size => 4} %> x
-    <%= f.input :custom_height, :label => false, :required => false, :input_html => {:size => 4} %>
-    <span class="hint"><%= t('simple_form.hints.cms_asset.dimensions') %></span>
-  </div>
-
-  <%= f.input :tag_list, :as => :string, :required => false %>
-
-  <% field_set_tag 'Meta Data' do %>
-    <ul id="meta_fields">
-      <% f.object.meta.each_with_index do |meta,idx| %>
-        <%= render 'meta_field', :f => f, :obj => meta, :idx => idx %>
-      <% end %>
-    </ul>
-    <%= cms_icon 'table_add.png' %> <%= link_to 'Add meta data', nil, :id => 'add_meta', :title => 'Add new meta data' %>
-  <% end %>
-
-  <%= f.commit_button_or_cancel %>
-
-  <% javascript_tag do %>
-    function remove_element(evt) {
-      this.up('li').remove();
-      evt.stop();
-    }
-
-    $('add_meta').observe('click', function(evt) {
-      var new_field_id = "new_" + new Date().getTime();
-      $('meta_fields').insert({
-        bottom:
-        "<%= escape_javascript(render('meta_field', :f => f, :obj => nil)) %>".replace(/new_\d+/g, new_field_id)
-      }).select('.remove_meta').last().observe('click', remove_element);
-      evt.stop();
-    });
-
-    $$('.remove_meta').invoke('observe', 'click', remove_element);
-  <% end %>
-<% end %>
+</div>

data/app/views/cms/assets/_list.html.erb

@@ -1,32 +1,14 @@
 <div id="assets">
-  <p>
-    <%= cms_icon 'picture_add.png' %> <%= link_to t('assets.actions.index.new'), new_cms_asset_path %>
-  </p>
-
-  <% if @cms_assets.empty? %>
+  <% if @assets.empty? %>
     <p><%= t 'assets.actions.index.none' %></p>
   <% else %>
-    <% if @cms_assets.any?(&:image?) %>
     <p class="preview"><%= link_to_function 'Toggle image previews', "asset_preview_toggle()" %></p>
-    <% end %>
-
     <ul>
-      <% @context_asset_tags.each do |tag| %>
-        <li class="group tagged">
-          <h4><%= tag.to_s %> <%= link_to cms_icon('picture_add.png', :title => 'Add a new asset with this tag'), new_cms_asset_path(:tag => tag.to_s) %></h4>
-          <ul>
-            <%= render :partial => 'cms/assets/asset', :collection => @context.assets.tagged_with(tag).ordered %>
-          </ul>
-        </li>
-      <% end %>
-      <li class="group untagged">
-        <% unless @context_asset_tags.blank? %>
-        <h4>Untagged</h4>
-        <% end %>
-        <ul>
-          <%= render :partial => 'cms/assets/asset', :collection => @context.assets.untagged.ordered %>
-        </ul>
-      </li>
+      <%= render :partial => 'cms/assets/asset', :collection => @assets %>
     </ul>
   <% end %>
+
+  <p>
+    <%= cms_icon 'picture_add.png' %> <%= link_to t('assets.actions.index.new_link'), new_cms_asset_path %>
+  </p>
 </div>

data/app/views/cms/assets/destroy.js.rjs

@@ -0,0 +1,2 @@
+page.remove dom_id(@asset)
+page << %[humanMsg.displayMsg('#{escape_javascript(flash[:notice])}', 'notice}');]

data/app/views/cms/components/_list.html.erb

@@ -1,14 +1,8 @@
 <div id="components">
-  <% form_tag upload_cms_components_path, :multipart => true do %>
-    <div>
-      <%= file_field_tag :zip_file %>
-      <%= submit_tag 'Upload' %> <em>.zip files only</em>
-    </div>
+  <%= form_tag cms_components_upload_path, :multipart => true do %>
+    <%= file_field_tag :zip_file %>
+    <%= submit_tag 'Upload' %> <em>.zip files only</em>
   <% end %>
 
-  <% if @cms_components.empty? %>
-    <p><%= t 'components.actions.index.none' %></p>
-  <% else %>
-    <%= list_files @cms_components %>
-  <% end %>
+  <%= list_files Cms::Component.full_path(@context) %>
 </div>

data/app/views/cms/components/edit.html.erb

@@ -1,17 +1,20 @@
 <h2>Edit Component File</h2>
 
-<% form_tag({:controller => 'cms/components', :action => 'update', :url => CGI::escape(@component.path)}, :class => 'simple_form') do %>
-  <div class="string required">
-    <%= label_tag :name, nil, :class => 'string required' %> <%= text_field_tag :name, @component.path, :readonly => true, :class => 'string required' %>
-  </div>
-  <div class="text required">
-    <%= label_tag :file_content, 'Content', :class => 'text required' %> <%= text_area_tag :file_content, @component.read, :rows => 40, :class => 'text required' %>
-    <span class="hint"><%= t('simple_form.hints.cms_component.file_content') %></span>
-  </div>
+<p>No liquid support currently for editing components.</p>
 
-  <div class="buttons">
-    <%= submit_tag 'Update', :class => 'update' %> or <%= link_to t('simple_form.buttons.cancel'), :back, :class => 'cancel' %>
-  </div>
+<%= form_tag({:controller => 'cms/components', :action => 'update', :url => CGI::escape(@component.path)}, :class => 'formtastic') do %>
+  <fieldset class="inputs">
+    <ol>
+      <li class="string"><%= label_tag :name %> <%= text_field_tag :name, @component.path, :readonly => true %></li>
+      <li class="text"><%= label_tag :contents %> <%= text_area_tag :contents, @component.read, :rows => 40 %></li>
+    </ol>
+  </fieldset>
+
+  <fieldset class="buttons">
+    <ol>
+      <li><%= submit_tag 'Update' %></li>
+    </ol>
+  </fieldset>
 <% end %>
 
-<%= codemirror_edit Cms::Editable::content_type(@component.path), 'form.simple_form', 'file_content' %>
+<%= codemirror_edit Cms::Editable::content_type(@component.path), 'form.simple_form', 'contents' %>

data/app/views/cms/documentation/_cms_drops.html.erb

@@ -5,27 +5,11 @@
 
 <p>Each size field has additional <strong>url</strong>, <strong>width</strong> and <strong>height</strong> attribute as well:</p>
 
+<code>
 <pre>
 {{ image.original.url }}
 {{ image.large.url }}
 {{ image.large.width }}
 {{ image.large.height }}
 </pre>
-
-<a name="asset_drop"></a>
-<h3>Asset</h3>
-<ul>
-  <li><span class="attribute">meta</span> - Meta fields can be accessed from the meta attribute. Meta data is associated with an asset when creating or editing them.</li>
-  <li>
-    <span class="attribute">image</span> - Gives you access to the image fields if the asset an image.  See the <a href="#image_drop">paperclip objects</a> drop for available fields.</a><br/>
-    The image attribute only contains the <em>'original'</em> size in addition to a <em>'custom'</em> size if custom dimensions were specified for the image.
-  </li>
-</ul>
-
-<pre>
-{{ asset.meta.field_name }}
-{{ asset.meta.location }}
-
-{{ asset.image.custom.url }}
-{{ asset.image.original.url }}
-</pre>
+</code>

data/app/views/cms/documentation/_cms_filters.html.erb

@@ -3,60 +3,76 @@
   <li><span class="param">precision</span> - Precision of dollar value. Defaults to 0.</li>
 </ol>
 
+<code>
 <pre>
 {{ 75 | money }} = $75
 {{ 75 | money: 2 }} = $75.00
 </pre>
+</code>
 
 <h3><span class="function">json</span> - converts data to json format</h3>
 
+<code>
 <pre>
 {{ some_value | json }}
 </pre>
+</code>
 
 <h3><span class="function">textilize</span> - formats text to html using textile markup</h3>
 <ol>
   <li><span class="param">wrap</span> - Wrap text with paragraphs. true/false. Defaults to true.</li>
 </ol>
  
+<code>
 <pre>
 {{ "test *string*" | textilize }} = &lt;p&gt;test &lt;strong&gt;string&lt;/strong&gt;&lt;/p&gt;
 {{ "test *string*" | textilize: false }} = test &lt;strong&gt;string&lt;/strong&gt;
 </pre>
+</code>
 
 <h3><span class="function">url_encode</span> - encodes a value for a url</h3>
 
+<code>
 <pre>
 {{ "test space" | url_encode }} = test+space
 </pre>
+</code>
 
 <h3><span class="function">url_decode</span> - decodes a value from a url</h3>
 
+<code>
 <pre>
 {{ "test+space" | url_decode }} = test space
 </pre>
+</code>
 
 <h3><span class="function">script_tag</span> - converts text to a javascript include tag (works the same as rails javascript_include_tag)</h3>
 
+<code>
 <pre>
 {{ "test.js" | script_tag }}
 </pre>
+</code>
 
 <h3><span class="function">stylesheet_tag</span> - converts text to a stylesheet link tag (works the same as rails stylesheet_link_tag)</h3>
 
+<code>
 <pre>
 {{ "test.css" | stylesheet_tag }}
 </pre>
+</code>
 
 <h3><span class="function">link_to</span> - converts a url to an anchor tag.</h3>
 <ol>
   <li><span class="param">text</span> - Link text.  Defaults to the link url.</li>
 </ol>
 
+<code>
 <pre>
 {{ "www.google.com" | link_to }} = &lt;a href="www.google.com"&gt;www.google.com&lt;/a&gt;
 {{ "www.google.com" | link_to: Google }} = &lt;a href="www.google.com"&gt;Google&lt;/a&gt;
 </pre>
+</code>
 
 <h3><span class="function">image_tag</span> - converts a url to an img tag.</h3>
 <ol>
@@ -64,12 +80,14 @@
   <li><span class="param">size</span> - Size as a "50x60" (width x height) formatted string.</li>
 </ol>
 
+<code>
 <pre>
 {{ "img.jpg" | image_tag }} = &lt;img src="img.jpg" /&gt;
 {{ "img.jpg" | image_tag: "An Image" }} = &lt;img src="img.jpg" title="An Image" /&gt;
 {{ "img.jpg" | image_tag: "An Image", "50x60" }} = &lt;img src="img.jpg" title="An Image" width="50" height="60" /&gt;
 {{ "img.jpg" | image_tag: nil, "50x60" }} = &lt;img src="img.jpg" width="50" height="60" /&gt;
 </pre>
+</code>
 
 <h3><span class="function">assign_to</span> - assigns the filter results to a variable.</h3>
 <ul>
@@ -77,12 +95,14 @@
 </ul>
 
 <p class="example">Assigns the paginated collection to the variable <strong>data</strong>.</p>
+<code>
 <pre>
 {{ collection | paginate_collection: 10, 1 | assign_to: 'data' }}
 {% for item in data %}
   ...
 {% endfor %}
 </pre>
+</code>
 
 <h3><span class="function">paginate_links</span> - use to paginate new and used vehicles</h3>
 <p>Uses a page parameter from the url (if set) to determine what page of the pagination to display.  Ie. /vehicles?page=3</p>
@@ -92,10 +112,12 @@
   <li><span class="param">next_label</span> - label for the next page button</li>
 </ol>
 
+<code>
 <pre>
 {{ vehicles | paginate }}
 {{ vehicles | paginate : "anchor", "Previous vehicles", "Next Vehicles" }}
 </pre>
+</code>
 
 <h3><span class="function">paginate_collection</span> - use to paginate any collection of data</h3>
 <ol>
@@ -104,10 +126,12 @@
 </ol>
 
 <p class="example">Retrieves 10 items from the collection at a time.  The 1st to 10th items for the 1st call and the 11th to 20th items for the 2nd call.</p>
+<code>
 <pre>
 {{ collection | paginate_collection: 10, 1 }}
 {{ collection | paginate_collection: 10, 2 }}
 </pre>
+</code>
 
 <p>An additional variable called <strong>paginate</strong> is automatically assigned when calling this method.  It contains the following pagination details:</p>
 <ul>
@@ -116,27 +140,36 @@
   <li><span class="param">previous_page</span> - the previous page</li>
   <li><span class="param">next_page</span> - the next page</li>
 </ul>
+<code>
 <pre>
 {{ paginate.total_pages }}
 {{ paginate.next_page }}
 </pre>
+</code>
 
 <h3><span class="function">page_url</span> - converts a text value representing a CMS page name to its corresponding url.</h3>
 
 <p class="example">If a page has been created called "test", its associated url is output.</p>
+<code>
 <pre>
 {{ "test" | page_url }} = /path/to/page
 </pre>
+</code>
 
 <h3><span class="function">asset_url</span> - converts a text value representing a CMS asset name to its corresponding url.</h3>
 
 <p class="example">If an asset has been created called "test", its associated path is output.</p>
+<code>
 <pre>
 {{ "test" | asset_url }} = /public/assets/5/original/test.jpg
 </pre>
+</code>
 
 <h3><span class="function">component_url</span> - converts a text value representing a component path to its corresponding url.</h3>
 
+<code>
 <pre>
 {{ "jquery.plugin-1.0/javascript/jquery.plugin-1.0.js" | component_url }} = /components/1/jquery.plugin-1.0/javascript/jquery.plugin-1.0.js
 </pre>
+</code>
+

data/app/views/cms/documentation/_cms_tags.html.erb

@@ -2,21 +2,10 @@
 
 <p class="example">The page named "test" will be inserted here along with any variables that have already been defined in the scope of the surrounding page.</p>
 
+<code>
 <pre>
 &lt;div&gt;
   {% include 'test' %}
 &lt;/div&gt;
 </pre>
-
-<h3><span class="function">asset_data</span> - Retrieves assets as a collection of asset drops.</h3>
-<ul>
-  <li><span class="param required">tag</span> - The tag string used to search for the assets.  Tags are associated with the asset when creating or editing them.</li>
-  <li><span class="param">random</span> - Return assets in a random order or most recent first. (true/false).  false by default.</li>
-  <li><span class="param">limit</span> - The maximum number of records to return.  Returns all by default.</li>
-  <li><span class="param">as</span> - Specify the name of the variable that the asset data will be saved in.  The name is 'assets' by default.</li>
-</ul>
-
-<pre>
-{% asset_data tag:'gallery' %}
-{% asset_data tag:'customer' random:true %}
-</pre>
+</code>

data/app/views/cms/documentation/_filters.html.erb

@@ -7,7 +7,9 @@
 <div class="cms_info">
   <h3>* Filters can be chained (see github link above)...</h3>
 
+  <code>
   <pre>
   {{ "test" | asset_url | image_tag }} = &lt;img src="/public/assets/5/original/test.jpg" /&gt;
   </pre>
+  </code>
 </div>

data/app/views/cms/documentation/_notes.html.erb

@@ -12,11 +12,14 @@ Variable parameter: <code>{% tag name:var_value %}</code>
 <p>Variables assigned to in templates can be used in the layouts template as well.</p>
 
 <p>In the child template:</p>
+<code>
 <pre>
   {% assign title = 'Page Title' %}
 </pre>
+</code>
 
 <p>In the layout template:</p>
+<code>
 <pre>
   &lt;html&gt;
     &lt;head&gt;
@@ -27,3 +30,4 @@ Variable parameter: <code>{% tag name:var_value %}</code>
     &lt;/body&gt;
   &lt;/html&gt;
 </pre>
+</code>

data/app/views/cms/documentation/_preamble.html.erb

@@ -1,3 +1,5 @@
 <h1>CMS Liquid Documentation</h1>
 
 <p>A good start for designers which also describes the default filters and tags available can be viewed here... <%= link_to nil, "http://wiki.github.com/tobi/liquid/liquid-for-designers" %></p>
+
+<p>The following are customisations to the liquid template system for use in the dealerships1st application.</p>

data/app/views/cms/documentation/_special_vars.html.erb

@@ -2,30 +2,38 @@
 
 <h3><span class="function">site_url</span> - The base url for the website including protocol and port based on the current request.</h3>
 
+<code>
 <pre>
 {{ site_url }} = http://testsite.com
 </pre>
+</code>
 
 <h3><span class="function">content_for_layout</span> - Inserts the contents of a page that defines it as its layout page.</h3>
 
-<p>If there's a page called "layout" that contains the following:</p>
+If there's a page called "layout" that contains the following:
+<code>
 <pre>
 &lt;html&gt;
   {{ content_for_layout }}
 &lt;/html&gt;
 </pre>
+</code>
 
-<p>And a page called "content" that specifies "layout" as its layout page (done via the CMS UI):</p>
+And a page called "content" that specifies "layout" as its layout page (done via the CMS UI):
+<code>
 <pre>
 &lt;div&gt;Content&lt;/div&gt;
 </pre>
+</code>
 
-<p>This results in:</p>
+This results in:
+<code>
 <pre>
 &lt;html&gt;
   &lt;div&gt;Content&lt;/div&gt;
 &lt;/html&gt;
 </pre>
+</code>
 
 <p>{{ content_for_layout }} can be nested in any number of pages to allow for layouts within layouts.</p>
 
@@ -33,6 +41,7 @@
 
 <p class="example">For a page request of /path/page?test=1</p>
 
+<code>
 <pre>
 {{ params.test }} = 1
 {{ params.url }} = pathpage
@@ -40,3 +49,5 @@
 {{ params.url[1] }} = page
 {{ params.url[2] }} = ''
 </pre>
+</code>
+

data/app/views/cms/documentation/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :cms_styles do %>
+<%= content_for :cms_styles do %>
   <%= stylesheet_link_tag '/cms/stylesheets/documentation' %>
 <% end %>
 

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

@@ -1,12 +1,14 @@
-<% simple_form_for @page do |f| %>
-  <%= f.input :name %>
-  <%= f.input :slug, :required => false %>
-  <%= f.input :content, :input_html => {:rows => 30, :spellcheck => false} %>
-  <%= f.input :layout_page_id, :collection => layouts_for_page(@page).collect{|pg| [pg.to_s, pg.id]}, :include_blank => '-- layout file --', :required => false unless layouts_for_page(@page).empty? %>
-  <%= f.input :published, :required => false %>
-  <%= f.input :root, :required => false %>
+<div class="formContainer form">
+  <%= simple_form_for @page do |f| %>
+    <%= f.input :name %>
+    <%= f.input :slug, :required => false %>
+    <%= f.input :content, :input_html => {:rows => 30, :spellcheck => false} %>
+    <%= f.input :layout_page_id, :collection => layouts_for_page(@page).collect{|pg| [pg.to_s, pg.id]}, :include_blank => '-- layout file --', :required => false unless layouts_for_page(@page).empty? %>
+    <%= f.input :published, :required => false %>
+    <%= f.input :root, :required => false %>
 
-  <%= f.commit_button_or_cancel %>
-<% end %>
+    <%= f.commit_button_or_cancel %>
+  <% end %>
+</div>
 
-<%= codemirror_edit @page.content_type, 'form.simple_form.cms_page', 'cms_page_content', !@page.new_record?, true %>
+<%= codemirror_edit @page.content_type, 'form.simple_form.cms_page', 'cms_page_content' %>

data/app/views/cms/pages/_list.html.erb

@@ -1,13 +1,13 @@
 <div id="pages">
-  <p><%= cms_icon 'page_add.png' %> <%= link_to t('pages.actions.index.new'), new_cms_page_path %></p>
-
-  <% if @cms_pages.empty? %>
+  <% if @pages.empty? %>
     <p><%= t 'pages.actions.index.none' %></p>
   <% else %>
-    <p><%= cms_icon 'page_find.png' %> <%= link_to t('pages.actions.index.search'), search_cms_pages_path %></p>
-
     <ul class="tree">
-      <%= render :partial => 'cms/pages/page', :collection => @cms_pages %>
+      <%= render :partial => 'cms/pages/page', :collection => @pages %>
     </ul>
   <% end %>
+
+  <p>
+    <%= cms_icon 'page_add.png' %> <%= link_to t('pages.actions.index.new_link'), new_cms_page_path %>
+  </p>
 </div>

data/app/views/cms/pages/_page.html.erb

@@ -1,11 +1,12 @@
-<% content_tag_for :li, page do %>
+<%= content_tag_for :li, page do %>
   <%= page_icon page %>
   <% if page.published? %>
     <%= cms_icon 'accept.png' %>
   <% else %>
-    <%= link_to cms_icon('delete.png', :title => 'Delete'), cms_page_path(page), :method => :delete, :confirm => "Are you sure you want to delete the \"#{page}\" page?" %>
+    <%= delete_page_link page %>
   <% end %>
   <%= link_to truncate(page.to_s, :length => 24), edit_cms_page_path(page), :title => "Edit '#{page}'" %>
+  <%= indicator dom_id(page, 'progress') %>
 
   <%= cms_icon 'house.png', :title => 'Root/Home Page' if page.root? %>
   <%= link_to cms_icon('magnifier.png', :title => 'View'), page.url, :class => 'external' if page.published? %>

data/app/views/cms/shared/_index.html.erb

@@ -1,3 +1 @@
-<div id="intro" class="panel shadow curved">
-  <p>Add a new page or upload a new asset.</p>
-</div>
+<p>Add a new page or upload a new asset.</p>

data/app/views/cms/shared/_sidebar.html.erb

@@ -1,36 +1,11 @@
-<div id="sidebar_container">
-  <ul id="cms_menus" class="tabs clearfix">
-    <li><%= link_to t('pages.actions.index.title'), '#cms_pages' %></li>
-    <li><%= link_to t('assets.actions.index.title'), '#cms_assets' %></li>
-    <li><%= link_to t('components.actions.index.title'), '#cms_components' %></li>
-  </ul>
+<h2><%= t 'pages.actions.index.title' %></h2>
+<%= render 'cms/pages/list' %>
 
-  <div id="tab_container">
-    <div id="cms_pages">
-      <h2><%= t 'pages.actions.index.title' %></h2>
-      <%= render 'cms/pages/list' %>
-    </div>
+<h2><%= t 'assets.actions.index.title' %></h2>
+<%= render 'cms/assets/list' %>
 
-    <div id="cms_assets">
-      <h2><%= t 'assets.actions.index.title' %></h2>
-      <%= render 'cms/assets/list' %>
-    </div>
+<h2><%= t 'components.actions.index.title' %></h2>
+<%= render 'cms/components/list' %>
 
-    <div id="cms_components">
-      <h2><%= t 'components.actions.index.title' %></h2>
-      <%= render 'cms/components/list' %>
-    </div>
-  </div>
-
-  <% javascript_tag do %>
-    new Control.Tabs('cms_menus', {
-      defaultTab: jar.get('active_tab') || 'first',
-      afterChange: function(new_container) {
-        // save the active tab
-        jar.put('active_tab', new_container.getAttribute('id'));
-      }
-    });
-  <% end %>
-
-  <p class="documentation"><%= cms_icon 'page.png' %> <%= link_to 'Documentation', cms_documentation_path %></p>
-</div>
+<hr style="border:1px solid #BBB" />
+<p style="text-align:right"><%= cms_icon 'page.png' %> <%= link_to 'Documentation', cms_documentation_index_path %></p>