udongo 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75a5407f853e677bc244654a801843f1b9663805
-  data.tar.gz: e3a9c0edbb2798d44ad7bd5fe934ee2c2826d5be
+  metadata.gz: ff6a2c5f11be6933246edd9840889f3e54565c1b
+  data.tar.gz: daa2e269f183b22722eb853480fdedbda50cf0e5
 SHA512:
-  metadata.gz: 4bc1535a00eded6212d6c39e0d0293ad7c28f99ac6809ec248f4bdf725d97a0d526711a65e2a4d80f5c065b3fcf026cb832e8c02faa4bc4e1c8f79edbf20b1e6
-  data.tar.gz: 3266aceac326318a4f86fd648f6b51e9c4f1f445b7e889fae6cb4e0d9c660a40b0202f08e61d89f8cc0b2400bba0fa0eca11d0a47b5d8c951038e308321f0d46
+  metadata.gz: 3e54b777799e616d3db6b1759655f1a2fac5d8d56954e41eeadf8606eeeb93be9a93003575720f29b010aee588727132ef7912e5442c7ce542728f54a65a62ce
+  data.tar.gz: 3562e610247ca7d202f4e331915d85fd1aac48c23d61dd810aec3190cbe4e23ff6b2366d6d15922b5ede0a1f080f71a2a1d69bbf59d07e38418420a1d85839c8

data/app/assets/javascripts/backend/application.js

@@ -17,8 +17,10 @@
 //= require jquery-ui/sortable
 //= require backend/tether.min
 //= require backend/bootstrap
+//= require backend/jquery.throttle-debounce.min.js
 //= require ckeditor/init
 //= require backend/general
+//= require backend/dirty-inputs
 //= require backend/search
 //= require backend/bootstrap-datepicker.min
 //= require backend/datepickers

data/app/assets/javascripts/backend/dirty-inputs.js

@@ -0,0 +1,33 @@
+var dirty_inputs = dirty_inputs || {
+  message: null,
+  init: function() {
+    $('[data-dirty]').parents('form').find(':input').on('change, keydown', this.input_change_listener);
+  },
+
+  input_change_listener: function(e) {
+    // I have to set the message this way, because the trigger for the click
+    // warning probably won't have the context of the form that this method has.
+    var input = $(this);
+    dirty_inputs.message = input.parents('form').find('[data-dirty]').text();
+    input.data('dirty', true);
+    $('a').each(dirty_inputs.iterate_anchors_and_bind_click_warning);
+  },
+
+  anchor_click_warning_listener: function(e) {
+    if(!window.confirm(dirty_inputs.message)) {
+      e.stopPropagation();
+      e.preventDefault();
+    }
+  },
+
+  iterate_anchors_and_bind_click_warning: function(){
+    var anchor = $(this);
+    var events = $._data(anchor[0], 'events');
+
+    if(typeof events == 'undefined') {
+      anchor.on('click', dirty_inputs.anchor_click_warning_listener);
+    }
+  }
+};
+
+$(function(){ dirty_inputs.init(); });

data/app/assets/javascripts/backend/seo.js

@@ -0,0 +1,38 @@
+var seo = {
+  init: function() {
+    this.sluggable_input().on('keydown', this.keydown_listener);
+    this.sluggable_input().on('keyup', $.debounce(250, this.keyup_listener));
+  },
+
+  data: function(key) {
+    return $('[data-seo]').data(key);
+  },
+
+  keydown_listener: function(e) {
+    if(e.keyCode == 13) e.preventDefault();
+  },
+
+  keyup_listener: function(e) {
+    if(seo.slug_input().attr('disabled')) return;
+    var input = $(this);
+
+    $.ajax({
+      url: seo.data('path'),
+      data: { value: input.val() },
+      type: 'GET'
+    }).done(function(data){
+      seo.slug_input().val(data.result);
+      if(e.keyCode == 13) input.parents('form').submit();
+    });
+  },
+
+  slug_input: function() {
+    return $('input[id*="seo_slug"]');
+  },
+
+  sluggable_input: function() {
+    return $($('[data-seo]').data('sluggable-input'));
+  }
+};
+
+$(function(){ seo.init(); });

