locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/app/views/locomotive/developers_documentation/_wagon.html.slim

@@ -0,0 +1,42 @@
+.alert.alert-info
+  | <a href="https://github.com/locomotivecms/wagon"><strong>Wagon</strong></a> is our tool to create, modify and deploy locomotive sites. See our <a href="http://doc.locomotivecms.com" />documentation site</a> for more information.
+
+h3 Install Wagon
+
+.alert.alert-warning
+  | You need to have <strong>Ruby</strong> installed. For more explanation, check out our <a href="http://doc.locomotivecms.com" />documentation</a>.
+
+pre
+  code.bash
+    | gem install locomotivecms_wagon --pre
+
+h3 Get the source code of your site locally
+
+pre
+  code.bash
+    = developer_documentation_wagon_clone_string
+
+p
+  | If you already have a Wagon site, just add the following code inside your <strong>config/deploy.yml</strong> file.
+
+pre
+  code.yaml
+    | production:<br/>
+    |   host: #{request.scheme}://#{request.host_with_port}<br/>
+    |   handle: #{current_site.handle}<br/>
+    |   email: #{current_locomotive_account.email}<br/>
+    |   api_key: #{current_locomotive_account.api_key}
+
+h3 Run your site locally
+
+pre
+  code.bash
+    | cd #{current_site_name_with_underscores}</br>wagon serve
+
+p Now, update any files of your site and see the results locally.
+
+h3 Deploy your modifications
+
+pre
+  code.bash
+    | wagon push production

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

@@ -0,0 +1,11 @@
+= title t('.title')
+
+ul.nav.nav-tabs role='tablist'
+  li.active= link_to t('.wagon'), '#wagon', role: 'tab', data: { toggle: 'tab' }
+  li= link_to t('.api'), '#api', role: 'tab', data: { toggle: 'tab' }
+
+.tab-content
+  - %w(wagon api).each_with_index do |name, index|
+    .tab-pane id=name class=(index == 0 ? 'active' : '')
+      .documentation
+        = render "locomotive/developers_documentation/#{name}"

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

@@ -0,0 +1,12 @@
+p
+  == t('locomotive.devise_mailer.common.hello')
+  = @resource.email
+  | \!
+p
+  == t('.reset_password_instruction')
+p
+  = link_to t('.change_my_password'), edit_locomotive_account_password_url(reset_password_token: @resource.reset_password_token)
+p
+  == t('.wrong_request_instruction')
+p
+  == t('.unchange_password_message')

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

@@ -0,0 +1,52 @@
+= locomotive_form_for @page, url: update_all_editable_elements_path(current_site, @page), remote: true, html: { multipart: true }, defaults: { placeholder: false, hint: false } do |f|
+
+  .container-fluid.main role='main'
+    .row.header-row
+      .col-md-12
+        h1= truncate(@content_entry.try(:_label) || @page.title, length: 50)
+
+    .row.info-row
+      .col-sm-8.col-xs-8
+        span.fullpath= nice_editable_elements_path
+
+        |  
+        | —
+        |  
+
+        = link_to edit_page_path(current_site, @page, _location: request.fullpath) do
+          i.fa.fa-gear
+          |  
+          = t('.settings_link')
+
+      .col-sm-4.col-xs-4
+        .text-right
+          - if current_site.localized?
+            = locale_picker_link
+          - unless @editable_elements.empty?
+            |  
+            = f.action
+
+      - unless @editable_elements.empty?
+        .col-sm-12.col-xs-12
+          fieldset.inputs
+            .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(@blocks)
+
+  .scrollable class="#{'no-editable-elements' if @editable_elements.empty?}"
+    .container-fluid
+      .row
+        .col-md-12
+          - if @content_entry
+            fieldset.inputs
+              .form-group.input.link.optional
+                label.link.control-label.optional
+                  span.label.label-primary= @content_entry.content_type.name
+                  |   /  
+                  = @content_entry._label
+                span.form_wrapper
+                  = link_to t(:edit, scope: 'locomotive.editable_elements.form.model.buttons'), edit_content_entry_path(current_site, @content_entry.content_type.slug, @content_entry, _location: request.fullpath), class: 'btn btn-primary btn-sm'
+
+          = render 'form', f: f

data/app/views/locomotive/editable_elements/{_form.html.haml → _form.html.slim}

@@ -1,14 +1,14 @@
 .editable-elements
 
-  - ordered_editable_elements(@editable_elements_by_block).each_with_index do |(page, editable_element), index|
+  - each_editable_element(@blocks, @editable_elements_by_block) do |page, editable_element, index|
 
     = f.inputs :editable_element do
 
       = f.simple_fields_for :editable_elements, editable_element, child_index: index do |g|
 
