inline_forms 1.6.36 → 1.6.37

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODU0NDY3YjdhMjlmNzEyNGMxYWJkY2I1N2JlNTEwYWQ3ODM4Njk1OA==
+    M2JmNDE5Nzc4MDc2YjY1M2U1N2E5OTMzN2Q5NWQ5NjNjMjk2NmJjOQ==
   data.tar.gz: !binary |-
-    M2IwMzdlNDkwOTEwOGIyOWY0OGQyZGNmNTlhNTRhZmFkZTIxNDJhMQ==
+    NTVmN2UxNGYwNjBhOTM4OGFjOTgwOTZiMDk3YTUyZGU5ZjhkZjg1YQ==
 SHA512:
   metadata.gz: !binary |-
-    NzYwMjllYzhjMTU5MGJhNDI5NTA3ZWIzZDk3ZTY0MTZjYzRjOTFjZGZjMmZj
-    NzhlOTU5Yjc5ZjI3Mjg1N2EzZGY2ZGY5OTIwZjdlYTM0ODA1ZDlmNWVjMzg5
-    OTcxZGRmNzMyYTRlMmI5ZmExYTk4ZjJjMzMyOGM2Mjc0NmU0ZTY=
+    M2ZmZWE3NDY3NzZiN2U2ZjBhZjNlNGUxODAwNjQ5NWNmMjk1N2M4YTJiYmM3
+    OTk5MWQ1MzdiN2M5Y2M4MjBjMjMwZDcxODVmNmYwOTZmNWM5MjUzMTliNDJh
+    MmM1MjFiYWIzY2RhNmYwZDYxMjJjOWIxN2JiMTFiY2ExNWE1MDI=
   data.tar.gz: !binary |-
-    YjA2ZmFlZmIyMmE2YTFkZGExZTY3ZjkwMzQ2ZTQzMzk0OGY3ZTE4Y2I3OTIy
-    OWEzYTFlNDkzZDU3OTQwNDljNDVkYTcyNTgwMzQ0OTA1N2RiYjRjOGM2ZTAy
-    ZWVmMGRiOTYwYmI2Y2VhZGNhNzA1MDlkODRjYmM4NzJjNDE4ZWM=
+    YjRhZjJlYjcwYjdhNDcxMWJiOWM1MDlmNjUwZmVjZDIzNzBkYmZmMWZlYjA1
+    NjdlYzBkZDZiODdlMGFjYjVlZTNjOGZkNzgwZTkwYzgyZTliZDA5MGNlODcy
+    YTk1YzNmODBkNTg2NDdjNjcyNWNiYTZhODYzMjdlNjcxZmU2NjA=

data/bin/inline_forms_app_template.rb

@@ -26,6 +26,7 @@ gem 'i18n-active_record', :git => 'git://github.com/acesuares/i18n-active_record
 gem 'unicorn'
 gem 'rvm'
 gem 'rvm-capistrano'
+gem 'foundation-rails'
 
 gem_group :development do
   gem 'sqlite3'
@@ -46,7 +47,6 @@ gem_group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'compass-rails' # you need this or you get an err
-  gem 'zurb-foundation', '~> 4.0.0'
 end 
 
 say "- Running bundle..."

data/lib/app/assets/stylesheets/inline_forms.css

@@ -185,7 +185,21 @@ ul.checklist li {
     padding: 0;
 }
 
-#Header {
+/* HEADER */
+
+#inline_forms_application_header {
+    background-color: #B94C32;
+    color: #FFFFFF;
+}
+
+#logout, #logout a {
+    background-color: #B94C32;
+    color: #FFFFFF;
+}
+
+
+/* Deprecated by foundation
+  #Header {
     background-color: #B94C32;
     color: #FFFFFF;
     font-weight: bold;
@@ -193,52 +207,47 @@ ul.checklist li {
     -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 white;*/
+    /*    border: 1px solid white; *\/
     padding: 0.4em;
     margin: 0.4em 0 0.3em 0;
-}
-
-/* HEADER */
-
-#title {
+  }
+  #title {
     float: left;
     height: 1.5em;
-}
-
-#logout {
-    float:right;
-    height: 1.5em;
-}
-
-#locales {
-    float: left;
-    height: 1.5em;
-    margin-left: 2em;
-}
-
-#locales ul {
-    list-style: none;
-    list-style-position: inside;
-    margin: 0;
-    padding: 0;
-}
-
-#locales li {
-    display: inline-block;
-    height: 1.5em;
-}
-
-#locales li a {
-    color: white;
-}
-
-#locales li .active_locale {
-    color: yellow;
-}
-
-#logout a {
-    color: white;
-}
+  }
+  #logout {
+      float:right;
+      height: 1.5em;
+  }
+  #logout a {
+      color: white;
+  }
+  #locales {
+      float: left;
+      height: 1.5em;
+      margin-left: 2em;
+  }
+  
+  #locales ul {
+      list-style: none;
+      list-style-position: inside;
+      margin: 0;
+      padding: 0;
+  }
+  
+  #locales li {
+      display: inline-block;
+      height: 1.5em;
+  }
+  
+  #locales li a {
+      color: white;
+  }
+  
+  #locales li .active_locale {
+      color: yellow;
+  }
+*/
 
 /* END HEADER */
 

