locomotivecms 3.0.0.pre.beta.1 → 3.0.0.rc1

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

@@ -18,5 +18,6 @@
     .buttons
       - if membership.account != current_locomotive_account && policy(membership).edit?
         = link_to t(:edit, scope: 'locomotive.shared.form.array_input'), edit_membership_path(current_site, membership), class: 'choose btn btn-primary btn-sm'
+        |  
         = link_to membership_path(current_site, membership), class: 'delete', data: { confirm: t('locomotive.messages.confirm') }, method: :delete do
           i.fa.fa-trash-o

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

@@ -6,7 +6,7 @@
 
   = hidden_field_tag :active_tab, ''
 
-  = f.action 'hide'
+  = f.action class: 'hide'
 
   = render 'locomotive/current_site/form/tabs', f: f
 

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

@@ -2,7 +2,7 @@
   = f.inputs :access_points do
     = f.input :handle
 
-    = f.input :domains, as: :array, placeholder: true, collection: f.object.domains, template: :domain, template_url: new_domain_current_site_path(current_site)
+    = f.input :domains, as: :array, hint: t(:domains, scope: 'simple_form.hints.locomotive.site', domain: Locomotive.config.host || request.host).html_safe, placeholder: true, collection: f.object.domains, template: :domain, template_url: new_domain_current_site_path(current_site)
 
   = f.actions do
     = f.action

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

@@ -5,6 +5,8 @@
 
   = f.input :robots_txt, as: :code, wrapper_html: { class: 'small' }
 
+  = f.input :cache_enabled, as: :toggle
+
 - if policy(@site).destroy?
   = f.actions do
     .row

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

@@ -0,0 +1,26 @@
+h3 class="activity"= t('.title')
+
+ul.activity-feed
+  - @activities.each do |activity|
+    li class=activity.domain
+      span.icon.fa-stack.fa-lg
+        i.fa.fa-circle.fa-stack-2x
+        i.fa.fa-stack-1x.fa-inverse class=activity_to_icon(activity)
+
+      p
+        = account_avatar_and_name(activity.actor, size = '70x70#')
+        |  
+        | ·
+        |  
+        span.time= activity.created_at.to_s(:humanized_ago)
+        |  
+        | ·
+        |  
+        span.sentence= render_activity_sentence(activity)
+
+      - if info = render_activity_additional_information(activity)
+        .additional-information= info
+
+- if @activities.current_page < @activities.total_pages
+  p.text-center
+    = link_to t('.load_more'), { page: @activities.current_page + 1 }, class: 'btn btn-primary btn-sm', data: { behavior: 'load-more', loading_text: t('.loading_activity_feed') }, remote: true

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

@@ -0,0 +1,9 @@
+h3 class="url"
+  = t('.title')
+
+  strong
+    = current_site_url
+  = link_to t('.visit'), current_site_url, target: '_blank', class: 'btn btn-sm btn-primary'
+
+  - if current_site.domains.blank?
+    = link_to t('.change_domain'), edit_current_site_path(current_site, anchor: 'access_points'), class: 'btn btn-sm btn-primary'

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

@@ -2,27 +2,9 @@
 
 .row
   .col-md-12
-    ul.activity-feed
-      - @activities.each do |activity|
-        li class=activity.domain
-          span.icon.fa-stack.fa-lg
-            i.fa.fa-circle.fa-stack-2x
-            i.fa.fa-stack-1x.fa-inverse class=activity_to_icon(activity)
+    = render 'url'
 
-          p
-            = account_avatar_and_name(activity.actor, size = '70x70#')
-            |  
-            | ·
-            |  
-            span.time= activity.created_at.to_s(:humanized_ago)
-            |  
-            | ·
-            |  
-            span.sentence= render_activity_sentence(activity)
+    hr
 
-          - if info = render_activity_additional_information(activity)
-            .additional-information= info
+    = render 'activity'
 
-    - if @activities.current_page < @activities.total_pages
-      p.text-center
-        = link_to t('.load_more'), { page: @activities.current_page + 1 }, class: 'btn btn-primary btn-sm', data: { behavior: 'load-more', loading_text: t('.loading_activity_feed') }, remote: true

data/app/views/locomotive/devise_mailer/reset_password_instructions.html.slim

@@ -5,7 +5,7 @@ p
 p
   == t('.reset_password_instruction')
 p
-  = link_to t('.change_my_password'), edit_locomotive_account_password_url(reset_password_token: @resource.reset_password_token)
+  = link_to t('.change_my_password'), edit_locomotive_account_password_url(reset_password_token: @token)
 p
   == t('.wrong_request_instruction')
 p

data/app/views/locomotive/editable_elements/_edit.html.slim

@@ -26,7 +26,14 @@
             |  
             = f.action
 
-      - unless @editable_elements.empty?
+      - if @editable_elements.empty?
+        - if @content_entry.nil?
+          .col-sm-12.col-xs-12
+            br
+            .alert.alert-warning.text-center role="alert"
+              = t('.no_editable_elements')
+
+      - else
         .col-sm-12.col-xs-12
           fieldset.inputs
             .form-group.input.select.optional.inline

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

@@ -13,7 +13,7 @@
         - case editable_element.type.to_sym
 
         - when :editable_text
-          = g.input :content, editable_element_input_options(editable_element, index, as: editable_element.format == 'html' ? :rte : :text, input_html: { rows: editable_element.rows })
+          = g.input :content, editable_element_input_options(editable_element, index, as: editable_text_format_to_input_type(editable_element), input_html: { rows: editable_element.rows })
 
         - when :editable_file
           = g.input :source, editable_element_input_options(editable_element, index, as: :file, select_content_asset: true, hidden_fields: [:content, :default_source_url])

data/app/views/locomotive/editable_elements/index_without_preview.html.slim

@@ -1,10 +1,8 @@
-- title t('.title', title: @page.title, fullpath: @page.fullpath)
-
-= help t('.help', default: '')
+= render 'locomotive/pages/header'
 
 = locomotive_form_for @page, url: update_all_editable_elements_path(current_site, @page), defaults: { placeholder: false, hint: false } do |f|
 
-  = f.action 'hide'
+  = f.action class: 'hide'
 
   ul.nav.nav-tabs role='tablist'
     = form_nav_tab :content, true do
@@ -18,17 +16,26 @@
     = form_tab_pane :content, true do
 
       .row
-        .col-md-12
-          fieldset.inputs.info-row
-            .form-group.input.select.optional.inline
-              label.select.optional.control-label for='page_block'
-                = t(:region, scope: 'simple_form.labels.locomotive.editable_element')
-              span.form-wrapper
-                = select_tag 'block', options_for_page_blocks(@editable_elements_by_block)
-
-        .col-md-12
-          = render 'form', f: f
-
-          = f.actions do
-            = f.action
+
+        - if @editable_elements.empty?
+          - if @content_entry.nil?
+            .col-md-12
+              br
+              .alert.alert-warning.text-center role="alert"
+                = t('.no_editable_elements')
+
+        - else
+          .col-md-12
+            fieldset.inputs.info-row
+              .form-group.input.select.optional.inline
+                label.select.optional.control-label for='page_block'
+                  = t(:region, scope: 'simple_form.labels.locomotive.editable_element')
+                span.form-wrapper
+                  = select_tag 'block', options_for_page_blocks(@editable_elements_by_block)
+
+          .col-md-12
+            = render 'form', f: f
+
+            = f.actions do
+              = f.action
 

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

@@ -3,6 +3,7 @@ doctype html
 html xmlns='http://www.w3.org/1999/xhtml'
   head
     = render 'locomotive/shared/head'
+
   body class=body_class
 
     - # HEADER: brand + current site + account
@@ -17,8 +18,11 @@ html xmlns='http://www.w3.org/1999/xhtml'
       .content
         .scrollable
           .container-fluid.main role='main'
+            .row
+              = yield :local_warning_message
+
             - if title
-              .row
+              .row.header-row
                 .col-md-8.col-xs-9
                   h1== title
 
@@ -35,8 +39,6 @@ html xmlns='http://www.w3.org/1999/xhtml'
             .container-fluid
               .row
                 .col-md-12
-                  h1 TEST
-                  p
-                    | Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc placerat   tincidunt massa, vitae mollis dui volutpat eu. Sed ullamcorper id turpis vel pulvinar. Nullam dignissim purus vel libero sodales finibus. Donec ut pellentesque velit, nec semper felis. Curabitur lacinia egestas condimentum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Nullam non feugiat erat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Nulla enim nibh, consectetur vel mollis eu, venenatis eget elit. Nulla eget massa tincidunt, scelerisque mi non, lacinia ante. In scelerisque, nisi ut ullamcorper aliquet, nulla quam faucibus est, a congue odio enim ac nulla. Cras dictum cursus ex vel scelerisque. Vestibulum elementum auctor tellus vitae imperdiet.
+                  h1 Right sidebar
 
     = yield :foot

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

@@ -3,6 +3,7 @@ doctype html
 html xmlns='http://www.w3.org/1999/xhtml'
   head
     = render 'locomotive/shared/head'
+
   body class="live-editing sidebar-closed"
 
     - # HEADER: brand + current site + account
@@ -10,6 +11,14 @@ html xmlns='http://www.w3.org/1999/xhtml'
 
     - # WRAPPER
     .wrapper
+      .slide-sidebar
+        .bar
+          .expand-button
+            i.fa.fa-chevron-right
+        nav.sidebar
+          .scrollable
+            = render 'locomotive/shared/sidebar'
+
       section.preview
         .scrollable
           = yield :preview

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

@@ -11,7 +11,7 @@ html xmlns='http://www.w3.org/1999/xhtml' lang=I18n.locale
     = stylesheet_link_tag     'locomotive/not_logged_in', media: 'screen'
 
     javascript:
-      window.flash_messages = #{flash_messages_to_json};
+      window.flash_messages = #{{flash_messages_to_json}};
 
     = yield :head
 

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

@@ -19,3 +19,5 @@ html xmlns='http://www.w3.org/1999/xhtml'
         .container-fluid
           .main
             = yield
+
+    = yield :foot

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

@@ -10,6 +10,6 @@
   = f.actions do
     .row
       .col-md-6.text-left
-        = link_to escape_once('← ') + t('.back'), edit_current_site_path(current_site)
+        = link_to "← #{t('.back')}".html_safe, edit_current_site_path(current_site)
       .col-md-6.text-right
         = f.action

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

@@ -10,6 +10,6 @@
   = f.actions do
     .row
       .col-md-6.text-left
-        = link_to escape_once('← ') + t('.back'), edit_current_site_path(current_site)
+        = link_to ('← ' + t('.back')).html_safe, edit_current_site_path(current_site)
       .col-md-6.text-right
         = f.action

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

@@ -3,12 +3,14 @@
 
 = help t('.help', default: '')
 
-= locomotive_form_for @account, url: my_account_path, html: { multipart: true }, defaults: { placeholder: false } do |f|
+.row
+  .col-sm-offset-2.col-sm-8
+    = locomotive_form_for @account, url: my_account_path, html: { multipart: true }, defaults: { placeholder: false } do |f|
 
-  = hidden_field_tag :active_tab, ''
+      = hidden_field_tag :active_tab, ''
 
-  = f.action 'hide'
+      = f.action class: 'hide'
 
-  = render 'locomotive/my_account/form/tabs', f: f
+      = render 'locomotive/my_account/form/tabs', f: f
 
-  = render 'locomotive/my_account/form/panes', f: f
+      = render 'locomotive/my_account/form/panes', f: f

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

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

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

@@ -1,13 +1,11 @@
-- title t('.title', title: @page.title, fullpath: @page.fullpath)
-
-= help t('.help', default: '')
+= render 'locomotive/pages/header'
 
 = locomotive_form_for @page, url: page_path(current_site, @page), html: { multipart: true } do |f|
 
   = hidden_field_tag :active_tab, ''
   = hidden_field_tag :_location,  params[:_location]
 
-  = f.action 'hide'
+  = f.action class: 'hide'
 
   = render 'locomotive/pages/form/tabs', f: f
 

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

@@ -19,8 +19,11 @@
 
   = f.input :published, as: :toggle
 
-  - unless @page.not_found? || @page.templatized?
+  - if !@page.not_found? && !@page.templatized? && @page.default_response_type?
 
     = f.input :listed, as: :toggle
 
+  - if current_site.cache_enabled?
+    = f.input :cache_enabled, as: :toggle
+
 = render 'locomotive/pages/form/actions', f: f

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

@@ -1,10 +1,11 @@
 ul.nav.nav-tabs role='tablist'
-  - unless @page.templatized? || @page.redirect?
+  - unless @page.redirect?
     = form_nav_tab :content do
       = link_to t('simple_form.titles.locomotive.content'), editable_elements_path(current_site, @page)
 
   = form_nav_tab :main, true do
     = link_to t('simple_form.titles.locomotive.settings'), '#main', role: 'tab', data: { toggle: 'tab' }
 
-  = form_nav_tab :seo do
-    = link_to t('simple_form.titles.locomotive.seo'), '#seo', role: 'tab', data: { toggle: 'tab' }
+  - if @page.default_response_type?
+    = form_nav_tab :seo do
+      = link_to t('simple_form.titles.locomotive.seo'), '#seo', role: 'tab', data: { toggle: 'tab' }

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

@@ -12,7 +12,7 @@
       .text
         = account.name
 
-        small= "<# account.email >"
+        small= "<#{account.email}>"
 
       .buttons
         = link_to '#', class: 'delete' do

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

@@ -12,5 +12,5 @@
 
   = f.actions back_url: content_entries_path(current_site, @content_type.slug)
 
-  = f.action 'hide'
+  = f.action class: 'hide'
 

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

@@ -1,30 +1,33 @@
-nav.navbar.navbar-default role='navigation'
+.header
+  nav.navbar.navbar-default role='navigation'
 
-  .container-fluid
+    .container-fluid
 
-    .navbar-header
+      .navbar-header
 
-      button type='button' class='navbar-toggle'
-        span.sr-only Toggle navigation
-        .icon-bar
-        .icon-bar
-        .icon-bar
+        button type='button' class='navbar-toggle'
+          span.sr-only Toggle navigation
+          .icon-bar
+          .icon-bar
+          .icon-bar
 
-      .navbar-brand.hidden-xs
-        = render 'locomotive/shared/header/brand'
+        .navbar-brand.hidden-xs
+          = render 'locomotive/shared/header/brand'
 
-      ul.nav.navbar-nav.navbar-site.visible-xs
-        li
-          = render 'locomotive/shared/header/site'
+        ul.nav.navbar-nav.navbar-site.visible-xs
+          li
+            = render 'locomotive/shared/header/site'
 
-    .navbar-collapse#account-menu-collapse.hidden-xs
-      ul.nav.navbar-nav.navbar-site
-        li
-          = render 'locomotive/shared/header/site'
+      .navbar-collapse#account-menu-collapse.hidden-xs
+        ul.nav.navbar-nav.navbar-site
+          li
+            = render 'locomotive/shared/header/site'
 
-      ul.nav.navbar-nav.navbar-right.account-menu-wrapper
-        li.dropdown
-          = render 'locomotive/shared/header/account'
+        ul.nav.navbar-nav.navbar-right.account-menu-wrapper
+          li.dropdown
+            = render 'locomotive/shared/header/account'
 
-          ul.dropdown-menu role='menu'
-            = render 'locomotive/shared/header/account_menu'
+            ul.dropdown-menu role='menu'
+              = render 'locomotive/shared/header/account_menu'
+
+  = render 'locomotive/shared/main_app_header'

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

@@ -1,6 +1,8 @@
 .btn-group
   button.btn.btn-primary.btn-sm.dropdown-toggle data-toggle='dropdown' data-aria-haspopup='true' data-aria-expanded='false'
     = flag_tag current_content_locale, '17x17'
+    |  
+    |  
     span.caret
   ul.dropdown-menu.dropdown-menu-right
     - current_site.locales.each do |locale|
@@ -8,4 +10,5 @@
         a href="?content_locale=#{locale}"
           = flag_tag locale, '17x17'
           |  
+          |  
           = t(locale, scope: 'locomotive.locales')