locomotivecms 4.0.0.alpha2 → 4.0.0.alpha3

data/app/views/locomotive/content_entries/new.html.slim

@@ -1,6 +1,6 @@
 - title t('.title', type: @content_type.name.capitalize)
 
-= help @content_type.description
+- help @content_type.description
 
 - content_for :actions do
   = link_to t(:back, scope: 'locomotive.content_entries.shared').html_safe, content_entries_path(current_site, @content_type.slug), class: 'btn btn-sm btn-default'

data/app/views/locomotive/current_site/edit.html.slim

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= help t('.help', default: '')
+- help t('.help', default: '')
 
 - content_for :actions do
   = locale_picker_link

data/app/views/locomotive/current_site/form/_url_redirections.html.slim

@@ -1,4 +1,8 @@
 = f.inputs :url_redirections do
+  = f.input :url_redirections_expert_mode, as: :toggle
+
+  = f.input :url_redirections_plain_text, as: :text, wrapper_html: { class: 'hide' }, input_html: { rows: 30 }
+
   = f.input :url_redirections, as: :array, hint: t(:url_redirections, scope: 'simple_form.hints.locomotive.site').html_safe, placeholder: true, collection: f.object.url_redirections_with_information(false).to_a, template: :url_redirection, template_url: new_url_redirection_current_site_path(current_site)
 
 = f.actions do

data/app/views/locomotive/current_site_metafields/index.html.slim

@@ -1,6 +1,6 @@
 - title current_site_metafields_ui[:title]
 
-= help current_site_metafields_ui[:hint]
+- help current_site_metafields_ui[:hint]
 
 - if @site.has_metafields?
 

data/app/views/locomotive/dashboard/_activity.html.slim

@@ -17,6 +17,9 @@ ul.activity-feed
         | ·
         |  
         span.sentence= render_activity_sentence(activity)
+        - if activity.locale && activity.locale.to_s != current_site.default_locale.to_s
+          span.locale
+            = activity.locale.to_s
 
       - if info = render_activity_additional_information(activity)
         .additional-information= info

data/app/views/locomotive/layouts/application.html.slim

@@ -26,10 +26,11 @@ html xmlns='http://www.w3.org/1999/xhtml'
 
             - if title
               .row.header-row
-                .col-md-8.col-xs-9
+                .col-md-7.col-xs-9
                   h1== title
+                  == help
 
-                .col-md-4.col-xs-3.actions
+                .col-md-5.col-xs-3.actions
                   = yield :actions
 
             = yield

data/app/views/locomotive/layouts/editor.html.slim

@@ -12,3 +12,5 @@ html xmlns='http://www.w3.org/1999/xhtml'
       .content-overlay
 
       = yield
+
+

data/app/views/locomotive/memberships/edit.html.slim

@@ -1,6 +1,6 @@
 - title t('.title', name: @membership.account.name)
 
-= help t('.help', default: '')
+- help t('.help', default: '')
 
 = locomotive_form_for @membership, url: membership_path(current_site, @membership) do |f|
 

data/app/views/locomotive/memberships/new.html.slim

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= help t('.help', default: '')
+- help t('.help', default: '')
 
 = locomotive_form_for @membership, url: memberships_path(current_site) do |f|
 

data/app/views/locomotive/page_content/edit.html.erb

@@ -16,3 +16,4 @@
   <%= javascript_include_tag  'locomotive/editor' %>
   <%= stylesheet_link_tag     'locomotive/editor', media: 'screen' %>
 <% end %>
+

data/app/views/locomotive/page_content/edit.json.jbuilder

@@ -6,7 +6,7 @@ json.data do
   json.page do
     json.(@page, :id, :title, :seo_title, :meta_description, :meta_keywords, :listed, :published)
 
-    json.slug @page.slug if !@page.index? && !@page.not_found? && !@page.templatized?
+    json.slug @page.slug if display_slug?(@page)
 
     json.fullpath nice_preview_page_path(@page)
     json.contentEntryId @page.content_entry&.id