-        = g.hidden_field :page_id
+        = g.hidden_field :_id
 
-        = g.hidden_field :humanized_id
+        = g.hidden_field :page_id
 
         - case editable_element.type.to_sym
 
@@ -21,3 +21,12 @@
         - when :editable_control
           = g.input :content, editable_element_input_options(editable_element, index, as: :select, collection: editable_element.options.map { |attributes| [attributes['text'], attributes['value']] })
 
+        - when :editable_model
+          fieldset.inputs
+            .form-group.input.link.optional data-block=editable_element.block
+              label.link.control-label.optional= editable_element_label(editable_element)
+              - if editable_element.hint.present?
+                span class="help-inline"= editable_element.hint
+              span.form_wrapper
+                = link_to t('.model.buttons.list'), content_entries_path(current_site, editable_element.content_type.slug), class: 'btn btn-primary btn-sm'
+

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

@@ -0,0 +1,8 @@
+= render 'edit'
+
+- content_for :preview do
+  .embed-responsive.embed-page
+    iframe.embed-responsive-item src=(preview_path(current_site) + '/' + (params[:preview_path] || current_site.localized_page_fullpath(@page, current_content_locale))) data-redirection-error=t('.redirection_error')
+
+
+

data/app/views/locomotive/editable_elements/{index_without_preview.html.haml → index_without_preview.html.slim}

@@ -6,7 +6,7 @@
 
   = f.action 'hide'
 
-  %ul.nav.nav-tabs{ role: 'tablist' }
+  ul.nav.nav-tabs role='tablist'
     = form_nav_tab :content, true do
       = link_to t('simple_form.titles.locomotive.content'), '#content', role: 'tab', data: { toggle: 'tab' }
 
@@ -19,10 +19,11 @@
 
       .row
         .col-md-12
-          %fieldset.inputs.info-row
+          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
+              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

data/app/views/locomotive/errors/404.html.slim

@@ -0,0 +1,2 @@
+h2.text-center
+  == t('.message')

data/app/views/locomotive/errors/500.html.slim

@@ -0,0 +1,2 @@
+h2.text-center
+  == t('.message')

data/app/views/locomotive/errors/no_site.html.slim

@@ -0,0 +1,7 @@
+- message, link = no_site_message_and_link
+
+h2.text-center
+  == message
+
+p.text-center.next
+  = link_to t('.next').html_safe, link

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

@@ -0,0 +1,42 @@
+doctype XML
+doctype html
+html xmlns='http://www.w3.org/1999/xhtml'
+  head
+    = render 'locomotive/shared/head'
+  body class=body_class
+
+    - # HEADER: brand + current site + account
+    = render 'locomotive/shared/header'
+
+    - # WRAPPER
+    .wrapper
+      nav.sidebar
+        .scrollable
+          = render 'locomotive/shared/sidebar'
+
+      .content
+        .scrollable
+          .container-fluid.main role='main'
+            - if title
+              .row
+                .col-md-8.col-xs-9
+                  h1== title
+
+                .col-md-4.col-xs-3.actions
+                  = yield :actions
+
+            = yield
+
+      section.drawer
+        .close-button
+          i.fa.fa-times
+        .inner
+          .scrollable
+            .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.
+
+    = yield :foot

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

@@ -0,0 +1,24 @@
+doctype XML
+doctype html
+html xmlns='http://www.w3.org/1999/xhtml'
+  head
+    title== error_title
+    meta name="viewport" content="width=device-width, initial-scale=1"
+
+    link rel="icon" type="image/png" href="#{asset_url('locomotive/favicon.png')}" sizes="32x32"
+
+    = stylesheet_link_tag 'locomotive/error', media: 'screen'
+
+  body
+    .wrapper.container-fluid
+      .main
+        .content
+          h1.text-center
+            = image_tag 'locomotive/logo.png'
+            |  
+            == 'Locomotive'
+            small== error_title
+
+          = yield
+
+

data/app/views/locomotive/layouts/{live_editing.html.haml → live_editing.html.slim}

@@ -1,30 +1,30 @@
-!!! XML
-!!!
-%html{ xmlns: 'http://www.w3.org/1999/xhtml'  }
-  %head
+doctype XML
+doctype html
+html xmlns='http://www.w3.org/1999/xhtml'
+  head
     = render 'locomotive/shared/head'
-  %body{ class: "live-editing sidebar-closed" }
+  body class="live-editing sidebar-closed"
 
     - # HEADER: brand + current site + account
     = render 'locomotive/shared/header'
 
     - # WRAPPER
     .wrapper
-      %section.preview
+      section.preview
         .scrollable
           = yield :preview
 
       .content
         .close-button
-          %i.fa.fa-chevron-left
+          i.fa.fa-chevron-left
         .expand-button
-          %i.fa.fa-chevron-right
+          i.fa.fa-chevron-right
         .inner
           = yield
 
-      %section.drawer
+      section.drawer
         .close-button
-          %i.fa.fa-times
+          i.fa.fa-times
         .inner
           = yield :drawer
 

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

@@ -0,0 +1,26 @@
+doctype XML
+doctype html
+html xmlns='http://www.w3.org/1999/xhtml' lang=I18n.locale
+  head
+    title= escape_once(strip_tags(title) || "#{Locomotive.config.name} — #{current_site.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"
+
+    = javascript_include_tag  'locomotive/not_logged_in'
+    = stylesheet_link_tag     'locomotive/not_logged_in', media: 'screen'
+
+    javascript:
+      window.flash_messages = #{flash_messages_to_json};
+
+    = yield :head
+
+  body class=[controller.controller_name, flash.empty? ? '' : 'with-flash'].join(' ')
+    .wrapper.container-fluid
+      .main
+        .content
+          h1
+            = image_tag 'locomotive/logo.png'
+            |  
+            == title
+          = yield

data/app/views/locomotive/layouts/{without_site.html.haml → without_site.html.slim}

@@ -1,11 +1,14 @@
-!!! XML
-!!!
-%html{ xmlns: 'http://www.w3.org/1999/xhtml'  }
-  %head
+doctype XML
+doctype html
+html xmlns='http://www.w3.org/1999/xhtml'
+  head
     = render 'locomotive/shared/head'
-  %body{ class: "#{body_class} without-site"  }
 
-    %nav.sidebar
+    link rel="icon" type="image/png" href="#{asset_url('locomotive/favicon.png')}" sizes="32x32"
+
+  body class="#{body_class} without-site"
+
+    nav.sidebar
       .scrollable
         = render 'locomotive/shared/sidebar_without_site'
 

data/app/views/locomotive/my_account/{edit.html.haml → edit.html.slim}

@@ -3,7 +3,7 @@
 
 = help t('.help', default: '')
 
-= locomotive_form_for @account, url: my_account_path, html: { multipart: true } do |f|
+= locomotive_form_for @account, url: my_account_path, html: { multipart: true }, defaults: { placeholder: false } do |f|
 
   = hidden_field_tag :active_tab, ''
 

data/app/views/locomotive/my_account/form/{_api.html.haml → _api.html.slim}

@@ -1,3 +1,2 @@
 = f.inputs :api do
   = f.input :api_key, as: :api_key, url: regenerate_api_key_my_account_path
-

data/app/views/locomotive/my_account/form/{_panes.html.haml → _panes.html.slim}

@@ -1,4 +1,4 @@
 .tab-content
   - %w(main credentials api).each_with_index do |name, index|
     = form_tab_pane name.to_sym, index == 0 do
-      = render "locomotive/my_account/form/#{name}", f: f
+      = render "locomotive/my_account/form/#{name}", f: f

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

@@ -0,0 +1,7 @@
+ul.nav.nav-tabs role='tablist'
+  = form_nav_tab :main, true do
+    = link_to t('simple_form.titles.locomotive.account.information'), '#main', role: 'tab', data: { toggle: 'tab' }
+  = form_nav_tab :credentials do
+    = link_to t('simple_form.titles.locomotive.account.credentials'), '#credentials', role: 'tab', data: { toggle: 'tab' }
+  = form_nav_tab :api do
+    = link_to t('simple_form.titles.locomotive.account.api'), '#api', role: 'tab', data: { toggle: 'tab' }

data/app/views/locomotive/notifications/{new_content_entry.html.haml → new_content_entry.html.slim}

@@ -1,19 +1,19 @@
-%p= t('.title', name: @account.name, domain: @domain, date: I18n.l(Time.now.in_time_zone), locale: @account.locale).html_safe
+p= t('.title', name: @account.name, domain: @domain, date: I18n.l(Time.now.in_time_zone), locale: @account.locale).html_safe
 
-%p
-  %b= t('.type', type: @type.name, locale: @account.locale)
-  %br
-  %i= @type.description
+p
+  b= t('.type', type: @type.name, locale: @account.locale)
+  br
+  i= @type.description
 
-%hr
+hr
 
-%ul
+ul
   - @type.ordered_entries_custom_fields.each do |field|
     - value = @entry.send(field.name)
-    %li
-      %strong= field.label
-       - 
-      %i
+    li
+      strong= field.label
+      |  - 
+      i
         - case field.type.to_s
         - when 'file'
           - url = value.guess_url