bhm-admin 0.3.1 → 0.3.2

data/app/views/admin/shared/_edit_base.html.haml

@@ -1,4 +1,4 @@
-%h2.title== Editing #{current_resource_name}
+%h2.title Editing #{current_resource_name}
 
 = humanized_errors_on resource
 

data/app/views/admin/shared/_header.html.haml

@@ -1,5 +1,5 @@
 #header-logo
-  %h1== #{BHM::Admin.site_name}
+  %h1= BHM::Admin.site_name
 
 #header-menu
   %ul

data/app/views/admin/shared/_new_base.html.haml

@@ -1,4 +1,4 @@
-%h2.title== Add a new #{current_resource_name}
+%h2.title Add a new #{current_resource_name}
 
 = humanized_errors_on resource
 

data/app/views/layouts/admin.html.haml

@@ -1,29 +1,29 @@
 !!! 5
 %html{:lang => "en", :dir => "ltr"}
   %head
-    %title== #{BHM::Admin.site_name} - Admin Area
-    
+    %title #{BHM::Admin.site_name} - Admin Area
+
     / Stylesheets
     = include_stylesheets(:admin, :media => 'screen, projection')
-    
+
     / Javascripts
     /[if IE]
       = javascript_include_tag "http://html5shiv.googlecode.com/svn/trunk/html5.js"
     = include_javascripts(:admin)
     = csrf_meta_tag
     = yield :extra_head
-    
+
   %body
     #container
       %header= render :partial => 'admin/shared/header'
       = flash_messages :alert, :notice
-      
+
       %section#content-container
         %section#content= yield
         %section#sidebar
           - sidebar_content = content_for(:sidebar)
           = sidebar_content.present? ? sidebar_content : render(:partial => 'admin/shared/sidebar')
-    
+
       %footer
         = render :partial => 'admin/shared/footer'
         = yield :page_bottom

data/bhm-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bhm-admin}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-12-14}
+  s.date = %q{2010-12-18}
   s.description = %q{Provides a reasonably dynamic and simple to use admin area for Rails 3 application. Built on a bunch of open source libraries.}
   s.email = %q{sutto@sutto.net}
   s.extra_rdoc_files = [

data/lib/bhm/admin.rb

@@ -3,7 +3,7 @@ require 'active_support'
 module BHM
   module Admin
     
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".freeze
     
     # Helpers for use in the admin area.
     autoload :SidebarHelper,         'bhm/admin/sidebar_helper'

data/lib/generators/bhm_admin/resource/resource_generator.rb

@@ -1,6 +1,7 @@
 module BhmAdmin
   module Generators
     class ResourceGenerator < Rails::Generators::NamedBase
+      include Rails::Generators::ResourceHelpers
       
       def self.source_root
         @_bar_source_root ||= File.expand_path("templates", File.dirname(__FILE__))
@@ -9,11 +10,12 @@ module BhmAdmin
       check_class_collision :suffix => "Controller", :prefix => "Admin::"
       
       def create_controller_files
-        template 'controller.rb', File.join('app/controllers/admin', class_path, "#{file_name}_controller.rb")
+        actual_class_path = controller_class_path + ["#{controller_file_path}_controller.rb"]
+        template 'controller.rb', File.join('app/controllers/admin', *actual_class_path)
       end
       
       def create_template_files
-        base_path = File.join("app/views/admin", class_path, file_name)
+        base_path = File.join("app/views/admin", *(controller_class_path + [controller_file_path]))
         empty_directory base_path
         %w(new edit index show _form).each do |view|
           sub_path = "#{view}.html.haml"

data/lib/generators/bhm_admin/resource/templates/controller.rb

@@ -1,2 +1,2 @@
-class Admin::<%= class_name %>Controller < Admin::BaseController
+class Admin::<%= controller_class_name %>Controller < Admin::BaseController
 end

data/lib/generators/bhm_admin/resource/templates/index.html.haml

@@ -1,4 +1,4 @@
-%h2.title== Viewing all #{current_resource_name.pluralize}
+%h2.title Viewing all #{current_resource_name.pluralize}
 
 - column_names = default_collection_columns
 
@@ -17,5 +17,5 @@
           %td=vwd r.try(column)
         %td.actions= individual_resource_links r
     = empty_row_for_collection column_names.size
-        
+
 = will_paginate collection

data/lib/generators/bhm_admin/resource/templates/show.html.haml

@@ -1,4 +1,4 @@
-%h2.title== Viewing #{current_resource_name}
+%h2.title Viewing #{current_resource_name}
 
 = show_for resource do |r|
   - (resource_class.column_names - [:created_at, :updated_at]).each do |column|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bhm-admin
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +08:00
+date: 2010-12-18 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency