liquid_cms 0.2.0.6 → 0.2.0.7

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

@@ -5,11 +5,9 @@
 
 <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>
-</code>

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

@@ -3,76 +3,60 @@
   <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>
@@ -80,14 +64,12 @@
   <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>
@@ -95,14 +77,12 @@
 </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>
@@ -112,12 +92,10 @@
   <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>
@@ -126,12 +104,10 @@
 </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>
@@ -140,36 +116,27 @@
   <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,10 +2,8 @@
 
 <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>
-</code>

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

@@ -7,9 +7,7 @@
 <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,14 +12,11 @@ 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;
@@ -30,4 +27,3 @@ Variable parameter: <code>{% tag name:var_value %}</code>
     &lt;/body&gt;
   &lt;/html&gt;
 </pre>
-</code>

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

@@ -2,38 +2,30 @@
 
 <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>
 
-If there's a page called "layout" that contains the following:
-<code>
+<p>If there's a page called "layout" that contains the following:</p>
 <pre>
 &lt;html&gt;
   {{ content_for_layout }}
 &lt;/html&gt;
 </pre>
-</code>
 
-And a page called "content" that specifies "layout" as its layout page (done via the CMS UI):
-<code>
+<p>And a page called "content" that specifies "layout" as its layout page (done via the CMS UI):</p>
 <pre>
 &lt;div&gt;Content&lt;/div&gt;
 </pre>
-</code>
 
-This results in:
-<code>
+<p>This results in:</p>
 <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>
 
@@ -41,7 +33,6 @@ This results in:
 
 <p class="example">For a page request of /path/page?test=1</p>
 
-<code>
 <pre>
 {{ params.test }} = 1
 {{ params.url }} = pathpage
@@ -49,5 +40,3 @@ This results in:
 {{ params.url[1] }} = page
 {{ params.url[2] }} = ''
 </pre>
-</code>
-

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

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

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

@@ -9,18 +9,19 @@
   <%= javascript_include_tag '/cms/codemirror/js/codemirror' %>
   <%= stylesheet_link_tag '/cms/stylesheets/simple_form' %>
   <%= stylesheet_link_tag '/cms/stylesheets/clearfix', '/cms/stylesheets/humanmsg', '/cms/stylesheets/styles' %>
+  <%= stylesheet_link_tag '/cms/stylesheets/themes/dark' %>
   <%= yield :cms_styles %>
   <!--[if lte IE 8]>
   <%= stylesheet_link_tag '/cms/stylesheets/ie' %>
   <![endif]-->
 </head>
-<body id="cms">
+<body id="cms" class="cms_<%= params[:controller].camelize.demodulize.downcase %>">
   <div id="header">
     <h1><%= link_to 'Liquid CMS', cms_root_path %></h1>
   </div>
 
-  <div class="clearfix">
-    <div id="sidebar">
+  <div id="outer-container" class="clearfix">
+    <div id="sidebar" class="shadow curved">
       <%= render 'cms/shared/sidebar' %>
     </div> 
 

data/generators/liquid_cms/templates/public/cms/stylesheets/documentation.css

@@ -1,12 +1,18 @@
-#content {
-  border-left: 1px solid #DDD;
-  margin-left: 23em;
-  margin-right: 1em;
-  padding-left: 1em;
-}
 h4 {
   font-size: 10pt;
 }
+.cms_documentation #content h2 {
+  margin-top: 1em;
+}
+.cms_documentation #content a {
+  text-decoration: none;
+}
+.cms_documentation #content a:hover {
+  text-decoration: underline;
+}
+#content pre {
+  margin: 0;
+}
 .subsection {
   margin-left: 1em;
 }
@@ -27,5 +33,5 @@ span.function {
   background-color: #F5F5F5;
   border: 1px solid #333;
   padding: 0 0.5em;
-  margin-bottom: 1em;
+  margin: 1em 0;
 }

data/generators/liquid_cms/templates/public/cms/stylesheets/simple_form.css

@@ -3,7 +3,7 @@ form.simple_form {
   background-color: #F5F5F5;
   margin-bottom: 1em;
 }
-form.simple_form, #sidebar {
+form.simple_form, .shadow {
   border: 1px solid #BBB;
   -moz-box-shadow: 0.3em 0.3em 9px 1px rgba(0, 0, 0, 0.1);
   -webkit-box-shadow: 0.3em 0.3em 9px rgba(0, 0, 0, 0.1);

data/generators/liquid_cms/templates/public/cms/stylesheets/styles.css

@@ -12,10 +12,15 @@ a img {
   border: none;
 }
 
+.curved {
+  -moz-border-radius: 0.5em;
+  -webkit-border-radius: 0.5em;
+  border-radius: 0.5em;
+}
+
 #header {
   position: relative;
   padding: 2em 0;
-  margin: 0 0 1em 0;
 }
 #header h1 {
   font-size: 18pt;
@@ -44,15 +49,36 @@ a img {
   font-weight: bold;
 }
 
+#outer-container {
+  height: 100%;
+  padding-top: 1em;
+}
+
 #content {
   margin-left: 23em;
   margin-right: 1em;
+  padding-bottom: 0.5em;
+}
+#content h1 {
+  padding-top: 0.5em;
+  margin-top: 0;
 }
 #content h2 {
   border-bottom: 1px solid #AAA;
   margin-top: 0;
   padding-bottom: 0.3em;
 }
+#content .message {
+  padding: 0.5em;
+  text-align: center;
+  background: none repeat scroll 0 0 #CCCCCC;
+  color: #333333;
+  font-weight: bold;
+  line-height: 5em;
+  padding: 0.5em;
+  text-align: center;
+  text-shadow: 1px 1px 4px #FFFFFF;
+}
 
 #sidebar {
   background-color: #CFCFCF;
@@ -142,6 +168,9 @@ h2 p.message {
   float: right;
 }
 
+.CodeMirror-wrapping {
+  display: inline-block;
+}
 .CodeMirror-wrapping iframe {
   background-color: white;
   border: 1px solid #BBBBBB !important;

data/generators/liquid_cms/templates/public/cms/stylesheets/themes/dark.css

@@ -0,0 +1,23 @@
+body {
+  background: url("/cms/images/trentacinque.gif") repeat scroll 0 0 transparent;
+}
+#header, #sidebar h2 {
+  background: #111;
+  background: -moz-linear-gradient(270deg, #555555 0%, #222 40%, #000 100%) repeat scroll 0 0 transparent;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#555), color-stop(0.40,#222), color-stop(1.0,#000));
+}
+#content h2 {
+  color: #AAA;
+}
+.cms_documentation #content {
+  color: #EEE;
+}
+.cms_documentation #content a {
+  color: #FFE900;
+}
+.cms_documentation span.function {
+  color: #49FF3F;
+}
+.cms_documentation .cms_info {
+  color: #333;
+}

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.2.0.6"
+  VERSION = "0.2.0.7"
 end

data/liquid_cms.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rails', '~> 2.3.5'
   s.add_dependency 'paperclip', '~> 2.3.1'
   s.add_dependency 'vestal_versions', '~> 1.0.1'
-  s.add_dependency 'simple_form', '~> 1.0.4'
+  s.add_dependency 'simple_form', '1.0.4'
   s.add_dependency 'rubyzip', '~> 0.9.1'
   s.add_dependency 'will_paginate', '~> 2.3.12'
   s.add_dependency 'RedCloth'

data/test/rails_app/public/cms/stylesheets/documentation.css

@@ -1,12 +1,18 @@
-#content {
-  border-left: 1px solid #DDD;
-  width: 80%;
-  padding-left: 2em;
-  margin-left: 1.5em;
-}
 h4 {
   font-size: 10pt;
 }
+.cms_documentation #content h2 {
+  margin-top: 1em;
+}
+.cms_documentation #content a {
+  text-decoration: none;
+}
+.cms_documentation #content a:hover {
+  text-decoration: underline;
+}
+#content pre {
+  margin: 0;
+}
 .subsection {
   margin-left: 1em;
 }
@@ -27,5 +33,5 @@ span.function {
   background-color: #F5F5F5;
   border: 1px solid #333;
   padding: 0 0.5em;
-  margin-bottom: 1em;
+  margin: 1em 0;
 }

data/test/rails_app/public/cms/stylesheets/simple_form.css

@@ -3,7 +3,7 @@ form.simple_form {
   background-color: #F5F5F5;
   margin-bottom: 1em;
 }
-form.simple_form, #sidebar {
+form.simple_form, .shadow {
   border: 1px solid #BBB;
   -moz-box-shadow: 0.3em 0.3em 9px 1px rgba(0, 0, 0, 0.1);
   -webkit-box-shadow: 0.3em 0.3em 9px rgba(0, 0, 0, 0.1);

data/test/rails_app/public/cms/stylesheets/styles.css

@@ -12,10 +12,15 @@ a img {
   border: none;
 }
 
+.curved {
+  -moz-border-radius: 0.5em;
+  -webkit-border-radius: 0.5em;
+  border-radius: 0.5em;
+}
+
 #header {
   position: relative;
   padding: 2em 0;
-  margin: 0 0 1em 0;
 }
 #header h1 {
   font-size: 18pt;
@@ -44,23 +49,43 @@ a img {
   font-weight: bold;
 }
 
+#outer-container {
+  height: 100%;
+  padding-top: 1em;
+}
+
 #content {
-  float: left;
-  margin-left: 2em;
-  width: 70%;
+  margin-left: 23em;
+  margin-right: 1em;
+  padding-bottom: 0.5em;
+}
+#content h1 {
+  padding-top: 0.5em;
+  margin-top: 0;
 }
 #content h2 {
   border-bottom: 1px solid #AAA;
   margin-top: 0;
   padding-bottom: 0.3em;
 }
+#content .message {
+  padding: 0.5em;
+  text-align: center;
+  background: none repeat scroll 0 0 #CCCCCC;
+  color: #333333;
+  font-weight: bold;
+  line-height: 5em;
+  padding: 0.5em;
+  text-align: center;
+  text-shadow: 1px 1px 4px #FFFFFF;
+}
 
 #sidebar {
   background-color: #CFCFCF;
   float: left;
   padding: 0 1em;
-  margin-left: 2em;
-  width: 250px;
+  margin-left: 1em;
+  width: 18em;
 }
 #sidebar h2 {
   font-size: 12pt;
@@ -76,12 +101,6 @@ a img {
   margin: 0;
   padding: 0;
 }
-#sidebar ul.tree, #sidebar #assets ul {
-  margin-bottom: 1em;
-}
-#sidebar ul.tree ul {
-  margin-left: 15px;
-}
 #sidebar #assets li {
   border: 1px solid #AAA;
   padding: 0.3em 0.4em;
@@ -135,6 +154,13 @@ h2 p.message {
 #cms ul.tree li { margin: 0; padding: 0 12px; line-height: 20px; background: url(/cms/images/tree/node.png) no-repeat; color: #369; font-weight: bold; } 
 #cms ul.tree li:last-child { background: url(/cms/images/tree/lastnode.png) no-repeat; }
 
+#cms ul.tree, #sidebar #assets ul {
+  margin-bottom: 1em;
+}
+#cms ul.tree ul {
+  margin-left: 15px;
+}
+
 .left {
   float: left;
 }
@@ -145,5 +171,4 @@ h2 p.message {
 .CodeMirror-wrapping iframe {
   background-color: white;
   border: 1px solid #BBBBBB !important;
-  width: 89% !important;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: liquid_cms
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - 6
-  version: 0.2.0.6
+  - 7
+  version: 0.2.0.7
 platform: ruby
 authors: 
 - Andrew Kaspick
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 -06:00
+date: 2011-02-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 31
         segments: 
@@ -1297,6 +1297,7 @@ files:
 - generators/liquid_cms/templates/public/cms/images/tree/lastnode.png
 - generators/liquid_cms/templates/public/cms/images/tree/node.png
 - generators/liquid_cms/templates/public/cms/images/tree/vline.png
+- generators/liquid_cms/templates/public/cms/images/trentacinque.gif
 - generators/liquid_cms/templates/public/cms/javascripts/cms.js
 - generators/liquid_cms/templates/public/cms/javascripts/cookiejar.js
 - generators/liquid_cms/templates/public/cms/javascripts/humanmsg.js
@@ -1308,6 +1309,7 @@ files:
 - generators/liquid_cms/templates/public/cms/stylesheets/liquidcolors.css
 - generators/liquid_cms/templates/public/cms/stylesheets/simple_form.css
 - generators/liquid_cms/templates/public/cms/stylesheets/styles.css
+- generators/liquid_cms/templates/public/cms/stylesheets/themes/dark.css
 - generators/liquid_cms/templates/setup_controller.rb
 - generators/liquid_cms/templates/vendor/plugins/cms_plugins/liquid/CHANGELOG
 - generators/liquid_cms/templates/vendor/plugins/cms_plugins/liquid/History.txt