udongo 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a1aa922ab7b660bf5ffeb8cf1ff461a2d7a5077
-  data.tar.gz: 9c361782ab9787cabeae45dd5e6564f92d8cc0f4
+  metadata.gz: 9058d4a4ae9f7e8f0d6c0f5ed60ae902559997cd
+  data.tar.gz: 4267002ee525804b74f0c38a0770d16a45d85ef1
 SHA512:
-  metadata.gz: c47d3df9fe5c05e28659a7690e5cbfc1deee40aaacc909811378a7cee59a70e37080c558ab9f2b2016bc4e5190ea53a8cf8a72ede0dec548521ccdb064d2c32d
-  data.tar.gz: 727518319c1dcbfb67a6f89ef409ebc477dea21d1db3afec85eac9c487de8e1b7d374dc57267c424c8c5182c5c1f33fc0cfa8f18ad581cb02f344ee60889cce2
+  metadata.gz: 7366fc2a16e78da7725965fdab5542763945380da67c3d1e73f23fd4d1d6e6db4c19560a2c5c297aa9aabd7b85e4053116426eed2fdd354b2da8efb0838ce39f
+  data.tar.gz: e96c73705f470b513397a3f5e1cb650235ea9d457130d057d1f5b6b98aada21de3f0cff88a63f82732476f98f9f3c0d90253d20c5e7ebad93d298ebe77df3a59

data/app/assets/stylesheets/backend/components/_abbreviated_tooltip.scss

@@ -0,0 +1,3 @@
+.abbreviated-tooltip {
+  border-bottom: 1px dashed #ffffff;
+}

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

@@ -17,6 +17,7 @@
 @import 'components/page_tree';
 @import 'components/table';
 @import 'components/card';
+@import 'components/abbreviated_tooltip';
 
 // Page specific styles
 @import 'pages/login';

data/app/controllers/backend/content/rows/pictures_controller.rb

@@ -46,6 +46,6 @@ class Backend::Content::Rows::PicturesController < Backend::BaseController
   def prepare_upload
     @asset = Asset.new
     @search = Asset.ransack params[:q]
-    @assets = @search.result(distinct: true).image.where.not(id: @model.asset_id).order('id DESC')
+    @assets = @search.result(distinct: true).image.where.not(id: @model.asset_id).order('id DESC').limit(30)
   end
 end

data/app/controllers/backend/images_controller.rb

@@ -5,7 +5,7 @@ class Backend::ImagesController < Backend::BaseController
 
   def index
     @search = Asset.ransack params[:q]
-    @assets = @search.result(distinct: true).image.where.not(id: @model.images.pluck(:asset_id)).order('id DESC')
+    @assets = @search.result(distinct: true).image.where.not(id: @model.images.pluck(:asset_id)).order('id DESC').limit(30)
   end
 
   def create

data/app/controllers/backend/pages_controller.rb

@@ -59,7 +59,7 @@ class Backend::PagesController < Backend::BaseController
   end
 
   def allowed_params
-    params[:page].permit(:description, :parent_id, :visible)
+    params[:page].permit(:description, :parent_id, :visible, :sitemap)
   end
 
   def translation_form

data/app/models/concerns/addressable.rb

@@ -7,7 +7,7 @@ module Concerns
     end
 
     module ClassMethods
-      def configure_adress(categories, default: nil)
+      def configure_address(categories, default: nil)
         address_config.update(categories, default: default)
       end
 

data/app/models/concerns/person.rb

@@ -3,5 +3,11 @@ module Concerns
     def full_name
       "#{first_name} #{last_name}"
     end
+
+    def short_name
+      short = "#{first_name}"
+      short << ' ' if first_name.present? && last_name.present?
+      short << last_name.to_s.split(' ').map { |n| "#{n[0,1]}." }.join
+    end
   end
 end

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

@@ -10,10 +10,10 @@
       <tr>
         <th><%= t 'b.title' %></th>
         <th><%= t 'b.author' %></th>
