udongo 2.0.4 → 3.0.0

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

@@ -8,7 +8,7 @@
         <%= link_to t('b.general'), edit_backend_email_template_path(@model), class: klass %>
       </li>
 
-      <% Udongo.config.i18n.locales.each do |locale| %>
+      <% Udongo.config.i18n.app.locales.each do |locale| %>
         <li class="nav-item">
           <% klass = %w(nav-link) %>
           <% klass << 'active' if active == locale.to_sym %>

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

@@ -3,6 +3,7 @@
 <%= render 'backend/breadcrumbs' %>
 
 <%= render 'backend/email_templates/tabs', active: params[:translation_locale].to_sym %>
+<%= render 'backend/general_form_error', object: @translation %>
 
 <%= simple_form_for([:backend, @translation], url: edit_translation_backend_email_template_path) do |f| %>
 

data/app/views/backend/navigation/items/_form.html.erb

@@ -1,4 +1,6 @@
-<%= simple_form_for(@form, url: url) do |f| %>
+<%= render 'backend/general_form_error', object: @model %>
+
+<%= simple_form_for(@model, url: url) do |f| %>
   <div class="card">
     <div class="card-header">
       <%= t 'b.general' %>
@@ -7,7 +9,7 @@
     <div class="card-block">
       <div class="row">
         <div class="col-md-6">
-          <%= f.input :page_id, collection: @form.navigation_item.options_for_page, include_blank: true %>
+          <%= f.input :page_id, collection: @model.options_for_page, include_blank: true %>
         </div>
 
         <div class="col-md-6">

data/app/views/backend/navigation/items/_tabs.html.erb

@@ -8,7 +8,7 @@
         <%= link_to t('b.general'), edit_backend_navigation_item_path(@navigation, @model), class: klass %>
       </li>
 
-      <% Udongo.config.i18n.locales.each do |locale| %>
+      <% Udongo.config.i18n.app.locales.each do |locale| %>
         <li class="nav-item">
           <% klass = %w(nav-link) %>
           <% klass << 'active' if active == locale.to_sym %>

data/app/views/backend/navigation/items/edit_translation.html.erb

@@ -4,6 +4,7 @@
 <%= render 'backend/breadcrumbs' %>
 
 <%= render 'backend/navigation/items/tabs', active: params[:translation_locale].to_sym %>
+<%= render 'backend/general_form_error', object: @translation %>
 
 <%= simple_form_for(@translation, url: edit_translation_backend_navigation_item_path) do |f| %>
   <div class="card">

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

@@ -1,4 +1,6 @@
-<%= simple_form_for [:backend, @form] do |f| %>
+<%= render 'backend/general_form_error', object: @model %>
+
+<%= simple_form_for [:backend, @model] do |f| %>
   <div class="row">
     <div class="col-md-8">
       <div class="card">
@@ -8,7 +10,7 @@
 
         <div class="card-block">
           <%= f.input :description %>
-          <%= f.input :parent_id, collection: @form.page.options_for_parents, disabled: 1 %>
+          <%= f.input :parent_id, collection: @model.options_for_parents, disabled: 1 %>
         </div>
       </div>
     </div>

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

@@ -8,7 +8,7 @@
         <%= link_to t('b.general'), edit_backend_page_path(@model), class: klass %>
       </li>
 
-      <% Udongo.config.i18n.locales.each do |locale| %>
+      <% Udongo.config.i18n.app.locales.each do |locale| %>
         <li class="nav-item">
           <% klass = %w(nav-link) %>
           <% klass << 'active' if active == locale.to_sym %>

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

@@ -3,6 +3,7 @@
 <%= render 'backend/breadcrumbs' %>
 
 <%= render 'backend/pages/tabs', 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/redirects/_form.html.erb

@@ -1,3 +1,5 @@
+<%= render 'backend/general_form_error', object: model %>
+
 <%= simple_form_for [:backend, model] do |f| %>
   <div class="row">
     <div class="col-md-6">

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

