sferik-merb-admin 0.2.3 → 0.2.4

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.3", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.2.4", :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.3"
+GEM_VERSION = "0.2.4"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

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

@@ -1,8 +1,6 @@
-              <div class="form-row page">
                 <div>
                   <%= text_field(property.name, :maxlength => property.length, :label => property.field.capitalize.gsub('_', ' ')) %>
                   <p class="help">
                     <%= !property.nullable? || property.serial? ? "Required." : "Optional." %>
                   </p>
                 </div>
-              </div>

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

@@ -1,9 +1,7 @@
 <% value = eval("@instance.#{property.field}") %>
-              <div class="form-row page">
                 <div>
                   <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : nil) %>
                   <p class="help">
                     <%= !property.nullable? ? "Required." : "Optional." %>
                   </p>
                 </div>
-              </div>

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

@@ -1,9 +1,7 @@
 <% value = eval("@instance.#{property.field}") %>
-              <div class="form-row page">
                 <div>
                   <%= text_field(property.name, :class => "vDateField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") ? nil) %>
                   <p class="help">
                     <%= !property.nullable? ? "Required." : "Optional." %>
                   </p>
                 </div>
-              </div>

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

@@ -1,8 +1,6 @@
-              <div class="form-row page">
                 <div>
                   <%= text_field(property.name, :maxlength => property.length, :label => property.field.capitalize.gsub('_', ' ')) %>
                   <p class="help">
                     <%= !property.nullable? || property.serial? ? "Required." : "Optional." %>
                   </p>
                 </div>
-              </div>

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

@@ -1,4 +1,3 @@
-              <div class="form-row page">
                 <div>
                   <% if property.type.respond_to?(:flag_map) #Enum or Flag type %>
                   <%= select(property.name, :collection => property.type.flag_map.map{|x| [x[1], x[1].to_s.capitalize.gsub('_', ' ')]}.sort{|a, b| a[1] <=> b[1]}, :label => property.field.capitalize.gsub('_', ' ')) %>
@@ -9,4 +8,3 @@
                     <%= !property.nullable? || property.serial? ? "Required." : "Optional." %>
                   </p>
                 </div>
-              </div>

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

@@ -1,4 +1,3 @@
-              <div class="form-row page">
                 <div>
                   <% case property.type.to_s %>
                   <% when "DataMapper::Types::Text" %>
@@ -13,4 +12,3 @@
                     </p>
                   <% end %>
                 </div>
-              </div>

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

@@ -1,9 +1,7 @@
 <% value = eval("@instance.#{property.field}") %>
-              <div class="form-row page">
                 <div>
                   <%= text_field(property.name, :class => "vTimeField", :label => property.field.capitalize.gsub('_', ' '), :value => value.respond_to?(:strftime) ? value.strftime("%H:%M:%S") : nil) %>
                   <p class="help">
                     <%= !property.nullable? ? "Required." : "Optional." %>
                   </p>
                 </div>
-              </div>

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

@@ -1,5 +1,3 @@
-              <div class="form-row page">
                 <div>
                   <%= check_box(property.name, :label => property.field.capitalize.gsub('_', ' ')) %>
                 </div>
-              </div>

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

@@ -7,10 +7,18 @@
         <%= form_for(@instance, :action => slice_url(:admin_update, :model_name => @model_name.snake_case, :id => @instance.id)) do %>
           <div>
             <fieldset class="module aligned">
-              <h2><%= @model_name %> info</h2>
               <% @properties.each do |property| %>
                 <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property.name) %>
+              <div class="<%= @instance.errors[property.name] ? "form-row errors" : "form-row"%>">
+                <% if @instance.errors[property.name] %>
+                <ul class="errorlist">
+                  <% @instance.errors[property.name].each do |error| %>
+                  <li><%= error %></li>
+                  <% end %>
+                </ul>
+                <% end %>
 <%= partial(property.primitive.to_s.snake_case, :property => property) -%>
+              </div>
               <% end %>
             </fieldset>
             <div class="submit-row" >

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

@@ -2,10 +2,18 @@
         <%= form_for(@instance, :action => slice_url(:admin_create, :model_name => @model_name.snake_case)) do %>
           <div>
             <fieldset class="module aligned">
-              <h2><%= @model_name %> info</h2>
               <% @properties.each do |property| %>
                 <% next if [:id, :created_at, :created_on, :updated_at, :updated_on].include?(property.name) %>
+              <div class="<%= @instance.errors[property.name] ? "form-row errors" : "form-row"%>">
+                <% if @instance.errors[property.name] %>
+                <ul class="errorlist">
+                  <% @instance.errors[property.name].each do |error| %>
+                  <li><%= error %></li>
+                  <% end %>
+                </ul>
+                <% end %>
 <%= partial(property.primitive.to_s.snake_case, :property => property) -%>
+              </div>
               <% end %>
             </fieldset>
             <div class="submit-row" >

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

@@ -1,7 +1,7 @@
 <% if message && message[:error] %>
-<ul class="errorlist">
-  <li><%=h message[:error] %></li>
-</ul>
+<p class="errornote">
+  <%=h message[:error] %>
+</p>
 <% end %>
 <% if message && message[:notice] %>
 <ul class="messagelist">

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.3"
+    self.version = "0.2.4"
     self.author = "Erik Michaels-Ober"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'merb-core'
 require 'merb-slices'
+require 'merb-helpers'
+require 'merb-assets'
 require 'spec'
 
 # Add merb-admin.rb to the search path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency