inline_forms 5.0.22 → 5.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf77cdc0c3da8f53227b0883967be1366219cda
-  data.tar.gz: 620e3b7126d08e38043bd00d1c91b629adb235f9
+  metadata.gz: dd6691df3203712f33899e1d8d1f6e4111d54356
+  data.tar.gz: 0507ce2baa082df9a2b0e9f98d050c7c72c9474b
 SHA512:
-  metadata.gz: a1effd59c017e1e0ea79a749c3287f88a959890b721b9c285cf122b15147da18f415e147820df5c1596de748156f157f882437bfebea8f071c2f5bab4d081036
-  data.tar.gz: 6628e7f0d5fd2c3de9ddb1855257652c6bf38e9c47407feeca1bf94456fd16410acb18121597a19a7eadd8ed3f08e68fb94b86d278cbf190ed57d1d99fed06e1
+  metadata.gz: 1f5e1b62be60a53bb817bd10a508086bf53a65fa40e22e2eb280b870d364ea017612e042eedae94ddfe3b0e621d98f9e4f7fbe19c36b5888734fb0437ba87e04
+  data.tar.gz: ec579cfb48811a98e65bb7328c7764d1f1f8f85341ea18789b11c85e2a385f79ffb7d480134ae2da1d69fd280b6796b0874883a0f9f035bbc5eb9298512c6278

data/{lib/generators/assets/javascripts → app/assets/javascripts/inline_forms}/inline_forms.js

@@ -1,3 +1,12 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery.ui.all
+//= require ckeditor/init
+//= require jquery.timepicker.js
+//= require foundation
+//= require jquery.remotipart
+
+$(function(){ $(document).foundation(); });
 // initialize datepickers
   $(document).ready(function() {
     $.datepicker.setDefaults({

data/app/assets/stylesheets/inline_forms/inline_forms.scss

@@ -0,0 +1,335 @@
+// inline_forms
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic);
+@import 'foundation-icons';
+@import 'themes/jquery.ui.sunny';
+@import 'jquery.ui.all';
+@import 'foundation_and_overrides';
+
+.contain-to-grid {
+  background-color: $body-bg !important;
+}
+
+input {
+  margin: 2px 0 !important;
+}
+
+select {
+  background-color: #fff8e0 !important;
+  border: 0 !important;
+  margin: 2px 0 !important;
+  padding: 0;
+
+}
+select:hover, select:focus {
+  background-color: lighten(#fff8e0, 2%) !important;
+  border: 0 !important;
+}
+
+#inline_forms_application_top_bar {
+    background-color: #A3381E;
+    color: #FFFFFF;
+    .top-bar-section li a {
+      background-color: #A3381E;
+    }
+}
+
+#inline_forms_model_top_bar {
+  background-color: #E1C150;
+  padding-top: 45px;
+  height: 90px;
+  .top-bar-section {
+    .right, li, .has-form {
+      background-color: #E1C150;
+    }
+    .inline_forms_model_top_bar_buttons {
+      top: 4px !important;
+      padding: 7px 0 7px 0 !important;
+      margin: 0 !important;
+    }
+    .new_button  {
+      background-color: #E1C150;
+      color: #B94C32;
+      font-size: 1.3rem;
+      padding: 0 2rem 0 1rem;
+    }
+    .new_button:hover, .new_button:focus {
+      color: white;
+      -webkit-transition-property: color;
+      transition-property: color;
+    }
+    input[type=text]:hover, input[type=text]:focus {
+      background-color: lighten(#fff8e0, 5%);
+      -webkit-transition-property: background-color;
+      transition-property: background-color;
+    }
+  }
+}
+
+#inline_forms_model_top_bar_container {
+    z-index: 9;
+}
+
+#outer_container {
+  width: 100%;
+  position: absolute;
+  top: 90px;
+}
+
+.top-level a {
+  font-weight: bold;
+  font-size: 110%;
+}
+.list_container {
+  .row {
+    font-size: 1.2rem;
+    font-weight: normal;
+    line-height: 2.2rem;
+    margin: 0 auto !important;
+  }
+  .odd {
+    background-color: #FBE38E;
+  }
+  .even {
+    background-color: #FBEEC1;
+  }
+}
+
+.inline_forms_list, .new_record {
+  .row.odd, .row.even {
+    font-size: 1rem !important;
+    font-weight: normal !important;
+  }
+  .row.form_element_header {
+    border-top: 1px solid #B94C32;
+    background-color: rgb(239, 202, 75);
+    font-weight: normal !important;
+    font-size: 1.3rem !important;
+  }
+}
+
+.new_record {
+  .button {
+    margin: 0;
+    padding: 0.5rem;
+  }
+}
+
+.object_presentation {
+  background-color: #B94C32;
+  color: white;
+  .close_button  {
+    background-color: #B94C32;
+    font-size: 1.3rem;
+    padding: 0 1rem 0 1rem;
+    margin: 0;
+  }
+  .close_button:hover, .close_button:focus {
+    background-color: #B94C32;
+    color: #FBEEC1;
+    -webkit-transition-property: color;
+    transition-property: color;
+  }
+}
+
+.list_container {
+  .row.odd, .row.even {
+    font-size: 1rem !important;
+    font-weight: normal !important;
+  }
+  .row.form_element_header {
+    border-top: 1px solid #B94C32;
+    background-color: rgb(239, 202, 75);
+    font-weight: normal !important;
+    font-size: 1.3rem !important;
+  }
+}
+
+
+
+.associated_auto_header {
+  border-top: 1px solid #B94C32;
+  .new_button  {
+    background-color: rgb(239, 202, 75);
+    font-size: 1.5rem;
+    color: #B94C32;
+    padding: 0 0.5rem 0 1rem;
+    margin: 0;
+  }
+  .new_button:hover, .new_button:focus {
+    background-color: rgb(239, 202, 75);
+    color: white;
+    -webkit-transition-property: color;
+    transition-property: color;
+  }
+  .close_button  {
+    background-color: rgb(239, 202, 75);
+    font-size: 1.5rem;
+    color: #B94C32;
+    padding: 0 0.5rem 0 1rem;
+    margin: 0;
+  }
+  .close_button:hover, .new_button:focus {
+    background-color: rgb(239, 202, 75);
+    color: white;
+    -webkit-transition-property: color;
+    transition-property: color;
+  }
+}
+
+.pagination {
+  font-weight: normal;
+  font-size: 0.9em;
+  a:hover {
+    color: #B94C32;
+    -webkit-transition-property: color;
+    -webkit-transition-duration: 0.3s;
+    transition-property: color;
+    transition-duration: 0.3s;
+  }
+  em {
+    color: #B94C32;
+    font-weight: bold;
+    font-style: normal;
+  }
+  span.disabled {
+    color: #AAA;
+  }
+}
+
+.record_footer {
+  background-color: rgb(239, 202, 75);
+  height: 0.2em;
+  border-bottom: 1px solid #B94C32;
+  margin-bottom: 1.5em;
+}
+
+.flash {
+  margin-top: 1em;
+  padding: 0.5em;
+  color: #A3381E;
+  font-size: 130%;
+  font-weight: bold;
+  line-height: 120%;
+  background-color: white;
+  border-top: 0.5em solid #fade7a;
+}
+
+  .custom-combobox {
+    position: relative;
+    display: inline-block;
+  }
+  .custom-combobox-toggle {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    margin-left: -1px;
+    padding: 0;
+    /* support: IE7 */
+    *height: 1.7em;
+    *top: 0.1em;
+  }
+  .custom-combobox-input {
+    margin: 0;
+    padding: 0.3em;
+  }
+
+
+.column {
+    padding-right: 0 !important;
+}
+
+.top-bar input, .top-bar .button {
+  top: 4px !important;
+}
+
+.top-bar-section {
+  padding-left: rem-calc(12) !important;
+  padding-right: rem-calc(12) !important;
+}
+
+.first-bar {
+  margin-bottom: 0 !important;
+}
+.second-bar {
+  margin-top: 1px !important;
+  margin-bottom: 0 !important;
+}
+
+#switch_user_identifier {
+  font-size: smaller;
+  select {
+    width: 5em;
+  }
+}
+
+
+.error {
+    color: #ffffff;
+    font-weight: bold;
+    -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: 0.7em;
+}
+.success {
+    color: #ffffff;
+    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-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: 0.7em;
+    margin-bottom: 0.5em;
+}
+
+.ckeditor_area {
+    position: relative;
+}
+
+.ckeditor_area .glass_plate {
+    position: absolute;
+    top: -1px;
+    width: 98%;
+    height: 232px;
+    border: 0;
+}
+
+.ckeditor_area .cke_top, .ckeditor_area .cke_bottom, .ckeditor_area .cke_border {
+    display: none;
+}
+
+/* jQuery ui Slider 8 */
+.slider {
+    width: 300px;
+    float: left;
+}
+.slider_value {
+    float: left;
+    min-width: 60px;
+    text-align: right;
+    font-family: monospace;
+}
+
+
+/* LEFT */
+
+#category_id {
+  margin-top: -2px !important;
+}
+
+#input_search {
+  border: none !important;
+  margin-top: -2px;
+}
+
+#inline_forms_model_top_bar .top-bar-section .inline_forms_model_top_bar_buttons {
+  top: 6px !important;
+}

