udongo 5.5.0 → 5.6.0

data/app/assets/stylesheets/backend/font-awesome.scss

@@ -1,21 +1,20 @@
 /*!
- *  Font Awesome 4.6.1 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: font-url('fontawesome-webfont.eot?v=4.6.1');
-  src: font-url('fontawesome-webfont.eot?#iefix&v=4.6.1') format('embedded-opentype'),
-       font-url('fontawesome-webfont.woff2?v=4.6.1') format('woff2'),
-       font-url('fontawesome-webfont.woff?v=4.6.1') format('woff'),
-       font-url('fontawesome-webfont.ttf?v=4.6.1') format('truetype'),
-       font-url('fontawesome-webfont.svg?v=4.6.1#fontawesomeregular') format('svg');
+  src: font-url('fontawesome-webfont.eot?v=4.7.0');
+  src: font-url('fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),
+       font-url('fontawesome-webfont.woff2?v=4.7.0') format('woff2'),
+       font-url('fontawesome-webfont.woff?v=4.7.0') format('woff'),
+       font-url('fontawesome-webfont.ttf?v=4.7.0') format('truetype'),
+       font-url('fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
-
 .fa {
   display: inline-block;
   font: normal normal normal 14px/1 FontAwesome;
@@ -582,7 +581,7 @@ $icon-eye-slash: "\f070";
 .fa-stumbleupon:before { content: "\f1a4"; }
 .fa-delicious:before { content: "\f1a5"; }
 .fa-digg:before { content: "\f1a6"; }
-.fa-pied-piper:before { content: "\f1a7"; }
+.fa-pied-piper-pp:before { content: "\f1a7"; }
 .fa-pied-piper-alt:before { content: "\f1a8"; }
 .fa-drupal:before { content: "\f1a9"; }
 .fa-joomla:before { content: "\f1aa"; }
@@ -620,7 +619,7 @@ $icon-eye-slash: "\f070";
 .fa-jsfiddle:before { content: "\f1cc"; }
 .fa-life-bouy:before, .fa-life-buoy:before, .fa-life-saver:before, .fa-support:before, .fa-life-ring:before { content: "\f1cd"; }
 .fa-circle-o-notch:before { content: "\f1ce"; }
-.fa-ra:before, .fa-rebel:before { content: "\f1d0"; }
+.fa-ra:before, .fa-resistance:before, .fa-rebel:before { content: "\f1d0"; }
 .fa-ge:before, .fa-empire:before { content: "\f1d1"; }
 .fa-git-square:before { content: "\f1d2"; }
 .fa-git:before { content: "\f1d3"; }
@@ -723,7 +722,7 @@ $icon-eye-slash: "\f070";
 .fa-optin-monster:before { content: "\f23c"; }
 .fa-opencart:before { content: "\f23d"; }
 .fa-expeditedssl:before { content: "\f23e"; }
-.fa-battery-4:before, .fa-battery-full:before { content: "\f240"; }
+.fa-battery-4:before, .fa-battery:before, .fa-battery-full:before { content: "\f240"; }
 .fa-battery-3:before, .fa-battery-three-quarters:before { content: "\f241"; }
 .fa-battery-2:before, .fa-battery-half:before { content: "\f242"; }
 .fa-battery-1:before, .fa-battery-quarter:before { content: "\f243"; }
@@ -827,6 +826,53 @@ $icon-eye-slash: "\f070";
 .fa-snapchat:before { content: "\f2ab"; }
 .fa-snapchat-ghost:before { content: "\f2ac"; }
 .fa-snapchat-square:before { content: "\f2ad"; }
+.fa-pied-piper:before { content: "\f2ae"; }
+.fa-first-order:before { content: "\f2b0"; }
+.fa-yoast:before { content: "\f2b1"; }
+.fa-themeisle:before { content: "\f2b2"; }
+.fa-google-plus-circle:before, .fa-google-plus-official:before { content: "\f2b3"; }
+.fa-fa:before, .fa-font-awesome:before { content: "\f2b4"; }
+.fa-handshake-o:before { content: "\f2b5"; }
+.fa-envelope-open:before { content: "\f2b6"; }
+.fa-envelope-open-o:before { content: "\f2b7"; }
+.fa-linode:before { content: "\f2b8"; }
+.fa-address-book:before { content: "\f2b9"; }
+.fa-address-book-o:before { content: "\f2ba"; }
+.fa-vcard:before, .fa-address-card:before { content: "\f2bb"; }
+.fa-vcard-o:before, .fa-address-card-o:before { content: "\f2bc"; }
+.fa-user-circle:before { content: "\f2bd"; }
+.fa-user-circle-o:before { content: "\f2be"; }
+.fa-user-o:before { content: "\f2c0"; }
+.fa-id-badge:before { content: "\f2c1"; }
+.fa-drivers-license:before, .fa-id-card:before { content: "\f2c2"; }
+.fa-drivers-license-o:before, .fa-id-card-o:before { content: "\f2c3"; }
+.fa-quora:before { content: "\f2c4"; }
+.fa-free-code-camp:before { content: "\f2c5"; }
+.fa-telegram:before { content: "\f2c6"; }
+.fa-thermometer-4:before, .fa-thermometer:before, .fa-thermometer-full:before { content: "\f2c7"; }
+.fa-thermometer-3:before, .fa-thermometer-three-quarters:before { content: "\f2c8"; }
+.fa-thermometer-2:before, .fa-thermometer-half:before { content: "\f2c9"; }
+.fa-thermometer-1:before, .fa-thermometer-quarter:before { content: "\f2ca"; }
+.fa-thermometer-0:before, .fa-thermometer-empty:before { content: "\f2cb"; }
+.fa-shower:before { content: "\f2cc"; }
+.fa-bathtub:before, .fa-s15:before, .fa-bath:before { content: "\f2cd"; }
+.fa-podcast:before { content: "\f2ce"; }
+.fa-window-maximize:before { content: "\f2d0"; }
+.fa-window-minimize:before { content: "\f2d1"; }
+.fa-window-restore:before { content: "\f2d2"; }
+.fa-times-rectangle:before, .fa-window-close:before { content: "\f2d3"; }
+.fa-times-rectangle-o:before, .fa-window-close-o:before { content: "\f2d4"; }
+.fa-bandcamp:before { content: "\f2d5"; }
+.fa-grav:before { content: "\f2d6"; }
+.fa-etsy:before { content: "\f2d7"; }
+.fa-imdb:before { content: "\f2d8"; }
+.fa-ravelry:before { content: "\f2d9"; }
+.fa-eercast:before { content: "\f2da"; }
+.fa-microchip:before { content: "\f2db"; }
+.fa-snowflake-o:before { content: "\f2dc"; }
+.fa-superpowers:before { content: "\f2dd"; }
+.fa-wpexplorer:before { content: "\f2de"; }
+.fa-meetup:before { content: "\f2e0"; }
 
 .sr-only {
   position: absolute;

data/app/controllers/backend/articles/base_controller.rb

@@ -2,7 +2,7 @@ class Backend::Articles::BaseController < Backend::BaseController
   before_action :find_article
   before_action do
     breadcrumb.add t('b.articles'), backend_articles_path
-    breadcrumb.add @article.title
+    breadcrumb.add @article.title.to_s.truncate(40), edit_backend_article_path(@article)
   end
 
   def find_article

data/app/decorators/page_decorator.rb

@@ -23,4 +23,12 @@ class PageDecorator < ApplicationDecorator
 
     "/#{locale}/#{slugs.reverse.join('/')}"
   end
+
+  def url(locale: I18n.locale, options: {})
+    prefix = Rails.configuration.force_ssl ? 'https://' : 'http://'
+    host = Udongo.config.base.host
+    params = { locale: locale, options: options }
+
+    "#{prefix}#{host}#{path(params)}"
+  end
 end

data/app/helpers/page_helper.rb

@@ -0,0 +1,5 @@
+module PageHelper
+  def page(identifier)
+    Page.find_in_cache(identifier).decorate
+  end
+end

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

@@ -1,4 +1,4 @@
-<% breadcrumb.add @model.title %>
+<% breadcrumb.add truncate(@model.title, length: 40), edit_backend_article_path(@model) %>
 <% breadcrumb.add t('b.edit') %>
 <%= render 'backend/breadcrumbs' %>
 

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

@@ -1,4 +1,4 @@
-<% breadcrumb.add @model.title, edit_backend_article_path(@model) %>
+<% breadcrumb.add truncate(@model.title, length: 40), edit_backend_article_path(@model) %>
 <% breadcrumb.add t('b.edit') %>
 <%= render 'backend/breadcrumbs' %>
 

data/app/views/backend/articles/images/index.html.erb

@@ -11,7 +11,7 @@
     <thead class="thead-inverse">
       <tr>
         <th><%= t 'b.file' %></th>
-        <th><%= t 'g.type' %></th>
+        <th><%= t 'b.type' %></th>
         <th><%= t 'b.size' %></th>
         <th><%= t 'b.description' %></th>
         <th><%= t 'b.last_changed_at' %></th>

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

@@ -27,7 +27,7 @@
                 <%= t('b.msg.no_title_set') %>
               <% end %>
             <% else %>
-              <%= a.title %>
+              <%= truncate a.title, length: 40 %>
             <% end %>
           </td>
           <td>

data/app/views/backend/assets/index.html.erb

@@ -10,7 +10,7 @@
     <thead class="thead-inverse">
       <tr>
         <th><%= t 'b.file' %></th>
-        <th><%= t 'g.type' %></th>
+        <th><%= t 'b.type' %></th>
         <th><%= t 'b.size' %></th>
         <th><%= t 'b.description' %></th>
         <th><%= t 'b.last_changed_at' %></th>

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

@@ -13,10 +13,14 @@
     </div>
 
     <div class="card-block">
-      <%= f.input :title, as: :string %>
+      <% unless @model.title_disabled? %>
+        <%= f.input :title, as: :string %>
+      <% end %>
 
-      <% content_type = @model.editor_for_content? ? :ckeditor : :text %>
-      <%= f.input :content, as: content_type %>
+      <% unless @model.content_disabled? %>
+        <% content_type = @model.editor_for_content? ? :ckeditor : :text %>
+        <%= f.input :content, as: content_type %>
+      <% end %>
     </div>
   </div>
 

data/changelog.md

@@ -1,3 +1,17 @@
+5.6.0 - 2017-03-18
+--
+* The article title is truncated to 40 chars in the overview and breadcrumbs.
+* Add the PageHelper which contains ```#page(identifier)``` to easily fetch a
+  page from cache.
+* The files nl_backend.yml and en_backend.yml have been synced.
+* The files nl_general.yml and en_general.yml have been removed.
+* Update the font-awesome icons from 4.6.1 to 4.7.0.
+* You can now disable the snippet title/content so it won't show up in the
+  translation edit form (which sometimes confused people).
+* Added PageDecorator#url because the ```only_path: false``` option seems to be
+  borked at this moment.
+
+
 5.5.0 - 2017-03-13
 --
 * When an SEO form has a slug, it's automatically calculated based on the title.

data/config/locales/en_backend.yml

@@ -10,6 +10,7 @@ en:
     articles: Articles
     author: Author
     cancel: Cancel
+    choose_an_existing_image: Choose an existing image
     content: Content
     current_image: Current image
     custom_title: Custom title
@@ -35,7 +36,8 @@ en:
     general: General
     house_number: House number
     html_content: HTML content
-    images: Afbeeldingen
+    image: Image
+    images: Images
     last_changed_at: Last changed at
     last_name: Last name
     locale: Locale
@@ -78,7 +80,9 @@ en:
     telephone: Telephone
     title: Title
     to: To
+    type: Type
     up: Up
+    upload_a_new_image: Upload a new image
     used: Used
     user: User
     users: Users
@@ -87,7 +91,7 @@ en:
     visible: Visible
 
     msg:
-      added: '%s was added.'
+      added: '%{actor} was added.'
       admins:
         account_details: Account details
         personal_details: Personal details
@@ -96,9 +100,9 @@ en:
       content_types:
         image: Image
         text: Text
-      deleted: '%s was deleted.'
+      deleted: '%{actor} 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.'
+      edited: '%{actor} was edited.'
       flexible_content:
         add_column: Add column
         add_row: Add row
@@ -119,8 +123,10 @@ en:
       no_title_set: This item has not title.
       pages:
         invisible: Deze pagina is niet zichtbaar op de website.
-      saved: '%s was saved.'
+      please_select_a_valid_image: Please select a valid image and try again.
+      saved: '%{actor} was saved.'
       seo: SEO
+      something_went_wrong: Something went wrong!
       status_codes:
         '301': 301 (Moved Permanently)
         '303': 303 (See Other)

data/config/locales/nl_backend.yml

@@ -80,6 +80,7 @@ nl:
     telephone: Telefoonnummer
     title: Titel
     to: Naar
+    type: Type
     up: Omhoog
     upload_a_new_image: Upload nieuwe afbeelding
     used: Gebruikt
@@ -114,7 +115,7 @@ nl:
       forgot_password: Wachtwoord vergeten?
       general_form_error: Er trad een fout op. Controleer de gemarkeerde velden.
       help_texts:
-        status_code: Meer info over het gebruik van status codes
+        status_code: Meer info over het gebruik van status codes.
       incorrect_login: Ongeldige login gegevens.
       navigation:
         custom: Op maat

data/config/locales/nl_general.yml

@@ -1,17 +1,3 @@
 nl:
   g:
-    address: Adres
-    cancel: Annuleren
-    category: Categorie
-    close: Sluiten
-    first_name: Voornaam
-    last_name: Achternaam
-    description: Beschrijving
-    email: E-mail
-    house_number: Huisnummer
-    name: Naam
-    save: Opslaan
-    search: Zoeken
-    subject: Onderwerp
-    telephone: Telefoon
     type: Type

data/db/migrate/20170318184654_add_title_and_content_disabled_to_snippet.rb

@@ -0,0 +1,6 @@
+class AddTitleAndContentDisabledToSnippet < ActiveRecord::Migration[5.0]
+  def change
+    add_column :snippets, :title_disabled, :boolean, after: 'description'
+    add_column :snippets, :content_disabled, :boolean, after: 'allow_html_in_title'
+  end
+end

data/lib/udongo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -505,6 +505,7 @@ files:
 - app/helpers/backend/pagination_helper.rb
 - app/helpers/icon_helper.rb
 - app/helpers/link_helper.rb
+- app/helpers/page_helper.rb
 - app/helpers/snippet_helper.rb
 - app/helpers/udongo_helper.rb
 - app/inputs/date_picker_input.rb
@@ -669,7 +670,6 @@ files:
 - config/locales/en.yml
 - config/locales/en_backend.yml
 - config/locales/en_forms.yml
-- config/locales/en_general.yml
 - config/locales/fr.yml
 - config/locales/nl.yml
 - config/locales/nl_backend.yml
@@ -754,6 +754,7 @@ files:
 - db/migrate/20170225144523_create_assets.rb
 - db/migrate/20170228183831_create_images.rb
 - db/migrate/20170305125627_create_articles.rb
+- db/migrate/20170318184654_add_title_and_content_disabled_to_snippet.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb

data/config/locales/en_general.yml

@@ -1,17 +0,0 @@
-en:
-  g:
-    address: Address
-    cancel: Cancel
-    category: Category
-    close: Close
-    first_name: First name
-    last_name: Last name
-    description: Description
-    email: E-mail
-    house_number: Housenumber
-    name: Name
-    save: Save
-    search: Search
-    subject: Subject
-    telephone: Telephone
-    type: Type