@@ -1,4 +1,6 @@
-<%= simple_form_for [:backend, @form] do |f| %>
+<%= render 'backend/general_form_error', object: @model %>
+
+<%= simple_form_for [:backend, @model] do |f| %>
   <div class="row">
     <div class="col-md-6">
       <div class="card">

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

@@ -8,7 +8,7 @@
         <%= link_to t('b.general'), edit_backend_snippet_path(@model), class: klass %>
       </li>
 
-      <% Udongo.config.i18n.locales.each do |locale| %>
+      <% Udongo.config.i18n.app.locales.each do |locale| %>
         <li class="nav-item">
           <% klass = %w(nav-link) %>
           <% klass << 'active' if active == locale.to_sym %>

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

@@ -3,4 +3,4 @@
 <%= render 'backend/breadcrumbs' %>
 
 <%= render 'backend/snippets/tabs', active: :general %>
-<%= render 'backend/snippets/form' %>
+<%= render 'backend/snippets/form', identifier: false %>

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

@@ -3,6 +3,7 @@
 <%= render 'backend/breadcrumbs' %>
 
 <%= render 'backend/snippets/tabs', active: params[:translation_locale].to_sym %>
+<%= render 'backend/general_form_error', object: @translation %>
 
 <%= simple_form_for([:backend, @translation], url: edit_translation_backend_snippet_path) do |f| %>
 

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

@@ -1,4 +1,4 @@
 <% breadcrumb.add t('b.add') %>
 <%= render 'backend/breadcrumbs' %>
 
-<%= render 'backend/snippets/form' %>
+<%= render 'form' %>

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

@@ -3,7 +3,6 @@
     <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.forms'), backend_forms_path, class: 'dropdown-item' %>
       <%= link_to t('b.snippets'), backend_snippets_path, class: 'dropdown-item' %>
     </div>
   </li>
@@ -14,7 +13,7 @@
       <%= 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.redirects'), backend_redirects_path, class: 'dropdown-item' %>
-      <%= link_to t('b.email'), backend_emails_path, class: 'dropdown-item' %>
+      <%= 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>

data/changelog.md

@@ -1,3 +1,41 @@
+3.0.0 - 2017-01-13
+--
+* Because of the complex structure and no actual necessity, the form models and
+  their related code have been cut.
+* You can now set the list of breakpoints you want to have visible for the 
+  flexible content. In most cases the xs and xl don't need to clutter the 
+  interface, so now you can hide them.
+* Added specs for all routes.
+* Add concern to easily use multiple addresses for a single model.
+* The BackendController has been renamed and moved to Backend::BaseController.
+* Update Bootstrap to v4.0.0-alpha.4
+* Tweak the styles for the simple form initializer.
+* Pages marked as invisible are now visibly distinguished from visible pages. Fixes #9
+* Add spec/support and spec/factories to the gem.
+* The i18n configuration has been split in 'app' and 'cms'. You can now
+  configure the cms interface locale(s) indepent of the app locale(s).
+* An admin can now choose his interface locale.
+* Add cc/bcc to the email templates and sent emails.
+* The general mailer has been expanded so it's easier to override the headers.
+* Added new contextmenu options for making pages (in)visible through the tree.
+* Add (and load) the select2 js lib in the backend.
+* After adding or editing content in a certain locale, redirect to the correct
+  locale.
+* The dashboard template no longer contains dashboard#show.
+* You can now add your custom css to app/assets/stylesheets/backend/custom.scss
+* When a backend form has 1 or more errors, you will now see a general error.
+* The `prefix_with_locale` setting has been removed because it's always true.
+* The webserver restart button/action has been removed.
+* The following form objects have been removed in favor of the model:
+  - EmailTemplateForm
+  - NavigationItemForm
+  - PageForm
+  - SnippetForm
+* A `Backend::TranslationForm` has been added. This makes it a whole lot easier
+  to create translation forms for your models.
+* Feature tests have been added for most of the basic functionality.
+
+
 2.0.4 - 2016-08-15
 --
 * Fix issue with resizing pictures in the CKEditor picture uploader.

data/config/initializers/simple_form_bootstrap.rb

@@ -30,26 +30,30 @@ SimpleForm.setup do |config|
     b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
   end
 
-  config.wrappers :vertical_boolean, tag: 'div', class: 'checkbox', error_class: 'has-danger' do |b|
+  config.wrappers :vertical_boolean, tag: 'div', class: 'form-check', error_class: 'has-danger' do |b|
     b.use :html5
     b.optional :readonly
 
-    b.wrapper tag: 'label' do |ba|
-      ba.use :input
+    b.wrapper tag: :label, class: 'form-check-label' do |ba|
+      ba.use :input, class: 'form-check-input'
       ba.use :label_text
     end
 
-    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
-    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    b.use :error, wrap_with: { tag: 'div', class: 'form-control-feedback' }
+    b.use :hint,  wrap_with: { tag: 'small', class: 'form-text text-muted' }
   end
 
   config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-danger' do |b|
     b.use :html5
     b.optional :readonly
-    b.use :label, class: 'control-label'
-    b.use :input
-    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
-    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+
+    b.wrapper tag: :label, class: 'form-check-label' do |ba|
+      ba.use :input, class: 'form-check-input'
+      ba.use :label_text
+    end
+
+    b.use :error, wrap_with: { tag: 'div', class: 'form-control-feedback' }
+    b.use :hint,  wrap_with: { tag: 'small', class: 'form-text text-muted' }
   end
 
   config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-danger' do |b|

data/config/locales/en_backend.yml

@@ -24,7 +24,6 @@ en:
     filter: Filter
     first_name: First name
     flexible_content: Flexible content
-    forms: Forms
     from: From
     general: General
     house_number: House number
@@ -47,7 +46,6 @@ en:
     recipient: Recipient
     redirect: Redirect
     redirects: Redirects
-    restart_webserver: Restart webserver
     save: Save
     search: Search
     sender: Sender
@@ -90,6 +88,7 @@ en:
         edit_text: Edit text
         explanation: With this module you can create flexible responsive content. Click the button below to create the first row.
       forgot_password: Forgot password?
+      general_form_error: Something went wrong. Please check the marked fields.
       help_texts:
         status_code: More info about the use of status codes.
       incorrect_login: Incorret login credentials.
@@ -102,5 +101,3 @@ en:
         '301': 301 (Moved Permanently)
         '303': 303 (See Other)
         '307': 307 (Temporary Redirect)
-      webserver:
-        restarted: The webserver was restarted.

data/config/locales/en_forms.yml

@@ -13,8 +13,10 @@ en:
 
     labels:
       defaults:
+        bcc: BCC
         caption: Caption
         category: Category
+        cc: CC
         content: Content
         description: Description
         disabled: Disabled
@@ -25,6 +27,7 @@ en:
         identifier: Internal name
         label: Label
         last_name: Last name
+        locale: Locale
         message: Message
         name: Name
         password: Password

data/config/locales/nl_backend.yml

@@ -24,7 +24,6 @@ nl:
     filter: Filter
     first_name: Voornaam
     flexible_content: Flexibele inhoud
-    forms: Formulieren
     from: Van
     general: Algemeen
     house_number: Huisnummer
@@ -47,7 +46,6 @@ nl:
     recipient: Bestemmeling
     redirect: Redirect
     redirects: Redirects
-    restart_webserver: Webserver herstarten
     save: Opslaan
     search: Zoeken
     sender: Afzender
@@ -90,17 +88,18 @@ nl:
         edit_text: Tekst bewerken
         explanation: Met deze module kan je flexibele, responsive inhoud toevoegen. Klik op onderstaande knop om een eerste rij toe te voegen.
       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
       incorrect_login: Ongeldige login gegevens.
       navigation:
         custom: Op maat
       no_items: Er zijn geen items.
+      pages:
+        invisible: Deze pagina is niet zichtbaar op de website.
       saved: '%{actor} werd bewaard.'
       seo: SEO
       status_codes:
         '301': 301 (Moved Permanently)
         '303': 303 (See Other)
         '307': 307 (Temporary Redirect)
-      webserver:
-        restarted: De webserver werd opnieuw opgestart

data/config/locales/nl_forms.yml

@@ -13,8 +13,10 @@ nl:
 
     labels:
       defaults:
+        bcc: BCC
         caption: Beschrijving
         category: Categorie
+        cc: CC
         content: Inhoud
         description: Beschrijving
         disabled: Uitgeschakeld
@@ -25,6 +27,7 @@ nl:
         identifier: Interne naam
         label: Label
         last_name: Achternaam
+        locale: Taal
         message: Bericht
         name: Naam
         password: Wachtwoord

data/config/routes.rb

@@ -14,18 +14,15 @@ Rails.application.routes.draw do
     end
 
     get '/' => 'dashboard#show'
-    post 'restart_webserver' => 'webserver#restart'
 
     resources :sessions, only: [:new, :create, :destroy]
     resources :admins
 
     resources :pages, except: [:show] do
       concerns :translatable
-      member { post :tree_drag_and_drop }
-    end
-
-    resources :forms do
-      resources :submissions, controller: 'forms/submissions'
+      member do
+        post :tree_drag_and_drop, :toggle_visibility
+      end
     end
 
     resources :navigations, only: [:index] do
@@ -57,6 +54,7 @@ Rails.application.routes.draw do
         get 'html_content'
       end
     end
+
     resources :redirects, except: :show
 
     namespace :content do
@@ -64,7 +62,7 @@ Rails.application.routes.draw do
         concerns :positionable
 
         scope module: 'rows' do
-          resources :columns do
+          resources :columns, except: [:index, :show] do
             concerns :positionable
           end
         end

data/db/migrate/20160815100903_remove_form_models.rb

@@ -0,0 +1,9 @@
+class RemoveFormModels < ActiveRecord::Migration#[5.0]
+  def change
+    drop_table :forms
+    drop_table :form_fields
+    drop_table :form_field_validations
+    drop_table :form_submissions
+    drop_table :form_submission_data
+  end
+end

data/db/migrate/20161014135637_add_category_to_admin.rb

@@ -0,0 +1,5 @@
+class AddCategoryToAdmin < ActiveRecord::Migration[5.0]
+  def change
+    add_column :addresses, :category, :string, after: 'addressable_type'
+  end
+end

data/db/migrate/20161029124558_add_locale_to_admin.rb

@@ -0,0 +1,6 @@
+class AddLocaleToAdmin < ActiveRecord::Migration[5.0]
+  def change
+    add_column :admins, :locale, :string, after: 'id'
+    add_index :admins, :locale
+  end
+end

data/db/migrate/20161029130557_add_bcc_and_cc_to_email_templates.rb

@@ -0,0 +1,6 @@
+class AddBccAndCcToEmailTemplates < ActiveRecord::Migration[5.0]
+  def change
+    add_column :email_templates, :cc, :string, after: 'from_email'
+    add_column :email_templates, :bcc, :string, after: 'cc'
+  end
+end

data/db/migrate/20161029171056_add_ccc_and_bcc_to_email.rb

@@ -0,0 +1,6 @@
+class AddCccAndBccToEmail < ActiveRecord::Migration[5.0]
+  def change
+    add_column :emails, :cc, :string, after: 'to_email'
+    add_column :emails, :bcc, :string, after: 'cc'
+  end
+end

data/lib/udongo/configs/flexible_content.rb

@@ -3,7 +3,14 @@ module Udongo
     class FlexibleContent
       include Virtus.model
 
+      BREAKPOINTS = %w(xs sm md lg xl)
+
       attribute :types, Array, default: %w(text image)
+      attribute :allowed_breakpoints, Array, default: BREAKPOINTS
+
+      def allowed_breakpoint?(value)
+        allowed_breakpoints.include?(value.to_s)
+      end
     end
   end
 end