RubyGems - merb-admin - Versions diffs - 0.8.1 → 0.8.3 - Mend

merb-admin 0.8.1 → 0.8.3

Files changed (109) hide show

data/.gitignore +29 -27
data/Gemfile +24 -22
data/Gemfile.lock +86 -0
data/LICENSE +20 -20
data/README.rdoc +54 -58
data/Rakefile +11 -44
data/app/controllers/application.rb +6 -6
data/app/controllers/main.rb +191 -191
data/app/helpers/application_helper.rb +64 -64
data/app/helpers/main_helper.rb +167 -167
data/app/models/.gitkeep +0 -0
data/app/views/layout/_message.html.erb +10 -10
data/app/views/layout/dashboard.html.erb +34 -34
data/app/views/layout/form.html.erb +48 -48
data/app/views/layout/list.html.erb +42 -42
data/app/views/main/_belongs_to.html.erb +29 -29
data/app/views/main/_big_decimal.html.erb +12 -12
data/app/views/main/_boolean.html.erb +7 -7
data/app/views/main/_date.html.erb +12 -12
data/app/views/main/_datetime.html.erb +12 -12
data/app/views/main/_float.html.erb +12 -12
data/app/views/main/_has_many.html.erb +16 -16
data/app/views/main/_has_one.html.erb +30 -30
data/app/views/main/_integer.html.erb +12 -12
data/app/views/main/_properties.html.erb +18 -18
data/app/views/main/_string.html.erb +15 -15
data/app/views/main/_text.html.erb +11 -11
data/app/views/main/_time.html.erb +12 -12
data/app/views/main/_timestamp.html.erb +12 -12
data/app/views/main/delete.html.erb +28 -28
data/app/views/main/edit.html.erb +19 -19
data/app/views/main/index.html.erb +22 -22
data/app/views/main/list.html.erb +93 -93
data/app/views/main/new.html.erb +16 -16
data/config/init.rb +30 -0
data/config/router.rb +4 -0
data/lib/abstract_model.rb +84 -86
data/lib/active_record_support.rb +147 -147
data/lib/datamapper_support.rb +139 -140
data/lib/generic_support.rb +13 -13
data/lib/merb-admin.rb +99 -99
data/lib/merb-admin/merbtasks.rb +103 -103
data/lib/merb-admin/slicetasks.rb +174 -174
data/lib/merb-admin/spectasks.rb +55 -55
data/lib/merb-admin/version.rb +3 -0
data/lib/sequel_support.rb +275 -275
data/merb-admin.gemspec +42 -232
data/public/javascripts/CollapsedFieldsets.js +85 -85
data/public/javascripts/DateTimeShortcuts.js +255 -255
data/public/javascripts/RelatedObjectLookups.js +96 -96
data/public/javascripts/SelectBox.js +111 -111
data/public/javascripts/SelectFilter2.js +113 -113
data/public/javascripts/actions.js +39 -39
data/public/javascripts/calendar.js +143 -143
data/public/javascripts/core.js +176 -176
data/public/javascripts/dateparse.js +233 -233
data/public/javascripts/getElementsBySelector.js +167 -167
data/public/javascripts/i18n.js +33 -33
data/public/javascripts/ordering.js +137 -137
data/public/javascripts/timeparse.js +94 -94
data/public/javascripts/urlify.js +140 -140
data/public/stylesheets/base.css +746 -746
data/public/stylesheets/changelists.css +269 -269
data/public/stylesheets/dashboard.css +24 -24
data/public/stylesheets/forms.css +327 -327
data/public/stylesheets/global.css +142 -142
data/public/stylesheets/ie.css +50 -50
data/public/stylesheets/layout.css +29 -29
data/public/stylesheets/login.css +54 -54
data/public/stylesheets/master.css +1 -1
data/public/stylesheets/patch-iewin.css +7 -7
data/public/stylesheets/rtl.css +206 -206
data/public/stylesheets/widgets.css +506 -506
data/screenshots/create.png +0 -0
data/screenshots/delete.png +0 -0
data/screenshots/edit.png +0 -0
data/screenshots/index.png +0 -0
data/screenshots/list.png +0 -0
data/screenshots/new.png +0 -0
data/spec/controllers/main_spec.rb +25 -25
data/spec/migrations/activerecord/001_create_divisions_migration.rb +13 -13
data/spec/migrations/activerecord/002_create_drafts_migration.rb +19 -19
data/spec/migrations/activerecord/003_create_leagues_migration.rb +12 -12
data/spec/migrations/activerecord/004_create_players_migration.rb +19 -20
data/spec/migrations/activerecord/005_create_teams_migration.rb +22 -22
data/spec/migrations/sequel/001_create_divisions_migration.rb +15 -15
data/spec/migrations/sequel/002_create_drafts_migration.rb +21 -21
data/spec/migrations/sequel/003_create_leagues_migration.rb +14 -14
data/spec/migrations/sequel/004_create_players_migration.rb +21 -22
data/spec/migrations/sequel/005_create_teams_migration.rb +24 -24
data/spec/models/activerecord/division.rb +7 -7
data/spec/models/activerecord/draft.rb +11 -11
data/spec/models/activerecord/league.rb +6 -6
data/spec/models/activerecord/player.rb +8 -8
data/spec/models/activerecord/team.rb +13 -13
data/spec/models/datamapper/division.rb +12 -12
data/spec/models/datamapper/draft.rb +18 -18
data/spec/models/datamapper/league.rb +11 -11
data/spec/models/datamapper/player.rb +20 -21
data/spec/models/datamapper/team.rb +22 -22
data/spec/models/sequel/division.rb +15 -15
data/spec/models/sequel/draft.rb +19 -19
data/spec/models/sequel/league.rb +14 -14
data/spec/models/sequel/player.rb +18 -18
data/spec/models/sequel/team.rb +21 -21
data/spec/requests/main_spec.rb +763 -763
data/spec/spec_helper.rb +113 -112
metadata +247 -41
data/VERSION +0 -1

data/app/models/.gitkeep ADDED Viewed

File without changes

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

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

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

@@ -1,34 +1,34 @@
-<%
-  slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
-  page_name = "Site administration"
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="NONE,NOARCHIVE" />
-    <title><%= page_name %> | <%= slice_name %></title>
-    <link href="<%= public_path_for :stylesheet, 'base.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
-    <link href="<%= public_path_for :stylesheet, 'dashboard.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
-    <!--[if lte IE 7]><link href="<%= public_path_for :stylesheet, 'ie.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" /><![endif]-->
-  </head>
-  <body class="admin-slice dashboard">
-    <div id="container">
-      <div id="header">
-        <div id="branding">
-          <h1 id="site-name">
-            <%= slice_name %>
-          </h1>
-        </div>
-      </div>
-<%= partial('layout/message', :message => message) unless message.blank? -%>
-      <div id="content" class="colMS">
-        <h1>
-          <%= page_name %>
-        </h1>
-<%= catch_content(:for_layout) -%>
-      </div>
-      <div id="footer"></div>
-    </div>
-  </body>
-</html>
+<%
+  slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
+  page_name = "Site administration"
+%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="NONE,NOARCHIVE" />
+    <title><%= page_name %> | <%= slice_name %></title>
+    <link href="<%= public_path_for :stylesheet, 'base.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
+    <link href="<%= public_path_for :stylesheet, 'dashboard.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
+    <!--[if lte IE 7]><link href="<%= public_path_for :stylesheet, 'ie.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" /><![endif]-->
+  </head>
+  <body class="admin-slice dashboard">
+    <div id="container">
+      <div id="header">
+        <div id="branding">
+          <h1 id="site-name">
+            <%= slice_name %>
+          </h1>
+        </div>
+      </div>
+<%= partial('layout/message', :message => message) unless message.blank? -%>
+      <div id="content" class="colMS">
+        <h1>
+          <%= page_name %>
+        </h1>
+<%= catch_content(:for_layout) -%>
+      </div>
+      <div id="footer"></div>
+    </div>
+  </body>
+</html>

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

@@ -1,48 +1,48 @@
-<%
-  slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
-  page_name = action_name.capitalize + " " + @abstract_model.pretty_name.downcase
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="NONE,NOARCHIVE" />
-    <title><%= page_name %> | <%= slice_name %></title>
-    <link href="<%= public_path_for :stylesheet, 'base.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
-    <link href="<%= public_path_for :stylesheet, 'forms.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
-    <!--[if lte IE 7]><link href="<%= public_path_for :stylesheet, 'ie.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" /><![endif]-->
-    <script src="<%= public_path_for :javascript, 'i18n.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'core.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'RelatedObjectLookups.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'getElementsBySelector.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'actions.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'SelectBox.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'SelectFilter2.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'calendar.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'DateTimeShortcuts.js' %>" type="text/javascript" charset="utf-8"></script>
-  </head>
-  <body class="admin-slice change-form">
-    <div id="container">
-      <div id="header">
-        <div id="branding">
-          <h1 id="site-name">
-            <%= slice_name %>
-          </h1>
-        </div>
-      </div>
-      <div class="breadcrumbs">
-        <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
-        <%= link_to(@abstract_model.pretty_name, url(:merb_admin_list, :model_name => @abstract_model.to_param)) %> &rsaquo;
-        <%= page_name %>
-      </div>
-<%= partial('layout/message', :message => message) unless message.blank? -%>
-      <div id="content" class="colM">
-        <h1>
-          <%= page_name %>
-        </h1>
-<%= catch_content(:for_layout) -%>
-      </div>
-      <div id="footer"></div>
-    </div>
-  </body>
-</html>
+<%
+  slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
+  page_name = action_name.capitalize + " " + @abstract_model.pretty_name.downcase
+%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="NONE,NOARCHIVE" />
+    <title><%= page_name %> | <%= slice_name %></title>
+    <link href="<%= public_path_for :stylesheet, 'base.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
+    <link href="<%= public_path_for :stylesheet, 'forms.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
+    <!--[if lte IE 7]><link href="<%= public_path_for :stylesheet, 'ie.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" /><![endif]-->
+    <script src="<%= public_path_for :javascript, 'i18n.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'core.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'RelatedObjectLookups.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'getElementsBySelector.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'actions.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'SelectBox.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'SelectFilter2.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'calendar.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'DateTimeShortcuts.js' %>" type="text/javascript" charset="utf-8"></script>
+  </head>
+  <body class="admin-slice change-form">
+    <div id="container">
+      <div id="header">
+        <div id="branding">
+          <h1 id="site-name">
+            <%= slice_name %>
+          </h1>
+        </div>
+      </div>
+      <div class="breadcrumbs">
+        <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
+        <%= link_to(@abstract_model.pretty_name, url(:merb_admin_list, :model_name => @abstract_model.to_param)) %> &rsaquo;
+        <%= page_name %>
+      </div>
+<%= partial('layout/message', :message => message) unless message.blank? -%>
+      <div id="content" class="colM">
+        <h1>
+          <%= page_name %>
+        </h1>
+<%= catch_content(:for_layout) -%>
+      </div>
+      <div id="footer"></div>
+    </div>
+  </body>
+</html>

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

@@ -1,42 +1,42 @@
-<%
-  slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
-  page_name = "Select " + @abstract_model.pretty_name.downcase + " to edit"
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <meta name="robots" content="NONE,NOARCHIVE" />
-    <title><%= page_name %> | <%= slice_name %></title>
-    <link href="<%= public_path_for :stylesheet, 'base.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
-    <link href="<%= public_path_for :stylesheet, 'changelists.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
-    <!--[if lte IE 7]><link href="<%= public_path_for :stylesheet, 'ie.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" /><![endif]-->
-    <script src="<%= public_path_for :javascript, 'core.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'RelatedObjectLookups.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'getElementsBySelector.js' %>" type="text/javascript" charset="utf-8"></script>
-    <script src="<%= public_path_for :javascript, 'actions.js' %>" type="text/javascript" charset="utf-8"></script>
-  </head>
-  <body class="admin-slice change-list">
-    <div id="container">
-      <div id="header">
-        <div id="branding">
-          <h1 id="site-name">
-            <%= slice_name %>
-          </h1>
-        </div>
-      </div>
-      <div class="breadcrumbs">
-        <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
-        <%= @abstract_model.pretty_name %>
-      </div>
-<%= partial('layout/message', :message => message) unless message.blank? -%>
-      <div id="content" class="flex">
-        <h1>
-          <%= page_name %>
-        </h1>
-<%= catch_content(:for_layout) -%>
-      </div>
-      <div id="footer"></div>
-    </div>
-  </body>
-</html>
+<%
+  slice_name = "MerbAdmin" + (MerbAdmin[:app_name].blank? ? "" : " for #{MerbAdmin[:app_name]}")
+  page_name = "Select " + @abstract_model.pretty_name.downcase + " to edit"
+%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="NONE,NOARCHIVE" />
+    <title><%= page_name %> | <%= slice_name %></title>
+    <link href="<%= public_path_for :stylesheet, 'base.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
+    <link href="<%= public_path_for :stylesheet, 'changelists.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
+    <!--[if lte IE 7]><link href="<%= public_path_for :stylesheet, 'ie.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" /><![endif]-->
+    <script src="<%= public_path_for :javascript, 'core.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'RelatedObjectLookups.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'getElementsBySelector.js' %>" type="text/javascript" charset="utf-8"></script>
+    <script src="<%= public_path_for :javascript, 'actions.js' %>" type="text/javascript" charset="utf-8"></script>
+  </head>
+  <body class="admin-slice change-list">
+    <div id="container">
+      <div id="header">
+        <div id="branding">
+          <h1 id="site-name">
+            <%= slice_name %>
+          </h1>
+        </div>
+      </div>
+      <div class="breadcrumbs">
+        <%= link_to("Home", url(:merb_admin_dashboard)) %> &rsaquo;
+        <%= @abstract_model.pretty_name %>
+      </div>
+<%= partial('layout/message', :message => message) unless message.blank? -%>
+      <div id="content" class="flex">
+        <h1>
+          <%= page_name %>
+        </h1>
+<%= catch_content(:for_layout) -%>
+      </div>
+      <div id="footer"></div>
+    </div>
+  </body>
+</html>

data/app/views/main/_belongs_to.html.erb CHANGED Viewed

@@ -1,29 +1,29 @@
-<%
-  child_key = association[:child_key].first
-  collection = MerbAdmin::AbstractModel.new(association[:parent_model]).all.map{|object| [object.id, object_label(object)]}.sort_by{|object| object[1]}
-  selected = @object.send(child_key)
-  label = association[:pretty_name]
-  required = false
-  errors_exist = !(@object.errors[child_key].nil? || @object.errors[child_key].empty?)
-  @properties.select{|property| property[:name] == child_key}.each do |property|
-    required = true unless property[:nullable?]
-  end
-%>
-            <fieldset class="module aligned">
-              <h2><%= label %></h2>
-              <div class="<%= errors_exist ? "form-row errors" : "form-row"%>">
-                <% if errors_exist %>
-                <ul class="errorlist">
-                  <% @object.errors[child_key].each do |error| %>
-                  <li><%= error %></li>
-                  <% end %>
-                </ul>
-                <% end %>
-                <div>
-                  <%= select(child_key, :collection => collection, :include_blank => true, :selected => selected.to_s, :label => label) %>
-                  <p class="help">
-                    <%= required ? "Required." : "Optional." %>
-                  </p>
-                </div>
-              </div>
-            </fieldset>
+<%
+  child_key = association[:child_key].first
+  collection = MerbAdmin::AbstractModel.new(association[:parent_model]).all.map{|object| [object.id, object_label(object)]}.sort_by{|object| object[1]}
+  selected = @object.send(child_key)
+  label = association[:pretty_name]
+  required = false
+  errors_exist = !(@object.errors[child_key].nil? || @object.errors[child_key].empty?)
+  @properties.select{|property| property[:name] == child_key}.each do |property|
+    required = true unless property[:nullable?]
+  end
+%>
+            <fieldset class="module aligned">
+              <h2><%= label %></h2>
+              <div class="<%= errors_exist ? "form-row errors" : "form-row"%>">
+                <% if errors_exist %>
+                <ul class="errorlist">
+                  <% @object.errors[child_key].each do |error| %>
+                  <li><%= error %></li>
+                  <% end %>
+                </ul>
+                <% end %>
+                <div>
+                  <%= select(child_key, :collection => collection, :include_blank => true, :selected => selected.to_s, :label => label) %>
+                  <p class="help">
+                    <%= required ? "Required." : "Optional." %>
+                  </p>
+                </div>
+              </div>
+            </fieldset>

data/app/views/main/_big_decimal.html.erb CHANGED Viewed

@@ -1,12 +1,12 @@
-<%
-  property_name = property[:name]
-  length = property[:length]
-  label = property[:pretty_name]
-  required = !property[:nullable?] || property[:serial?]
-%>
-                <div>
-                  <%= text_field(property_name, :maxlength => length, :label => label) %>
-                  <p class="help">
-                    <%= required ? "Required." : "Optional." %>
-                  </p>
-                </div>
+<%
+  property_name = property[:name]
+  length = property[:length].to_i
+  label = property[:pretty_name]
+  required = !property[:nullable?] || property[:serial?]
+%>
+                <div>
+                  <%= text_field(property_name, :maxlength => length, :label => label) %>
+                  <p class="help">
+                    <%= required ? "Required." : "Optional." %>
+                  </p>
+                </div>

data/app/views/main/_boolean.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
-<%
-  property_name = property[:name]
-  label = property[:pretty_name]
-%>
-                <div>
-                  <%= check_box(property_name, :label => label) %>
-                </div>
+<%
+  property_name = property[:name]
+  label = property[:pretty_name]
+%>
+                <div>
+                  <%= check_box(property_name, :label => label) %>
+                </div>

data/app/views/main/_date.html.erb CHANGED Viewed

@@ -1,12 +1,12 @@
-<%
-  property_name = property[:name]
-  value = @object.send(property_name)
-  label = property[:pretty_name]
-  required = !property[:nullable?]
-%>
-                <div>
-                  <%= text_field(property_name, :class => "vDateField", :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : nil, :label => label) %>
-                  <p class="help">
-                    <%= required ? "Required." : "Optional." %>
-                  </p>
-                </div>
+<%
+  property_name = property[:name]
+  value = @object.send(property_name)
+  label = property[:pretty_name]
+  required = !property[:nullable?]
+%>
+                <div>
+                  <%= text_field(property_name, :class => "vDateField", :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d") : nil, :label => label) %>
+                  <p class="help">
+                    <%= required ? "Required." : "Optional." %>
+                  </p>
+                </div>

data/app/views/main/_datetime.html.erb CHANGED Viewed

@@ -1,12 +1,12 @@
-<%
-  property_name = property[:name]
-  value = @object.send(property_name)
-  label = property[:pretty_name]
-  required = !property[:nullable?]
-%>
-                <div>
-                  <%= text_field(property_name, :class => "vDateField", :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") : nil, :label => label) %>
-                  <p class="help">
-                    <%= required ? "Required." : "Optional." %>
-                  </p>
-                </div>
+<%
+  property_name = property[:name]
+  value = @object.send(property_name)
+  label = property[:pretty_name]
+  required = !property[:nullable?]
+%>
+                <div>
+                  <%= text_field(property_name, :class => "vDateField", :value => value.respond_to?(:strftime) ? value.strftime("%Y-%m-%d %H:%M:%S") : nil, :label => label) %>
+                  <p class="help">
+                    <%= required ? "Required." : "Optional." %>
+                  </p>
+                </div>

data/app/views/main/_float.html.erb CHANGED Viewed

@@ -1,12 +1,12 @@
-<%
-  property_name = property[:name]
-  length = property[:length]
-  label = property[:pretty_name]
-  required = !property[:nullable?] || property[:serial?]
-%>
-                <div>
-                  <%= text_field(property_name, :maxlength => length, :label => label) %>
-                  <p class="help">
-                    <%= required ? "Required." : "Optional." %>
-                  </p>
-                </div>
+<%
+  property_name = property[:name]
+  length = property[:length].to_i
+  label = property[:pretty_name]
+  required = !property[:nullable?] || property[:serial?]
+%>
+                <div>
+                  <%= text_field(property_name, :maxlength => length, :label => label) %>
+                  <p class="help">
+                    <%= required ? "Required." : "Optional." %>
+                  </p>
+                </div>