locomotivecms 4.0.0.rc0 → 4.0.0

data/app/models/locomotive/page.rb

@@ -28,6 +28,8 @@ module Locomotive
     field :locales,             type: Array
     field :published,           type: Boolean, default: false
     field :cache_enabled,       type: Boolean, default: true
+    field :cache_control
+    field :cache_vary
     field :response_type,       default: 'text/html'
     field :display_settings,    type: Hash
 

data/app/models/locomotive/section.rb

@@ -76,7 +76,7 @@ module Locomotive
             properties: {
               id:       { type: 'string' },
               label:    { '$ref': '#/definitions/locale_string' },
-              type:     { enum: ['text', 'image_picker', 'checkbox', 'select', 'url', 'radio', 'content_type', 'hint'] },
+              type:     { enum: ['text', 'image_picker', 'checkbox', 'select', 'url', 'radio', 'content_type', 'hint', 'integer'] },
               default:  {}
             },
             required: [:id, :type]

data/app/policies/locomotive/account_policy.rb

@@ -15,7 +15,7 @@ module Locomotive
     end
 
     def update?
-      super_admin? || owner?
+      (super_admin? || owner?) && !@resource.visitor?
     end
 
     def destroy?

data/app/policies/locomotive/content_asset_policy.rb

@@ -5,16 +5,24 @@ module Locomotive
       site_staff?
     end
 
-    def create?
+    def new?
       site_staff?
     end
 
-    def update?
+    def edit?
       site_staff?
     end
 
+    def create?
+      site_staff? && !membership.visitor?
+    end
+
+    def update?
+      site_staff? && !membership.visitor?
+    end
+
     def destroy?
-      site_staff?
+      site_staff? && !membership.visitor?
     end
 
   end

data/app/policies/locomotive/content_entry_policy.rb

@@ -5,16 +5,24 @@ module Locomotive
       site_staff?
     end
 
-    def create?
+    def new?
       site_staff?
     end
 
-    def update?
+    def edit?
       site_staff?
     end
 
+    def create?
+      site_staff? && !membership.visitor?
+    end
+
+    def update?
+      site_staff? && !membership.visitor?
+    end
+
     def destroy?
-      site_staff?
+      site_staff? && !membership.visitor?
     end
 
   end

data/app/policies/locomotive/page_policy.rb

@@ -5,16 +5,24 @@ module Locomotive
       site_staff?
     end
 
-    def create?
+    def new?
       site_staff?
     end
 
-    def update?
+    def edit?
       site_staff?
     end
 
+    def create?
+      site_staff? && !membership.visitor?
+    end
+
+    def update?
+      site_staff? && !membership.visitor?
+    end
+
     def destroy?
-      site_staff? && !@resource.index_or_not_found?
+      site_staff? && !@resource.index_or_not_found? && !membership.visitor?
     end
 
     def show?
@@ -22,8 +30,11 @@ module Locomotive
     end
 
     def permitted_attributes
-      attributes = [:title, :layout_id, :slug, :parent_id, :listed, :published, :redirect, :redirect_url, :redirect_type, :seo_title, :meta_description, :meta_keywords, :cache_enabled]
-      attributes += [:handle] if site_admin_or_designer?
+      attributes = [:title, :layout_id, :slug, :parent_id, :listed, :published, :redirect, :redirect_url, :redirect_type, :seo_title, :meta_description, :meta_keywords]
+      if site_admin_or_designer?
+        attributes += [:cache_enabled, :cache_control, :cache_vary]
+        attributes += [:handle]
+      end
       attributes
     end
 

data/app/policies/locomotive/site_policy.rb

@@ -21,12 +21,20 @@ module Locomotive
       true
     end
 
+    def edit?
+      super_admin? || site_staff?
+    end
+
+    def new
+      !account.visitor?
+    end
+
     def create?
-      true
+      !account.visitor?
     end
 
     def update?
-      super_admin? || site_staff?
+      super_admin? || site_staff? && !membership.visitor?
     end
 
     def destroy?
@@ -46,11 +54,17 @@ module Locomotive
     end
 
     def permitted_attributes
-      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :asset_host, :cache_enabled, :redirect_to_first_domain, :redirect_to_https, :private_access, :password, :prefix_default_locale]
+      plain = [
+        :name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :robots_txt,
+        :timezone_name, :timezone,
+        :cache_enabled, :cache_control, :cache_vary,
+        :asset_host, :redirect_to_first_domain, :redirect_to_https,
+        :private_access, :password, :prefix_default_locale, :bypass_browser_locale
+      ]
       hash  = { domains: [], locales: [], url_redirections: [] }
 
       if persisted? && !update_advanced?
-        plain -= [:timezone_name, :robots_txt, :cache_enabled, :prefix_default_locale, :asset_host]
+        plain -= [:timezone_name, :timezone, :robots_txt, :cache_enabled, :cache_control, :cache_vary, :prefix_default_locale, :bypass_browser_locale, :asset_host]
         hash.delete(:locales)
         hash.delete(:url_redirections)
       end

data/app/policies/locomotive/translation_policy.rb

@@ -5,20 +5,28 @@ module Locomotive
       site_staff?
     end
 
-    def create?
+    def new?
       site_staff?
     end
 
-    def update?
+    def edit?
       site_staff?
     end
 
+    def create?
+      site_staff? && !membership.visitor?
+    end
+
+    def update?
+      site_staff? && !membership.visitor?
+    end
+
     def destroy?
-      site_staff?
+      site_staff? && !membership.visitor?
     end
 
     def destroy_all?
-      site_staff?
+      site_staff? && !membership.visitor?
     end
 
   end

data/app/views/locomotive/content_entries/form/_actions.html.slim

@@ -1 +1,12 @@
-= f.actions back_url: content_entries_path(current_site, @content_type.slug), use_stored_location: params[:_location].present?
+- if defined?(advanced) && advanced == true && @content_entry.persisted?
+  = f.actions do
+    .row
+      .col-sm-6.text-left
+        - if policy(@content_entry).destroy?
+          = link_to t(:delete, scope: 'simple_form.buttons.locomotive.content_entry'), content_entry_path(current_site, @content_type.slug, @content_entry), data: { confirm:  I18n.t('locomotive.messages.confirm') }, class:'btn btn-sm btn-danger', method: :delete
+
+      .col-sm-6.text-right
+        = f.actions_with_back_button back_url: content_entries_path(current_site, @content_type.slug), use_stored_location: params[:_location].present?
+
+- else
+  = f.actions back_url: content_entries_path(current_site, @content_type.slug), use_stored_location: params[:_location].present?

data/app/views/locomotive/content_entries/form/_advanced.html.slim

@@ -2,4 +2,4 @@
   = f.input :_slug, required: false
   = f.input :_visible, as: :toggle
 
-= render 'locomotive/content_entries/form/actions', f: f
+= render 'locomotive/content_entries/form/actions', f: f, advanced: true

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

@@ -14,30 +14,36 @@
         = t('.bulk_destroy')
 
   .main-action
-    .btn-group
+    - if can_edit_public_submission_accounts?(@content_type) || !empty_collection?(@content_entries)
+      .btn-group
+        = link_to new_content_entry_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm' do
+          i.fa.fa-plus
+          |  
+          = t('.new')
+        button.btn.btn-primary.btn-sm.dropdown-toggle data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+          span.caret
+          span.sr-only Toggle Dropdown
+        ul.dropdown-menu.dropdown-menu-right
+          - if can_edit_public_submission_accounts?(@content_type)
+            li
+              = link_to edit_public_submission_accounts_path(current_site, @content_type.slug) do
+                i.fas.fa-cog
+                = t('.edit_notification_settings')
+
+          - unless empty_collection?(@content_entries)
+            li
+              = link_to export_content_entries_path(current_site, @content_type.slug, :csv) do
+                i.fa.fa-download
+                = t('.download')
+    - else
       = link_to new_content_entry_path(current_site, @content_type.slug), class: 'btn btn-primary btn-sm' do
         i.fa.fa-plus
         |  
         = t('.new')
-      button.btn.btn-primary.btn-sm.dropdown-toggle data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-        span.caret
-        span.sr-only Toggle Dropdown
-      ul.dropdown-menu.dropdown-menu-right
-        - if can_edit_public_submission_accounts?(@content_type)
-          li
-            = link_to edit_public_submission_accounts_path(current_site, @content_type.slug) do
-              i.fas.fa-cog
-              = t('.edit_notification_settings')
-
-        - unless empty_collection?(@content_entries)
-          li
-            = link_to export_content_entries_path(current_site, @content_type.slug, :csv) do
-              i.fa.fa-download
-              = t('.download')
 
 - if @content_type.groupable?
   .row.list-groups
-    .nav-container
+    .nav-container.nav-container--scroll
       ul.nav.nav-tabs role='tablist'
         li class="#{'active' if params[:group].nil?}"
           = link_to t('.group_by.all'), content_entries_path(current_site, @content_type.slug, query: params[:query])
@@ -46,6 +52,8 @@
           li class="#{'active' if params[:group] == group[:name]}"
             = link_to group[:name], group[:url]
 
+        li
+
 .row.list-header
   .col.col-md-6.text-left
     - if @content_type.filter_fields.present?

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

@@ -3,11 +3,16 @@
 
   = f.input :prefix_default_locale, as: :toggle
 
+  = f.input :bypass_browser_locale, as: :toggle
+
   = f.input :timezone_name, as: :select, include_blank: false, collection: options_for_site_timezones
 
   = f.input :robots_txt, as: :code, wrapper_html: { class: 'small' }
 
-  = f.input :cache_enabled, as: :toggle
+  = f.inputs :cache_enabled do
+    = f.input :cache_enabled, as: :toggle
+    = f.input :cache_control, as: :string, wrapper_html: { class: "#{'hide' unless f.object.cache_enabled?}" }
+    = f.input :cache_vary, as: :string, wrapper_html: { class: "#{'hide' unless f.object.cache_enabled?}" }
 
 - if policy(@site).destroy?
   = f.actions do

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

@@ -1,9 +1,15 @@
 = 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 }
+  - if f.object.url_redirections.count > 30
+    = f.hidden_field :url_redirections_expert_mode, value: '1'
+    = f.input :url_redirections_plain_text, as: :text, input_html: { rows: 30 }
+  - else
+    = 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.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
   = f.action

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

@@ -1,39 +1,7 @@
 doctype html
 html xmlns='http://www.w3.org/1999/xhtml' lang=I18n.locale
   head
-    meta charset="utf-8"
-    meta http-equiv="x-ua-compatible" content="ie=edge"
-
-    title= escape_once(strip_tags(title) + " | #{application_name}")
-
-    meta name="viewport" content="width=device-width, initial-scale=1"
-
-    link rel="icon" type="image/png" href="#{asset_url('locomotive/favicon.png')}" sizes="32x32"
-
-    link href="https://fonts.googleapis.com/css?family=Muli:400,300|Noto+Sans:400,700" rel="stylesheet" type="text/css"
-
-    javascript:
-      window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' }
-
-    = javascript_include_tag  'locomotive'
-    = stylesheet_link_tag     'locomotive/account', media: 'screen'
-
-    javascript:
-      window.locale                     = '#{locale}';
-
-      $(document).ready(function() {
-
-        window.application_view = new Locomotive.Views.SimpleView({
-          flash:      #{{flash_messages_to_json}},
-          view:       #{backbone_view_class_name}
-        });
-        window.application_view.render();
-
-      });
-
-    = csrf_meta_tag
-
-    = yield :head
+    = render 'locomotive/shared/account/head'
 
   body class=[controller.controller_name, controller.action_name, flash.empty? ? '' : 'with-flash'].join(' ')
     .public-background

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

@@ -26,7 +26,10 @@
 
     = f.input :listed, as: :toggle
 
-  - if current_site.cache_enabled? && !@page.redirect?
-    = f.input :cache_enabled, as: :toggle
+  - if policy(current_site).site_admin_or_designer? && current_site.cache_enabled? && !@page.redirect?
+    = f.inputs :cache_enabled do
+      = f.input :cache_enabled, as: :toggle
+      = f.input :cache_control, as: :string, wrapper_html: { class: "#{'hide' unless f.object.cache_enabled?}" }
+      = f.input :cache_vary, as: :string, wrapper_html: { class: "#{'hide' unless f.object.cache_enabled?}" }
 
 = render 'locomotive/pages/form/actions', f: f

data/app/views/locomotive/shared/_head.html.slim

@@ -1,5 +1,5 @@
 - if current_site
-  title== escape_once("#{Locomotive.config.name} — #{current_site.name}")
+  title== escape_once("#{current_site.name} — #{Locomotive.config.name}")
 - else
   title= escape_once(Locomotive.config.name)
 

data/app/views/locomotive/shared/account/_head.html.slim

@@ -0,0 +1,33 @@
+meta charset="utf-8"
+meta http-equiv="x-ua-compatible" content="ie=edge"
+
+title= escape_once(strip_tags(title) + " | #{application_name}")
+
+meta name="viewport" content="width=device-width, initial-scale=1"
+
+link rel="icon" type="image/png" href="#{asset_url('locomotive/favicon.png')}" sizes="32x32"
+
+link href="https://fonts.googleapis.com/css?family=Muli:400,300|Noto+Sans:400,700" rel="stylesheet" type="text/css"
+
+javascript:
+  window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' }
+
+= javascript_include_tag  'locomotive'
+= stylesheet_link_tag     'locomotive/account', media: 'screen'
+
+javascript:
+  window.locale                     = '#{locale}';
+
+  $(document).ready(function() {
+
+    window.application_view = new Locomotive.Views.SimpleView({
+      flash:      #{{flash_messages_to_json}},
+      view:       #{backbone_view_class_name}
+    });
+    window.application_view.render();
+
+  });
+
+= csrf_meta_tag
+
+= yield :head

data/app/views/locomotive/shared/account/_navigation.html.slim

@@ -7,7 +7,8 @@ ul.navigation-links
 
     ul.dropdown-menu role='menu' aria-labelledby="navigation-dropdown"
       li= link_to t(:sites, scope: 'locomotive.shared.header'), sites_path
-      li= link_to t(:account, scope: 'locomotive.shared.header'), edit_my_account_path(_location: request.fullpath)
+      - if policy(current_locomotive_account).edit?
+        li= link_to t(:account, scope: 'locomotive.shared.header'), edit_my_account_path(_location: request.fullpath)
       li= link_to t(:help, scope: 'locomotive.shared.header'), 'http://locomotive-v3.readme.io', target: '_blank'
       li class="divider"
       li= link_to t(:logout, scope: 'locomotive.shared.header'), sign_out_path, data: { method: 'delete' }

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

@@ -11,6 +11,7 @@
   .public-entries
     = render @sites
 
-  = link_to new_site_url, class: 'public-entry is-add' do
-    i.fa.fa-plus
-    = t('.new')
+  - if policy(Locomotive::Site).new?
+    = link_to new_site_url, class: 'public-entry is-add' do
+      i.fa.fa-plus
+      = t('.new')