inline_forms 1.6.38 → 1.6.39

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQ0ZjllZjdlNTQzYjAwMWI5NmM2OWE1NGE1OTJmZjQ5NTI3NmI2OA==
+    MGFlZTcwOTJlYThjNTg5MDdiN2FmODYzNmJhY2Y2MDQ5YzVmMTkzNQ==
   data.tar.gz: !binary |-
-    OWZjYjg5NjdiNTgyMzMxNGU3OTZkNmU4MTRlZjNhOWU1NzIzOGQwMA==
+    ZWM5YTU2OGZjYzZkMDZlMTI4M2IwYjRhNjk1ZmYyOWIyZDZkMTg0ZQ==
 SHA512:
   metadata.gz: !binary |-
-    OWVkMDM5ZjQyMzAzNmFjMzczNmE0MWFhMGZhZTIzZDQ4NzM1N2U0OGE5YTMw
-    YTFhMmFlMzk3ZTdhNGFmNzlkM2I0NTZiZjM2YWM2ZmJlMmY4MjA3NzlhOTlj
-    NThmNjVkNDNkZjcxYmM0OTAyN2E2Yzk5YzM1NjU1ZGMyOTM1ZWY=
+    NDJhMDkzYmEyYzBjNjdmMzRhNTYzNDU5Y2JmNDgzMDJmMTBmZDIyMjc5M2I2
+    OTBjYjQ5ZGViMjc3OGI3MTc0YWMyMzgwM2Q5ZTc1NjMyZDI5Y2RiNzZhZjli
+    ZTQ1NmQ5MzcxNWY0YzBmNGE4NjViY2JkOWQ1Yjk0ZDBjYmY3ZGU=
   data.tar.gz: !binary |-
-    ZGJlMjlkMTQ0NDk2MGMxMDY4ODFmZGU2YjZlOTJiY2Y2NDZiYjVlOWFhOWE2
-    MzNjODI0MWU4OGNmY2I1ZDU4M2FlZDNhMTg3OTk0MWFkZTEzYmZhODVkZGM5
-    NDliNzYwNTcwNTA2M2U4N2NiNWQ0ZWIwNWVhMjJiNmMyNTVjNjU=
+    ZGFkZTk0ZjdhYTJmYzM2ZDM2MmZlYzRiNDAzNjA4MDY2Y2VmM2E5Yzc0ZGRh
+    YjgwZTQ1MDI5MGU1NzQ1ZTM2ZjUwMzAwZDAyNDU4MjhmZjJlNzM5NjhhZjFi
+    MjRiYWRlMWNkY2EwMGFmNmE3MTExNWE5NmE5MzBhZTQ2MTk2MDc=

data/lib/app/assets/javascripts/inline_forms.js

@@ -1,6 +1,8 @@
+/*
 $(document).ready(function() {
     // get rid of translation_missing tooltips
     $(this).on("mouseover", ".translation_missing",  function() {
         $(this).attr('title', '');
     });
 });
+*/

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

@@ -136,12 +136,12 @@
 
 
 #inline_forms_application_header {
-    background-color: #B94C32;
+    background-color: #A3381E;
     color: #FFFFFF;
 }
 
 #logout, #logout a {
-    background-color: #B94C32;
+    background-color: #A3381E;
     color: #FFFFFF;
 }
 

data/lib/app/helpers/inline_forms_helper.rb

@@ -20,55 +20,29 @@ module InlineFormsHelper
 
   # close link
   def close_link( object, update_span )
-    link_to image_tag(  'close.png',
-      :class => "close_icon",
-      :title => t('inline_forms.view.close') ),
+    link_to "<i class='fi-x'></i>".html_safe,
       send( object.class.to_s.underscore + '_path',
       object,
       :update => update_span,
       :close => true ),
-      :remote => true
+      :remote => true,
+      :title => t('inline_forms.view.close')
   end
 
   # destroy link
   def link_to_destroy( object, update_span )
     if cancan_disabled? || ( can? :delete, object )
-      link_to image_tag(  'trash.png',
-        :class => "trash_icon",
-        :title => t('inline_forms.view.trash') ),
+      link_to "<i class='fi-trash'></i>".html_safe,
         send( object.class.to_s.underscore + '_path',
         object,
         :update => update_span ),
         :method => :delete,
-        :remote => true
-    end
-  end
-
-  #  # undo link
-  #  def link_to_undo_destroy(object, update_span )
-  #    link_to(t('inline_forms.view.undo'), revert_version_path(object.versions.scoped.last), :method => :post)
-  #  end
-
-  # link_to_inline_edit
-  def link_to_inline_edit(object, attribute, attribute_value='')
-    attribute_value = attribute_value.to_s
-    spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
-    value = h(attribute_value) + ("&nbsp;" * spaces).html_safe
-    css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
-    if cancan_disabled? || ( can? :update, object, attribute )
-      link_to value,
-        send( 'edit_' + object.class.to_s.underscore + '_path',
-        object,
-        :attribute => attribute.to_s,
-        :form_element => calling_method.sub(/_[a-z]+$/,'').sub(/block in /,''),
-        :update => css_class_id ),
-        :remote => true
-    else
-      h(attribute_value)
+        :remote => true,
+        :title => t('inline_forms.view.trash')
     end
   end
 
-  # link to new record
+  # new link
   def link_to_new_record(model, path_to_new, update_span, parent_class, parent_id)
     out = ""
     out << "<div class='new_record_link'>"
@@ -93,6 +67,25 @@ module InlineFormsHelper
     end
   end
 
+  # link_to_inline_edit
+  def link_to_inline_edit(object, attribute, attribute_value='')
+    attribute_value = attribute_value.to_s
+    spaces = attribute_value.length > 40 ? 0 : 40 - attribute_value.length
+    value = h(attribute_value) + ("&nbsp;" * spaces).html_safe
+    css_class_id = "#{object.class.to_s.underscore}_#{object.id}_#{attribute}"
+    if cancan_disabled? || ( can? :update, object, attribute )
+      link_to value,
+        send( 'edit_' + object.class.to_s.underscore + '_path',
+        object,
+        :attribute => attribute.to_s,
+        :form_element => calling_method.sub(/_[a-z]+$/,'').sub(/block in /,''),
+        :update => css_class_id ),
+        :remote => true
+    else
+      h(attribute_value)
+    end
+  end
+
   # url to other language
   def locale_url(request, locale)
     subdomains = request.subdomains

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

@@ -37,4 +37,4 @@
     </section>
 
   </nav>
-</div>
+</div>

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

@@ -1,9 +1,9 @@
 <% unless @skip %>
 <div class="row">
-  <div class="large-10 column object_presentation">
+  <div class="small-11 column object_presentation">
     <%= h(@object._presentation) -%>
   </div>
-  <div class="large-1 column close_link" >
+  <div class="small-1 column close_link" >
     <%= close_link(@object, @update_span) -%>
   </div>
 </div>
@@ -19,7 +19,7 @@
         </div>
       </div>
     <% else %>
-      <div class="row <%= 'has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="">
+      <div class="row <%= cycle('odd', 'even') %><%= ' has_validations ' if @object.has_validations_for?(attribute) -%>" validation-hint="">
         <div class='large-4 column<%= " attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
           <span data-tooltip class="has-tip tip-top" title="<%= validation_hints_as_list_for(@object, attribute) -%>">
             <%= @object.class.human_attribute_name(attribute) -%>
@@ -41,3 +41,4 @@
     <% end -%>
   <% end -%>
 <% end -%>
+<div class="record_footer"></div>

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

@@ -1,24 +1,14 @@
 <!DOCTYPE html>
-<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7 ]> <html class="ie6" lang="en"> <![endif]-->
-<!--[if IE 7 ]>    <html class="ie7" lang="en"> <![endif]-->
-<!--[if IE 8 ]>    <html class="ie8" lang="en"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!--> <html lang="en"> <!--<![endif]-->
+<html lang="en">
   <head>
     <meta charset="utf-8" />
-
-    <!-- Uncomment to make IE8 render like IE7 -->
-    <!-- <meta http-equiv="X-UA-Compatible" content="IE=7" /> -->
-
-    <!-- Set the viewport width to device width for mobile -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,400italic' rel='stylesheet' type='text/css' />
-    <title><%= t('application.name') + " v" + InlineForms::VERSION -%></title>
+    <title><%= t('application_name') + " v" + InlineForms::VERSION -%></title>
 
     <%= stylesheet_link_tag    "application" %>
-    <%= javascript_include_tag "vendor/custom.modernizr" %>
+    <%= javascript_include_tag "vendor/modernizr" %>
     <%= csrf_meta_tags %>
-
   </head>
 
   <body>

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

@@ -1,32 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
   <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
     <title><%= t('application_name') + " v" + InlineForms::VERSION -%></title>
-    <%= stylesheet_link_tag 'inline_forms_application', 'application' %>
+
+    <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
-    <%= csrf_meta_tag %>
-    <%= yield(:head) %>
-    <script>
-      $.datepicker.setDefaults({
-        dateFormat: 'dd-mm-yy',
-        changeMonth: true,
-        changeYear: true,
-        showOtherMonths: true,
-        selectOtherMonths: true,
-        showButtonPanel: false,
-        showWeek: true,
-        firstDay: 1,
-        prevText: '<<',
-        nextText: '>>'
-      })
-    </script>
+    <%= csrf_meta_tags %>
   </head>
+
   <body>
+
     <%= render "inline_forms/header" %>
     <%= render "/inline_forms_tabs" %>
     <div id="inline_forms_main_list">
-      <%= yield %>
+    <%= yield %>
     </div>
     <%= javascript_include_tag 'application', 'inline_forms_application' %>
   </body>

data/lib/inline_forms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.6.38
+  version: 1.6.39
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -170,12 +170,10 @@ files:
 - bin/inline_forms
 - bin/inline_forms_app_template.rb
 - inline_forms.gemspec
-- lib/app/assets/images/close.png
 - lib/app/assets/images/devise_footer_left.png
 - lib/app/assets/images/devise_footer_right.png
 - lib/app/assets/images/devise_header.png
 - lib/app/assets/images/glass_plate.gif
-- lib/app/assets/images/trash.png
 - lib/app/assets/javascripts/ckeditor/config.js
 - lib/app/assets/javascripts/inline_forms.js
 - lib/app/assets/javascripts/inline_forms_application.js