@@ -28,6 +28,8 @@ json.data do
   json.locale   current_content_locale
   json.locales  current_site.locales
   json.uiLocale I18n.locale
+
+  json.contentTypes content_types_with_templates(current_site)
 end
 
 json.urls do

data/app/views/locomotive/pages/_header.html.slim

@@ -1,6 +1,6 @@
 - title t(:title, title: h(@page.title), fullpath: nice_preview_page_path(@page), scope: 'locomotive.pages.edit')
 
-= help t('.help', default: '')
+- help t('.help', default: '')
 
 - if current_site.localized?
   - content_for :actions do

data/app/views/locomotive/pages/form/_main.html.slim

@@ -5,7 +5,7 @@
   - if display_page_layouts?
     = f.input :layout_id, as: :select, collection: options_for_page_layouts, include_blank: false
 
-  - if !@page.index? && !@page.not_found? && !@page.templatized?
+  - if display_slug?(@page)
 
     = f.input :slug
 

data/app/views/locomotive/pages/new.html.slim

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= help t('.help', default: '')
+- help t('.help', default: '')
 
 = locomotive_form_for @page, url: pages_path(current_site), html: { multipart: true } do |f|
 

data/app/views/locomotive/public_submission_accounts/edit.html.slim

@@ -1,6 +1,6 @@
 - title t('.title', name: @content_type.name)
 
-= help t('.help', default: '')
+- help t('.help', default: '')
 
 = locomotive_form_for @content_type, url: public_submission_accounts_path(current_site, @content_type.slug), html: { multipart: true } do |f|
 

data/app/views/locomotive/translations/_form.html.slim

@@ -1,6 +1,3 @@
-- (params[:_location] || {}).each do |name, value|
-  = hidden_field_tag "_location[#{name}]", value
-
 = f.inputs do
 
   = f.simple_fields_for :values, OpenStruct.new(@translation.values) do |g|

data/app/views/locomotive/translations/edit.html.slim

@@ -1,6 +1,6 @@
 - title t('.title', key: @translation.key )
 
-= locomotive_form_for @translation, url: translation_path(current_site, @translation) do |f|
+= locomotive_form_for @translation, url: translation_path(current_site, @translation, translation_nav_params) do |f|
 
   = render 'form', f: f
 

data/app/views/locomotive/translations/index.html.slim

@@ -1,9 +1,25 @@
 - title t('.title')
-
-.row
-  .col-md-7
-    = help t('.help')
-  .col-md-5
+- help t('.help')
+
+- content_for :actions do
+  .bulk-destroy-action.hidden
+    = form_tag bulk_destroy_translations_path(current_site, page: params[:page] || 1, filter_by: params[:filter_by], q: params[:q]), method: :delete do
+      = hidden_field_tag 'ids', ''
+      = button_tag type: 'submit', class: 'btn btn-primary btn-sm', data: { confirm: t('locomotive.messages.confirm') } do
+        i.far.fa-trash-alt
+        |  
+        = t('.bulk_destroy')
+
+.row.list-groups
+  .nav-container
+    ul.nav.nav-tabs role='tablist'
+      - %w(all done partially none).each_with_index do |name, index|
+
+        li class="#{'active' if params[:filter_by] == name || (index == 0 && params[:filter_by].blank?)}"
+          = link_to t(".filter_by.#{name}"), translations_path(current_site, q: params[:q], filter_by: index == 0 ? '' : name)
+
+.row.list-header
+  .col.col-md-6.col-xs-6.text-left
     .search-bar
       = form_tag translations_path(current_site), method: :get do
         .form-group
@@ -11,12 +27,11 @@
           = text_field_tag :q, params[:q], placeholder: t('.search_placeholder'), class: 'form-control'
           i.fa.fa-search.icon
 
-.nav-container
-  ul.nav.nav-tabs role='tablist'
-    - %w(all done partially none).each_with_index do |name, index|
-
-      li class="#{'active' if params[:filter_by] == name || (index == 0 && params[:filter_by].blank?)}"
-        = link_to t(".filter_by.#{name}"), translations_path(current_site, q: params[:q], filter_by: index == 0 ? '' : name)
+  .col.col-md-6.col-xs-6.text-right
+    - unless @translations.empty?
+      .checkbox
+        = check_box_tag 'all_translations', 1, false, class: 'list-main-checkbox'
+        = label_tag 'all_translations', ''
 
 - if @translations.empty?
   br
@@ -25,18 +40,22 @@
     == t('.no_items')
 
 - else
-
   #translations-list.row.big-list
     - @translations.each do |translation|
       .item.col-md-12 class=translation_completion_to_class(current_site, translation)
+        .status
+          span.completion
+            i.fa.fa-circle
+
         .text
-          strong= link_to translation.key, edit_translation_path(current_site, translation, _location: { filter_by: params[:filter_by], q: params[:q] })
+          strong= link_to translation.key, edit_translation_path(current_site, translation, translation_nav_params)
           .stamp
             == document_stamp(translation)
 
         .actions
-          span.completion
-            i.fa.fa-circle
+          .checkbox
+            = check_box_tag "item_#{translation._id}", translation._id
+            = label_tag "item_#{translation._id}", ''
 
     .text-center
       = paginate @translations, theme: 'twitter-bootstrap-3', pagination_class: 'pagination-sm'

data/config/locales/devise.fr.yml

@@ -40,11 +40,11 @@ fr:
         unlocked: 'Votre compte à été dé-verouillé. Vous êtes connecté!'
     mailer:
       confirmation_instructions:
-        locomotive_account_subject: 'Instructions de validation'
+        locomotive_account_subject: 'Instructions pour confirmation'
       reset_password_instructions:
-        locomotive_account_subject:  'Instructions de rétablissement du mot de passe'
+        locomotive_account_subject: 'Instructions pour ré-initialiser le mot de passe'
       unlock_instructions:
-        locomotive_account_subject: 'Instructions de déverrouillage.'
+        locomotive_account_subject: 'Instructions pour débloquer'
   locomotive:
     devise_mailer:
       common:

data/config/locales/editor.en.yml

@@ -10,22 +10,25 @@ en:
           action: "Apply"
           action_in_progress: "Cropping..."
 
-        url_picker:
-          no_url: "No URL for now"
-          placeholder: "Please type the label of a resource"
-          open_new_window: "Open in a new window?"
-          select_button: "Select"
-          cancel_button: "Cancel"
-          change_button: "Change"
-          done_button: "Done"
-          types:
-            external: "External"
-            pages: "Page"
-
         locale_switcher:
           locale: "<strong>{{locale}}</strong> version"
 
+        draft:
+          link:
+            title: Insert link
+            insert_link: Done
+
       inputs:
+        url:
+          select_button: "Select"
+          change_button: "Change"
+          remove_button: "Remove"
+          types:
+            page: Page
+            content_entry: Model
+            _external: URL
+            email: Email
+
         image_picker:
           select_button: "Select"
           change_button: "Change"
@@ -50,12 +53,35 @@ en:
             settings: "Settings"
             seo: "SEO"
 
-        assets:
+        pickers:
           images:
             title: "Images"
             loading: "Loading the images. Please wait!"
             add: "+ add"
+            too_big: "Your image is too big: Maximum file size is 2MB"
             upload_in_progress: "Uploading..."
+          url:
+            title: "Pick a target"
+            open_new_window: "Open in a new window?"
+            types:
+              page: Page
+              content_entry: Model
+              _external: URL
+              email: Email
+            page:
+              label: Page
+              placeholder: Type the title of your page
+              section_label: Section
+            content_entry:
+              content_type_label: Which model?
+              label: Instance of your model
+              placeholder: Type the label of the instance
+            _external:
+              label: URL address
+              placeholder: "https://www.example.com"
+            email:
+              label: Email address
+              placeholder: "name@example.com"
 
         preview:
           view: "View"

data/config/locales/editor.fr.yml

@@ -10,22 +10,25 @@ fr:
           action: "Appliquer"
           action_in_progress: "Rognage..."
 
-        url_picker:
-          no_url: "Aucune URL pour le moment"
-          placeholder: "Veuillez taper le titre d'une ressource"
-          open_new_window: "Ouvrir dans une nouvelle fenêtre ?"
-          select_button: "Sélectionner"
-          cancel_button: "Annuler"
-          change_button: "Changer"
-          done_button: "Finir"
-          types:
-            external: "Externe"
-            pages: "Page"
-
         locale_switcher:
           locale: 'version <strong>{{locale}}</strong>'
 
+        draft:
+          link:
+            title: Insérer un lien
+            insert_link: Terminé
+
       inputs:
+        url:
+          select_button: "Sélectionner"
+          change_button: "Changer"
+          remove_button: "Enlever"
+          types:
+            page: Page
+            content_entry: Modèle
+            _external: URL
+            email: Email
+
         image_picker:
           select_button: "Sélectionner"
           change_button: "Changer"
@@ -50,12 +53,35 @@ fr:
             settings: "Paramètres"
             seo: "SEO"
 
-        assets:
+        pickers:
           images:
             title: "Images"
             loading: "Chargement des images en cours !"
+            too_big: "Votre image est trop lourde : la taille maximale pour un fichier est de 2Mo"
             add: "+ ajouter"
             upload_in_progress: "Téléchargement en cours..."
+          url:
+            title: "Sélectionner une cible"
+            open_new_window: "Ouvrir dans une nouvelle fenêtre ?"
+            types:
+              page: Page
+              content_entry: Modèle
+              _external: URL
+              email: Email
+            page:
+              label: Page
+              placeholder: Taper le titre de votre page
+              section_label: Section
+            content_entry:
+              content_type_label: Quel modèle ?
+              label: Titre d'une ressource
+              placeholder: Taper le tire de votre ressource
+            _external:
+              label: Adresse WEB
+              placeholder: "https://www.example.com"
+            email:
+              label: Adresse Email
+              placeholder: "name@example.com"
 
         preview:
           view: "Aperçu"

data/config/locales/en.yml

@@ -102,6 +102,8 @@ en:
         updated: 'updated the %{page} page'
         destroyed: 'deleted the %{page} page'
         sorted: 'sorted pages'
+      page_content:
+        updated: 'modified the content of %{page}'
       editable_element:
         updated_bulk: 'modified the content of %{pages}'
       content_entry:
@@ -110,6 +112,7 @@ en:
         updated: 'updated %{entry} from %{content_type}'
         destroyed: 'deleted %{entry} from %{content_type}'
         sorted: 'sorted %{content_type}'
+        destroyed_bulk: 'deleted %{entry} from %{content_type}'
       content_asset:
         created_bulk: 'uploaded %{count} asset(s)'
         destroyed: 'deleted the %{name} asset'
@@ -358,6 +361,7 @@ en:
         title: '%{type}'
         download: download entries
         new: new entry
+        bulk_destroy: delete entries
         edit_notification_settings: Edit notification settings
         search_placeholder: "Enter your search keywords here"
         group_by:

data/config/locales/flash.en.yml

@@ -24,6 +24,8 @@ en:
           notice: "Entries were successfully sorted."
         destroy:
           notice: "Entry was successfully deleted."
+        bulk_destroy:
+          notice: "Entries were successfully deleted."
 
       content_types:
         update:
@@ -85,6 +87,8 @@ en:
           alert: "Translation was not updated."
         destroy:
           notice: "Translation was successfully deleted."
+        bulk_destroy:
+          notice: "Translations were successfully deleted."
 
       custom_fields:
         select_options: