spud_core 0.5.2 → 0.5.5

data/app/helpers/spud/admin/application_helper.rb

@@ -15,4 +15,19 @@ module Spud::Admin::ApplicationHelper
     end
     link_to_function(name, "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")")
   end
+
+  def error_messages_for(object)
+    content = ""
+    if object.errors.any?
+      content += "<div class='spud_admin_form_error_list'>"
+      content += "<h4>#{pluralize(object.errors.count, "error")} prohibited you from saving:</h4>"
+      content +="<ul>"
+      object.errors.full_messages.each do |msg|
+        content+="<li>#{msg}</li>"
+      end
+      content +="</ul></div>"
+    end
+    return content.html_safe
+  
+  end
 end

data/app/views/layouts/spud/admin/application.html.erb

@@ -24,17 +24,9 @@
 <% if flash[:warning] %>
   <div class="flash warning"><%= flash[:warning] %></div>
 <% end %>
-<% if flash[:error] || @error_object_name.nil? == false %>
+<% if flash[:error]%>
 <div class="flash error">
 	  <%= flash[:error] %>
-<%-unless @error_object_name.nil?%>
-	  <%-if @error_object_name.is_a?(Array)%>
-		 <%=error_messages_for @error_object_name[0], :header_message => @error_object_name[1], :message => @error_object_name[2]%>
-	  <%-else%>
-		 <%=error_messages_for @error_object_name%>
-    <%-end%>
- 
- <%-end%>
 </div>
 <%-end%>
 	<%= content_for?(:content) ? yield(:content) : yield %>

data/app/views/spud/admin/users/_form.html.erb

@@ -1,21 +1,23 @@
+<%= error_messages_for(f.object) %>
+
 <fieldset>
   <legend>User Details</legend>
 <ol>
 <li><%=f.label :login, :required=>true%>
   <%=f.text_field :login,:title => "",:size=>25%>
-  <%=error_message_on "user","login"%>
+  
 </li>
 <li><%=f.label :email%>
   <%=f.text_field :email, :title => "",:size => 25%>
-  <%=error_message_on "user","email"%>
+  
 </li>
 <li><%=f.label :first_name%>
   <%=f.text_field :first_name, :title => "",:size => 25%>
-  <%=error_message_on "user","first_name"%>
+  
 </li>
 <li><%=f.label :last_name%>
   <%=f.text_field :last_name, :title => "",:size => 25%>
-  <%=error_message_on "user","last_name"%>
+  
 </li>
 
 </ol>
@@ -25,11 +27,11 @@
 <ol>
 <li><%=f.label :password%>
   <%=f.password_field :password, :title => "",:size => 25%>
-  <%=error_message_on "user","password"%>
+  
 </li>
 <li><%=f.label :password_confirmation,"Confirm"%>
   <%=f.password_field :password_confirmation, :title => "",:size => 25%>
-  <%=error_message_on "user","password_confirmation"%>
+  
 </li>
 <li><%=f.label :super_admin,"Super Admin"%>
   <%=f.check_box :super_admin, :title => ""%>

data/app/views/spud/user_sessions/new.html.erb

@@ -1,9 +1,9 @@
 <div class="login-form">
 	<h1>Spud CMS Admin</h1>
 	<%= form_for @user_session, url: spud_user_session_path do |f| %>
-	  <div>
-		  <%= f.error_messages %>
-	  </div>
+	  
+	  <%= error_messages_for(f.object) %>
+	  
 	  <div class="field-group">
 		  <%= f.label :login %>
 		  <%= f.text_field :login %>

data/app/views/spud/users/_form.html.erb

@@ -1,21 +1,22 @@
+<%=error_messages_for f.object%>
 <fieldset>
   <legend>User Details</legend>
 <ol>
 <li><%=f.label :login, :required=>true%>
   <%=f.text_field :login,:title => "",:size=>25%>
-  <%=error_message_on "user","login"%>
+  
 </li>
 <li><%=f.label :email%>
   <%=f.text_field :email, :title => "",:size => 25%>
-  <%=error_message_on "user","email"%>
+  
 </li>
 <li><%=f.label :first_name%>
   <%=f.text_field :first_name, :title => "",:size => 25%>
-  <%=error_message_on "user","first_name"%>
+  
 </li>
 <li><%=f.label :last_name%>
   <%=f.text_field :last_name, :title => "",:size => 25%>
-  <%=error_message_on "user","last_name"%>
+  
 </li>
 
 </ol>
@@ -25,11 +26,11 @@
 <ol>
 <li><%=f.label :password%>
   <%=f.password_field :password, :title => "",:size => 25%>
-  <%=error_message_on "user","password"%>
+  
 </li>
 <li><%=f.label :password_confirmation,"Confirm"%>
   <%=f.password_field :password_confirmation, :title => "",:size => 25%>
-  <%=error_message_on "user","password_confirmation"%>
+  
 </li>
 </ol>
 </fieldset>

data/lib/spud_core/engine.rb

@@ -4,7 +4,7 @@ require 'action_controller'
 require 'rubygems'
 require 'jquery-rails'
 require 'authlogic'
-require 'dynamic_form'
+# require 'dynamic_form'
 require 'breadcrumbs_on_rails'
 require 'will_paginate'
 require 'spud_core/belongs_to_app'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_core
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70245147061360 !ruby/object:Gem::Requirement
+  requirement: &70244174346920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70245147061360
+  version_requirements: *70244174346920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70245147055560 !ruby/object:Gem::Requirement
+  requirement: &70244174346440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70245147055560
+  version_requirements: *70244174346440
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70245147053480 !ruby/object:Gem::Requirement
+  requirement: &70244174345960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245147053480
+  version_requirements: *70244174345960
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70245147052500 !ruby/object:Gem::Requirement
+  requirement: &70244174345480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245147052500
-- !ruby/object:Gem::Dependency
-  name: dynamic_form
-  requirement: &70245147051660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70245147051660
+  version_requirements: *70244174345480
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
-  requirement: &70245147050780 !ruby/object:Gem::Requirement
+  requirement: &70244174345000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245147050780
+  version_requirements: *70244174345000
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70245147049340 !ruby/object:Gem::Requirement
+  requirement: &70244174344520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70245147049340
+  version_requirements: *70244174344520
 description: 
 email: destes@redwindsw.com
 executables: []
@@ -249,12 +238,6 @@ files:
 - app/controllers/spud/user_sessions_controller.rb
 - app/controllers/spud/users_controller.rb
 - app/helpers/spud/admin/application_helper.rb
-- app/helpers/spud/admin/settings_helper.rb
-- app/helpers/spud/admin/users_helper.rb
-- app/helpers/spud/setup_helper.rb
-- app/helpers/spud/sitemaps_helper.rb
-- app/helpers/spud/user_sessions_helper.rb
-- app/helpers/spud/users_helper.rb
 - app/models/spud_admin_permission.rb
 - app/models/spud_user.rb
 - app/models/spud_user_session.rb

data/app/helpers/spud/admin/settings_helper.rb

@@ -1,2 +0,0 @@
-module Spud::Admin::SettingsHelper
-end

data/app/helpers/spud/admin/users_helper.rb

@@ -1,2 +0,0 @@
-module Spud::Admin::UsersHelper
-end

data/app/helpers/spud/setup_helper.rb

@@ -1,2 +0,0 @@
-module Spud::SetupHelper
-end

data/app/helpers/spud/sitemaps_helper.rb

@@ -1,2 +0,0 @@
-module Spud::SitemapsHelper
-end

data/app/helpers/spud/user_sessions_helper.rb

@@ -1,2 +0,0 @@
-module Spud::UserSessionsHelper
-end

data/app/helpers/spud/users_helper.rb

@@ -1,2 +0,0 @@
-module Spud::UsersHelper
-end