udongo 6.5.2 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54260312474acd8ceeb3a57639beaa0e4211aa5d
-  data.tar.gz: 4ec895593cb6a05ef9887086790fb64e7ddd0932
+  metadata.gz: b44092ed3a002bf2b3e068d7f1507613997b59ed
+  data.tar.gz: 32fdb5697265fae0ab8a5f13b020509a4793e6f5
 SHA512:
-  metadata.gz: 67653962456e33f75a3db20889b392b59eb60e133da4a016826de9ef5d7930bd0900d4acc2c1c1b0bb49afbcd84d986d4d1dc717432efe3d41b0781c9d014f7a
-  data.tar.gz: dad523392675eb9062dfe7d85ad1fcb95f0984eec74b9588caf5e71859f7475df981fa23ac104aa24174749ed17d5faef58dce1304f5bdd897b96a27ab943d5f
+  metadata.gz: 821caf33fad2b65fc7fc95193e4d374ccbd9071601b9429f3b19e65a1c43500395e16a5ef4c407e7b8ea6674d7f608408e0b3ee1a39e4c572b79d1aa868c3caf
+  data.tar.gz: 2a35b6f92441b7707af739bcc713a588ea79ae1a9ca07f4482187bf08425827f6691b67abef8c76a9a963d160b85b334df48c39c0fca970703d56890f241cd2a

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

@@ -0,0 +1,11 @@
+class Backend::Pages::BaseController < Backend::BaseController
+  before_action :find_page
+  before_action do
+    breadcrumb.add t('b.pages'), backend_pages_path
+    breadcrumb.add @page.description, edit_backend_page_path(@page)
+  end
+
+  def find_page
+    @page = Page.find params[:page_id]
+  end
+end

data/app/controllers/backend/pages/images_controller.rb

@@ -0,0 +1,15 @@
+class Backend::Pages::ImagesController < Backend::Pages::BaseController
+  include Concerns::Backend::PositionableController
+
+  before_action { breadcrumb.add t('b.images') }
+
+  def index
+    @images = @page.images
+  end
+
+  private
+
+  def find_model
+    @model = @page.images.find params[:id]
+  end
+end

data/app/models/page.rb

@@ -7,6 +7,7 @@ class Page < ApplicationRecord
   include Concerns::Draggable
   include Concerns::FlexibleContent
   include Concerns::Searchable
+  include Concerns::Imageable
 
   include Concerns::Sortable
   sortable scope: [:parent_id]

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

@@ -5,7 +5,7 @@
         <% klass = %w(nav-link) %>
         <% klass << 'active' if active == :general %>
 
-        <%= link_to t('b.general'), edit_backend_page_path(@model), class: klass %>
+        <%= link_to t('b.general'), edit_backend_page_path(model), class: klass %>
       </li>
 
       <% Udongo.config.i18n.app.locales.each do |locale| %>
@@ -13,7 +13,15 @@
           <% klass = %w(nav-link) %>
           <% klass << 'active' if active == locale.to_sym %>
 
-          <%= link_to locale.upcase, edit_translation_backend_page_path(@model, locale), class: klass %>
+          <%= link_to locale.upcase, edit_translation_backend_page_path(model, locale), class: klass %>
+        </li>
+      <% end %>
+
+      <% if Udongo.config.pages.images? %>
+        <li class="nav-item">
+          <% klass = %w(nav-link) %>
+          <% klass << 'active' if active == :images %>
+          <%= link_to icon(:image, t('b.images')), backend_page_images_path(model), class: klass %>
         </li>
       <% end %>
     </ul>

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

@@ -2,5 +2,5 @@
 <% breadcrumb.add t('b.edit') %>
 <%= render 'backend/breadcrumbs' %>
 
-<%= render 'backend/pages/tabs', active: :general %>
+<%= render 'backend/pages/tabs', model: @model, active: :general %>
 <%= render 'backend/pages/form' %>

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

@@ -2,7 +2,7 @@
 <% breadcrumb.add t('b.edit') %>
 <%= render 'backend/breadcrumbs' %>
 