data/bin/inline_forms_installer_core.rb

@@ -33,6 +33,8 @@ gem 'figaro'
 gem 'unicorn'
 gem 'validation_hints'
 gem 'will_paginate' #, git: 'https://github.com/acesuares/will_paginate.git'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
 
 gem_group :development do
   gem 'bundler'
@@ -92,6 +94,8 @@ route <<-ROUTE.strip_heredoc
 devise_for :users, :path_prefix => 'auth'
   resources :users do
     post 'revert', :on => :member
+    get 'list_versions', :on => :member
+    get 'close_versions_list', :on => :member
 end
 ROUTE
 
@@ -275,19 +279,13 @@ say "- Copy images..."
   copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/images' , image), File.join('app/assets/images' , image)
 end
 
-say "- Copy stylesheets..."
-remove_file 'app/assets/stylesheets/application.css'
-remove_file 'app/assets/stylesheets/foundation_and_overrides.scss'
-%w(application.scss devise.scss foundation_and_overrides.scss inline_forms.scss).each do |stylesheet|
-  copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/stylesheets' , stylesheet), File.join('app/assets/stylesheets' , stylesheet)
-end
-
 say "- Copy javascripts..."
 remove_file 'app/assets/javascripts/application.js'
 %w(application.js inline_forms.js).each do |javascript|
   copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts' , javascript), File.join('app/assets/javascripts' , javascript)
 end
 
+
 say "- Add human_attribute_name in app/models/application_record.rb"
 remove_file 'app/models/application_record.rb' # the one that 'rails new' created
 copy_file File.join(GENERATOR_PATH, 'lib/generators/templates/application_record.rb'), "app/models/application_record.rb"
@@ -302,12 +300,12 @@ application "config.autoload_paths += %W(\#{config.root}/app/models/ckeditor)"
 say "- Set languages for ckeditor to ['en', 'nl'] in config/initializers/ckeditor.rb..."
 insert_into_file "config/initializers/ckeditor.rb", "  config.assets_languages = ['en', 'nl']\n", :after => "config.assets_languages = ['en', 'uk']\n"
 
-say "- Create ckeditor config.js"
-copy_file File.join(GENERATOR_PATH, 'lib/generators/assets/javascripts/ckeditor/config.js'), "app/assets/javascripts/ckeditor/config.js"
-
 say "- Paper_trail install..."
 generate "paper_trail:install" # TODO One day, we need some management tools so we can actually SEE the versions, restore them etc.
 
+say "- Import migrations from engines"
+run "bundle exec rails railties:install:migrations" # This is needed to add changeset field to the paper_trail versions table
+
 # Create Translations
 say "- Generate models and tables and views for translations..." # TODO Translations need to be done in inline_forms, and then generate a yml file, perhaps
 generate "inline_forms", "InlineFormsLocale name:string inline_forms_translations:belongs_to _enabled:yes _presentation:\#{name}"

data/config/initializers/paper_trail.rb

@@ -0,0 +1,7 @@
+PaperTrail.config.track_associations = false
+
+PaperTrail::Version.class_eval do
+  def author
+    User.find(whodunnit) if whodunnit
+  end
+end

data/db/migrate/20180116154757_add_object_changes_to_versions.rb

@@ -0,0 +1,5 @@
+class AddObjectChangesToVersions < ActiveRecord::Migration[5.0]
+  def change
+    add_column :versions, :object_changes, :text
+  end
+end

data/lib/app/controllers/concerns/versions_concern.rb

@@ -0,0 +1,25 @@
+module VersionsConcern
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :set_paper_trail_whodunnit
+  end
+
+  def list_versions
+    @update_span = params[:update]
+    @object = referenced_object
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :versions_list }
+    end
+  end
+
+  def close_versions_list
+    @update_span = params[:update]
+    @object = referenced_object
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :versions }
+    end
+  end
+end

data/lib/app/controllers/inline_forms_controller.rb

@@ -23,6 +23,7 @@
 #
 class InlineFormsController < ApplicationController
   include CancanConcern
+  include VersionsConcern
 
   before_action :getKlass
 

data/lib/app/helpers/form_elements/ckeditor.rb

@@ -17,7 +17,7 @@ def ckeditor_show(object, attribute)
                       :toolbarCanCollapse => "false"
                     }
     ) +
-      image_tag(  'glass_plate.gif',
+      image_tag(  'inline_forms/glass_plate.gif',
                   :class => "glass_plate",
                   :title => '' ) +
       "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +

data/lib/app/helpers/form_elements/text_area.rb

@@ -21,7 +21,7 @@ def text_area_show(object, attribute)
                         :toolbarCanCollapse => "false"
                       }
       ) +
-        image_tag(  'glass_plate.gif',
+        image_tag(  'inline_forms/glass_plate.gif',
         :class => "glass_plate",
         :title => '' ) +
         "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +

data/lib/app/helpers/inline_forms_helper.rb

@@ -88,6 +88,34 @@ module InlineFormsHelper
     end
   end
 
+  # link to versions list
+  def link_to_versions_list(path_to_versions_list, object, update_span, html_class = 'button new_button')
+    out = (link_to "<i class='fi-list'></i>".html_safe,
+                   send(path_to_versions_list,
+                        object,
+                        :update => update_span,
+                       ),
+                   :remote => true,
+                   :class => html_class,
+                   :title => t('inline_forms.view.list_versions')
+          )
+    if current_user.role? :superadmin
+      raw out
+    end
+  end
+
+  # close versions list link
+  def close_versions_list_link(object, update_span, html_class = 'button close_button' )
+    link_to "<i class='fi-x'></i>".html_safe,
+      send('close_versions_list_' + @object.class.to_s.underscore + "_path",
+          object,
+          :update => update_span
+      ),
+      :remote => true,
+      :class => html_class,
+      :title => t('inline_forms.view.close_versions_list')
+  end
+
   # link_to_inline_edit
   def link_to_inline_edit(object, attribute, attribute_value='')
     attribute_value = attribute_value.to_s

data/lib/app/views/devise/sessions/_flash.html.erb

@@ -0,0 +1,7 @@
+<% if !flash.empty? %>
+  <div id='inline_forms_devise_flash_div' class='row'>
+    <% flash.each do |name, msg| %>
+      <%= content_tag :div, msg, :id => "flash_#{name}", :class => 'devise flash' %>
+    <% end %>
+  </div>
+<% end %>

data/lib/app/views/devise/sessions/_top-bar-and-flash.html.erb

@@ -1,19 +1,2 @@
-<div class='contain-to-grid'>
-  <nav id='inline_forms_devise_top_nav_bar' class='top-bar' data-topbar>
-    <ul class='title-area'>
-      <li class='name'>
-        <h1><a href='/'><%= t('inline_forms.devise.title_for_devise') %> <%= InlineForms::VERSION %></a></h1>
-      </li>
-      <li class='toggle-topbar menu-icon'>
-        <a href='#'><span></span></a>
-      </li>
-    </ul>
-  </nav>
-</div>
-
-<div id='inline_forms_devise_flash_div' class='row'>
-  <% flash = @flash %>
-  <% flash.each do |name, msg| %>
-    <%= content_tag :div, msg, :id => "flash_#{name}", :class => 'devise flash' %>
-  <% end unless flash.blank? %>
-</div>
+<%= render 'top-bar' %>
+<%= render 'flash' %>

data/lib/app/views/devise/sessions/_top-bar.html.erb

@@ -0,0 +1,12 @@
+<div class='contain-to-grid'>
+  <nav id='inline_forms_devise_top_nav_bar' class='top-bar' data-topbar>
+    <ul class='title-area'>
+      <li class='name'>
+        <h1><a href='/'><%= t('inline_forms.devise.title_for_devise') %> <%= InlineForms::VERSION %></a></h1>
+      </li>
+      <li class='toggle-topbar menu-icon'>
+        <a href='#'><span></span></a>
+      </li>
+    </ul>
+  </nav>
+</div>

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

@@ -115,6 +115,12 @@
         <% end %>
       <% end %>
     <% end %>
+    <% if current_user.role? :superadmin %>
+      <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
+      <div id="<%= css_class_id -%>">
+        <%= render 'versions' %>
+      </div>
+    <% end %>
     <div class="record_footer"></div>
   </div>
 </div>

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

@@ -0,0 +1,14 @@
+<% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
+<div class="row form_element_header associated_auto_header callout">
+  <div class='medium-11 large-11 column' >
+    <%= "Versions (#{@object.versions.length})" %>
+  </div>
+  <div class='medium-1 large-1 column'>
+      <%= link_to_versions_list(
+            'list_versions_' + @object.class.to_s.underscore + "_path",
+            @object,
+            css_class_id
+          )
+        %>
+  </div>
+</div>

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

@@ -0,0 +1,75 @@
+<% path_to_object = @object.class.to_s.underscore + '_path' %>
+<% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_versions" -%>
+<div class="row form_element_header associated_auto_header callout">
+  <div class='medium-11 large-11 column' >
+    <%= "Versions (#{@object.versions.length})" %>
+  </div>
+  <div class='medium-1 large-1 column'>
+    <%= close_versions_list_link(
+          @object,
+          css_class_id
+        )
+      %>
+  </div>
+</div>
+<div class="row <%= cycle('odd', 'even') %>">
+  <div class='small-12 column'>
+      <div class="small-1 column">
+        &nbsp;
+      </div>
+      <div  class="small-1 column">
+        <strong>Event</strong>
+      </div>
+      <div  class="small-2 column">
+        <strong>Done by</strong>
+      </div>
+      <div  class="small-8 column">
+        <strong>Changeset</strong>
+      </div>
+  </div>
+</div>
+<div class="row <%= cycle('odd', 'even') %>">
+  <% @object.versions.reverse.each do | version | %>
+    <div class='small-12 column'>
+      <div class="small-1 column">
+        <%= link_to t('inline_forms.view.restore'),
+          send('revert_' + @object.class.to_s.underscore + "_path",
+            version,
+            :update => "#{@object.class.name.underscore}_#{@object.id}"
+          ),
+          :remote => true,
+          :method => :post
+        %>
+      </div>
+      <div class="small-1 column">
+        <%= version.event -%>
+      </div>
+      <div  class="small-2 column">
+        <%= version.whodunnit.nil? ? 'nil' : version.author.name -%>
+      </div>
+      <div  class="small-8 column">
+        <% if version.changeset.empty? %>
+          <em>empty</em>
+        <% else %>
+          <% version.changeset.each do |attribute, value| %>
+            <% next if attribute == 'updated_at' %>
+            <table>
+              <tr>
+                <th colspan="2" class="text-center"><%= attribute %></th>
+                <th></th>
+              </tr>
+              <tr>
+                <td>old value</td>
+                <td>new value</td>
+              </tr>
+              <tr>
+                <td><%= value[0] %></td>
+                <td><%= value[1] %></td>
+              </tr>
+            </table>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/lib/app/views/inline_forms/versions.js.erb

@@ -0,0 +1,4 @@
+$('#<%= @update_span %>').fadeOut("slow", function() {
+$(this).html('<%= escape_javascript(render(:partial => 'inline_forms/versions' ))%>');
+$(this).fadeIn("slow");
+});

data/lib/app/views/inline_forms/versions_list.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').html('<%= escape_javascript(render(:partial => 'inline_forms/versions_list' ))%>')

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

@@ -6,7 +6,7 @@
     <title>
       <%= t('inline_forms.general.application_title') %> v<%= InlineForms::VERSION %>
     </title>
-    <%= stylesheet_link_tag "devise" %>
+    <%= stylesheet_link_tag "inline_forms/devise" %>
     <%= csrf_meta_tags %>
   </head>
 

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

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title><%= t('application_name') + " v" + InlineForms::VERSION -%></title>
     <%= stylesheet_link_tag "application" %>
+    <%= stylesheet_link_tag "inline_forms/inline_forms" %>
     <%= csrf_meta_tags %>
   </head>
 
@@ -14,6 +15,6 @@
     <div id="outer_container">
       <%= yield %>
     </div>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%= javascript_include_tag 'inline_forms/inline_forms', 'data-turbolinks-track' => true %>
   </body>
 </html>

data/lib/generators/assets/stylesheets/inline_forms.scss

@@ -161,6 +161,19 @@ select:hover, select:focus {
     -webkit-transition-property: color;
     transition-property: color;
   }
+  .close_button  {
+    background-color: rgb(239, 202, 75);
+    font-size: 1.5rem;
+    color: #B94C32;
+    padding: 0 0.5rem 0 1rem;
+    margin: 0;
+  }
+  .close_button:hover, .new_button:focus {
+    background-color: rgb(239, 202, 75);
+    color: white;
+    -webkit-transition-property: color;
+    transition-property: color;
+  }
 }
 
 .pagination {

data/lib/generators/inline_forms_generator.rb

@@ -172,6 +172,8 @@ module InlineForms
         route <<-ROUTE.strip_heredoc
           resources :#{resource_name} do
             post 'revert', :on => :member
+            get 'list_versions', :on => :member
+            get 'close_versions_list', :on => :member
           end
         ROUTE
       end

data/lib/generators/templates/paper_trail.rb

@@ -0,0 +1,7 @@
+PaperTrail.config.track_associations = false
+
+PaperTrail::Version.class_eval do
+  def author
+    User.find(whodunnit) if whodunnit
+  end
+end

data/lib/inline_forms.rb

@@ -144,6 +144,23 @@ module InlineForms
     paths["app/views"] << "lib/app/views"
     paths["app/assets"] << "lib/app/assets"
 
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match(root.to_s)
+        config.paths["db/migrate"].expanded.each do |path|
+          app.config.paths["db/migrate"] << path
+        end
+      end
+    end
+
+    initializer "inline_forms.assets.precompile" do |app|
+      app.config.assets.precompile += %w( inline_forms/inline_forms.scss
+        inline_forms/devise.css
+        inline_forms/inline_forms.js
+        inline_forms/ckeditor/config.js
+        inline_forms/glass_plate.gif
+      )
+    end
+
     I18n.load_path << Dir[File.join(File.expand_path(File.dirname(__FILE__) + '/locales'), '*.yml')]
     I18n.load_path.flatten!
   end

data/lib/inline_forms/version.rb

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

data/lib/locales/inline_forms.en.yml

@@ -27,7 +27,10 @@ en:
       close: close
       add_new: make a new %{model}
       undo: undo
+      restore: restore
       trash: trash
+      list_versions: List versions
+      close_versions_list: Close versions list
   succes: success.
   activerecord:
     models:
@@ -35,4 +38,4 @@ en:
     attributes:
       client:
         first_name: first name
-        last_name: last name
+        last_name: last name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 5.0.22
+  version: 5.0.23
 platform: ruby
 authors:
 - Ace Suares
@@ -10,132 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2018-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: validation_hints
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Inline Forms aims to ease the setup of forms that provide inline editing.
@@ -149,18 +149,27 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".vscode/settings.json"
+- .document
+- .gitignore
+- .vscode/settings.json
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- app/assets/images/inline_forms/glass_plate.gif
+- app/assets/javascripts/inline_forms/ckeditor/config.js
+- app/assets/javascripts/inline_forms/inline_forms.js
+- app/assets/stylesheets/inline_forms/devise.scss
+- app/assets/stylesheets/inline_forms/foundation_and_overrides.scss
+- app/assets/stylesheets/inline_forms/inline_forms.scss
 - bin/inline_forms
 - bin/inline_forms_app_template.rb
 - bin/inline_forms_installer_core.rb
+- config/initializers/paper_trail.rb
+- db/migrate/20180116154757_add_object_changes_to_versions.rb
 - inline_forms.gemspec
 - lib/app/controllers/concerns/cancan_concern.rb
+- lib/app/controllers/concerns/versions_concern.rb
 - lib/app/controllers/geo_code_curacao_controller.rb
 - lib/app/controllers/inline_forms_application_controller.rb
 - lib/app/controllers/inline_forms_controller.rb
@@ -215,8 +224,10 @@ files:
 - lib/app/views/devise/passwords/_top-bar-and-flash.html.erb
 - lib/app/views/devise/passwords/edit.html.erb
 - lib/app/views/devise/passwords/new.html.erb
+- lib/app/views/devise/sessions/_flash.html.erb
 - lib/app/views/devise/sessions/_form.html.erb
 - lib/app/views/devise/sessions/_top-bar-and-flash.html.erb
+- lib/app/views/devise/sessions/_top-bar.html.erb
 - lib/app/views/devise/sessions/new.html.erb
 - lib/app/views/devise/shared/_header_and_errors.html.erb
 - lib/app/views/devise/shared/_links.erb
@@ -231,6 +242,8 @@ files:
 - lib/app/views/inline_forms/_new_nested.html.erb
 - lib/app/views/inline_forms/_show.html.erb
 - lib/app/views/inline_forms/_tree.html.erb
+- lib/app/views/inline_forms/_versions.html.erb
+- lib/app/views/inline_forms/_versions_list.html.erb
 - lib/app/views/inline_forms/close.js.erb
 - lib/app/views/inline_forms/edit.js.erb
 - lib/app/views/inline_forms/extract_translations.erb
@@ -240,17 +253,12 @@ files:
 - lib/app/views/inline_forms/show_element.js.erb
 - lib/app/views/inline_forms/show_undo.js.erb
 - lib/app/views/inline_forms/update.js.erb
+- lib/app/views/inline_forms/versions.js.erb
+- lib/app/views/inline_forms/versions_list.js.erb
 - lib/app/views/layouts/application.html.erb
 - lib/app/views/layouts/devise.html.erb
 - lib/app/views/layouts/inline_forms.html.erb
 - lib/generators/USAGE
-- lib/generators/assets/images/glass_plate.gif
-- lib/generators/assets/javascripts/application.js
-- lib/generators/assets/javascripts/ckeditor/config.js
-- lib/generators/assets/javascripts/inline_forms.js
-- lib/generators/assets/stylesheets/application.scss
-- lib/generators/assets/stylesheets/devise.scss
-- lib/generators/assets/stylesheets/foundation_and_overrides.scss
 - lib/generators/assets/stylesheets/inline_forms.scss
 - lib/generators/inline_forms_generator.rb
 - lib/generators/templates/_inline_forms_tabs.html.erb
@@ -263,6 +271,7 @@ files:
 - lib/generators/templates/controller.erb
 - lib/generators/templates/migration.erb
 - lib/generators/templates/model.erb
+- lib/generators/templates/paper_trail.rb
 - lib/generators/templates/test.erb
 - lib/generators/templates/unicorn/production.rb
 - lib/inline_forms.rb
@@ -288,17 +297,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: inline_forms
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Inline editing of forms.

data/lib/generators/assets/javascripts/application.js

@@ -1,22 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require jquery.ui.all
-//= require ckeditor/init
-//= require jquery.timepicker.js
-//= require foundation
-//= require jquery.remotipart
-//= require inline_forms
-
-$(function(){ $(document).foundation(); });

data/lib/generators/assets/stylesheets/application.scss

@@ -1,16 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require jquery.ui.core
- *= require jquery.ui.theme
- *= require foundation_and_overrides
- *= require jquery.timepicker.css
- *= require inline_forms
- */