udongo 5.9.0 → 6.0.0

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

@@ -1,6 +1,10 @@
 <%= render 'backend/breadcrumbs' %>
 
 <% if @forms.any? %>
+  <p class="text-right">
+    <%= link_to icon(:plus, t('b.add')), new_backend_form_path, class: 'btn btn-primary btn-sm' %>
+  </p>
+
   <table class="table table-striped table-hover">
     <thead class="thead-inverse">
       <tr>
@@ -14,15 +18,9 @@
     <tbody>
       <% @forms.each do |f| %>
         <tr>
+          <td><%= f.description %></td>
           <td>
-            <%= f.description %>
-          </td>
-          <td>
-            <% if f.fields.none? %>
-              0
-            <% else %>
-              <%= f.fields.size %> (<%= link_to t('b.overview').downcase, backend_form_fields_path(f) %>)
-            <% end %>
+            <%= f.fields.size %> (<%= link_to t('b.overview').downcase, backend_form_fields_path(f) %>)
           </td>
           <td>
             <% if f.submissions.none? %>
@@ -31,7 +29,7 @@
               <%= f.submissions.size %> (<%= link_to t('b.overview').downcase, backend_form_submissions_path(f) %>)
             <% end %>
           </td>
-          <td class="text-xs-right">
+          <td class="text-right">
             <%= link_to_edit [:backend, f] %>
 
             <% if f.submissions.any? %>

data/app/views/backend/forms/submissions/index.html.erb

@@ -13,21 +13,13 @@
       </tr>
     </thead>
 
-    <tfoot>
-      <tr>
-        <td colspan="2" class="text-xs-center">
-          <%= udongo_paginate @submissions %><br>
-        </td>
-      </tr>
-    </tfoot>
-
     <tbody>
       <% @submissions.each do |s| %>
         <tr>
           <% if @form.email_present? %>
             <td><%= mail_to s.data_object.email %></td>
           <% end %>
-          <td class="text-xs-right">
+          <td class="text-right">
             <%= link_to_show backend_form_submission_path(@form, s) %>
             <%= link_to_delete backend_form_submission_path(@form, s) %>
           </td>
@@ -35,6 +27,9 @@
       <% end %>
     </tbody>
   </table>
+
+  <%= udongo_paginate @submissions %>
+
 <% else %>
   <p><%= t 'b.msg.form_submissions.explanation' %></p>
 <% end %>

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

@@ -10,9 +10,7 @@
         <%= fa.input :description, as: :text, required: false %>
       <% end %>
 
-      <div class="form-actions">
-        <button type="submit" class="btn btn-primary"><%= t 'b.save' %></button>
-      </div>
+      <button type="submit" class="btn btn-primary"><%= t 'b.save' %></button>
     </div>
   </div>
 <% end %>

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

@@ -20,5 +20,4 @@
       <%= render 'backend/form_actions', cancel_url: backend_images_path(klass: @model.class.name, id: @model.id) %>
     </div>
   </div>
-
 <% end %>

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

@@ -6,7 +6,7 @@
     <div class="col-md-6">
       <h2><%= n.description %></h2>
     </div>
-    <div class="col-md-6 text-xs-right">
+    <div class="col-md-6 text-right">
       <%= link_to t('b.add'), new_backend_navigation_item_path(n), class: 'btn btn-primary btn-sm' %>
     </div>
   </div>
@@ -32,7 +32,7 @@
             <td><%= i.translation.label %></td>
             <td><%= i.translation.path %></td>
             <td><%= i.extra %></td>
-            <td class="text-xs-right">
+            <td class="text-right">
               <%= link_to_edit edit_translation_backend_navigation_item_path(n, i, default_app_locale) %>
               <%= link_to_delete backend_navigation_item_path(n, i) %>
             </td>

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

@@ -4,7 +4,7 @@
 <% javascript 'backend/pages' %>
 <%= render 'backend/breadcrumbs' %>
 
-<p class="text-xs-right">
+<p class="text-right">
   <%= link_to t('b.add'), new_backend_page_path, class: 'btn btn-primary btn-sm' %>
 </p>
 

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

@@ -1,8 +1,7 @@
 <%= render 'backend/breadcrumbs' %>
+<%= render 'filter' %>
 
-<%= render 'backend/redirects/filter' %>
-
-<p class="text-xs-right">
+<p class="text-right">
   <%= link_to icon(:plus, t('b.add')), new_backend_redirect_path, class: 'btn btn-primary btn-sm' %>
 </p>
 
@@ -27,7 +26,7 @@
           <td><%= r.status_code %></td>
           <td><%= t r.enabled?.to_s %></td>
           <td><%= r.times_used.to_i %></td>
-          <td class="text-xs-right">
+          <td class="text-right">
             <%= link_to_edit [:backend, r] %>
             <%= link_to_delete [:backend, r] %>
           </td>

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

@@ -1,16 +1,24 @@
 <%= render 'backend/general_form_error', object: model %>
 
 <%= simple_form_for [:backend, model] do |f| %>
-  <div class="row">
-    <div class="col-md-12">
-      <div class="card">
-        <div class="card-header">
-          <%= t 'b.general' %>
-        </div>
+  <div class="card">
+    <div class="card-header">
+      <%= t 'b.general' %>
+    </div>
 
-        <div class="card-block">
+    <div class="card-block">
+      <div class="row">
+        <div class="col-md-6">
           <%= f.input :locale, collection: Udongo.config.i18n.cms.interface_locales, include_blank: false %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-6">
           <%= f.input :term %>
+        </div>
+
+        <div class="col-md-6">
           <%= f.input :synonyms, as: :string %>
         </div>
       </div>

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

@@ -1,6 +1,6 @@
 <%= render 'backend/breadcrumbs' %>
 
-<p class="text-xs-right">
+<p class="text-right">
   <%= link_to icon(:plus, t('b.add')), new_backend_search_synonym_path, class: 'btn btn-primary btn-sm' %>
 </p>
 
@@ -21,7 +21,7 @@
           <td><%= s.locale %></td>
           <td><%= s.term %></td>
           <td><%= s.synonyms %></td>
-          <td class="text-xs-right">
+          <td class="text-right">
             <%= link_to_edit [:backend, s] %>
             <%= link_to_delete [:backend, s] %>
           </td>

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

@@ -13,7 +13,7 @@
       <% @snippets.each do |s| %>
         <tr>
           <td><%= s.description %></td>
-          <td class="text-xs-right">
+          <td class="text-right">
             <%= link_to_edit_translation [:backend, s] %>
           </td>
         </tr>

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

@@ -1,7 +1,7 @@
 <%= render 'backend/breadcrumbs' %>
 <%= render 'filter' %>
 
-<p class="text-xs-right">
+<p class="text-right">
   <%= link_to icon(:plus, t('b.add')), new_backend_user_path, class: 'btn btn-primary btn-sm' %>
 </p>
 
@@ -22,7 +22,7 @@
           <td><%= u.full_name %></td>
           <td><%= mail_to u.email %></td>
           <td><%= t u.active?.to_s %></td>
-          <td class="text-xs-right">
+          <td class="text-right">
             <%= link_to_edit [:backend, u] %>
             <%= link_to_delete [:backend, u] %>
           </td>

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

@@ -1,45 +1,50 @@
-<ul class="nav navbar-nav">
-  <li class="nav-item dropdown">
-    <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:list, t('b.content')) %></a>
-    <div class="dropdown-menu">
-      <%= link_to t('b.pages'), backend_pages_path, class: 'dropdown-item' %>
-      <%= link_to t('b.articles'), backend_articles_path, class: 'dropdown-item' %>
-      <%= link_to t('b.snippets'), backend_snippets_path, class: 'dropdown-item' %>
-      <%= link_to t('b.files'), backend_assets_path, class: 'dropdown-item' %>
-      <%= link_to t('b.forms'), backend_forms_path, class: 'dropdown-item' %>
-    </div>
-  </li>
+<!-- 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">
+      <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:list, t('b.content')) %></a>
+      <div class="dropdown-menu">
+        <%= link_to t('b.pages'), backend_pages_path, class: 'dropdown-item' %>
+        <%= link_to t('b.articles'), backend_articles_path, class: 'dropdown-item' %>
+        <%= link_to t('b.snippets'), backend_snippets_path, class: 'dropdown-item' %>
+        <%= link_to t('b.files'), backend_assets_path, class: 'dropdown-item' %>
+        <%= link_to t('b.forms'), backend_forms_path, class: 'dropdown-item' %>
+      </div>
+    </li>
 