data/app/assets/stylesheets/backend/udongo.scss

@@ -4,6 +4,10 @@
 // fonts
 @import 'font-awesome';
 
+// Vendored
+@import 'backend/tagit/base';
+@import 'backend/tagit/autocomplete';
+
 // Components
 @import 'components/navbar';
 @import 'components/tabs';

data/app/helpers/backend/form_helper.rb

@@ -0,0 +1,5 @@
+module Backend::FormHelper
+  def trigger_dirty_inputs_warning(message: I18n.t('b.msg.dirty_inputs_warning'))
+    content_tag :span, message, class: 'hidden-xs-up', data: { dirty: false }
+  end
+end

data/app/views/backend/_seo_form.html.erb

@@ -1,4 +1,8 @@
-<div class="card">
+<% javascript 'backend/seo' %>
+
+<% sluggable_field ||= 'title' %>
+
+<%= content_tag :div, class: 'card', data: { seo: true, path: backend_seo_slugify_path, sluggable_input: "##{f.object_name}_#{sluggable_field}" } do %>
   <div class="card-header">
     <%= t 'b.msg.seo' %>
   </div>
@@ -10,4 +14,4 @@
     <%= f.input :seo_keywords, as: :string %>
     <%= f.input :seo_custom, as: :text %>
   </div>
-</div>
+<% end %>

data/app/views/backend/_tags.html.erb

@@ -1,5 +1,3 @@
-<% stylesheet 'backend/tagit/tagit-autocomplete' %>
-<% stylesheet 'backend/tagit/tagit' %>
 <% javascript 'backend/tagit.min' %>
 <% javascript 'backend/plugins/tagbox' %>
 <% javascript 'backend/tags' %>

data/app/views/backend/articles/edit_translation.html.erb

@@ -6,6 +6,7 @@
 <%= render 'backend/general_form_error', object: @translation %>
 
 <%= simple_form_for([:backend, @translation], url: edit_translation_backend_article_path, html: { class: 'no-focus' }) do |f| %>
+  <%= trigger_dirty_inputs_warning %>
 
   <div class="row">
     <div class="col-md-12">

data/app/views/backend/images/new.html.erb

@@ -1,6 +1,6 @@
 <% if @image.errors.any? %>
   <div class="alert alert-danger" role="alert">
-    <strong><%= t 'b.msg.something_went_wrong' %>!</strong>
+    <strong><%= t 'b.msg.something_went_wrong' %></strong>
     <%= t 'b.msg.please_select_a_valid_image' %>
   </div>
 <% end %>

data/app/views/backend/pages/edit_translation.html.erb

@@ -6,7 +6,7 @@
 <%= render 'backend/general_form_error', object: @translation %>
 
 <%= simple_form_for([:backend, @translation], url: edit_translation_backend_page_path, html: { class: 'no-focus' }) do |f| %>
-
+  <%= trigger_dirty_inputs_warning %>
   <div class="row">
     <div class="col-md-12">
       <!-- Content -->

data/changelog.md

@@ -1,8 +1,24 @@
+5.5.0 - 2017-03-13
+--
+* When an SEO form has a slug, it's automatically calculated based on the title.
+* Trigger a generic warning when trying to leave a page through an anchor when
+  the form contains unsaved changes.
+* The dirty-inputs warning is now triggered on a form by calling the
+  ```trigger_dirty_inputs_warning``` helper method.
+* The sluggable autofill now plays nice when immediately hitting enter after
+  typing your title.
+* Trigger a generic warning when trying to leave a page through an anchor when
+  the form contains unsaved changes.
+* The dirty-inputs warning is now triggered on a form by calling the
+  ```trigger_dirty_inputs_warning``` helper method.
+
+
 5.4.0 - 2017-03-08
 --
 * When enabled, you can add images to articles from the assets module.
 * Bugfix: the sortable scope for the ```Image``` wasn't properly set.
 * Images are now enabled by default for articles.
+* Fixed a missing image reference triggered by Tagit.
 
 
 5.3.1 - 2017-03-07

data/config/locales/en_backend.yml

@@ -97,6 +97,7 @@ en:
         image: Image
         text: Text
       deleted: '%s was deleted.'
+      dirty_inputs_warning: "You are about to leave the page but your changes aren't saved yet.\nDo you still want to leave the page?"
       edited: '%s was edited.'
       flexible_content:
         add_column: Add column

data/config/locales/nl_backend.yml

@@ -100,6 +100,7 @@ nl:
         image: Afbeelding
         text: Tekst
       deleted: '%{actor} werd verwijderd.'
+      dirty_inputs_warning: "Je gaat de pagina verlaten maar je aanpassingen zijn nog niet bewaard.\nWil je nog steeds de pagina verlaten?"
       edited: '%{actor} werd gewijzigd.'
       flexible_content:
         add_column: Kolom toevoegen

data/config/routes.rb

@@ -15,6 +15,8 @@ Rails.application.routes.draw do
 
     get '/' => 'dashboard#show'
     get 'search' => 'search#query'
+    get 'seo/slugify' => 'seo#slugify'
+
 
     resources :sessions, only: [:new, :create, :destroy]
     resources :admins

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '5.4.0'
+  VERSION = '5.5.0'
 end

data/readme.md

@@ -50,6 +50,69 @@ Udongo.config.i18n.app.default_interface_locale = 'nl'
 Udongo.config.i18n.app.interface_locales = %w(nl en)
 ```
 
+## Forms
+### Adding SEO fields to your page.
+You can add SEO fields to your form by rendering a partial:
+
+```erb
+<%= simple_form_for([:backend, @your_model]) do |f| %>
+  ...
+  <%= render 'backend/seo_form', f: f %>
+  ...
+<% end %>
+```
+This partial has support to let you base its SEO slug on whatever is typed in 
+an input element of your choice. In Udongo, this field is called the 
+**sluggable field**.
+
+By default, the partial looks for a field called **title**. You can override 
+this name by passing ```sluggable_field``` to the partial, like so:
+
+```erb
+<%= simple_form_for([:backend, @your_model]) do |f| %>
+  ...
+  <%# This will look for #backend_your_model_name as its sluggable field. %>
+  <%= render 'backend/seo_form', f: f, sluggable_field: :name %>
+  ...
+<% end %>
+```
+
+### Dirty inputs
+Sometimes a user enters some data in a form and assumes that everything is
+magically saved without submitting said form.
+
+To warn a user that this is not default behaviour, you can trigger a warning
+to show up whenever a user has changed input contents and clicks on any
+```<a>``` element on the page.
+
+Simply call the following helper method within your form tags:
+
+```erb
+<%= simple_form_for([:backend, @your_model]) do |f| %>
+	<%= trigger_dirty_inputs_warning %>
+  ...
+<% end %>
+```
+
+This renders the following HTML:
+
+```html
+<form class="simple_form" id="edit_your_model_1" action="/backend/your_models/1/edit" accept-charset="UTF-8" method="post">
+  ...
+  <span data-dirty="false"></span>
+  ...
+</form>
+```
+
+You can also override the default message with your own:
+
+```erb
+<%= simple_form_for([:backend, @your_model]) do |f| %>
+  <%= trigger_dirty_inputs_warning(message: 'Are you sure you want to leave the page?') %>
+  ...
+<% end %>
+```
+
 ## Flexible content
 ### types
 ```ruby

data/vendor/assets/javascripts/backend/jquery.throttle-debounce.min.js

@@ -0,0 +1,9 @@
+/*
+ * jQuery throttle / debounce - v1.1 - 3/7/2010
+ * http://benalman.com/projects/jquery-throttle-debounce-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function(b,c){var $=b.jQuery||b.Cowboy||(b.Cowboy={}),a;$.throttle=a=function(e,f,j,i){var h,d=0;if(typeof f!=="boolean"){i=j;j=f;f=c}function g(){var o=this,m=+new Date()-d,n=arguments;function l(){d=+new Date();j.apply(o,n)}function k(){h=c}if(i&&!h){l()}h&&clearTimeout(h);if(i===c&&m>e){l()}else{if(f!==true){h=setTimeout(i?k:l,i===c?e-m:e)}}}if($.guid){g.guid=j.guid=j.guid||$.guid++}return g};$.debounce=function(d,e,f){return f===c?a(d,e,false):a(d,f,e!==false)}})(this);

data/vendor/assets/stylesheets/backend/tagit/{tagit-autocomplete.css → _autocomplete.scss}

@@ -33,7 +33,7 @@
 }
 .ui-widget-content {
 	border: 1px solid #dddddd;
-	background: #f2f5f7 url("/assets/ui-bg_highlight-hard_100_f2f5f7_1x100.png") 50% top repeat-x;
+	background: #f2f5f7 asset-url('ui-bg_highlight-soft_75_cccccc_1x100.png') 50% top repeat-x;
 	color: #362b36;
 }
 .ui-corner-all, .ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -426,12 +426,14 @@ files:
 - app/assets/javascripts/backend/application.js
 - app/assets/javascripts/backend/bootstrap.js
 - app/assets/javascripts/backend/datepickers.js
+- app/assets/javascripts/backend/dirty-inputs.js
 - app/assets/javascripts/backend/flexible_content.js
 - app/assets/javascripts/backend/general.js
 - app/assets/javascripts/backend/pages.js
 - app/assets/javascripts/backend/plugins/autocomplete.js
 - app/assets/javascripts/backend/plugins/tagbox.js
 - app/assets/javascripts/backend/search.js
+- app/assets/javascripts/backend/seo.js
 - app/assets/javascripts/backend/sortable.js
 - app/assets/javascripts/backend/tags.js
 - app/assets/javascripts/backend/tree.js
@@ -499,6 +501,7 @@ files:
 - app/forms/backend/translation_form.rb
 - app/forms/backend/translation_with_seo_form.rb
 - app/helpers/backend/dropdown_helper.rb
+- app/helpers/backend/form_helper.rb
 - app/helpers/backend/pagination_helper.rb
 - app/helpers/icon_helper.rb
 - app/helpers/link_helper.rb
@@ -851,6 +854,7 @@ files:
 - vendor/assets/images/jstree/default/40px.png
 - vendor/assets/images/jstree/default/throbber.gif
 - vendor/assets/javascripts/backend/bootstrap-datepicker.min.js
+- vendor/assets/javascripts/backend/jquery.throttle-debounce.min.js
 - vendor/assets/javascripts/backend/jstree/jstree.min.js
 - vendor/assets/javascripts/backend/jstree/libs/require.js
 - vendor/assets/javascripts/backend/select2.min.js
@@ -862,8 +866,8 @@ files:
 - vendor/assets/stylesheets/backend/jstree/default/style.min.scss
 - vendor/assets/stylesheets/backend/jstree/default/style.scss
 - vendor/assets/stylesheets/backend/select2.min.scss
-- vendor/assets/stylesheets/backend/tagit/tagit-autocomplete.css
-- vendor/assets/stylesheets/backend/tagit/tagit.css
+- vendor/assets/stylesheets/backend/tagit/_autocomplete.scss
+- vendor/assets/stylesheets/backend/tagit/_base.scss
 - vendor/assets/stylesheets/jquery-ui.theme.min.css
 homepage: http://udongo.be
 licenses: