liquid_cms 0.2.0.8 → 0.2.0.9

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

@@ -2,19 +2,17 @@
 
 <p>No liquid support currently for editing components.</p>
 
-<% 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>
+<% 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 :contents, nil, :class => 'text required' %> <%= text_area_tag :contents, @component.read, :rows => 40, :class => 'text required' %>
+  </div>
 
-  <fieldset class="buttons">
-    <ol>
-      <li><%= submit_tag 'Update' %></li>
-    </ol>
-  </fieldset>
+  <div class="buttons">
+    <%= submit_tag 'Update', :class => 'update' %> or <%= link_to 'Cancel', :back, :class => 'cancel' %>
+  </div>
 <% end %>
 
 <%= codemirror_edit Cms::Editable::content_type(@component.path), 'form.simple_form', 'contents' %>

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

@@ -9,10 +9,40 @@ form.simple_form, .shadow {
   -webkit-box-shadow: 0.3em 0.3em 9px rgba(0, 0, 0, 0.1);
   box-shadow: 0.3em 0.3em 9px rgba(0, 0, 0, 0.1);
 }
+
+form.simple_form .buttons input,
 form.simple_form a.cancel {
-  color: red;
+  font-family: Arial;
+  font-weight: bold;
   line-height: 2em;
+  padding: 0.5em 1em;
 }
+form.simple_form .buttons input {
+  color: #444;
+  margin-right: 0.3em;
+  text-shadow: 0 1px #FFF;
+}
+form.simple_form .buttons input:hover {
+  cursor: pointer;
+}
+form.simple_form a.cancel {
+  -moz-border-radius: 0.5em;
+  -webkit-border-radius: 0.5em;
+  border-radius: 0.5em;
+  background: #D00;
+  background: -moz-linear-gradient(90deg, #BB0000 0%, #EE4444 100%) repeat scroll 0 0 transparent;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#E44), color-stop(1.0,#B00));
+  color: white;
+  margin-left: 0.3em;
+  text-decoration: none;
+  text-shadow: 0 1px #555;
+}
+form.simple_form a.cancel:hover {
+  background: #E00;
+  background: -moz-linear-gradient(90deg, #C11 0%, #F55 100%) repeat scroll 0 0 transparent;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#F55), color-stop(1.0,#C11));
+}
+
 form.simple_form div.string, form.simple_form div.text, form.simple_form div.boolean, div.select {
   margin-bottom: 1.3em;
 }
@@ -20,25 +50,30 @@ form.simple_form label {
   color: #333;
   float: left;
   font-size: 10pt;
+  font-family: Verdana;
   font-weight: bold;
-  width: 10%;
+  line-height: 1.8em;
+  width: 9%;
 }
 form.simple_form input.string {
+  display: block;
+  padding: 0.3em;
+  margin-left: 9%;
   width: 89%;
 }
 
-form.simple_form .buttons { margin-left: 10%; margin-top: 1em; }
-form.simple_form span.hint { color: #666; display: block; font-size: 8pt; font-style: italic; margin: 0.5em 0 0 10%;}
+form.simple_form .buttons { margin-left: 9%; margin-top: 1.5em; }
+form.simple_form span.hint { color: #666; display: block; font-size: 8pt; font-style: italic; margin: 0.5em 0 0 9%;}
 form.simple_form span.hint em { color: #333; font-weight: bold; }
 
 form.simple_form div.fieldWithErrors { background-color: #FBE3E4; padding: 0.5em 0; }
 form.simple_form span.error {
   background: white;
-  border:1px solid red;
-  color:red;
-  display:block;
-  font-weight:bold;
-  margin-left:10%;
-  margin-top:0.5em;
-  padding:0.5em;
+  border: 1px solid red;
+  color: red;
+  display: block;
+  font-weight: bold;
+  margin-left: 9%;
+  margin-top: 0.5em;
+  padding: 0.5em;
 }

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

@@ -79,6 +79,9 @@ a img {
   text-align: center;
   text-shadow: 1px 1px 4px #FFFFFF;
 }
+.cms_components #content p {
+  font-style: italic;
+}
 
 #sidebar {
   background-color: #CFCFCF;
@@ -178,3 +181,10 @@ h2 p.message {
   background-color: white;
   border: 1px solid #BBBBBB !important;
 }
+
+.cms_pages #content h2 {
+  background: url("/cms/images/icons/page.png") no-repeat scroll right 50% transparent;
+}
+.cms_assets #content h2 {
+  background: url("/cms/images/icons/photo.png") no-repeat scroll right 50% transparent;
+}

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

@@ -15,9 +15,18 @@ body {
 .cms_documentation #content a {
   color: #FFE900;
 }
+.cms_components #content p {
+  color: white;
+}
 .cms_documentation span.function {
   color: #49FF3F;
 }
 .cms_documentation .cms_info {
   color: #333;
 }
+
+form.simple_form, .shadow {
+  -moz-box-shadow: 0.3em 0.3em 9px 1px rgba(0, 0, 0, 0.5);
+  -webkit-box-shadow: 0.3em 0.3em 9px rgba(0, 0, 0, 0.5);
+  box-shadow: 0.3em 0.3em 9px rgba(0, 0, 0, 0.5);
+}

data/lib/liquid_cms/configuration.rb

@@ -9,6 +9,8 @@ module Cms
   mattr_reader :context_class
   def self.context_class=(klass)
     @@context_class = klass
+    return if klass.nil?
+
     Dispatcher.to_prepare {
       eval(klass.to_s).extend Cms::ContextAssociation
 
@@ -19,6 +21,7 @@ module Cms
   @@context_class = nil
 
   def self.set_context(context, bind_to)
+    return if @@context_class.nil?
     bind_to.instance_variable_set :@cms_context, context
   end
 

data/lib/liquid_cms/context.rb

@@ -5,7 +5,7 @@ module Cms
     attr_reader :object
 
     def initialize(context = nil)
-      @object = context
+      @object = Cms.context_class ? context : nil
     end
 
     def pages

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.2.0.8"
+  VERSION = "0.2.0.9"
 end

data/liquid_cms.gemspec

@@ -9,7 +9,10 @@ Gem::Specification.new do |s|
   s.email       = ['andrew@redlinesoftware.com']
   s.homepage    = "http://rubygems.org/gems/liquid_cms"
   s.summary     = "A context aware Rails CMS engine using the Liquid template library."
-  s.description = "A context aware Rails CMS engine using the Liquid template library."
+  s.description = <<-TXT
+  A context aware Rails CMS engine using the Liquid template library.
+  Use the 0.3.x series for Rails 3 compatibility and the 0.2.x version for Rails 2 compatibility.
+  TXT
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "liquid_cms"

data/test/factories/company.rb

@@ -3,7 +3,7 @@ Factory.define :company do |c|
   c.domain_name 'acme.com'
   c.subdomain 'test'
   c.after_create do |c|
-    Factory(:home_page, :context => c)
+    Factory(:home_page, Cms.context_class ? {:context => c} : {})
   end
   c.after_create do |c|
     Factory(:user, :company => c)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: liquid_cms
 version: !ruby/object:Gem::Version 
-  hash: 79
   prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - 8
-  version: 0.2.0.8
+  - 9
+  version: 0.2.0.9
 platform: ruby
 authors: 
 - Andrew Kaspick
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -06:00
+date: 2011-02-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 3
@@ -44,7 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
         - 3
@@ -60,7 +57,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 0
@@ -76,7 +72,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
@@ -92,7 +87,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
         segments: 
         - 0
         - 9
@@ -108,7 +102,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 2
         - 3
@@ -124,7 +117,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -138,7 +130,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 1
         - 2
@@ -154,7 +145,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 2
         - 10
@@ -162,7 +152,7 @@ dependencies:
         version: 2.10.3
   type: :development
   version_requirements: *id009
-description: A context aware Rails CMS engine using the Liquid template library.
+description: "  A context aware Rails CMS engine using the Liquid template library.\n  Use the 0.3.x series for Rails 3 compatibility and the 0.2.x version for Rails 2 compatibility.\n"
 email: 
 - andrew@redlinesoftware.com
 executables: []
@@ -1496,7 +1486,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -1505,7 +1494,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3