sferik-merb-admin 0.2.1 → 0.2.2

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.2.1", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.2.2", :require_as => "merb-admin"
 
 Add the following route to `config/router.rb`:
 

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://twitter.com/sferik"
 SUMMARY = "MerbAdmin is a merb slice that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.2.1"
+GEM_VERSION = "0.2.2"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/views/forms/edit.html.erb

@@ -10,7 +10,7 @@
               <h2><%= @model_name %> info</h2>
               <% @properties.each do |property| %>
                 <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property.name) %>
-<%= partial property.primitive.to_s.snake_case, :property => property -%>
+<%= partial(property.primitive.to_s.snake_case, :property => property) -%>
               <% end %>
             </fieldset>
             <div class="submit-row" >

data/app/views/forms/new.html.erb

@@ -5,7 +5,7 @@
               <h2><%= @model_name %> info</h2>
               <% @properties.each do |property| %>
                 <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property.name) %>
-<%= partial property.primitive.to_s.snake_case, :property => property -%>
+<%= partial(property.primitive.to_s.snake_case, :property => property) -%>
               <% end %>
             </fieldset>
             <div class="submit-row" >

data/app/views/layout/dashboard.html.erb

@@ -24,12 +24,12 @@
           <!-- Welcome, <strong></strong>. <a href="">Log out</a> -->
         </div>
       </div>
-<%= partial 'layout/message' -%>
+<%= partial('layout/message') -%>
       <div id="content" class="colMS">
         <h1>
           <%= page_name %>
         </h1>
-<%= catch_content :for_layout -%>
+<%= catch_content(:for_layout) -%>
       </div>
       <div id="footer"></div>
     </div>

data/app/views/layout/form.html.erb

@@ -38,12 +38,12 @@
         <%= link_to(@model_name.pluralize, url(:admin_list, :model_name => @model_name.snake_case)) %> &rsaquo;
         <%= page_name %>
       </div>
-<%= partial 'layout/message' -%>
+<%= partial('layout/message', :message => message) unless message.blank? -%>
       <div id="content" class="colM">
         <h1>
           <%= page_name %>
         </h1>
-<%= catch_content :for_layout -%>
+<%= catch_content(:for_layout) -%>
       </div>
       <div id="footer"></div>
     </div>

data/app/views/layout/list.html.erb

@@ -32,12 +32,12 @@
         <%= link_to("Home", url(:admin_dashboard)) %> &rsaquo;
         <%=h @model_name.pluralize %>
       </div>
-<%= partial 'layout/message' -%>
+<%= partial('layout/message') -%>
       <div id="content" class="flex">
         <h1>
           <%= page_name %>
         </h1>
-<%= catch_content :for_layout -%>
+<%= catch_content(:for_layout) -%>
       </div>
       <div id="footer"></div>
     </div>

data/lib/merb-admin.rb

@@ -22,7 +22,7 @@ if defined?(Merb::Plugins)
     
     # Slice metadata
     self.description = "MerbAdmin is a merb slice that uses your DataMapper models to provide an easy-to-use, Django-style interface for content managers."
-    self.version = "0.2.1"
+    self.version = "0.2.2"
     self.author = "Erik Michaels-Ober"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Erik Michaels-Ober