data/lib/app/views/inline_forms/_close.html.erb

@@ -1,2 +1,7 @@
-<%= link_to_destroy(@object, @update_span) -%>
-<%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true -%>
+<div  class="small-1 column">
+  <%= link_to_destroy(@object, @update_span) -%>
+</div>
+<div  class="small-11 column">
+  <%= link_to h(@object._presentation), send(@object.class.to_s.underscore + "_path", @object, :update => @update_span), :remote => true -%>
+</div>
+

data/lib/app/views/inline_forms/_header.html.erb

@@ -1 +1,23 @@
-<div id="Header">Inline Forms</div>
+<nav id='inline_forms_application_header' class="top-bar" data-topbar>
+  <ul class="title-area">
+    <li class="name">
+      <h1><a href="#"><%= application_title %> v<%= inline_forms_version %></a></h1>
+    </li>
+    <li class="toggle-topbar menu-icon">
+      <a href="#"><span></span></a>
+    </li>
+  </ul>
+  <section class="top-bar-section" id="logout">
+    <ul class="right">
+      <li class="has-dropdown">
+        <a href="#"><%= current_user.name %></a>
+        <ul class="dropdown">
+          <li>
+            <%= link_to("Afmelden...", destroy_user_session_path, :method => :delete) if current_user  %>
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </section>
+
+</nav>

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

@@ -47,7 +47,7 @@ they are @object. We need this magic here to rewrite all the @variables to varia
   <% objects = objects.paginate  :page => params[:page], :per_page => @PER_PAGE || 5, :conditions => conditions %>
 <% end %>
 
-<%= raw "<ul id=\"#{update_span}\" class=\"inline_forms_list\">" if ul_needed -%>
+<%= raw "<div id=\"#{update_span}\" class=\"inline_forms_list\">" if ul_needed -%>
 <!--  # link to new -->
 <%= link_to_new_record(model, path_to_new, update_span, parent_class, parent_id) -%>
 <!--  # list of objects -->
@@ -59,12 +59,16 @@ they are @object. We need this magic here to rewrite all the @variables to varia
     <% 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_destroy(object, css_class_id) -%>
-    <%= link_to h(object._presentation),
-      send( path_to_object, object, :update => css_class_id),
-      :remote => true -%>
-  </li>
+  <div class="row <%= cycle('odd', 'even') %>" id="<%= css_class_id -%>">
+    <div  class="small-1 column">
+      <%= link_to_destroy(object, css_class_id) -%>
+    </div>
+    <div  class="small-11 column">
+      <%= link_to h(object._presentation),
+        send( path_to_object, object, :update => css_class_id),
+        :remote => true -%>
+    </div>
+  </div>
 <% end -%>
 <!--  # pagination -->
 <% if parent_id.nil? -%>
@@ -72,5 +76,5 @@ they are @object. We need this magic here to rewrite all the @variables to varia
 <% else %>
   <% pagination = will_paginate objects, :remote => true, :params => {:controller => attribute, :action => :index, :id => nil, :parent_class => parent_class, :parent_id => parent_id, :update => "#{parent_class.to_s.underscore}_#{parent_id}_#{attribute}", :ul_needed => true  } -%>
 <% end %>
-<%= raw "<li class=\"#{cycle('odd', 'even')}\">" + pagination + "</li>" if pagination -%>
-<%= raw "</ul>" if ul_needed -%>
+<%= raw "<div class=\"row\><div class=\"large-12 column #{cycle('odd', 'even')}\">" + pagination + "</div></div>" if pagination -%>
+<%= raw "</div>" if ul_needed -%>

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

@@ -3,70 +3,63 @@
     <div id="flash" class="flash <%= key %>">
       <ul>
         <% value.each do |m| %>
-          <li><%= m %></li>
+        <li>
+          <%= m %>
+        </li>
         <% end %>
       </ul>
     </div>
   <% end %>
   <script type="text/javascript">
-    $(function() { $("#flash").delay(1000).fadeTo('slow', 0.33); } );
+    $(function() {
+      $("#flash").delay(1000).fadeTo('slow', 0.33);
+    });
   </script>
-  <%= 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 -%>
+  <%= 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">
-      <table cellspacing="0" cellpadding="0">
-        <tr>
-          <th colspan="2" valign="top">
-            <div class="object_presentation" >
-              <%= t('inline_forms.view.add_new', :model => @Klass.model_name.human ) -%>
+      <div class="row" >
+        <div class="large-12 column object_presentation" >
+          <%= t('inline_forms.view.add_new', :model => @Klass.model_name.human ) -%>
+        </div>
+      </div>
+      <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
+      <% attributes.each do | attribute, name, form_element | -%>
+        <% unless form_element.to_sym == :associated || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute)) -%>
+          <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
+          <% if form_element == :header %>
+            <div class="row" >
+              <div class='large-12 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <%= @object.class.human_attribute_name(attribute) -%>
+              </div>
+            </div>
+          <% else %>
+            <div class="row <%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
+              <div class='large-4 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <%= @object.class.human_attribute_name(attribute) -%>
+              </div>
+              <div class='large-8 column<%= " attribute_value attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <span id="<%= css_class_id -%>" > <%= send("#{form_element}_edit", @object, attribute) -%> </span>
+              </div>
             </div>
-          </th>
-        </tr>
-        <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
-        <% attributes.each do | attribute, name, form_element | -%>
-          <% unless form_element.to_sym == :associated || (cancan_enabled? && cannot?(:read, @Klass.to_s.underscore.pluralize.to_sym, attribute)) -%>
-            <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
-            <% if form_element == :header %>
-              <tr>
-                <td valign="top" class="header" colspan="2">
-                  <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-                    <%= @object.class.human_attribute_name(attribute) -%>
-                  </div>
-                </td>
-              </tr>
-            <% else %>
-              <tr>
-                <td valign="top" class="<%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
-                  <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-                    <%= @object.class.human_attribute_name(attribute) -%>
-                  </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 -%>
         <% end -%>
-      </table>
-    </div>
-    <%= 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 -%>
+      <%= 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 %>
+      <%= submit_tag "ok", :class => "edit_form_submit"-%>
+      <div style="clear: both;"></div>
     <% end %>
-    <%= submit_tag "ok", :class => "edit_form_submit"-%>
-    <div style="clear: both;"></div>
-  <% end %>
 </li>
 <script type="text/javascript">
-  $(function() { $("#newnew").slideDown(4000); } );
+  $(function() {
+    $("#newnew").slideDown(4000);
+  }); 
 </script>

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

@@ -1,49 +1,39 @@
-<table cellspacing="0" cellpadding="0" style="height: 0">
-  <tr>
-    <th valign="top" colspan="2">
-      <div class="object_presentation" >
-        <%= h(@object._presentation) -%>
+<div class="row">
+  <div class="large-10 column object_presentation">
+    <%= h(@object._presentation) -%>
+  </div>
+  <div class="large-1 column close_link" >
+    <%= close_link(@object, @update_span) -%>
+  </div>
+</div>
+<% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
+<% attributes.each do | attribute, name, form_element | -%>
+  <% if cancan_disabled? || can?(:read, @object, attribute) %>
+    <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
+    <% if form_element == :header %>
+      <div class="row header">
+        <div class='large-12 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+          <%= @object.class.human_attribute_name(attribute) -%>
+        </div>
       </div>
-      <div class="close_link" >
-        <%= close_link(@object, @update_span) -%>
+    <% else %>
+      <div class="row <%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
+        <div class='large-4 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+          <%= @object.class.human_attribute_name(attribute) -%>
+        </div>
+        <div class='large-8 column<%= " 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>
       </div>
-    </th>
-  </tr>
-  <% attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list -%>
-  <% attributes.each do | attribute, name, form_element | -%>
-    <% if cancan_disabled? || can?(:read, @object, attribute) %>
-      <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
-      <% if form_element == :header %>
-        <tr>
-          <td valign="top" class="header" colspan="2">
-            <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-              <%= @object.class.human_attribute_name(attribute) -%>
-            </div>
-          </td>
-        </tr>
-      <% else %>
-        <tr>
-          <td valign="top" class="<%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="<%= validation_hints_as_list_for(@object, attribute) -%>">
-            <div class='<%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
-              <%= @object.class.human_attribute_name(attribute) -%>
-            </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 -%>
     <% end -%>
   <% end -%>
-</table>
+<% end -%>

data/lib/app/views/layouts/inline_forms.html.erb

@@ -4,7 +4,7 @@
   <head>
     <title><%= t('application_name') + " v" + InlineForms::VERSION -%></title>
     <%= stylesheet_link_tag 'inline_forms_application', 'application' %>
-    <%= javascript_include_tag 'application', 'inline_forms_application' %>
+    <%= javascript_include_tag "vendor/modernizr" %>
     <%= csrf_meta_tag %>
     <%= yield(:head) %>
     <script>
@@ -28,5 +28,6 @@
     <div id="inline_forms_main_list">
       <%= yield %>
     </div>
+    <%= javascript_include_tag 'application', 'inline_forms_application' %>
   </body>
 </html>

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "1.6.36"
+  VERSION = "1.6.37"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.6.36
+  version: 1.6.37
 platform: ruby
 authors:
 - Ace Suares