-        <th><%= t 'b.published_at' %></th>
-        <th><%= t 'b.visible' %></th>
-        <th><%= t 'b.press_release' %></th>
-        <th>&nbsp;</th>
+        <th width="200"><%= t 'b.published_at' %></th>
+        <th><span data-toggle="tooltip" title="<%= t 'b.visible' %>" class="abbreviated-tooltip"><%= t 'b.msg.articles.visible_abbreviated' %></span></th>
+        <th><span data-toggle="tooltip" title="<%= t 'b.press_release' %>" class="abbreviated-tooltip"><%= t 'b.msg.articles.press_release_abbreviated' %></span></th>
+        <th width="60">&nbsp;</th>
       </tr>
     </thead>
 
@@ -27,17 +27,17 @@
                 <%= t('b.msg.no_title_set') %>
               <% end %>
             <% else %>
-              <%= truncate a.title, length: 40 %>
+              <%= truncate a.title, length: 70 %>
             <% end %>
           </td>
           <td>
             <% if a.user.present? %>
-              <%= link_to icon(:user, a.user.full_name), edit_backend_user_path(a.user) %>
+              <%= link_to icon(:user, a.user.short_name), edit_backend_user_path(a.user) %>
             <% else %>
               <%= t 'b.not_set' %>
             <% end %>
           </td>
-          <td><%= l a.published_at if a.published_at %></td>
+          <td class="text-right"><%= l(a.published_at, format: :short) if a.published_at %></td>
           <td><%= t a.visible?.to_s %></td>
           <td><%= t a.press_release?.to_s %></td>
           <td class="text-right">

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

@@ -31,7 +31,7 @@
           <td><%= a.actual_filename.split('.').last.upcase %></td>
           <td><%= number_to_human_size a.filesize %></td>
           <td><%= simple_format a.description %></td>
-          <td><%= l a.updated_at %></td>
+          <td><%= l a.updated_at, format: :short %></td>
           <td class="text-right">
             <%= link_to_edit [:backend, a] %>
             <%= link_to_delete [:backend, a] if a.deletable? %>

data/app/views/backend/content/_picture.html.erb

@@ -3,9 +3,13 @@
   <%= image_tag object.asset.image.url(1100, 1100, quality: 65), alt: '', class: 'img-fluid' %>
 
   <% if object.caption.present? %>
-    <div class="text-xs-center">
+    <% if Udongo.config.flexible_content.picture_caption_editor? %>
       <%= object.caption.html_safe %>
-    </div>
+    <% else %>
+      <div class="text-center">
+        <%= object.caption%>
+      </div>
+    <% end %>
   <% end %>
 
 <% else %>

data/app/views/backend/content/rows/columns/_column_width_explanation.html.erb

@@ -1,5 +1,5 @@
 <div class="alert alert-info">
-  <p class="m-b-0">
+  <p class="mb-0">
     <%= icon(:info) %> <%= t 'b.msg.flexible_content.width_explanation' %>
   </p>
 </div>

data/app/views/backend/content/rows/pictures/_filter.html.erb

@@ -1,5 +1,5 @@
 <%= search_form_for @search, url: link_or_upload_backend_content_picture_path(@model) do |f| %>
-  <div class="row m-b-2">
+  <div class="row mb-4">
     <div class="col-md-6">
       <%= f.search_field :description_cont, placeholder: t('b.description'), class: 'form-control' %>
     </div>

data/app/views/backend/content/rows/pictures/edit.html.erb

@@ -10,7 +10,10 @@
 
     <%= simple_form_for [:backend, @model] do |f| %>
       <%= f.input :url, as: :string %>
-      <%= f.input :caption, as: :text %>
+
+      <% content_type = Udongo.config.flexible_content.picture_caption_editor? ? :ckeditor : :text %>
+      <%= f.input :caption, as: content_type %>
+
       <%= render 'backend/form_actions', cancel_url: content_path %>
     <% end %>
   </div>

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

