RubyGems - liquid_cms - Versions diffs - 0.3.0.1 → 0.3.0.2 - Mend

liquid_cms 0.3.0.1 → 0.3.0.2

Files changed (49) hide show

data/CHANGELOG.rdoc CHANGED Viewed

@@ -1,3 +1,7 @@
-== 0.5.0
+== 0.3.0.2
+Updated codemirror to 0.9
+== 0.3.0
 * First release

data/Gemfile.lock CHANGED Viewed

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    liquid_cms (0.3.0)
+    liquid_cms (0.3.0.1)
       bundler (>= 1.0.0)
       formatize
       paperclip (~> 2.3.1)

data/README.rdoc CHANGED Viewed

@@ -6,6 +6,8 @@ If you're using rails 2, use the 0.2.x series of this gem.
 If you're using rails 3, use the 0.3.x series of this gem.
+See the {wiki page}[http://github.com/redlinesoftware/liquid_cms/wiki] for additional documentation on usage and customizations... currently a work in progress.
 = Installation
 Add the gem to your Gemfile:
@@ -52,10 +54,12 @@ Once the engine is configured, you can view the CMS at the <b>/cms</b> path in y
 = Customization
+All CMS templates and the layout can be overridden in the main application.  Simply create the partial or template at the same path as the engine and your applications template will take priority.
 In order to expose data in your application in the templates, liquid filters, drops, tags and blocks specific to your application can be added to the <b>app/liquid</b> folder.  Knowledge of liquid templates and the liquid library is required to do this.  Examples of custom filters, drops, tags and blocks can be found in the liquid_cms gem files or in additional documentation on this website or related forums.
 A set of filters, drops and tags are provided in addition to the defaults provided by liquid.  The documentation link accessible in the CMS provides additional details.
 = Contribution
-If you experience any issues with this CMS engine, please open a bug report.  Contributionis to improve this engine is extremely welcome.  A 1.0 release will be made when the engine has a bit more _polish_ on it.
+If you experience any issues with this CMS engine, please open a bug report.  Contributions to improve this engine are extremely welcome.  A 1.0 release will be made when the engine has a bit more _polish_ on it.

data/app/helpers/cms/common_helper.rb CHANGED Viewed

@@ -38,6 +38,7 @@ module Cms::CommonHelper
         path: "/cms/codemirror/js/",
         textWrapping: false,
         height: '600px',
+        width: '89%',
         saveFunction: function() {
           var form = $$('#{form}').first();
           $('#{content_id}').setValue(editor.getCode());

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

@@ -6,11 +6,12 @@
     <%= 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? %>
+  <%= indicator dom_id(page, 'progress') %>
   <% unless page.content_pages.empty? %>
     <ul>
       <%= render :partial => 'cms/pages/page', :collection => page.content_pages %>

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

@@ -13,10 +13,11 @@
   <!--[if lte IE 8]>
   <%= stylesheet_link_tag '/cms/stylesheets/ie' %>
   <![endif]-->
+  <%= csrf_meta_tag %>
 </head>
 <body id="cms">
   <div id="header">
-    <h1>Liquid CMS</h1>
+    <h1><%= link_to 'Liquid CMS', cms_root_path %></h1>
   </div>
   <div class="clearfix">

data/lib/generators/liquid_cms/templates/public/cms/codemirror/LICENSE CHANGED Viewed

@@ -1,4 +1,4 @@
- Copyright (c) 2007-2009 Marijn Haverbeke
+ Copyright (c) 2007-2010 Marijn Haverbeke
  This software is provided 'as-is', without any express or implied
  warranty. In no event will the authors be held liable for any
@@ -20,4 +20,4 @@
     distribution.
  Marijn Haverbeke
- marijnh at gmail
+ marijnh@gmail.com

data/lib/generators/liquid_cms/templates/public/cms/codemirror/css/csscolors.css CHANGED Viewed

@@ -11,7 +11,7 @@ html {
 }
 pre.code, .editbox {
-  color: #666666;
+  color: #666;
 }
 .editbox p {
@@ -19,33 +19,37 @@ pre.code, .editbox {
 }
 span.css-at {
-  color: #770088;
+  color: #708;
 }
 span.css-unit {
-  color: #228811;
+  color: #281;
 }
 span.css-value {
-  color: #770088;
+  color: #708;
 }
 span.css-identifier {
   color: black;
 }
+span.css-selector {
+  color: #11B;
+}
 span.css-important {
-  color: #0000FF;
+  color: #00F;
 }
 span.css-colorcode {
-  color: #004499;
+  color: #299;
 }
 span.css-comment {
-  color: #AA7700;
+  color: #A70;
 }
 span.css-string {
-  color: #AA2222;
+  color: #A22;
 }

data/lib/generators/liquid_cms/templates/public/cms/codemirror/css/docs.css CHANGED Viewed

@@ -1,50 +1,144 @@
 body {
-  margin: 0;
-  padding: 3em 6em;
-  color: black;
-  max-width: 50em;
+  font-family: Droid Sans, Arial, sans-serif;
+  line-height: 1.5;
+  max-width: 64.3em;
+  margin: 3em auto;
+  padding: 0 1em;
 }
 h1 {
-  font-size: 22pt;
-}
-.underline {
-  border-bottom: 3px solid #C44;
+  letter-spacing: -3px;
+  font-size: 3.23em;
+  font-weight: bold;
+  margin: 0;
 }
 h2 {
-  font-size: 14pt;
+  font-size: 1.23em;
+  font-weight: bold;
+  margin: .5em 0;
+  letter-spacing: -1px;
 }
 h3 {
-  font-size: 12pt;
+  font-size: 1em;
+  font-weight: bold;
+  margin: .4em 0;
 }
-p.rel {
-  padding-left: 2em;
-  text-indent: -2em;
+pre {
+  font-family: Droid Sans Mono, Courier New, monospaced;
+  background-color: #eee;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  padding: 1em;
 }
-div.border {
-  border: 1px solid black;
-  padding: 3px;
+pre.code {
+  margin: 0 1em;
 }
-code {
-  font-family: courier, monospace;
-  font-size: 90%;
-  color: #144;
+.grey {
+  font-size: 2em;
+  padding: .5em 1em;
+  line-height: 1.2em;
+  margin-top: .5em;
 }
-pre.code {
-  margin: 1.1em 12px;
-  border: 1px solid #CCCCCC;
-  color: black;
-  padding: .4em;
-  font-family: courier, monospace;
+a:link, a:visited, .quasilink {
+  color: #df0019;
+  cursor: pointer;
+  text-decoration: none;
+}
+a:hover {
+  color: #800004;
+}
+ul {
+  margin: 0;
+  padding-left: 1.2em;
+}
+a.download {
+  color: white;
+  background-color: #df0019;
+  width: 100%;
+  display: block;
+  text-align: center;
+  font-size: 1.23em;
+  font-weight: bold;
+  text-decoration: none;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  padding: .5em 0;
+  margin-bottom: 1em;
+}
+a.download:hover {
+  background-color: #bb0010;
+}
+.rel {
+  margin-bottom: 0;
+}
+.rel-note {
+  color: #777;
+  font-size: .9em;
+  margin-top: .1em;
+}
+.logo-braces {
+  color: #df0019;
+  position: relative;
+  top: -4px;
+}
+.blk {
+  float: left;
+}
+.left {
+  width: 37em;
+  padding-right: 6.53em;
+  padding-bottom: 1em;
+}
+.left1 {
+  width: 15.24em;
+  padding-right: 6.45em;
+}
+.left2 {
+  width: 15.24em;
+}
+.right {
+  width: 20.68em;
+}
+.leftbig {
+  width: 42.44em;
+  padding-right: 6.53em;
+}
+.rightsmall {
+  width: 15.24em;
 }
-.warn {
-  color: #C00;
+.clear:after {
+  visibility: hidden;
+  display: block;
+  font-size: 0;
+  content: " ";
+  clear: both;
+  height: 0;
 }
+.clear { display: inline-block; }
+/* start commented backslash hack \*/
+* html .clear { height: 1%; }
+.clear { display: block; }
+/* close commented backslash hack */

data/lib/generators/liquid_cms/templates/public/cms/codemirror/csstest.html CHANGED Viewed

@@ -49,7 +49,7 @@ code {
 <script type="text/javascript">
   var editor = CodeMirror.fromTextArea('code', {
-    height: "350px",
+    height: "dynamic",
     parserfile: "parsecss.js",
     stylesheet: "css/csscolors.css",
     path: "js/"

data/lib/generators/liquid_cms/templates/public/cms/codemirror/htmltest.html CHANGED Viewed

@@ -23,7 +23,7 @@ for <a href="index.html">CodeMirror</a>. The <a
 href="js/parsexml.js">javascript</a> file contains some comments with
 more information.</p>
-<div style="border: 1px solid black; padding: 0px;">
+<div class="border">
 <textarea id="code" cols="120" rows="30">
 &lt;html style="color: green"&gt;
   &lt;!-- this is a comment --&gt;