comfortable_mexican_sofa 1.0.5 → 1.0.6

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

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

@@ -16,7 +16,7 @@
           <%= active_link_to 'Layouts', cms_admin_layouts_path %>
           <%= active_link_to 'Pages', cms_admin_pages_path %>
           <%= active_link_to 'Snippets', cms_admin_snippets_path %>
-          <%= yield :left_column %>
+          <%= hook :navigation %>
         </div>
       </div>
       <div class='right_column'>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2010-10-26}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -98,6 +98,7 @@ Gem::Specification.new do |s|
      "lib/comfortable_mexican_sofa/form_builder.rb",
      "lib/comfortable_mexican_sofa/http_auth.rb",
      "lib/comfortable_mexican_sofa/rails_extensions.rb",
+     "lib/comfortable_mexican_sofa/view_hooks.rb",
      "lib/comfortable_mexican_sofa/view_methods.rb",
      "lib/generators/README",
      "lib/generators/cms_generator.rb",
@@ -135,6 +136,7 @@ Gem::Specification.new do |s|
      "test/fixtures/cms_uploads.yml",
      "test/fixtures/files/invalid_file.gif",
      "test/fixtures/files/valid_image.jpg",
+     "test/fixtures/views/_nav_hook.html.erb",
      "test/functional/cms_admin/layouts_controller_test.rb",
      "test/functional/cms_admin/pages_controller_test.rb",
      "test/functional/cms_admin/sites_controller_test.rb",
@@ -145,6 +147,7 @@ Gem::Specification.new do |s|
      "test/integration/render_cms_seed_test.rb",
      "test/integration/render_cms_test.rb",
      "test/integration/sites_test.rb",
+     "test/integration/view_hooks_test.rb",
      "test/test_helper.rb",
      "test/unit/cms_block_test.rb",
      "test/unit/cms_configuration_test.rb",
@@ -182,6 +185,7 @@ Gem::Specification.new do |s|
      "test/integration/render_cms_seed_test.rb",
      "test/integration/render_cms_test.rb",
      "test/integration/sites_test.rb",
+     "test/integration/view_hooks_test.rb",
      "test/test_helper.rb",
      "test/unit/cms_block_test.rb",
      "test/unit/cms_configuration_test.rb",

data/lib/comfortable_mexican_sofa.rb

@@ -7,6 +7,7 @@ end
   'comfortable_mexican_sofa/http_auth',
   'comfortable_mexican_sofa/rails_extensions',
   'comfortable_mexican_sofa/controller_methods',
+  'comfortable_mexican_sofa/view_hooks',
   'comfortable_mexican_sofa/view_methods',
   'comfortable_mexican_sofa/form_builder',
   'comfortable_mexican_sofa/acts_as_tree',

data/lib/comfortable_mexican_sofa/view_hooks.rb

@@ -0,0 +1,25 @@
+module ComfortableMexicanSofa::ViewHooks
+  
+  # Array of declared hooks
+  def self.hooks
+    @@hooks ||= { }
+  end
+  
+  # Renders hook content
+  def self.render(name, template)
+    template.render :partial => self.hooks[name.to_sym] if self.hooks[name.to_sym]
+  end
+  
+  # Will declare a partial that will be rendered for this hook
+  # Example:
+  # ComfortableMexicanSofa::ViewHooks.add(:navigation, 'shared/navigation')
+  def self.add(name, partial_path)
+    self.hooks[name.to_sym] = partial_path
+  end
+  
+  # Removing previously declared hook
+  def self.remove(name)
+    self.hooks.delete(name)
+  end
+  
+end

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -14,6 +14,11 @@ module ComfortableMexicanSofa::ViewMethods
   def datetime_field_tag(name, value = nil, options = {})
     text_field_tag(name, value, options.stringify_keys.update('type' => 'datetime'))
   end
+  
+  # Injects some content somewhere inside cms admin area
+  def hook(name)
+    ComfortableMexicanSofa::ViewHooks.render(name, self)
+  end
 end
 
 ActionView::Base.send :include, ComfortableMexicanSofa::ViewMethods

data/public/stylesheets/comfortable_mexican_sofa/structure.css

@@ -160,9 +160,12 @@ ul.list li .action_links {
   float: right;
   opacity: 0.1;
 }
-ul.list .action_links a {
+table.formatted td.action_links a {
+  opacity: 0.1;
+}
+ul.list .action_links a,
+table.formatted td.action_links a {
   margin-left: 3px;
-  float: left;
   background-color: #272A2D;
   color: #fff;
   padding: 3px 5px;
@@ -171,11 +174,15 @@ ul.list .action_links a {
   border-radius: 3px;
   -moz-border-radius: 3px;
 }
-ul.list li .label {
+ul.list li .label,
+table.formatted td .label {
   margin-left: 35px;
   font: 16px/18px Georgia, serif;
   color: #1C1F22;
 }
+table.formatted td .label {
+  margin-left: 0px;
+}
 ul.list li .label .sublabel {
   margin-left: 15px;
   font: 11px/14px Arial, sans-serif;
@@ -184,9 +191,23 @@ ul.list li .label .sublabel {
 ul.list li ul {
   margin-left: 30px;
 }
-ul.list li .item:hover {
+ul.list li .item:hover,
+table.formatted tr:hover td {
   background-color: #fff;
 }
-ul.list li .item:hover .action_links {
+ul.list li .item:hover .action_links,
+table.formatted tr:hover td.action_links a {
   opacity: 1;
+}
+table.formatted th,
+table.formatted td {
+  white-space: nowrap;
+  vertical-align: top;
+  padding: 5px;
+  border-bottom: 1px solid #fff;
+}
+table.formatted th.main,
+table.formatted td.main {
+  width: 100%;
+  white-space: normal;
 }

data/test/fixtures/views/_nav_hook.html.erb

@@ -0,0 +1 @@
+hook_content

data/test/integration/view_hooks_test.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ViewHooksTest < ActionDispatch::IntegrationTest
+  
+  def test_hooks_rendering
+    CmsAdmin::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook')
+    
+    http_auth :get, cms_admin_sites_path
+    assert_response :success
+    assert_match /hook_content/, response.body
+  end
+  
+  def test_hooks_rendering_with_no_hook
+    ComfortableMexicanSofa::ViewHooks.remove(:navigation)
+    
+    http_auth :get, cms_admin_sites_path
+    assert_response :success
+    assert_no_match /hook_content/, response.body
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,6 +158,7 @@ files:
 - lib/comfortable_mexican_sofa/form_builder.rb
 - lib/comfortable_mexican_sofa/http_auth.rb
 - lib/comfortable_mexican_sofa/rails_extensions.rb
+- lib/comfortable_mexican_sofa/view_hooks.rb
 - lib/comfortable_mexican_sofa/view_methods.rb
 - lib/generators/README
 - lib/generators/cms_generator.rb
@@ -195,6 +196,7 @@ files:
 - test/fixtures/cms_uploads.yml
 - test/fixtures/files/invalid_file.gif
 - test/fixtures/files/valid_image.jpg
+- test/fixtures/views/_nav_hook.html.erb
 - test/functional/cms_admin/layouts_controller_test.rb
 - test/functional/cms_admin/pages_controller_test.rb
 - test/functional/cms_admin/sites_controller_test.rb
@@ -205,6 +207,7 @@ files:
 - test/integration/render_cms_seed_test.rb
 - test/integration/render_cms_test.rb
 - test/integration/sites_test.rb
+- test/integration/view_hooks_test.rb
 - test/test_helper.rb
 - test/unit/cms_block_test.rb
 - test/unit/cms_configuration_test.rb
@@ -270,6 +273,7 @@ test_files:
 - test/integration/render_cms_seed_test.rb
 - test/integration/render_cms_test.rb
 - test/integration/sites_test.rb
+- test/integration/view_hooks_test.rb
 - test/test_helper.rb
 - test/unit/cms_block_test.rb
 - test/unit/cms_configuration_test.rb