-  <li class="nav-item dropdown">
-    <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:cog, t('b.settings')) %></a>
-    <div class="dropdown-menu">
-      <%= link_to t('b.navigation'), backend_navigations_path, class: 'dropdown-item' %>
-      <%= link_to t('b.admins'), backend_admins_path, class: 'dropdown-item' %>
-      <%= link_to t('b.users'), backend_users_path, class: 'dropdown-item' %>
-      <%= link_to t('b.redirects'), backend_redirects_path, class: 'dropdown-item' %>
-      <div class="dropdown-divider"></div>
-      <%= link_to t('b.emails'), backend_emails_path, class: 'dropdown-item' %>
-      <%= link_to t('b.email_templates'), backend_email_templates_path, class: 'dropdown-item' %>
-    </div>
-  </li>
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:cog, t('b.settings')) %></a>
+      <div class="dropdown-menu">
+        <%= link_to t('b.navigation'), backend_navigations_path, class: 'dropdown-item' %>
+        <%= link_to t('b.admins'), backend_admins_path, class: 'dropdown-item' %>
+        <%= link_to t('b.users'), backend_users_path, class: 'dropdown-item' %>
+        <%= link_to t('b.redirects'), backend_redirects_path, class: 'dropdown-item' %>
+        <div class="dropdown-divider"></div>
+        <%= link_to t('b.emails'), backend_emails_path, class: 'dropdown-item' %>
+        <%= link_to t('b.email_templates'), backend_email_templates_path, class: 'dropdown-item' %>
+      </div>
+    </li>
 
-  <li class="nav-item dropdown">
-    <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:search, t('b.search')) %></a>
-    <div class="dropdown-menu">
-      <%= link_to t('b.synonyms'), backend_search_synonyms_path, class: 'dropdown-item' %>
-    </div>
-  </li>
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:search, t('b.search')) %></a>
+      <div class="dropdown-menu">
+        <%= link_to t('b.synonyms'), backend_search_synonyms_path, class: 'dropdown-item' %>
+      </div>
+    </li>
+  </ul>
 
-  <li class="nav-item dropdown pull-xs-right">
-    <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:user, current_admin.full_name) %></a>
-    <div class="dropdown-menu">
-      <%= link_to icon(:sign_out, t('b.logout')), backend_session_path(id: 42), method: :delete, data: { confirm: t('b.msg.confirm') }, class: 'dropdown-item' %>
-    </div>
-  </li>
+  <ul class="navbar-nav">
+    <li class="nav-item pull-xs-right">
+      <%= 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 %>
+    </li>
 
-  <li class="nav-item pull-xs-right">
-    <%= 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 %>
-  </li>
-</ul>
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:user, current_admin.full_name) %></a>
+      <div class="dropdown-menu">
+        <%= link_to icon(:sign_out, t('b.logout')), backend_session_path(id: 42), method: :delete, data: { confirm: t('b.msg.confirm') }, class: 'dropdown-item' %>
+      </div>
+    </li>
+  </ul>
+</div>

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

@@ -6,8 +6,8 @@
   <title>Udongo</title>
 
   <%= stylesheet_link_tag 'backend/application', media: 'all' %>
+  <%= yield(:stylesheets) %>
   <%= javascript_include_tag 'modernizr' %>
-  <%= javascript_include_tag 'backend/application' %>
   <%= csrf_meta_tags %>
 </head>
 
@@ -17,5 +17,9 @@
       <%= yield %>
     </div>
   </div>
+
+  <%= yield(:javascripts_early) %>
+  <%= javascript_include_tag 'backend/application' %>
+  <%= yield(:javascripts) %>
 </body>
 </html>

data/changelog.md

@@ -1,3 +1,15 @@
+6.0.0 - 2017-05-08
+--
+* When adding/editing flexible content columns, you now only see the medium
+  breakpoint by default.
+* Upgrade bootstrap v4 from alpha 4 to alpha 6.
+* The last item in the list of breadcrumbs will never be a link.
+* Flexible content now allows you to align columns within a row vertically or
+  horizontally. You can also define a row to be full width instead of the
+  default container.
+* A new widget has been added to easily insert youtube/vimeo video's.
+
+
 5.9.0 - 2017-05-04
 --
 * Fixes issue in pages module that prevented you from clicking the context

data/config/locales/en_backend.yml

@@ -110,6 +110,7 @@ en:
         image: Image (deprecated!)
         picture: Picture
         text: Text
+        video: Video
       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: '%{actor} was edited.'
@@ -117,16 +118,24 @@ en:
         add_column: Add column
         add_row: Add row
         add_text: Add text
-        delete_row: Delete row
+        align_center: Center
+        align_left: Align left
+        align_right: Align right
+        align_vertical_bottom: Align vertical bottom
+        align_vertical_center: Align vertically
+        align_vertical_top: Align vertical top
         edit_column: Edit column
         edit_image: Edit image
         edit_picture: Edit picture
         edit_text: Edit text
+        edit_video: Edit video
         explanation: With this module you can create flexible responsive content. Click the button below to create the first row.
+        full_width: Full width
         no_picture_present: No picture has been uploaded/linked yet.
+        no_video_present: No valid video URL was given.
+        width_explanation: For the flexible content we use a grid layout. This works with rows and columns. Every row can contain at most 12 columns. That's why the column width is expressed as a fracture.
       forgot_password: Forgot password?
       form_fields:
-        add: Add input field
         add_first: Create the first input field.
         edit: Edit input field
         explanation: No input fields have been added yet.

data/config/locales/nl_backend.yml

@@ -110,6 +110,7 @@ nl:
         image: Afbeelding (niet meer gebruiken!)
         picture: Foto
         text: Tekst
+        video: Video
       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.'
@@ -117,16 +118,24 @@ nl:
         add_column: Kolom toevoegen
         add_row: Rij toevoegen
         add_text: Tekst toevoegen
-        delete_row: Rij verwijderen
+        align_center: Centreren
+        align_left: Links uitlijnen
+        align_right: Rechts uitlijnen
+        align_vertical_bottom: Vertikaal onderaan uitlijnen
+        align_vertical_center: Vertikaal centreren
+        align_vertical_top: Vertikaal bovenaan uitlijnen
         edit_column: Kolom bewerken
         edit_image: Afbeelding bewerken
         edit_picture: Foto bewerken
         edit_text: Tekst bewerken
+        edit_video: Video bewerken
         explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
+        full_width: Volledige breedte
         no_picture_present: Er werd nog geen foto geüpload of gelinkt.
+        no_video_present: Er werd nog geen geldige URL voor een video opgegeven.
+        width_explanation: Voor de flexibele inhoud wordt er gebruikt gemaakt van een grid layout. Deze werkt met rijen en kolommen. Iedere rij kan maximaal 12 kolommen bevatten. Daarom dat de breedte uitgedrukt is in een breuk op 12.
       forgot_password: Wachtwoord vergeten?
       form_fields:
-        add: Invulveld toevoegen
         add_first: Maak het eerste invulveld aan
         edit: Bewerk invulveld
         explanation: Er zijn nog geen invulvelden gedefiniëerd voor dit formulier.

data/config/routes.rb

@@ -81,6 +81,10 @@ Rails.application.routes.draw do
 
     namespace :content do
       resources :rows, only: [:index, :new, :destroy] do
+        member do
+          get :horizontal_alignment, :vertical_alignment, :toggle_full_width
+        end
+
         concerns :positionable
 
         scope module: 'rows' do

data/db/migrate/20170507092541_add_alignment_options_to_content_rows.rb

@@ -0,0 +1,7 @@
+class AddAlignmentOptionsToContentRows < ActiveRecord::Migration[5.0]
+  def change
+    add_column :content_rows, :full_width, :boolean, after: 'rowable_id'
+    add_column :content_rows, :horizontal_alignment, :string, after: 'full_width'
+    add_column :content_rows, :vertical_alignment, :string, after: 'horizontal_alignment'
+  end
+end

data/db/migrate/20170507163532_create_content_videos.rb

@@ -0,0 +1,10 @@
+class CreateContentVideos < ActiveRecord::Migration[5.0]
+  def change
+    create_table :content_videos do |t|
+      t.text :url
+      t.string :aspect_ratio
+
+      t.timestamps
+    end
+  end
+end