@@ -1,7 +1,7 @@
 <%= search_form_for @search, url: backend_images_path do |f| %>
   <%= hidden_field_tag :klass, @model.class.name %>
   <%= hidden_field_tag :id, @model.id %>
-  <div class="row m-b-2">
+  <div class="row mb-4">
     <div class="col-md-6">
       <%= f.search_field :description_cont, placeholder: t('b.description'), class: 'form-control' %>
     </div>

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

@@ -23,6 +23,7 @@
 
         <div class="card-block">
           <%= f.input :visible, as: :boolean %>
+          <%= f.input :sitemap, as: :boolean %>
         </div>
       </div>
     </div>

data/app/views/layouts/backend/_top_navigation.html.erb

@@ -1,4 +1,3 @@
-<!-- TODO move this div to the top navigation partial -->
 <div class="collapse navbar-collapse" id="udongo-navbar">
   <ul class="navbar-nav mr-auto">
     <li class="nav-item dropdown">
@@ -34,7 +33,7 @@
   </ul>
 
   <ul class="navbar-nav">
-    <li class="nav-item pull-xs-right">
+    <li class="nav-item">
       <%= form_tag backend_search_path, method: :get, id: 'search', class: 'form-inline my-2 my-lg-0' do %>
         <%= text_field_tag :term, params[:term], class: 'form-control mr-sm-2 no-focus', placeholder: t('b.search') %>
       <% end %>

data/changelog.md

@@ -1,3 +1,17 @@
+6.1.0 - 2017-05-16
+--
+* The obsolete top navigation markup has been cleaned up.
+* Add setting 'sitemap' to pages. These can be used to easily see which pages
+  are to be included in the sitemap.
+* Rename Concerns::Addressable#configure_adress to configure_address
+* Add method Person#short_name which uses the first name and first letter of the
+  last name.
+* A new setting ```Udongo.config.flexible_content.picture_caption_editor``` was
+  added. This allows you to use an editor for picture captions.
+* Tweaked some bottom margins related to the media module.
+* Linking an image via de media module now only suggests 30 pictures.
+
+
 6.0.0 - 2017-05-08
 --
 * When adding/editing flexible content columns, you now only see the medium

data/config/locales/en.yml

@@ -201,7 +201,7 @@ en:
     formats:
       default: ! '%B %-d, %Y at %Hh%M'
       timeless: ! '%d %B %Y'
-      short: ! '%d %b at %Hh%M'
+      short: ! '%-d %b %Y at %-Hh%M'
       time_attr: ! '%G-W%V-%uT%R%:z'
       full: ! '%a, %d %b %Y %H:%M:%S %z'
     pm: pm

data/config/locales/en_backend.yml

@@ -104,6 +104,9 @@ en:
       admins:
         account_details: Account details
         personal_details: Personal details
+      articles:
+        press_release_abbreviated: Press.
+        visible_abbreviated: Visi.
       changes_saved: The changes have been saved.
       confirm: Are you sure?
       content_types:

data/config/locales/fr.yml

@@ -208,7 +208,7 @@ fr:
     formats:
       default: "%A %-d %B %Y à %Hh%M"
       timeless: '%d %B %Y'
-      short: "%d %b à %Hh%M"
+      short: "%-d %b à %-Hh%M"
       time_attr: ! '%G-W%V-%uT%R%:z'
       full: "%d %B %Y %H:%M:%S %Z"
     pm: 'pm'

data/config/locales/nl.yml

@@ -207,7 +207,7 @@ nl:
     formats:
       default: ! '%-d %B %Y om %Hu%M'
       timeless: ! '%d %B %Y'
-      short: ! '%d %b om %Hu%M'
+      short: ! '%-d %b %Y om %-Hu%M'
       time_attr: ! '%FT%R%:z'
       full: ! '%a %d %b %Y %H:%M:%S %Z'
     pm: ! '''s middags'

data/config/locales/nl_backend.yml

@@ -104,6 +104,9 @@ nl:
       admins:
         account_details: Accountgegevens
         personal_details: Persoonlijke gegevens
+      articles:
+        press_release_abbreviated: Pers.
+        visible_abbreviated: Zicht.
       changes_saved: De wijzigingen werden opgeslagen.
       confirm: Ben je zeker?
       content_types:

data/config/locales/nl_forms.yml

@@ -46,6 +46,7 @@ nl:
         seo_description: Beschrijving
         seo_keywords: Sleutelwoorden
         seo_custom: Extra meta-tags
+        sitemap: Sitemap?
         subject: Onderwerp
         subtitle: Subtitel
         success_message: Melding bij succesvolle verzending

data/db/migrate/20170516092845_add_sitemap_to_page.rb

@@ -0,0 +1,6 @@
+class AddSitemapToPage < ActiveRecord::Migration[5.0]
+  def change
+    add_column :pages, :sitemap, :boolean, after: 'content_disabled'
+    add_index :pages, :sitemap
+  end
+end

data/lib/udongo/configs/flexible_content.rb

@@ -7,6 +7,11 @@ module Udongo
       DEFAULT_BREAKPOINT = 'md'
 
       attribute :types, Array, default: %w(text picture video image)
+      attribute :picture_caption_editor, Axiom::Types::Boolean, default: false
+
+      def picture_caption_editor?
+        picture_caption_editor
+      end
     end
   end
 end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '6.0.0'
+  VERSION = '6.1.0'
 end

data/readme.md

@@ -119,6 +119,11 @@ You can also override the default message with your own:
 Udongo.config.flexible_content.types = %w(text picture video)
 ```
 
+### picture_caption_editor
+```ruby
+Udongo.config.flexible_content.picture_caption_editor = false
+```
+
 ## Assets
 ### image_white_list
 ```ruby

data/spec/support/concerns/person.rb

@@ -9,7 +9,34 @@ shared_examples_for :person do
     expect(person.full_name).to eq 'Foo Bar'
   end
 
+  describe '#short_name' do
+    it 'no first name' do
+      person = build(klass, first_name: nil, last_name: 'Bar')
+      expect(person.short_name).to eq 'B.'
+    end
+
+    it 'no last name' do
+      person = build(klass, first_name: 'Foo', last_name: nil)
+      expect(person.short_name).to eq 'Foo'
+    end
+
+    it 'last name with 1 word' do
+      person = build(klass, first_name: 'Foo', last_name: 'Bar')
+      expect(person.short_name).to eq 'Foo B.'
+    end
+
+    it 'last name with 2 words' do
+      person = build(klass, first_name: 'Foo', last_name: 'Bar Baz')
+      expect(person.short_name).to eq 'Foo B.B.'
+    end
+
+    it 'last name with 3 words' do
+      person = build(klass, first_name: 'Foo', last_name: 'Bar Baz Boz')
+      expect(person.short_name).to eq 'Foo B.B.B.'
+    end
+  end
+
   it '#respond_to?' do
-    expect(model.new).to respond_to(:full_name)
+    expect(model.new).to respond_to(:full_name, :short_name)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -440,6 +440,7 @@ files:
 - app/assets/javascripts/backend/tree.js
 - app/assets/stylesheets/backend/application.scss
 - app/assets/stylesheets/backend/bootstrap.scss
+- app/assets/stylesheets/backend/components/_abbreviated_tooltip.scss
 - app/assets/stylesheets/backend/components/_breadcrumb.scss
 - app/assets/stylesheets/backend/components/_card.scss
 - app/assets/stylesheets/backend/components/_form.scss
@@ -807,6 +808,7 @@ files:
 - db/migrate/20170412074304_create_content_pictures.rb
 - db/migrate/20170507092541_add_alignment_options_to_content_rows.rb
 - db/migrate/20170507163532_create_content_videos.rb
+- db/migrate/20170516092845_add_sitemap_to_page.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb