inline_forms 0.9.2 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/app/controllers/inline_forms_controller.rb

@@ -29,17 +29,22 @@ class InlineFormsController < ApplicationController
   # The link to 'new' allows you to create a new record.
   #
   def index
-    @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
     update_span = params[:update]
+    @parent_class = params[:parent_class]
+    if @parent_class.nil?
+      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
+    else
+      @parent_id = params[:parent_id]
+      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => [ "#{@parent_class.foreign_key} = ?", @parent_id ]
+    end
+
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
-      format.html { render 'inline_forms/index', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
-      format.js { render(:update) {|page| page.replace_html update_span, :partial => 'inline_forms/index' } }
+      format.html { render 'inline_forms/_list', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
+      format.js { render(:update) {|page| page.replace_html update_span, :partial => 'inline_forms/list' } }
     end
   end
 
-  
-
   # :new prepares a new object, updates the entire list of objects and replaces it with a new
   # empty form. After pressing OK or Cancel, the list of objects is retrieved in the same way as :index
   #
@@ -47,6 +52,11 @@ class InlineFormsController < ApplicationController
   def new
     @object = @Klass.new
     @update_span = params[:update]
+    @parent_class = params[:parent_class]
+    unless @parent_class.nil?
+      @parent_id = params[:parent_id]
+      @object[@parent_class.foreign_key] = @parent_id
+    end
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
       format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/new'}
@@ -78,19 +88,26 @@ class InlineFormsController < ApplicationController
   def create
     object = @Klass.new
     @update_span = params[:update]
+    # update each field of the record
     attributes = object.inline_forms_attribute_list
     attributes.each do | name, attribute, form_element |
       send("#{form_element.to_s}_update", object, attribute) unless form_element == :associated
     end
     if object.save
-      flash[:success] = "Successfully created #{object.class.to_s.downcase}."
+      flash.now[:success] = "Successfully created #{object.class.to_s.downcase}."
+    else
+      flash.now[:error] = "Failed to create #{object.class.to_s.downcase}."
+    end
+    @parent_class = params[:parent_class]
+    if @parent_class.nil?
+      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
     else
-      flash[:error] = "Failed to create #{object.class.to_s.downcase}."
+      @parent_id = params[:parent_id]
+      @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC', :conditions => [ "#{@parent_class.foreign_key} = ?", @parent_id ]
     end
-    @objects = @Klass.paginate :page => params[:page], :order => 'created_at DESC'
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
-      format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/index'}
+      format.js { render(:update) {|page| page.replace_html @update_span, :partial => 'inline_forms/list'}
       }
     end
   end
@@ -104,10 +121,8 @@ class InlineFormsController < ApplicationController
     @form_element = params[:form_element]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
-    logger.info @form_element.to_s
     send("#{@form_element.to_s}_update", @object, @attribute)
     @object.save
-    logger.info "after"
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
       format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element.to_s}_show", @object, @attribute) %>' }
@@ -138,16 +153,28 @@ class InlineFormsController < ApplicationController
         @attributes = @object.inline_forms_attribute_list
         # found this here: http://www.ruby-forum.com/topic/211467
         if close
-          format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true %>' } }
+          format.js do
+            render(:update) do |page|
+              page.replace_html @update_span, :inline => '<%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true %>'
+            end
+          end
         else
-          format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object) %>' } }
+          format.js do
+            render(:update) do |page|
+              page.replace_html @update_span, :partial => 'inline_forms/show'
+            end
+          end
+          #          format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send( "inline_forms_show_record", @object) %>' } }
         end
       end
     else
       respond_to do |format|
         # found this here: http://www.ruby-forum.com/topic/211467
-        format.js { render(:update) {|page| page.replace_html @update_span, :inline => '<%= send("#{@form_element}_show", @object, @attribute) %>' }
-        }
+        format.js do
+          render(:update) do |page|
+            page.replace_html @update_span, :inline => '<%= send("#{@form_element}_show", @object, @attribute) %>'
+          end
+        end
       end
     end
   end

data/app/helpers/inline_forms_helper.rb

@@ -8,111 +8,6 @@ module InlineFormsHelper
     require form_element
   end
 
-  # default inline forms attribute list, for models that don't have an inline_attribute_attribute_list defined.
-  INLINE_FORMS_DEFAULT_ATTRIBUTE_LIST = { :name => [ 'name', :text ] }
-
-  # show a record by iterating through its attribute list
-  def inline_forms_show_record(object, attributes=nil)
-    out = String.new
-    name_cell = content_tag :th, :valign=>'top' do
-      content_tag :div, :class=> "object_presentation" do
-        h(object._presentation)
-      end
-    end
-    value_cell = content_tag :th, :valign=>'top' do
-      content_tag :div, :class=> "close_link" do
-        close_link(object)
-      end
-    end
-    out += content_tag :tr, name_cell + value_cell
-    out << "\n"
-    attributes ||= object.inline_forms_attribute_list
-    attributes.each do | attribute, name, form_element |
-      css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
-      name_cell = content_tag :td, :valign=>'top' do
-        content_tag :div, :class=> "attribute_name attribute_#{attribute} form_element_#{form_element}" do
-          h(name)
-        end
-      end
-      value_cell = content_tag :td, :valign=>'top' do
-        content_tag :div, :class=> "attribute_value attribute_#{attribute} form_element_#{form_element}" do
-          content_tag :span, :id => css_class_id do
-            if form_element == :associated
-              inline_forms_list(object.send(attribute.to_s.pluralize), attribute )
-            else
-              send("#{form_element}_show", object, attribute)
-            end
-          end
-        end
-      end
-      out += content_tag :tr, name_cell + value_cell
-      out += "\n"
-    end
-    #    end
-    return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
-  end
-
-  # show the form for a new record
-  #
-  # associated records are NOT shown!
-  #
-  def inline_forms_new_record(object, attributes=nil)
-    out = String.new
-    out += content_tag :tr do
-      content_tag :th, :colspan => 2, :valign=>'top' do
-        content_tag :div, :class=> "object_presentation" do
-          "New #{object.class.to_s}"
-        end
-      end
-    end
-    out << "\n"
-    attributes ||= object.inline_forms_attribute_list
-    attributes.each do | attribute, name, form_element |
-      unless form_element.to_sym == :associated
-        css_class_id = "attribute_#{attribute}_#{object.id}"
-        name_cell = content_tag :td, :valign=>'top' do
-          content_tag :div, :class=> "attribute_name attribute_#{attribute} form_element_#{form_element}" do
-            h(name)
-          end
-        end
-        value_cell = content_tag :td, :valign=>'top' do
-          content_tag :div, :class=> "attribute_value attribute_#{attribute} form_element_#{form_element}" do
-            content_tag :span, :id => css_class_id do
-              send("#{form_element}_edit", object, attribute)
-            end
-          end
-        end
-        out += content_tag :tr, name_cell + value_cell
-      end
-    end
-    return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
-  end
-
-  # display a list of objects
-  def inline_forms_list(objects, attribute )
-    t = String.new
-    # link to new
-    update_span = attribute.to_s.underscore + '_list'
-    t += content_tag :li, :class => "new_record_link_li" do
-      link_to "New",
-        send('new_' + attribute.to_s.singularize.underscore + '_path', :update => update_span),
-        :remote => true
-    end
-    # list of objects
-    objects.each do |object|
-      css_class_id = object.class.to_s.underscore + '_' + object.id.to_s
-      t += content_tag :li, :id => css_class_id, :class => cycle("odd", "even") do
-        link_to h(object._presentation),
-          send( object.class.to_s.underscore + '_path', object, :update => css_class_id),
-          :remote => true
-      end
-    end
-    t = content_tag :ul, :id => update_span, :class => "inline_forms_list" do
-      t.html_safe
-    end
-    return t
-  end
-
   private
 
   # close icon

data/app/views/inline_forms/_list.html.erb

@@ -0,0 +1,70 @@
+<% flash.each do |key, value| %>
+  <div id="flash" class="flash <%= key %>"><%= value %></div>
+<% end %>
+
+<!-- purpose: list objects. we come here from #index and from #new.
+If we come here for the 'first' time, we dont' have parents; its just a list of objects.
+But if we come here because we are called from the show partial, then we have to deal wits some parent object.
+Unfortaunatlly, the way :locals work, these are local variables, like object, but if we come from a controller,
+they are @object. We need this magic here to rewrite all the @variables to variables. Ugh. -->
+
+<% ul_needed = true %>
+<% if not defined?(parent_class)  %>
+  <%   # we didn't come here via _show.html.erb %>
+  <%  if @parent_class.nil? %>
+    <% # the controller didn't give us a parent_class, this means we are here for the 'first' time  %>
+    <% # we have to rely on the @Klass set in the controller %>
+    <% update_span = @Klass.to_s.pluralize.downcase + '_list'  %>
+    <% human_readable_class = @Klass.to_s.humanize.downcase  %>
+    <% path_to_new = "new_#{@Klass.to_s.singularize.underscore}_path" %>
+    <% parent_class = nil %>
+    <% parent_id = nil  %>
+    <% objects = @objects %>
+  <% else %>
+    <% # the controller gave us an @parent_class, so ... %>
+    <% attribute = @Klass.to_s.underscore.pluralize %>
+    <% update_span = "#{@parent_class.to_s.underscore}_#{@parent_id}_#{attribute}_list" -%>
+    <% human_readable_class= attribute.to_s.singularize.humanize.downcase %>
+    <% path_to_new='new_' + attribute.to_s.underscore.singularize + '_path' %>
+    <% parent_class=@parent_class %>
+    <% parent_id=@parent_id %>
+    <% objects = @objects %>
+    <% ul_needed = false %>
+  <% end %>
+<% else %>
+  <% # here we come from _show %>
+  <% update_span = "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}_list" -%>
+  <% human_readable_class = attribute.to_s.singularize.humanize.downcase %>
+  <% path_to_new='new_' + attribute.to_s.singularize + '_path' %>
+  <% objects = parent_class.find(parent_id).send(attribute) %>
+<% end %>
+
+<% if ul_needed %>
+  <ul id="<%= update_span -%>" class="inline_forms_list">
+  <% end %>
+  <!--  # link to new -->
+  <li class="new_record_link">
+    <%= link_to "Add a new #{human_readable_class}",
+      send(path_to_new, :update       => update_span,
+      :parent_class => parent_class,
+      :parent_id    => parent_id ),
+      :remote => true -%>
+  </li>
+  <!--  # list of objects -->
+  <% for object in objects %>
+    <% if parent_class.nil?  %>
+      <% css_class_id = object.class.to_s.underscore + '_' + object.id.to_s -%>
+      <% path_to_object = object.class.to_s.underscore + '_path' %>
+    <% else %>
+      <% css_class_id = parent_class.to_s.underscore + '_' + parent_id.to_s + '_' + attribute.to_s.singularize.underscore + "_" + object.id.to_s -%>
+      <% path_to_object = attribute.to_s.singularize.underscore + "_path" %>
+    <% end %>
+    <li id="<%= css_class_id -%>" class="<%= cycle('odd', 'even') -%>" >
+      <%= link_to h(object._presentation),
+        send( path_to_object, object, :update => css_class_id),
+        :remote => true -%>
+    </li>
+  <% end -%>
+  <% if ul_needed %>
+  </ul>
+<% end %>

data/app/views/inline_forms/_new.html.erb

@@ -1,12 +1,47 @@
-<% form_tag  send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span || 'inline_forms_list' ),
+<li>
+<% form_tag  send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
+                                                              :parent_class => @parent_class,
+                                                              :parent_id => @parent_id ),
   :multipart => true, :remote => true, :class  => "edit_form"  do -%>
   <div class="edit_form_field">
-    <%= inline_forms_new_record @object %>
+    <table cellspacing="0" cellpadding="0">
+      <tr>
+        <th colspan="2" valign="top">
+          <div class="object_presentation" >
+            Add a new <%= @object.class.to_s.singularize.downcase -%>
+          </div>
+        </th>
+      </tr>
+      <% attributes ||= @object.inline_forms_attribute_list -%>
+      <% attributes.each do | attribute, name, form_element | -%>
+        <% unless form_element.to_sym == :associated -%>
+          <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
+          <tr>
+            <td valign="top">
+              <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <%= h(name) -%>
+              </div>
+            </td>
+            <td valign="top">
+              <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <span id="<%= css_class_id -%>" >
+                  <%= send("#{form_element}_edit", @object, attribute) -%>
+                </span>
+              </div>
+            </td>
+          </tr>
+        <% end -%>
+      <% end -%>
+    </table>
   </div>
-  <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path',:update => @update_span || 'inline_forms_list'), :remote => true,
+  <%= link_to( send(@Klass.to_s.underscore.pluralize + '_path', :update => @update_span,
+                                                                :parent_class => @parent_class,
+                                                                :parent_id => @parent_id ),
+    :remote => true,
     :class  => "edit_form_cancel" ) do  %>
     <input type="button" name="cancel" value="cancel" />
-<% end %>
+  <% end %>
   <%= submit_tag "ok", :class => "edit_form_submit"-%>
   <div style="clear: both;"></div>
-<% end -%>
+<% end %>
+</li>

data/app/views/inline_forms/_show.html.erb

@@ -0,0 +1,39 @@
+<table cellspacing="0" cellpadding="0">
+  <tr>
+    <th valign="top">
+      <div class="object_presentation" >
+        <%= h(@object._presentation) -%>
+      </div>
+    </th>
+    <th valign="top">
+      <div class="close_link" >
+        <%= close_link(@object) -%>
+      </div>
+    </th>
+  </tr>
+  <% attributes ||= @object.inline_forms_attribute_list -%>
+  <% attributes.each do | attribute, name, form_element | -%>
+    <% css_class_id = "#{@object.class.to_s.underscore}_#{@object.id}_#{attribute}" -%>
+    <tr>
+      <td valign="top">
+        <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+          <%= h(name) -%>
+        </div>
+      </td>
+      <td valign="top">
+        <div class='<%= "attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
+          <span id="<%= css_class_id -%>" >
+            <% if form_element == :associated -%>
+              <%= render  :partial => "inline_forms/list",
+                          :locals => {  :parent_class => @object.class,
+                                        :parent_id    => @object.id,
+                                        :attribute    => attribute } %>
+            <% else -%>
+              <%= send("#{form_element}_show", @object, attribute) -%>
+            <% end -%>
+          </span>
+        </div>
+      </td>
+    </tr>
+  <% end -%>
+</table>

data/app/views/layouts/inline_forms.rhtml

@@ -9,12 +9,8 @@
     <%= yield(:head) %>
   </head>
   <body>
- <%= render "inline_forms/header" %>
- <%= render "/inline_forms_tabs" %>
-    <div id="main">
-    <ul id="inline_forms_list">
+    <%= render "inline_forms/header" %>
+    <%= render "/inline_forms_tabs" %>
       <%= yield %>
-    </ul>
-    </div>
   </body>
 </html>

data/inline_forms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
@@ -42,9 +42,9 @@ Gem::Specification.new do |s|
     "app/models/geo_code_curacao.rb",
     "app/views/inline_forms/_edit.html.erb",
     "app/views/inline_forms/_header.html.erb",
-    "app/views/inline_forms/_index.html.erb",
+    "app/views/inline_forms/_list.html.erb",
     "app/views/inline_forms/_new.html.erb",
-    "app/views/inline_forms/index.html.erb",
+    "app/views/inline_forms/_show.html.erb",
     "app/views/layouts/inline_forms.rhtml",
     "inline_forms.gemspec",
     "lib/generators/inline_forms/USAGE",

data/public/stylesheets/inline_forms.css

@@ -10,7 +10,9 @@
    TODO customize this sample style
    Syntax recommendation http://www.w3.org/TR/REC-CSS2/
 */
-
+#flash {
+    border: 4px solid white;
+}
 root { 
     display: block;
 }
@@ -21,64 +23,69 @@ body {
     padding: 0;
     margin: 0;
     font-family: sans-serif;
+    font-size: 12pt;
 }
 
 a {
     text-decoration: none;
 }
-#inline_forms_list {
-    padding: 0;
-    margin: 0;
-    list-style-type: none;
-    font-size: 0.7em;
-    font-weight: normal;
-}
 
 .inline_forms_list {
+    font-size: 100%;
+    font-weight: normal;
     padding: 0.7em;
-    margin: 0;
+    margin: 0.4em 1em 0.4em 1em;
     list-style-type: none;
     -moz-border-radius: 10px;
     -webkit-border-radius: 10px;
     -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
     -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
+    background-color: #F9EBAE;
 }
 
-#inline_forms_list li.inline_forms_new_record_link {
-    padding: 0.5em;
+
+.inline_forms_list .new_record_link {
+    font-size: 110%;
+   padding: 0.3em;
+    border: solid #999999 1px;
+    text-decoration: none;
+    text-align: center;
+    color:black;
+    background-color: #EBEAE9;
+    background-image: -moz-linear-gradient(100% 100% 90deg, #cccccc,#EBEAE9);
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#cccccc), to(#EBEAE9));
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    -webkit-box-shadow: 0 2px 3px rgba(0,0,0, .4);
+    -moz-box-shadow: 0 2px 3px rgba(0,0,0, .4);
+    margin-bottom: 0.5em;
+    width: 14em;
 }
 
-#inline_forms_list li a {
+.inline_forms_list li a {
     color: #385B7B;
 }
 
-#inline_forms_list li {
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-    -webkit-box-shadow: 0 1px 1px rgba(0,0,0, .1);
-    -moz-box-shadow: 0 1px 1px rgba(0,0,0, .1);
+.inline_forms_list li {
     padding: 0.5em;
     margin-bottom: 0.3em;
 }
 
-#inline_forms_list li.even {
+.inline_forms_list li.odd {
     background-color: #FFE58C;
 }
 
-#inline_forms_list li.odd {
+.inline_forms_list li.even {
     background-color: #FFEDB0;
     }
 
-#inline_forms_list li table {
+.inline_forms_list li table {
     border: 1px solid #EFCA4B;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
     margin: 0;
     padding: 0;
-    width: 100%;
 }
 
-#inline_forms_list table tr th {
+.inline_forms_list table tr th {
     padding: 0.2em 0.5em 0.2em 0.2em;
     border-bottom: 1px dotted lightgrey;
     font-weight: bold;
@@ -86,43 +93,38 @@ a {
     background-color: #EFCA4B;
 }
 
-#inline_forms_list li table tr td {
+.inline_forms_list li table tr td {
     padding: 0.2em 0.5em 0.2em 0.2em;
-    border-bottom: 1px dotted lightgrey;
     font-weight: normal;
     background-color: #F9EBAE;
 }
-/*#inline_forms_list div.attribute_name{
-    font-weight: bold;
-}
-*/
-#inline_forms_list div.attribute_value a{
-    color: #385B7B;
-}
-/*
-#inline_forms_list div.form_element_text_attribute {  }
-#inline_forms_list div.form_element_associated ul {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
-}
-#inline_forms_list div.form_element_associated li {
-    padding: 0em 0.5em 0.2em 0;
 
-}
-#inline_forms_list div.form_element_associated li a {
-    padding: 0;
-    margin: 0;
+.inline_forms_list div.attribute_value {
+    margin-left: 1em;
 }
 
-#inline_forms_list div.associated_new  {
+.inline_forms_list div.attribute_value a{
+    color: #385B7B;
 }
-*/
 .attribute_text_area {
-    width: 80em;
+    width: 600px;
     height: 4em;
+    padding: 0.2em;
+    background-color: #FFE58C;
+    border: 1px solid #eee;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
 }
 
+.input_text_field {
+    width: 600px;
+    height: 1.5em;
+    padding: 0.2em;
+    background-color: #FFE58C;
+    border: 1px solid #eee;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
 
 .edit_form_checklist ul {
     list-style-type: none;
@@ -146,7 +148,7 @@ ul.checklist li {
 }
 
 
-#inline_forms_list .edit_form_checklist ul li {
+.inline_forms_list .edit_form_checklist ul li {
     margin: 0;
     padding: 0 0 0.3em 0;
 }
@@ -164,7 +166,6 @@ ul.checklist li {
 #Header {
     background-color: #B94C32;
     color: #FFFFFF;
-    font-size: x-large;
     font-weight: bold;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
@@ -177,8 +178,6 @@ ul.checklist li {
 
 #tabs {
     background-color: #F9EBAE;
-    font-size: x-large;
-    font-weight: bold;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
@@ -187,15 +186,15 @@ ul.checklist li {
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F9EBAE), to(#F9EBAE));
     padding: 0.4em;
     margin: 0 1em 0.4em 1em;
-    /*    border: 1px solid white;*/
 }
 
 #tabs li {
+    font-size: 130%;
+    font-weight: bold;
     display: inline-block;
     background-color: #EFE06C;
     padding: 0.2em 0.3em;
     border: 1px solid #385b7b;
-    font-size: smaller;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
@@ -221,19 +220,6 @@ ul.checklist li {
     border: 2px solid  #385b7b;
 }
 
-#main {
-    background-color: #F9EBAE;
-    font-size: x-large;
-    font-weight: bold;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    padding: 0.4em;
-    margin: 0 1em 0.4em 1em;
-    /*    border: 1px solid white;*/
-}
-
 .close_icon {
     border: 0;
     margin: 1px;
@@ -248,27 +234,26 @@ ul.checklist li {
     -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
     background-image: -moz-linear-gradient(100% 100% 90deg, #EFCA4B, #F9EBAE );
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EFCA4B), to(#F9EBAE));
-    padding: 0.7em; }
+    padding: 0.7em;
+    margin: 0 1em 0.4em 1em;
+}
+
 .pagination a, .pagination span, .pagination em {
+    font-size: 70%;
     padding-left:8px;
     padding-right:8px;
     padding-top:5px;
     padding-bottom: 5px;
     border: solid #999999 1px;
     text-decoration: none;
-
     color:black;
     background-color: #EBEAE9;
-
     background-image: -moz-linear-gradient(100% 100% 90deg, #cccccc,#EBEAE9);
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#cccccc), to(#EBEAE9));
-
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     -webkit-box-shadow: 0 2px 3px rgba(0,0,0, .4);
     -moz-box-shadow: 0 2px 3px rgba(0,0,0, .4);
-
-
 }
 
 .pagination  a:hover {
@@ -277,210 +262,43 @@ ul.checklist li {
     background-image: -moz-linear-gradient(100% 100% 90deg, #F9EBAE,#EFCA4B);
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EFCA4B), to(#F9EBAE));
 }
+
 .pagination em {
     background-color: #eeeeee;
     color: black;
-
     background-image: -moz-linear-gradient(100% 100% 90deg, #eeeeee, #ffffff);
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#eeeeee));
 }
 
-
 .pagination span.disabled {
     color: #AAA; }
 
-
-dt label {
-    margin-left: 18px;
-}
-dd {
-    margin-bottom: 10px;
-}
-input[type='text'] {
-    font-size: 1.2em;
-    width: 80%;
-}
-select {
-    font-size: 1.1em;
-    width: 80%;
-}
-#HeaderUserMenu {
-    font-size: 10px;
-    float:right;
-}
-#HeaderUserMenu a {
-    text-decoration: none;
-    color: #333333;
-}
-
-#MainMenu ul {
-    padding:0;
-    margin:0;
-}
-#MainMenu li {
-    display: inline;
-    list-style: none;
-    padding-right: 10px;
-    margin: 0;
-}
-#MainMenu a {
+#paginate_info {
     color: #ffffff;
-    text-decoration: none;
-    padding: 5px;
-    border-bottom: none;
-}
-#MainMenu a:hover {
-    color: white;
-    background-image: -moz-linear-gradient(100% 100% 90deg, #385b7b,#48739c);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#48739c), to(#385b7b));
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-transform: scale(1.1);
-    -moz-transform: scale(1.1);
-    -webkit-box-shadow: 0 2px 5px rgba(0,0,0, .5);
-    -moz-box-shadow: 0 2px 5px rgba(0,0,0, .5);
-}
-.Section {
-    background-color: #ffffff;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    border: 1px solid #cccccc;
-    padding: 5px;
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-.SectionHeading {
-    background-color: #eeeeee;
-    font-size: 16px;
     font-weight: bold;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    border-bottom: 1px solid #cccccc;
-    background-image: -moz-linear-gradient(100% 100% 90deg, #eeeeee, #ffffff);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#eeeeee));
-    padding: 10px;
-}
-.SectionHeadingMenu {
-    font-size: 12px;
-    float:right;
-}
-.SectionHeadingMenu a {
-    text-decoration: none;
-    border: none;
-    padding: 5px;
-    color: #333333;
-}
-.SectionHeadingMenu a:hover {
-    color: white;
-    background-color: #385b7b;
-    background-image: -moz-linear-gradient(100% 100% 90deg, #385b7b,#48739c);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#48739c), to(#385b7b));
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-}
-
-.SectionContent {
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-.SectionContent p {
-    padding-left: 5px;
-    padding-right: 5px;
-}
-
-.DataTable {
-    padding-top: 10px;
-    padding-bottom: 15px;
-    border-collapse: collapse;
-
-}
-.DataTable th {
-    background-color: #dddddd;
-    color: #333333 !important;
-    border-top: solid 1px #cccccc;
-    border-bottom: solid 1px #cccccc;
-}
-
-.DataTable td {
-    border-bottom: solid 1px #eeeeee;
-
-}
-.DataTable tr:hover {
-    color:#ffffff;
-    background-color: #385b7b;
-    background-image: -moz-linear-gradient(100% 100% 90deg, #385b7b,#48739c);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#48739c), to(#385b7b));
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-}
-
-.DataTable tr:hover a {
-    color: #ffffff;
-    border-bottom: solid 1px #ffffff;
-}
-.PaginationWidget {
-    text-align:center;
-}
-.PaginationWidget ul {
-
-}
-.PaginationWidget ul li {
-    display: inline;
-    list-style: none;
-    padding-right: 5px;
-    margin: 0;
-}
-.PaginationWidget ul li img {
-    margin-bottom: -2px;
-}
-.PaginationWidget ul li a {
-    padding-left:8px;
-    padding-right:8px;
-    padding-top:5px;
-    padding-bottom: 5px;
-    border: solid #999999 1px;
-    text-decoration: none;
-
-    color:black;
-    background-color: #cccccc;
-
-    background-image: -moz-linear-gradient(100% 100% 90deg, #999999,#cccccc);
-    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#cccccc), to(#999999));
-
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 2px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 2px 3px rgba(0,0,0, .4);
+    -webkit-box-shadow: 0 1px 1px rgba(0,0,0, .1);
+    -moz-box-shadow: 0 1px 1px rgba(0,0,0, .1);
+    background-color: #EFCA4B;
+    padding: 0.7em;
+    margin: 0 1em 0.4em 1em;
 
 }
-
-.ErrorMessage {
+.error {
     color: #ffffff;
-    font-size: 14px;
     font-weight: bold;
-    -moz-border-radius: 5px;
-    -webkit-border-radius: 5px;
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    -moz-box-shadow: 0 1px 3px rgba(0,0,0, .4);
-    border-bottom: 1px solid #cccccc;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+    -webkit-box-shadow: 0 1px 1px rgba(0,0,0, .1);
+    -moz-box-shadow: 0 1px 1px rgba(0,0,0, .1);
     background-color: #a70f0f;
     background-image: -moz-linear-gradient(100% 100% 90deg, #a70f0f, #c01313);
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#c01313), to(#a70f0f));
-    padding: 10px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    margin-left: 10px;
-    margin-right: 10px
+    padding: 0.7em;
 }
-.SuccessMessage {
+.success {
     color: #ffffff;
-    font-size: 14px;
     font-weight: bold;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
@@ -490,18 +308,6 @@ select {
     background-color: #4f8d0d;
     background-image: -moz-linear-gradient(100% 100% 90deg, #4f8d0d, #5ba210);
     background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#5ba210), to(#4f8d0d));
-    padding: 10px;
-    margin-top: 5px;
-    margin-bottom: 5px;
-    margin-left: 10px;
-    margin-right: 10px;
-
-}
-#Footer {
-    font-size: 10px;
-    padding-top: 5px;
-    border-top: solid 1px #dddddd;
-}
-#CopyrightStatement {
-    text-align: right;
+    padding: 0.7em;
+    margin-bottom: 0.5em;
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Ace Suares
@@ -113,9 +113,9 @@ files:
 - app/models/geo_code_curacao.rb
 - app/views/inline_forms/_edit.html.erb
 - app/views/inline_forms/_header.html.erb
-- app/views/inline_forms/_index.html.erb
+- app/views/inline_forms/_list.html.erb
 - app/views/inline_forms/_new.html.erb
-- app/views/inline_forms/index.html.erb
+- app/views/inline_forms/_show.html.erb
 - app/views/layouts/inline_forms.rhtml
 - inline_forms.gemspec
 - lib/generators/inline_forms/USAGE

data/app/views/inline_forms/_index.html.erb

@@ -1,6 +0,0 @@
-<% flash.each do |key, value| %>
-  <div id="flash" class="flash <%= key %>"><%= value %></div>
-<% end %>
-<%= inline_forms_list(@objects, @Klass.to_s.pluralize) %>
-<%= will_paginate @objects %>
-<div id="paginate_info"><%= page_entries_info @objects %></div>

data/app/views/inline_forms/index.html.erb

@@ -1,7 +0,0 @@
-<% flash.each do |key, value| %>
-  <div id="flash" class="flash <%= key %>"><%= value %></div>
-<% end %>
-
-<%= inline_forms_list(@objects, @Klass.to_s.pluralize) %>
-<%= will_paginate @objects %>
-<div id="paginate_info"><%= page_entries_info @objects %></div>