udongo 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5dcd9c07952f78c60a0f082968eec84e5df29c0
-  data.tar.gz: f5b1440aa0920a2794e30cfec54b16ca155f0bc2
+  metadata.gz: 9a9d78af6af9e79dc93e988f912f0dc35cf63c32
+  data.tar.gz: 77387997bf2df93647585e6a8c980002d688999a
 SHA512:
-  metadata.gz: 23358d0c06b06407219f51c732eb695fb3ccd81fa1f3480d6f5932e2df44a7d9cd4017daf85a256d0722a665b22f11c42686aff9c256141d8b93ea12963aaff6
-  data.tar.gz: 3420ec55347bbd72e41e0ff649ae58c9d8a99eb63f83b66c98f76f64a8977253127d9b7df96546c9e1411de8270c4aea40637f5773843a2f9339b45480b0c1f2
+  metadata.gz: ad09958982bbb2913c20486dcce2b295c6c96533199bc1f79d0684e6875dccbc25a09a7d0aa3b25f382f02584bb2e803480989b7c72575503ab248e01b91cc93
+  data.tar.gz: 08666441135710beb54f0baa767f14c3c3d5a081ac937eb652cf1e0209dd39a2545be838aa4f826ed132f7009aa029bacb2a0a8c7ac666bcb58221ea3e5776af

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

@@ -0,0 +1,33 @@
+var flexible_content = flexible_content || {
+  init: function() {
+    $('#content-rows .cards').sortable({
+      axis: 'y',
+      handle: '.card-header',
+      update: sortable.update_position_listener,
+      tolerance: 'pointer',
+      placeholder: 'placeholder',
+      start: function(e, ui){
+        ui.placeholder.height(ui.item.height());
+        ui.placeholder.css('margin-bottom', ui.item.css('margin-bottom'));
+      }
+    });
+
+    $('.content-columns').sortable({
+      axis: 'x',
+      handle: '.card',
+      update: sortable.update_position_listener,
+      tolerance: 'pointer',
+      placeholder: 'placeholder',
+      start: function(e, ui){
+        var classes = ui.item.attr('class').replace('content-column ') + ' placeholder';
+        ui.placeholder.attr('class', classes);
+        ui.placeholder.height(ui.item.find('.card').height());
+        ui.placeholder.width(ui.item.find('.card').width() - 30);
+        ui.placeholder.css('margin-left', '15px');
+        ui.placeholder.css('margin-right', '15px');
+      }
+    })
+  }
+}
+
+$(function(){ flexible_content.init(); });

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

@@ -26,7 +26,7 @@ var sortable = sortable || {
   },
 
   update_position_listener: function(e, ui) {
-    var new_position = ui.item[0].rowIndex;
+    var new_position = ui.item.index() + 1
 
     $.ajax({
       data: { position: new_position },

data/app/assets/stylesheets/backend/pages/_flexible_content.scss

@@ -1,5 +1,66 @@
 #content-rows {
   margin-bottom: 35px;
+
+  .placeholder {
+    background-color: #ffdc99;
+    border: 1px solid #ddba77;
+    border-radius: 4px;
+    opacity: 0.5;
+  }
+
+  .handle {
+    cursor: move;
+  }
+
+  .content-column {
+    .card {
+      &:hover {
+        border: 1px solid #999;
+
+        .btn-group a {
+          border: 1px solid #999 !important;
+          border-bottom: none !important;
+          color: #333 !important;
+        }
+      }
+
+      .card-footer {
+        background-color: white;
+        padding-bottom: 4px;
+        padding-top: 20px;
+        border-top: none;
+
+        .btn-group {
+          position: absolute;
+          bottom: 0;
+          left: 0;
+
+          a {
+            border: 1px solid #e5e5e5;
+            border-bottom: none;
+            color: #e5e5e5;
+
+            &:first-child {
+              border-left: none !important;
+              border-top-left-radius: 0;
+            }
+
+            &:last-child {
+              border-bottom-right-radius: 0;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  a.btn.full-width {
+    width: 100%;
+  }
+
+  a.btn.block {
+    padding: 25px;
+  }
 }
 
 .lightbox {

data/app/controllers/backend/admins_controller.rb

@@ -3,7 +3,7 @@ class Backend::AdminsController < BackendController
   before_action -> { breadcrumb.add t('b.admins'), backend_admins_path }
 
   def index
-    @admins = ::Admin.all
+    @admins = Admin.all
   end
 
   def show
@@ -11,14 +11,14 @@ class Backend::AdminsController < BackendController
   end
 
   def new
-    @admin = ::Admin.new
+    @admin = Admin.new
   end
 
   def create
-    @admin = ::Admin.new allowed_params
+    @admin = Admin.new allowed_params
 
     if @admin.save
-      redirect_to backend_admins_path, notice: t('b.msg.admins.added')
+      redirect_to backend_admins_path, notice: translate_notice(:added, :admin)
     else
       render :new
     end
@@ -26,7 +26,7 @@ class Backend::AdminsController < BackendController
 
   def update
     if @admin.update_attributes allowed_params
-      redirect_to backend_admins_path, notice: t('b.msg.changes_saved')
+      redirect_to backend_admins_path, notice: translate_notice(:changes_saved)
     else
       render :edit
     end
@@ -34,13 +34,13 @@ class Backend::AdminsController < BackendController
 
   def destroy
     @admin.destroy
-    redirect_to backend_admins_path, notice: t('b.msg.admins.deleted')
+    redirect_to backend_admins_path, notice: translate_notice(:deleted, :admin)
   end
 
   private
 
   def find_admin
-    @admin = ::Admin.find params[:id]
+    @admin = Admin.find params[:id]
   end
 
   def allowed_params

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

@@ -1,10 +1,12 @@
 class Backend::Content::Rows::ColumnsController < BackendController
+  include Concerns::Backend::PositionableController
+
   before_action :find_row
-  before_action :find_column, only: [:edit, :update, :move_up, :move_down, :destroy]
+  before_action :find_model, only: [:edit, :update, :update_position, :destroy]
   layout 'backend/lightbox'
 
   def new
-    @column = @row.columns.new
+    @column = @row.columns.new(@row.column_width_calculator.hashed_values)
     cancel_url
   end
 
@@ -29,16 +31,6 @@ class Backend::Content::Rows::ColumnsController < BackendController
     end
   end
 
-  def move_up
-    @column.move_higher
-    redirect_to cancel_url
-  end
-
-  def move_down
-    @column.move_lower
-    redirect_to cancel_url
-  end
-
   def destroy
     @column.destroy
 
@@ -49,11 +41,11 @@ class Backend::Content::Rows::ColumnsController < BackendController
   private
 
   def find_row
-    @row = ::ContentRow.find params[:row_id]
+    @row = ContentRow.find params[:row_id]
   end
 
-  def find_column
-    @column = ::ContentColumn.find params[:id]
+  def find_model
+    @column = ContentColumn.find params[:id]
   end
 
   def allowed_params

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

@@ -1,6 +1,6 @@
 class Backend::Content::Rows::ImagesController < BackendController
   include Concerns::Backend::ContentTypeController
 
-  model ::ContentImage
+  model ContentImage
   allowed_params :file, :caption, :url
 end

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

@@ -1,6 +1,6 @@
 class Backend::Content::Rows::TextsController < BackendController
   include Concerns::Backend::ContentTypeController
 
-  model ::ContentText
+  model ContentText
   allowed_params :content
 end

data/app/controllers/backend/content/rows_controller.rb

@@ -1,5 +1,6 @@
 class Backend::Content::RowsController < BackendController
-  before_action :find_row, only: [:move_up, :move_down, :destroy]
+  include Concerns::Backend::PositionableController
+  before_action :find_model, only: [:update_position, :destroy]
 
   def new
     if params[:klass] && params[:id] && params[:locale]
@@ -12,16 +13,6 @@ class Backend::Content::RowsController < BackendController
     end
   end
 
-  def move_up
-    @row.move_higher
-    redirect_back_to_content
-  end
-
-  def move_down
-    @row.move_lower
-    redirect_back_to_content
-  end
-
   def destroy
     @row.destroy
     redirect_back_to_content('content-rows')
@@ -29,8 +20,8 @@ class Backend::Content::RowsController < BackendController
 
   private
 
-  def find_row
-    @row = ::ContentRow.find params[:id]
+  def find_model
+    @row = ContentRow.find params[:id]
   end
 
   def content_path(instance, locale, anchor)

data/app/controllers/backend/email_templates_controller.rb

@@ -6,15 +6,15 @@ class Backend::EmailTemplatesController < BackendController
   before_action -> { breadcrumb.add t('b.email_templates'), backend_email_templates_path }
 
   def index
-    @email_templates = ::EmailTemplate.all
+    @email_templates = EmailTemplate.all
   end
 
   def new
-    @model = ::EmailTemplate.new
+    @model = EmailTemplate.new
   end
 
   def create
-    @model = ::EmailTemplate.new allowed_params
+    @model = EmailTemplate.new allowed_params
 
     if @model.save
       redirect_to edit_translation_backend_email_template_path(@model, translation_locale: default_locale), notice: translate_notice(:added, :email_template)
@@ -34,7 +34,7 @@ class Backend::EmailTemplatesController < BackendController
   private
 
   def find_model
-    @model = ::EmailTemplate.find params[:id]
+    @model = EmailTemplate.find params[:id]
   end
 
   def translation_form

data/app/controllers/backend/emails_controller.rb

@@ -4,15 +4,15 @@ class Backend::EmailsController < BackendController
   before_action -> { breadcrumb.add t('b.emails'), backend_emails_path }
 
   def index
-    @emails = paginate ::Email.all.order('id DESC')
+    @emails = paginate Email.all.order('id DESC')
   end
 
   def show
-    @email = ::Email.find params[:id]
+    @email = Email.find params[:id]
   end
 
   def html_content
-    @email = ::Email.find params[:id]
+    @email = Email.find params[:id]
     render text: @email.html_content
   end
 end

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

@@ -0,0 +1,14 @@
+class Backend::Forms::BaseController < BackendController
+  before_action :find_form
+
+  before_action -> do
+    breadcrumb.add t('b.forms'), backend_forms_path
+    breadcrumb.add @form.description
+  end
+
+  private
+
+  def find_form
+    @form ||= Form.find(params[:form_id].to_i).decorate
+  end
+end

data/app/controllers/backend/forms/submissions_controller.rb

@@ -0,0 +1,8 @@
+class Backend::Forms::SubmissionsController < Backend::Forms::BaseController
+  include Concerns::PaginationController
+
+  def index
+    @filter = Udongo::Forms::SubmissionFilter.search(@form, params[:q])
+    @submissions = paginate(@filter.result).decorate
+  end
+end

data/app/controllers/backend/forms_controller.rb

@@ -0,0 +1,7 @@
+class Backend::FormsController < BackendController
+  before_action -> { breadcrumb.add t('b.forms'), backend_forms_path }
+
+  def index
+    @forms = Form.all
+  end
+end

data/app/controllers/backend/navigation/items_controller.rb

@@ -14,7 +14,8 @@ class Backend::Navigation::ItemsController < BackendController
     @model = @navigation.items.new(allowed_params).decorate
 
     if @model.save
-      redirect_to backend_navigations_path, notice: t('b.msg.navigation.added')
+      redirect_to backend_navigations_path,
+        notice: translate_notice(:added, :navigation_item)
     else
       render :new
     end
@@ -22,7 +23,8 @@ class Backend::Navigation::ItemsController < BackendController
 
   def update
     if @model.update_attributes allowed_params
-      redirect_to backend_navigations_path, notice: t('b.msg.changes_saved')
+      redirect_to backend_navigations_path,
+        notice: translate_notice(:changes_saved)
     else
       render :edit
     end
@@ -30,17 +32,18 @@ class Backend::Navigation::ItemsController < BackendController
 
   def destroy
     @model.destroy
-    redirect_to backend_navigations_path, notice: t('b.msg.navigation.deleted')
+    redirect_to backend_navigations_path,
+      notice: translate_notice(:deleted, :navigation_item)
   end
 
   private
 
   def find_navigation
-    @navigation = ::Navigation.find params[:navigation_id]
+    @navigation = Navigation.find params[:navigation_id]
   end
 
   def find_model
-    @model = ::NavigationItem.find(params[:id]).decorate
+    @model = NavigationItem.find(params[:id]).decorate
   end
 
   def allowed_params

data/app/controllers/backend/navigations_controller.rb

@@ -2,6 +2,6 @@ class Backend::NavigationsController < BackendController
   before_action -> { breadcrumb.add t('b.navigation'), backend_navigations_path }
 
   def index
-    @navigations = ::Navigation.all
+    @navigations = Navigation.all
   end
 end

data/app/controllers/backend/pages_controller.rb

@@ -5,7 +5,7 @@ class Backend::PagesController < BackendController
   before_action -> { breadcrumb.add t('b.pages'), backend_pages_path }
 
   def index
-    @pages = ::Page.all
+    @pages = Page.all
 
     respond_to do |format|
       format.html
@@ -16,11 +16,11 @@ class Backend::PagesController < BackendController
   end
 
   def new
-    @model = ::Page.new.decorate
+    @model = Page.new.decorate
   end
 
   def create
-    @model = ::Page.new(params.require('page').permit(:description, :visible, :parent_id)).decorate
+    @model = Page.new(params.require('page').permit(:description, :visible, :parent_id)).decorate
 
     if @model.save
       redirect_to edit_backend_page_path(@model), notice: translate_notice(:added, :page)
@@ -46,7 +46,7 @@ class Backend::PagesController < BackendController
   end
 
   def page_tree_data(parent_id: nil)
-    ::Page.where(parent_id: parent_id).inject([]) do |data, p|
+    Page.where(parent_id: parent_id).inject([]) do |data, p|
       hash = node_data p
       hash[:children] = page_tree_data(parent_id: p.id) if p.children.any?
       data << hash
@@ -56,7 +56,7 @@ class Backend::PagesController < BackendController
   private
 
   def find_model
-    @model = ::Page.find(params[:id]).decorate
+    @model = Page.find(params[:id]).decorate
   end
 
   def translation_form

data/app/controllers/backend/redirects_controller.rb

@@ -5,16 +5,16 @@ class Backend::RedirectsController < BackendController
   before_action :find_model, only: [:edit, :update, :destroy]
 
   def index
-    @search = ::Redirect.ransack params[:q]
+    @search = Redirect.ransack params[:q]
     @redirects = @search.result(distinct: true).order('times_used DESC').page(page_number).per_page(per_page)
   end
 
   def new
-    @redirect = ::Redirect.new(status_code: 301).decorate
+    @redirect = Redirect.new(status_code: 301).decorate
   end
 
   def create
-    @redirect = ::Redirect.new(allowed_params).decorate
+    @redirect = Redirect.new(allowed_params).decorate
 
     if @redirect.save
       redirect_to backend_redirects_path, notice: translate_notice(:added, :redirect)
@@ -45,6 +45,6 @@ class Backend::RedirectsController < BackendController
   end
 
   def find_model
-    @redirect = ::Redirect.find(params[:id]).decorate
+    @redirect = Redirect.find(params[:id]).decorate
   end
 end

data/app/controllers/backend/sessions_controller.rb

@@ -3,7 +3,7 @@ class Backend::SessionsController < BackendController
   layout 'backend/login'
 
   def create
-    admin = ::Admin.find_by(email: params[:session][:email])
+    admin = Admin.find_by(email: params[:session][:email])
 
     if admin && admin.authenticate(params[:session][:password])
       session[:admin_id] = admin.id

data/app/controllers/backend/snippets_controller.rb

@@ -5,19 +5,19 @@ class Backend::SnippetsController < BackendController
   before_action -> { breadcrumb.add t('b.snippets'), backend_snippets_path }
 
   def index
-    @snippets = ::Snippet.order(:description)
+    @snippets = Snippet.order(:description)
   end
 
   def new
     @form = Backend::SnippetForm.new
-    # @model = ::Snippet.new
   end
 
   def create
     @form = Backend::SnippetForm.new
 
     if @form.save params[:snippet]
-      redirect_to edit_translation_backend_snippet_path(@form.snippet, translation_locale: default_locale), notice: translate_notice(:added, :snippet)
+      redirect_to edit_translation_backend_snippet_path(@form.snippet, translation_locale: default_locale),
+                  notice: translate_notice(:added, :snippet)
     else
       render :new
     end
@@ -31,7 +31,8 @@ class Backend::SnippetsController < BackendController
     @form = Backend::SnippetForm.new(@model)
 
     if @form.save params[:snippet]
-      redirect_to edit_backend_snippet_path(@model), notice: translate_notice(:edited, :snippet)
+      redirect_to edit_backend_snippet_path(@model),
+                  notice: translate_notice(:edited, :snippet)
     else
       render :edit
     end
@@ -40,7 +41,7 @@ class Backend::SnippetsController < BackendController
   private
 
   def find_model
-    @model = ::Snippet.find params[:id]
+    @model = Snippet.find params[:id]
   end
 
   def translation_form

data/app/controllers/backend/tagbox_controller.rb

@@ -1,6 +1,6 @@
 class Backend::TagboxController < BackendController
   def index
-    tags = ::Tag.by_locale(locale).pluck(:name).map do |name|
+    tags = Tag.by_locale(locale).pluck(:name).map do |name|
       { label: name, value: name }
     end
 
@@ -25,15 +25,15 @@ class Backend::TagboxController < BackendController
   end
 
   def find_tag
-    ::Tag.find_by locale: params[:locale], name: params[:tag]
+    Tag.find_by locale: params[:locale], name: params[:tag]
   end
 
   def tag_creatable?
-    !::Tag.exists?(tag_params) && Udongo.config.allow_new_tags?
+    !Tag.exists?(tag_params) && Udongo.config.allow_new_tags?
   end
 
   def create_tag
-    ::Tag.create! tag_params
+    Tag.create! tag_params
   end
 
   def tag_params

data/app/controllers/backend_controller.rb

@@ -10,12 +10,12 @@ class BackendController < ActionController::Base
   helper_method :breadcrumb
 
   def current_admin
-    @current_admin ||= ::Admin.find(session[:admin_id]) if session[:admin_id]
+    @current_admin ||= Admin.find(session[:admin_id]) if session[:admin_id]
   end
   helper_method :current_admin
 
-  def translate_notice(notice, actor)
-    I18n.t("b.msg.#{notice}") % I18n.t("b.#{actor}")
+  def translate_notice(notice, actor = nil)
+    Udongo::Notification.new(notice).translate(actor)
   end
 
   def default_locale

data/app/controllers/catch_all_controller.rb

@@ -1,6 +1,6 @@
 class CatchAllController < ActionController::Base
   def resolve
-    redirect = ::Redirect.find_by(source_uri: request.path)
+    redirect = Redirect.find_by(source_uri: request.path)
 
     if redirect && redirect.enabled?
       redirect.used!

data/app/controllers/redirects_controller.rb

@@ -1,6 +1,6 @@
 class RedirectsController < ActionController::Base
   def go
-    redirect = ::Redirect.find_by(source_uri: source_uri)
+    redirect = Redirect.find_by(source_uri: source_uri)
 
     if redirect && redirect.enabled?
       redirect.used!

data/app/decorators/application_decorator.rb

@@ -0,0 +1,5 @@
+class ApplicationDecorator < Draper::Decorator
+  def self.collection_decorator_class
+    PaginationDecorator
+  end
+end

data/app/decorators/content_image_decorator.rb

@@ -1,4 +1,4 @@
-class ContentImageDecorator < Draper::Decorator
+class ContentImageDecorator < ApplicationDecorator
   delegate_all
 
   def content_type_is?(value)

data/app/decorators/content_row_decorator.rb

@@ -0,0 +1,9 @@
+class ContentRowDecorator < ApplicationDecorator
+  delegate_all
+
+  # If the max. column count for the biggest screen medium is met, we can safely
+  # assume no more additional columns are needed.
+  def column_limit_reached?
+    column_width_calculator.total(:width_xl) >= 12
+  end
+end

data/app/decorators/content_text_decorator.rb

@@ -1,4 +1,4 @@
-class ContentTextDecorator < Draper::Decorator
+class ContentTextDecorator < ApplicationDecorator
   delegate_all
 
   def render

data/app/decorators/form_decorator.rb

@@ -0,0 +1,16 @@
+class FormDecorator < ApplicationDecorator
+  delegate_all
+
+  def datagrid
+    @datagrid ||= Udongo::Forms::SubmissionDatagrid.new(object)
+  end
+
+  def datagrid_fields_configured?
+    Udongo.config.forms.send(identifier).datagrid_fields.any?
+  end
+
+  def email_present?
+    return false if datagrid_fields_configured?
+    data.select('DISTINCT name').map(&:name).include?('email')
+  end
+end

data/app/decorators/form_submission_decorator.rb

@@ -0,0 +1,3 @@
+class FormSubmissionDecorator < ApplicationDecorator
+  delegate_all
+end

data/app/decorators/navigation_item_decorator.rb

@@ -1,4 +1,4 @@
-class NavigationItemDecorator < Draper::Decorator
+class NavigationItemDecorator < ApplicationDecorator
   delegate_all
 
   def label
@@ -22,7 +22,7 @@ class NavigationItemDecorator < Draper::Decorator
   end
 
   def options_for_page
-    ::Page.order(:description).map do |p|
+    Page.order(:description).map do |p|
       [p.description, p.id]
     end
   end