-<%= render 'backend/pages/tabs', active: params[:translation_locale].to_sym %>
+<%= render 'backend/pages/tabs', model: @model, active: params[:translation_locale].to_sym %>
 <%= render 'backend/general_form_error', object: @translation %>
 
 <%= simple_form_for([:backend, @translation], url: edit_translation_backend_page_path, html: { class: 'no-focus' }) do |f| %>

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

@@ -0,0 +1,43 @@
+<% javascript 'backend/sortable' %>
+<%= render 'backend/breadcrumbs' %>
+<%= render 'backend/pages/tabs', model: @page, active: :images %>
+
+<p class="text-right">
+  <%= link_to icon(:plus, t('b.add')), backend_images_path(klass: @page.class.name, id: @page.id), class: 'btn btn-primary btn-sm' %>
+</p>
+
+<% if @images.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.file' %></th>
+        <th><%= t 'b.type' %></th>
+        <th><%= t 'b.size' %></th>
+        <th><%= t 'b.description' %></th>
+        <th><%= t 'b.last_changed_at' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @images.each do |img| %>
+        <% a = img.asset %>
+        <tr data-update-position="<%= update_position_backend_page_image_path(@page, img) %>">
+          <td>
+            <%= image_tag a.image.url(150, 150), alt: '', class: 'img-fluid' %>
+          </td>
+          <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 class="text-right">
+            <%= link_to icon(:trash), unlink_backend_images_path(klass: @page.class.name, id: @page.id, asset_id: a.id), data: { confirm: t('b.msg.confirm') }, title: t('b.delete') %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/changelog.md

@@ -1,3 +1,8 @@
+6.6.0 - 2017-07-04
+--
+* When enabled, you can add images to pages from the assets module.
+
+
 6.5.2 - 2016-06-26
 --
 * Bugfix: remove frontend/forms.js include in flexible content.

data/config/routes.rb

@@ -30,6 +30,10 @@ Rails.application.routes.draw do
       member do
         post :tree_drag_and_drop, :toggle_visibility
       end
+
+      resources :images, only: [:index], controller: 'pages/images' do
+        concerns :positionable
+      end
     end
 
     resources :forms do

data/lib/udongo/configs/pages.rb

@@ -0,0 +1,13 @@
+module Udongo
+  module Configs
+    class Pages
+      include Virtus.model
+
+      attribute :images, Axiom::Types::Boolean, default: false
+
+      def images?
+        images === true
+      end
+    end
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '6.5.2'
+  VERSION = '6.6.0'
 end

data/readme.md

@@ -21,6 +21,12 @@ Udongo.config.base.project_name = 'Udongo'
 Udongo.config.base.time_zone = 'Brussels'
 ```
 
+## Pages
+### images
+```ruby
+Udongo.config.pages.images = false
+```
+
 ## Tags
 ### allow_new
 ```ruby
@@ -50,69 +56,6 @@ 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
@@ -569,3 +512,66 @@ Find a navigation from cache by its identifier.
 ## Select2
 This library is loaded by default in the backend.
 See https://select2.github.io
+
+# 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 %>
+```

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 6.5.2
+  version: 6.6.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -483,6 +483,8 @@ files:
 - app/controllers/backend/images_controller.rb
 - app/controllers/backend/navigation/items_controller.rb
 - app/controllers/backend/navigations_controller.rb
+- app/controllers/backend/pages/base_controller.rb
+- app/controllers/backend/pages/images_controller.rb
 - app/controllers/backend/pages_controller.rb
 - app/controllers/backend/redirects_controller.rb
 - app/controllers/backend/search_controller.rb
@@ -701,6 +703,7 @@ files:
 - app/views/backend/pages/_tabs.html.erb
 - app/views/backend/pages/edit.html.erb
 - app/views/backend/pages/edit_translation.html.erb
+- app/views/backend/pages/images/index.html.erb
 - app/views/backend/pages/index.html.erb
 - app/views/backend/pages/new.html.erb
 - app/views/backend/redirects/_filter.html.erb
@@ -873,6 +876,7 @@ files:
 - lib/udongo/configs/i18n.rb
 - lib/udongo/configs/i18ns/app.rb
 - lib/udongo/configs/i18ns/cms.rb
+- lib/udongo/configs/pages.rb
 - lib/udongo/configs/tags.rb
 - lib/udongo/crypt.rb
 - lib/udongo/cryptography.rb