scaffolding_extensions 1.5.5 → 1.6.0

data/README

@@ -21,14 +21,14 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 3.2.3
+  * Rails 3.2.9
   * Ramaze 2011.12.28
   * Camping 2.1
-  * Sinatra 1.3.1
-  * Rack 1.4.0
+  * Sinatra 1.3.2
+  * Rack 1.4.1
 * Object Relational Mappers
-  * ActiveRecord 3.2.3
-  * Sequel 3.34.0
+  * ActiveRecord 3.2.9
+  * Sequel 3.39.0
   * DataMapper 1.0.2 (see doc/datamapper.txt for details)
 * Javascript Libaries (used for Ajax/Autocompleting, default is now JQuery)
   * Prototype 1.6.0.3
@@ -55,15 +55,17 @@ Support for other web frameworks and ORMs can be added, see the
 controller_spec.txt and model_spec.txt files for the methods that need to be
 defined.
 
+The Scaffolding Extensions UI is now tab-based and requires Twitter Bootstrap
+to be fully functional (though the UI is still usable without it).
+
 You can get Scaffolding Extensions via git or as a gem:
 
 * git: git://github.com/jeremyevans/scaffolding_extensions.git
 * gem: sudo gem install scaffolding_extensions
 * demo: http://se-demo.heroku.com
-* github: http://github.com/jeremyevans/scaffolding_extensions
+* GitHub: http://github.com/jeremyevans/scaffolding_extensions
 * RDoc: http://scaffolding-ext.rubyforge.org
-* Bug Tracker: http://rubyforge.org/tracker/?atid=22169&group_id=5726&func=browse
-* Forum: http://rubyforge.org/forum/forum.php?forum_id=22403
+* Issues: http://github.com/jeremyevans/scaffolding_extensions/issues
 
 == Quick Start
 
@@ -74,12 +76,13 @@ The recommended use of the plugin is to execute:
 inside of a controller.  We'll assume the path to the controller is /admin.
 
 Then go to the index page for the controller (e.g. http://website/admin).  
-You'll see a link to a management page for each of your models.  Each
-management page has links to browse, create, delete, edit, show, search, and
-merge pages for the model. The pages are usable right away, but you'll want to
-add some configuration code to your models to specify the default names to
-display in select boxes, attributes to show on the forms, associations to show,
-whether to use select boxes or autocompleting text boxes, etc..
+You'll see a link to pages for each of your models.  Clicking on those links
+takes you to the model's browse page, with tabs to access the create, delete,
+edit, show, search, and merge pages for the model. The pages are usable right
+away, but you'll want to add some configuration code to your models to specify
+the default names to display in select boxes, attributes to show on the forms,
+associations to show, whether to use select boxes or autocompleting text boxes,
+etc..
 
 == Customization
 
@@ -113,7 +116,7 @@ to edit).
 
 @scaffold_use_auto_complete turns on autocompleting for the model, instead
 of using select boxes (necessary for a decent response time if you have a large
-number of records). See the advanced.txt for more autocompleting options.
+number of records). See doc/advanced.txt for more autocompleting options.
 
 scaffold_name is an instance method that determines the name to use for each
 album inside those select boxes.
@@ -145,15 +148,19 @@ There are a ton of other customization options:
 * Control access to the model via a session variable (e.g. so a user can only
   see objects with a matching user_id)
 
-Consult advanced.txt and/or the RDoc if you would like more information on
+Consult doc/advanced.txt and/or the RDoc if you would like more information on
 these (and many other options).
 
 == Testing
 
-See the testing.txt file for details on the plugin's automated test suite and
+See doc/testing.txt for details on the plugin's automated test suite and
 Rails functional testing support.
 
 == Questions?
 
-Please post on the RubyForge forum if you have any questions about Scaffolding
-Extensions.
+Please post an issue in the GitHub issue tracker if you have questions that
+the existing documentation does not answer.
+
+== Author
+
+Jeremy Evans <code@jeremyevans.net>

data/contrib/scaffold_associations_tree/scaffold_associations_tree.js

@@ -9,7 +9,7 @@ function makeTreesC() {
     uls = document.getElementsByTagName("ul");
     for (uli=0;uli<uls.length;uli++) {
         ul = uls[uli];
-        if (ul.nodeName == "UL" && ul.className == "scaffold_associations_tree") {
+        if (ul.nodeName == "UL" && ul.className.split(" ").indexOf("scaffold_associations_tree") != -1) {
             processULELC(ul);
         }
     }

data/lib/scaffolding_extensions/helper.rb

@@ -11,15 +11,17 @@ module ScaffoldingExtensions
         show_edit = read_only ? :show : :edit
         so = @scaffold_object
         soid = so.scaffold_id
+        default_action = @scaffold_options[:default_action]
         singular_name = @scaffold_options[:singular_name]
+        return '' unless klass.scaffold_associations.any?{|a| klass.scaffold_show_association_links?(a)}
         content = '<h3 class="scaffold_associated_records_header">Associated Records</h3>'
-        content << "<ul id='scaffolded_associations_#{singular_name}_#{soid}' class='#{klass.scaffold_association_list_class}'>\n"
+        content << "<ul id='scaffolded_associations_#{singular_name}_#{soid}' class='association_links #{klass.scaffold_association_list_class}'>\n"
         klass.scaffold_associations.each do |association| 
           next unless klass.scaffold_show_association_links?(association)
           class_name = klass.scaffold_associated_name(association)
           human_name = klass.scaffold_associated_human_name(association)
           content << "<li>"
-          content << scaffold_check_link(human_name, read_only, "manage_#{class_name}") 
+          content << scaffold_check_link(human_name, read_only, "#{default_action}_#{class_name}") 
           content << "\n "
           case klass.scaffold_association_type(association)
             when :one
@@ -217,10 +219,10 @@ module ScaffoldingExtensions
         "<label for='#{id}'>#{h text}</label>"
       end
       
-      # 'a' tag with the content text.  action and options are passed to
+      # 'a' tag with the content text.  action and url_options are passed to
       # scaffold_url to get the href.
-      def scaffold_link(text, action, options={})
-        "<a href='#{scaffold_url(action, options)}'>#{h text}</a>"
+      def scaffold_link(text, action, url_options={}, tag_options={})
+        "<a #{"class=\"#{tag_options[:class]}\" " if tag_options[:class]}href='#{scaffold_url(action, url_options)}'>#{h text}</a>"
       end
       
       # Returns link to the scaffolded management page for the model if it was created by the scaffolding.
@@ -269,7 +271,7 @@ module ScaffoldingExtensions
         #{scaffold_form(scaffold_url("#{action}#{@scaffold_suffix}", options), :attributes=>scaffold_form_enctype(fields))}
         #{scaffold_model_field_tags(fields)}
         #{(yield content; content) if block_given?}
-        <input class='btn btn-primary' type='submit' value="#{@scaffold_submit_value || "#{action.capitalize} #{@scaffold_options[:singular_lc_human_name]}"}" />
+        <input class='btn btn-primary' type='submit' value="#{@scaffold_submit_value || "#{action.capitalize} #{@scaffold_options[:singular_human_name]}"}" />
         </form>
         END
       end
@@ -296,6 +298,19 @@ module ScaffoldingExtensions
         "<select name='#{name}#{scaffold_param_list_suffix if multiple}' id='#{name}' #{"multiple='multiple'" if multiple}>#{'<option></option>' unless multiple}#{collection.collect{|obj| "<option value='#{i = obj.scaffold_id}' id='#{name}_#{i}'>#{h obj.scaffold_name}</option>"}.join("\n")}</select>"
       end
       
+      def scaffold_tabs
+        content = '<ul class="nav nav-tabs">'
+        [["#{@scaffold_options[:plural_human_name]}", :browse], ["New", :new], ["Show", :show], ["Edit", :edit], ["Delete", :delete], ["Merge", :merge], ["Search", :search]].each do |text, action|
+          link = scaffold_check_link(text, true, "#{action}#{@scaffold_suffix}")
+          action = :destroy if action == :delete
+          content << '<li'
+          content << ' class="active"' if action == @scaffold_action
+          content << ">#{scaffold_raw(link)}</li>"
+        end
+        content << '</ul>'
+        scaffold_raw(content)
+      end
+      
       # Text field with scaffold autocompleting.  The id is the html id, and the model name and association
       # are passed to scaffold_javascript_autocompleter.  The options are passed to scaffold_field_tag.
       def scaffold_text_field_tag_with_auto_complete(id, model_name, association = nil, options = {})

data/lib/scaffolding_extensions/jquery_helper.rb

@@ -50,7 +50,7 @@ module ScaffoldingExtensions
       def scaffold_load_associations_with_ajax_link
         soid = @scaffold_object.scaffold_id
         divid = "scaffold_ajax_content_#{soid}"
-        "<div id='#{divid}'><a href='#{scaffold_url("edit#{@scaffold_suffix}", :id=>soid, :associations=>:show)}' onclick=\"$('##{divid}').load('#{scaffold_url("associations#{@scaffold_suffix}", :id=>soid)}'); return false;\">Modify Associations</a></div>"
+        "<div class='scaffold_ajax_content' id='#{divid}'><a href='#{scaffold_url("edit#{@scaffold_suffix}", :id=>soid, :associations=>:show)}' onclick=\"$('##{divid}').load('#{scaffold_url("associations#{@scaffold_suffix}", :id=>soid)}'); return false;\">Modify Associations</a></div>"
       end
       
       # Javascript that removes @remove_element_id from the page and inserts

data/lib/scaffolding_extensions/meta_controller.rb

@@ -3,6 +3,10 @@ module ScaffoldingExtensions
   module MetaController
     attr_accessor :scaffolded_methods, :scaffolded_nonidempotent_methods, :scaffolded_auto_complete_associations
     
+    def scaffold_default_action
+      @scaffold_default_action ||= DEFAULT_ACTION
+    end
+    
     # The location of the scaffold templates
     def scaffold_template_dir
       @scaffold_template_dir ||= TEMPLATE_DIR
@@ -16,6 +20,7 @@ module ScaffoldingExtensions
       #
       # - :except: symbol or array of method symbols not to define
       # - :only: symbol or array of method symbols to define instead of the default
+      # - :default: method symbol to use as default landing page
       #
       # The following method symbols are used to control the methods that get
       # added by the scaffold function:
@@ -39,7 +44,7 @@ module ScaffoldingExtensions
       #   an object, which then shows the attribute name and value for scaffolded fields.
       #   Also shows associations specified in the model's scaffold_associations.
       def scaffold(klass, options = {})
-        scaffold_setup 
+        scaffold_setup
         singular_name = klass.scaffold_name
         singular_human_name = klass.scaffold_human_name
         plural_name = singular_name.pluralize
@@ -48,7 +53,8 @@ module ScaffoldingExtensions
         render_meth = :"render#{suffix}"
         add_methods = options[:only] ? Array(options[:only]) : scaffold_default_methods
         add_methods -= Array(options[:except])
-        scaffold_options = {:singular_name=>singular_name, :plural_name=>plural_name, :singular_human_name=>singular_human_name, :plural_human_name=>plural_human_name, :class=>klass, :suffix=>suffix, :singular_lc_human_name=>singular_human_name.downcase, :plural_lc_human_name=>plural_human_name.downcase}
+        default_action = options[:default] || scaffold_default_action
+        scaffold_options = {:default_action=>default_action, :singular_name=>singular_name, :plural_name=>plural_name, :singular_human_name=>singular_human_name, :plural_human_name=>plural_human_name, :class=>klass, :suffix=>suffix, :singular_lc_human_name=>singular_human_name.downcase, :plural_lc_human_name=>plural_human_name.downcase}
 
         scaffold_auto_complete_for(klass) if klass.scaffold_use_auto_complete
         klass.scaffold_auto_complete_associations.each{|association| scaffold_auto_complete_for(klass, association)}
@@ -60,7 +66,7 @@ module ScaffoldingExtensions
 
         if add_methods.include?(:manage)
           scaffold_define_method("manage#{suffix}") do
-            send(render_meth, :manage) 
+            scaffold_redirect(default_action, suffix)
           end
         end
         
@@ -73,12 +79,12 @@ module ScaffoldingExtensions
         
         if add_methods.include?(:show)
           scaffold_define_method("show#{suffix}") do
+            @scaffold_action = :show
             if scaffold_request_id
               @scaffold_object ||= klass.scaffold_find_object(:show, scaffold_request_id, :session=>scaffold_session)
               @scaffold_associations_readonly = true
-              send(render_meth, :show) 
+              send(render_meth, :show)
             else
-              @scaffold_action = :show
               send("list#{suffix}")
             end
           end
@@ -101,12 +107,12 @@ module ScaffoldingExtensions
           klass.scaffold_habtm_associations.each{|association| scaffold_habtm(klass, association)}
 
           scaffold_define_method("edit#{suffix}") do
+            @scaffold_action = :edit
             if scaffold_request_id
               @scaffold_show_associations = true if scaffold_request_param(:associations) == 'show'
               @scaffold_object ||= klass.scaffold_find_object(:edit, scaffold_request_id, :session=>scaffold_session)
               send(render_meth, :edit) 
             else
-              @scaffold_action = :edit
               send("list#{suffix}")
             end
           end
@@ -132,6 +138,7 @@ module ScaffoldingExtensions
         if add_methods.include?(:new)
           scaffold_define_method("new#{suffix}") do
             @scaffold_object ||= klass.scaffold_new_object(scaffold_request_param(singular_name), :session=>scaffold_session)
+            @scaffold_action = :new
             send(render_meth, :new) 
           end
           
@@ -148,6 +155,7 @@ module ScaffoldingExtensions
         if add_methods.include?(:search)
           scaffold_define_method("search#{suffix}") do
             @scaffold_object ||= klass.scaffold_search_object
+            @scaffold_action = :search
             send(render_meth, :search) 
           end
           
@@ -156,7 +164,7 @@ module ScaffoldingExtensions
             page -= 1 if scaffold_request_param(:page_previous)
             page += 1 if scaffold_request_param(:page_next)
             @scaffold_search_results_form_params, @scaffold_objects = klass.scaffold_search(:model=>scaffold_request_param(singular_name), :notnull=>Array(scaffold_request_param(:notnull)), :null=>Array(scaffold_request_param(:null)), :page=>page, :session=>scaffold_session)
-            @scaffold_listtable_type = :search
+            @scaffold_action = :search
             send(render_meth, :listtable) 
           end
         end
@@ -164,6 +172,7 @@ module ScaffoldingExtensions
         if add_methods.include?(:merge)
           scaffold_define_method("merge#{suffix}") do
             @scaffold_objects ||= klass.scaffold_find_objects(:merge, :session=>scaffold_session) unless klass.scaffold_use_auto_complete
+            @scaffold_action = :merge
             send(render_meth, :merge) 
           end
           
@@ -183,7 +192,7 @@ module ScaffoldingExtensions
             unless @scaffold_objects
               @next_page, @scaffold_objects = klass.scaffold_browse_find_objects(:session=>scaffold_session, :page=>@page)
             end
-            @scaffold_listtable_type = :browse
+            @scaffold_action = :browse
             send(render_meth, :listtable) 
           end
         end
@@ -199,7 +208,7 @@ module ScaffoldingExtensions
         scaffold_setup
         links = scaffold_all_models_parse_options(options).collect do |model, options|
           scaffold(model, options)
-          ["manage_#{model.scaffold_name}", model.scaffold_human_name]
+          ["#{scaffold_default_action}_#{model.scaffold_name}", model.scaffold_human_name]
         end
         scaffold_define_method('index') do
           @links = links
@@ -258,6 +267,7 @@ module ScaffoldingExtensions
       def scaffold_habtm(klass, association)
         scaffold_setup
         sn = klass.scaffold_name
+        shn = klass.scaffold_human_name
         scaffold_auto_complete_for(klass, association) if auto_complete = klass.scaffold_association_use_auto_complete(association)
         
         if klass.scaffold_habtm_with_ajax
@@ -299,9 +309,12 @@ module ScaffoldingExtensions
           end
         else
           suffix = "_#{sn}_#{association}"
+          scaffold_options={:aph_name=>association.to_s.humanize, :singular_name=>sn, :singular_human_name=>shn, :association=>association, :class=>klass, :suffix=>suffix}
+          # ash_name = association singular human name
+          scaffold_options[:ash_name] = scaffold_options[:aph_name].downcase
           # aplch_name = association plural lower case human name
-          scaffold_options={:aplch_name=>association.to_s.humanize.downcase, :singular_name=>sn, :association=>association, :class=>klass, :suffix=>suffix}
-          # aslch_name = association singular lower case human name
+          scaffold_options[:aplch_name] = scaffold_options[:aph_name].downcase
+          # aslhc_name = association singular lower case human name (typo!)
           scaffold_options[:aslhc_name] = scaffold_options[:aplch_name].singularize
           
           scaffold_define_method("edit#{suffix}") do

data/lib/scaffolding_extensions/meta_model.rb

@@ -72,7 +72,7 @@ module ScaffoldingExtensions::MetaModel
   # - :auto_complete: Hash containing the default options to use for the scaffold
   #   autocompleter (iv: @scaffold_auto_complete_options)
   SCAFFOLD_OPTIONS = {:text_to_string=>false, 
-    :table_classes=>{:form=>'table formtable', :list=>'table table-bordered table-condensed sortable', :show=>'table sortable'},
+    :table_classes=>{:form=>'table formtable', :list=>'table table-condensed table-striped sortable', :show=>'table sortable'},
     :column_type_options=>{},
     :column_types=>{},
     :column_options=>{},
@@ -434,7 +434,7 @@ module ScaffoldingExtensions::MetaModel
 
     # Don't set any fields left blank by the user
     h = {}
-    attributes.each{|k,v| h[k] = v unless v.blank?}
+    attributes.each {|k,v| h[k] = v unless v.to_s.strip.empty?}
 
     scaffold_set_attributes(object, h)
     object
@@ -566,7 +566,7 @@ module ScaffoldingExtensions::MetaModel
         if allowed_attributes.include?(k)
           h[k] = v
         elsif convert_attributes.include?(k)
-          h[k] = v.blank? ? '' : v.to_i.to_s
+          h[k] = v.to_s.strip.empty? ? '' : v.to_i.to_s
         end
       end
       h

data/lib/scaffolding_extensions/prototype_helper.rb

@@ -54,7 +54,7 @@ module ScaffoldingExtensions
       def scaffold_load_associations_with_ajax_link
         soid = @scaffold_object.scaffold_id
         divid = "scaffold_ajax_content_#{soid}"
-        "<div id='#{divid}'><a href='#{scaffold_url("edit#{@scaffold_suffix}", :id=>soid, :associations=>:show)}' onclick=\"new Ajax.Updater('#{divid}', '#{scaffold_url("associations#{@scaffold_suffix}", :id=>soid)}', {method:'get', asynchronous:true, evalScripts:true}); return false;\">Modify Associations</a></div>"
+        "<div class='scaffold_ajax_content' id='#{divid}'><a href='#{scaffold_url("edit#{@scaffold_suffix}", :id=>soid, :associations=>:show)}' onclick=\"new Ajax.Updater('#{divid}', '#{scaffold_url("associations#{@scaffold_suffix}", :id=>soid)}', {method:'get', asynchronous:true, evalScripts:true}); return false;\">Modify Associations</a></div>"
       end
       
       # Javascript that removes @remove_element_id from the page and inserts

data/lib/scaffolding_extensions.rb

@@ -42,11 +42,12 @@ module ScaffoldingExtensions
   END
   ROOT = File.dirname(File.dirname(__FILE__))
   TEMPLATE_DIR = File.join(ROOT, "scaffolds")
+  DEFAULT_ACTION = :browse
   DEFAULT_METHODS = [:manage, :show, :delete, :edit, :new, :search, :merge, :browse]
   MODEL_SUPERCLASSES = []
   
   @auto_complete_skip_style = false
-    
+  
   class << self
     attr_accessor :auto_complete_skip_style
     attr_writer :all_models, :model_files

data/scaffolds/edit.rhtml

@@ -1,6 +1,13 @@
-<% @scaffold_title = "Editing #{@scaffold_options[:singular_lc_human_name]}" %>
+<% @scaffold_title = "#{plural_name = @scaffold_options[:plural_human_name]} - Edit" %>
+
+<%= scaffold_tabs %>
+
+<h1>Editing <%= @scaffold_options[:singular_human_name] %>: <%= @scaffold_object.scaffold_name %></h1>
 
 <%=scaffold_raw scaffold_model_form('update', @scaffold_class.scaffold_fields(:edit)) %>
+<% if delete = scaffolded_method?(ds = "destroy#{@scaffold_suffix}") %>
+  <%=scaffold_raw scaffold_button_to("Delete #{@scaffold_options[:singular_human_name]}", scaffold_url(ds, :id=>@scaffold_object.id), :class=>'btn-danger') %>
+<% end %>
 
 <% if @scaffold_class.scaffold_load_associations_with_ajax && !@scaffold_show_associations %>
   <%=scaffold_raw scaffold_load_associations_with_ajax_link %>
@@ -9,4 +16,4 @@
   <%=scaffold_raw scaffold_association_links %>
 <% end %>
 
-<%=scaffold_raw scaffold_manage_link %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/habtm.rhtml

@@ -1,24 +1,29 @@
-<% @scaffold_title = "Update #{sn = h(@scaffold_object.scaffold_name)}'s #{mpn = (so = @scaffold_options )[:aplch_name]}" %>
+<% @scaffold_title = "#{sn = h((so = @scaffold_options)[:singular_human_name])} - Update #{mpn = so[:aph_name]}" %>
+<h1>Update <%= mpn %> for <%= sn %>: <%=scaffold_raw @scaffold_object.scaffold_name %></h1>
 
 <%=scaffold_raw scaffold_form(scaffold_url("update#{@scaffold_suffix}", :id=>(soid=@scaffold_object.scaffold_id))) %>
 
 <% if @scaffold_class.scaffold_association_use_auto_complete(assoc = so[:association]) %>
-  <h4>Add this <%= so[:aslhc_name] %></h4>
+  <h4>Add This <%= so[:ash_name] %></h4>
   <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('add', so[:singular_name], assoc) %>
 <% elsif @items_to_add.length > 0 %>
-  <h4>Add these <%= mpn %></h4>
+  <h4>Add These <%= mpn %></h4>
   <%=scaffold_raw scaffold_select_tag('add', @items_to_add, true) %>
 <% end %>
 
 <% if @items_to_remove.length > 0 %> 
-  <h4>Remove these <%= mpn %></h4>
+  <h4>Remove These <%= mpn %></h4>
   <%=scaffold_raw scaffold_select_tag('remove', @items_to_remove, true) %>
 <% end %>
 
 <br /><br />
-<input class="btn btn-primary" type='submit' value="Update <%= sn %>'s <%= mpn %>" />
+<input class="btn btn-primary" type='submit' value="Update" />
 </form>
 
-<% if '' != (edit_link = scaffold_check_link("Edit #{sn}", true, "edit_#{@scaffold_options[:singular_name]}", :id=>soid)) %>
-  <h2><%=scaffold_raw edit_link %></h2>
+<% if '' != (edit_link = scaffold_check_link("Edit #{sn}: #{@scaffold_object.scaffold_name}", true, "edit_#{@scaffold_options[:singular_name]}", :id=>soid)) %>
+  <ul class="edit">
+    <li><%=scaffold_raw edit_link %></li>
+  </ul>
 <% end %>
+
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/index.rhtml

@@ -1,5 +1,7 @@
-<% @scaffold_title = 'Manage Models' %>
-<ul>
+<% @scaffold_title = 'Dashboard' %>
+<h1>Dashboard</h1>
+
+<ul class="models">
 <% @links.each do |link, human_name| %>
   <li><a href="<%= scaffold_url(link) %>"><%= human_name %></a></li>
 <% end %>

data/scaffolds/layout.rhtml

@@ -4,27 +4,20 @@
   <title>Scaffolding Extensions<%= " - #{@scaffold_title}" if @scaffold_title %></title>
   <link rel="stylesheet" type="text/css" href="/css/bootstrap.min.css" />
   <style type="text/css">
-    body { background-color: #fff; color: #333; }
-
-    body, p, ol, ul, td {
-      font-family: verdana, arial, helvetica, sans-serif;
-      font-size:   13px;
-      line-height: 18px;
-    }
-    
     h1, h4 { margin-bottom: 10px; }
-    h4 { font-size: 16px; }
 
     pre {
       background-color: #eee;
       padding: 10px;
       font-size: 11px;
     }
-
-    a { color: #000; }
-    a:visited { color: #666; }
-    a:hover { color: #fff; background-color:#000; }
     
+    .navbar-inner {
+      -webkit-border-radius: 0;
+      -moz-border-radius: 0;
+      border-radius: 0;
+    }
+
     div.habtm_ajax_remove_associations form { display: inline; }
     
     div.auto_complete {
@@ -76,14 +69,23 @@
   </style>
 </head>
 <body>
-<% if @scaffold_title %>
-  <h1><%= @scaffold_title %></h1>
-<% end %>
+<div class="navbar">
+  <div class="navbar-inner">
+    <div class="container">
+      <a href="/admin" class="brand">Company Name</a>
+
+      <ul class="nav">
+        <li><a href="/admin">Dashboard</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
+<div class="container-fluid">
 <% if scaffold_get_flash %>
   <h4><%= scaffold_get_flash %></h4>
 <% end %>
 
 <%= @content %>
-
+</div>
 </body>
 </html>

data/scaffolds/list.rhtml

@@ -1,13 +1,18 @@
-<% @scaffold_title = "Choose #{hn = @scaffold_options[:singular_lc_human_name]} to #{(haction = (action = @scaffold_action).to_s.humanize).downcase}" %>
+<% (haction = (action = @scaffold_action).to_s.humanize).downcase %>
+<% haction = 'Delete' if haction == 'Destroy' %>
+<% @scaffold_title = "#{plural_name = @scaffold_options[:plural_human_name]} - #{haction}" %>
+
+<%= scaffold_tabs %>
 
 <%=scaffold_raw scaffold_form(scaffold_url("#{action}#{@scaffold_suffix}"), :method=>scaffold_idempotent_action?(action) ? :get : :post) %>
+<%= haction %> <%= @scaffold_options[:singular_human_name]%>:
 <% if @scaffold_class.scaffold_use_auto_complete %>
   <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('id', @scaffold_options[:singular_name]) %>
 <% else %>
   <%=scaffold_raw scaffold_select_tag('id', @scaffold_objects) %>
 <% end %>
 <br /><br />
-<input class="btn btn-<%= scaffold_idempotent_action?(action) ? 'primary' : 'danger' %>" type="submit" value="<%= haction %> <%= hn %>" />
+<input class="btn btn-<%= scaffold_idempotent_action?(action) ? 'primary' : 'danger' %>" type="submit" value="<%= haction %> <%= @scaffold_options[:singular_human_name] %>" />
 </form>
 
-<%=scaffold_raw scaffold_manage_link %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/listtable.rhtml

@@ -1,48 +1,61 @@
-<% @scaffold_title = "Listing #{@scaffold_options[:plural_lc_human_name]}" %>
+<% @scaffold_title = "#{plural_name = @scaffold_options[:plural_human_name]} - Browse" %>
+
+<%= scaffold_tabs %>
 
 <table id="scaffolded" class="<%= @scaffold_class.scaffold_table_class(:list) %>">
-  <thead><tr>
-  <% @scaffold_class.scaffold_fields(@scaffold_listtable_type).each do |column| %>
+<thead>
+  <tr>
+  <% @scaffold_class.scaffold_fields(@scaffold_action).each do |column| %>
     <th><%=h @scaffold_class.scaffold_column_name(column) %></th>
   <% end %>
   <% if show = scaffolded_method?(ss = "show#{@scaffold_suffix}") %>
-    <th><%= s = 'Show' %></th>
+    <th>Show</th>
   <% end %>
   <% if edit = scaffolded_method?(es = "edit#{@scaffold_suffix}") %>
-    <th><%= e = 'Edit' %></th>
+    <th>Edit</th>
   <% end %>
   <% if delete = scaffolded_method?(ds = "destroy#{@scaffold_suffix}") %>
-    <th><%= d = 'Delete' %></th>
+    <th>Delete</th>
   <% end %>
-  </tr></thead><tbody>
+  </tr>
+</thead>
+<tbody>
 <% @scaffold_objects.each do |entry| eid = entry.scaffold_id  %>
   <tr>
-  <% @scaffold_class.scaffold_fields(@scaffold_listtable_type).each do |column| %>
+  <% @scaffold_class.scaffold_fields(@scaffold_action).each do |column| %>
     <td><%=h entry.scaffold_value(column).to_s %></td>
   <% end %>
   <% if show %>
-    <td><%=scaffold_raw scaffold_button_to(s, scaffold_url(ss, :id=>eid), :method=>:get, :class=>'btn-info') %></td>
+    <td><%=scaffold_raw scaffold_link('Show', ss, {:id=>eid}, :class=>'btn btn-info btn-mini') %></td>
   <% end %>
   <% if edit %>
-    <td><%=scaffold_raw scaffold_button_to(e, scaffold_url(es, :id=>eid), :method=>:get, :class=>'btn-primary') %></td>
+    <td><%=scaffold_raw scaffold_link('Edit', es, {:id=>eid}, :class=>'btn btn-primary btn-mini') %></td>
   <% end %>
   <% if delete %>
-    <td><%=scaffold_raw scaffold_button_to(d, scaffold_url(ds, :id=>eid), :class=>'btn-danger') %></td>
+    <td><%=scaffold_raw scaffold_button_to('Delete', scaffold_url(ds, :id=>eid), :class=>'btn btn-mini btn-danger') %></td>
   <% end %>
   </tr>
 <% end %>
-</tbody></table>
+</tbody>
+</table>
 
-<% if @scaffold_listtable_type == :browse %>
+<% if @scaffold_action == :browse %>
+<ul class="pager">
   <% if @page > 1 %>
-    <a href="<%= scaffold_url("browse#{@scaffold_suffix}", :page=>(@page-1)) %>">Previous Page</a>
+    <li><a href="<%= scaffold_url("browse#{@scaffold_suffix}", :page=>(@page-1)) %>">Previous</a></li>
+  <% else %>
+    <li class="disabled"><a href="#">Previous</a></li>
   <% end %>
+
   <% if @next_page %>
-    <a href="<%= scaffold_url("browse#{@scaffold_suffix}", :page=>(@page+1)) %>">Next Page</a>
+    <li><a href="<%= scaffold_url("browse#{@scaffold_suffix}", :page=>(@next_page ? @page+1 : @page)) %>">Next</a></li>
+  <% else %>
+    <li class="disabled"><a href="#">Next</a></li>
   <% end %>
+</ul>
 <% end %>
 
-<% if @scaffold_listtable_type == :search && @scaffold_search_results_form_params && (@scaffold_search_results_form_params[:page] > 1 || @scaffold_search_results_form_params[:next_page]) %>
+<% if @scaffold_action == :search && @scaffold_search_results_form_params && (@scaffold_search_results_form_params[:page] > 1 || @scaffold_search_results_form_params[:next_page]) %>
   <%=scaffold_raw scaffold_form(scaffold_url("results#{@scaffold_suffix}")) %>
   <%=scaffold_raw scaffold_field_tag(:hidden, :value=>@scaffold_search_results_form_params[:page], :id=>'page') %>
   <% @scaffold_search_results_form_params[:model].each do |key, value| %>
@@ -63,4 +76,4 @@
   </form>
 <% end %>
 
-<%=scaffold_raw scaffold_manage_link %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/merge.rhtml

@@ -1,7 +1,9 @@
-<% @scaffold_title = "Merge two #{@scaffold_options[:plural_lc_human_name]}" %>
+<% @scaffold_title = "#{plural_name = @scaffold_options[:plural_human_name]} - Merge" %>
+
+<%= scaffold_tabs %>
 
 <%=scaffold_raw scaffold_form(scaffold_url("merge_update#{@scaffold_suffix}")) %>
-<p>Merge:
+<p>Merge <%= @scaffold_options[:singular_human_name] %>:
 <% if @scaffold_class.scaffold_use_auto_complete %>
   <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('from', @scaffold_options[:singular_name]) %>
 <% else %>
@@ -9,7 +11,7 @@
 <% end %>
 </p>
 
-<p>into: 
+<p>Into <%= @scaffold_options[:singular_human_name] %>: 
 <% if @scaffold_class.scaffold_use_auto_complete %>
   <%=scaffold_raw scaffold_text_field_tag_with_auto_complete('to', @scaffold_options[:singular_name]) %>
 <% else %>
@@ -17,7 +19,7 @@
 <% end %>
 </p>
 
-<input class="btn btn-danger" type="submit" value="Merge <%= @scaffold_options[:plural_lc_human_name] %>" />
+<input class="btn btn-danger" type="submit" value="Merge <%= @scaffold_options[:plural_human_name] %>" />
 </form>
 
-<%=scaffold_raw scaffold_manage_link %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/new.rhtml

@@ -1,5 +1,9 @@
-<% @scaffold_title = "Create new #{@scaffold_options[:singular_lc_human_name]}" %>
+<% @scaffold_title = "#{plural_name = @scaffold_options[:plural_human_name]} - New" %>
+
+<%= scaffold_tabs %>
+
+<h1>Create New <%= @scaffold_options[:singular_human_name] %></h1>
 
 <%=scaffold_raw scaffold_model_form('create', @scaffold_class.scaffold_fields(:new)) %>
 
-<%=scaffold_raw scaffold_manage_link %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/search.rhtml

@@ -1,11 +1,14 @@
-<% @scaffold_title = "Search #{@scaffold_options[:plural_lc_human_name]}" %>
+<% @scaffold_title = "#{plural_name = @scaffold_options[:plural_human_name]} - Search" %>
 
-<%=scaffold_raw(scaffold_model_form('results', @scaffold_class.scaffold_fields(:search)) do |form|
+<%= scaffold_tabs %>
+<h1>Search <%= @scaffold_options[:plural_human_name] %></h1>
+
+<%= scaffold_raw(scaffold_model_form('results', @scaffold_class.scaffold_fields(:search)) do |form|
   form << "<table class='#{@scaffold_class.scaffold_table_class(:form)}'><tbody>"
   form << "<tr><td><label for='null'>Null Fields</label></td><td><select name='null#{scaffold_param_list_suffix}' id='null' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
   form << "<tr><td><label for='notnull'>Not Null Fields</label></td><td><select name='notnull#{scaffold_param_list_suffix}' id='notnull' multiple='multiple'>#{@scaffold_class.scaffold_search_null_options.collect{|name, i| "<option value='#{i}'>#{name}</option>"}.join("\n")}</select></td></tr>\n"
   form << '</tbody></table>'
-  @scaffold_submit_value = @scaffold_title
-end)%>
+  @scaffold_submit_value = "Search #{@scaffold_options[:plural_human_name]}"
+end) %>
 
-<%=scaffold_raw scaffold_manage_link %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

data/scaffolds/show.rhtml

@@ -1,7 +1,8 @@
-<% @scaffold_title = "Showing #{@scaffold_options[:singular_lc_human_name]}" %>
-<% if '' != (edit_link = scaffold_check_link('Edit', true, "edit_#{@scaffold_options[:singular_name]}", :id=>@scaffold_object.scaffold_id)) %>
-  <h2><%=scaffold_raw edit_link %></h2>
-<% end %>
+<% @scaffold_title = "#{plural_name = @scaffold_options[:plural_human_name]} - Show" %>
+
+<%= scaffold_tabs %>
+
+<h1>Showing <%= @scaffold_options[:singular_human_name] %>: <%= @scaffold_object.scaffold_name %></h1>
 
 <table id="scaffolded" class="<%= @scaffold_class.scaffold_table_class(:show) %>">
 <thead><tr><th>Attribute</th><th>Value</th></tr></thead>
@@ -14,6 +15,12 @@
 <% end %>
 </tbody></table>
 
-<%=scaffold_raw scaffold_association_links %>
+<% if edit = scaffolded_method?(es = "edit#{@scaffold_suffix}") %>
+<ul class="edit">
+  <li><%=scaffold_raw scaffold_link("Edit #{@scaffold_options[:singular_human_name]}", es, :id=>@scaffold_object.id) %></li>
+</ul>
+<% end %>
+
+<%= scaffold_raw scaffold_association_links %>
 
-<%=scaffold_raw scaffold_manage_link %>
+<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: code@jeremyevans.net
@@ -69,11 +69,10 @@ files:
 - scaffolds/layout.rhtml
 - scaffolds/list.rhtml
 - scaffolds/listtable.rhtml
-- scaffolds/manage.rhtml
+- scaffolds/edit.rhtml
 - scaffolds/merge.rhtml
 - scaffolds/new.rhtml
 - scaffolds/search.rhtml
-- scaffolds/edit.rhtml
 homepage: http://scaffolding-ext.rubyforge.org/
 licenses: []
 post_install_message: 
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scaffolding-ext
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Administrative database front-end for multiple web-frameworks and ORMs

data/scaffolds/manage.rhtml

@@ -1,17 +0,0 @@
-<% @scaffold_title = "Manage #{plural_name = @scaffold_options[:plural_lc_human_name]}" %>
-<ul>
-<% [["Browse #{plural_name}", :browse],
-["Create #{singular_name = @scaffold_options[:singular_lc_human_name]}", :new],
-["Delete #{singular_name}", :delete],
-["Edit #{singular_name}", :edit],
-["Merge #{plural_name}", :merge],
-["Search #{plural_name}", :search],
-["Show #{singular_name}", :show]].each do |text, action| %>
-  <% link = scaffold_check_link(text, true, "#{action}#{@scaffold_suffix}") 
-  unless link == '' %>
-    <li><%=scaffold_raw link %></li>
-  <% end %>
-<% end %>
-</ul>
-
-<%=scaffold_raw scaffold_check_link('Manage Models', true, 'index') %>