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

data/app/views/locomotive/pages/form/{_tabs.html.haml → _tabs.html.slim}

@@ -1,4 +1,4 @@
-%ul.nav.nav-tabs{ role: 'tablist' }
+ul.nav.nav-tabs role='tablist'
   - unless @page.templatized? || @page.redirect?
     = form_nav_tab :content do
       = link_to t('simple_form.titles.locomotive.content'), editable_elements_path(current_site, @page)

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

@@ -0,0 +1,2 @@
+.embed-responsive.embed-page
+  iframe.embed-responsive-item src=preview_path(current_site) + '/' + current_site.localized_page_fullpath(@page)

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

@@ -1,18 +1,18 @@
-- title t('.title')
+- title current_site ? current_site.name : t('locomotive.not_logged_in.title')
 
 = locomotive_form_for(resource, as: resource_name, url: locomotive_account_password_path, html: { method: :put }) do |f|
 
   = f.hidden_field :reset_password_token
 
-  = flash_message
-
   = f.inputs do
     = f.input :password, label: t('.password'), required: false
     = f.input :password_confirmation, label: t('.password_confirmation'), required: false
 
-  %p.link
-    = link_to preserve(t('.link')), new_locomotive_account_session_path
-
   = f.actions do
     = f.button :submit, t('locomotive.buttons.change_password'), class: 'btn'
 
+    br
+
+    p= link_to t('.link').html_safe, new_locomotive_account_session_path
+
+

data/app/views/locomotive/passwords/{new.html.haml → new.html.slim}

@@ -1,17 +1,17 @@
-- title t('.title')
+- title current_site ? current_site.name : t('locomotive.not_logged_in.title')
 
 = locomotive_form_for(resource, as: resource_name, url: locomotive_account_password_path) do |f|
 
   = f.hidden_field :reset_password_token
 
-  = flash_message
-
   = f.inputs do
     = flash_message
     = f.input :email, label: t('.email'), required: false
 
-  %p.link
-    = link_to preserve(t('.link')), new_locomotive_account_session_path
-
   = f.actions do
     = f.button :submit, t('locomotive.buttons.send_password'), class: 'btn'
+
+    br
+
+    p
+      = link_to t('.link').html_safe, new_locomotive_account_session_path

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

@@ -0,0 +1,19 @@
+- if account = current_site.accounts.all.detect { |a| a._id.to_s == public_submission_account.to_s }
+
+  .item.row data-id=account._id
+
+    = hidden_field_tag 'content_type[public_submission_accounts][]', account._id
+
+    .inner-row.col-md-12
+
+      .icon
+        = image_tag account_avatar_url(account, '35x35#'), class: 'img-circle', style: 'width: 35px'
+
+      .text
+        = account.name
+
+        small= "<# account.email >"
+
+      .buttons
+        = link_to '#', class: 'delete' do
+          i.fa.fa-trash-o

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

@@ -0,0 +1,16 @@
+- title t('.title', name: @content_type.name)
+
+= help t('.help', default: '')
+
+= locomotive_form_for @content_type, url: public_submission_accounts_path(current_site, @content_type.slug), html: { multipart: true } do |f|
+
+  = f.inputs :information do
+
+    = hidden_field_tag 'content_type[public_submission_accounts][]', nil
+
+    = f.input :public_submission_accounts, as: :array, template: :account, template_url: new_account_public_submission_accounts_path(current_site, @content_type.slug), select_options: options_for_public_submission_accounts
+
+  = f.actions back_url: content_entries_path(current_site, @content_type.slug)
+
+  = f.action 'hide'
+

data/app/views/locomotive/registrations/{new.html.haml → new.html.slim}

@@ -2,8 +2,6 @@
 
 = locomotive_form_for resource, as: resource_name, url: sign_up_path do |f|
 
-  = flash_message
-
   = f.inputs do
     = f.input :name, required: true, autofocus: true
     = f.input :email, required: true
@@ -13,7 +11,7 @@
   = f.actions do
     = f.button :submit, t('locomotive.buttons.sign_up'), class: 'btn'
 
-    %br
+    br
 
-    %p
+    p
       = link_to t('.sign_in'), new_locomotive_account_session_path

data/app/views/locomotive/sessions/{new.html.haml → new.html.slim}

@@ -6,8 +6,6 @@
 
   = f.hidden_field :remember_me, value: 'true'
 
-  = flash_message
-
   = f.inputs do
     = f.input :email, label: t('.email'), required: false, input_html: { tabindex: 1 }
     = f.input :password, label: t('.password'), hint: link_to(t('.link'), new_locomotive_account_password_path).html_safe, required: false, input_html: { tabindex: 2 }
@@ -17,6 +15,6 @@
 
     - if current_site.nil?
 
-      %br
+      br
 
-      %p= link_to t('.sign_up'), sign_up_path
+      p= link_to t('.sign_up').html_safe, sign_up_path

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

@@ -0,0 +1,2 @@
+p.tcenter
+  == t('.who_is_behind', version: Locomotive::VERSION, development: nocoffee_tag)

data/app/views/locomotive/shared/{_form_actions.html.haml → _form_actions.html.slim}

@@ -1,14 +1,14 @@
 #local-actions-bottom-bar
   .span-12
-    %p
+    p
       - if defined?(back_url)
         = link_to escape_once('← ') + t('.back'), back_url
       - elsif defined?(delete_button)
         = delete_button
-       
+      |  
 
   .span-12.last
-    %p
+    p
       = submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label, :'data-disable-with' => t('.disable_with'), :'data-sending-form-message' => t('locomotive.messages.sending_form')
 
-  .clear
+  .clear

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

@@ -0,0 +1,39 @@
+- if current_site
+  title== escape_once("#{Locomotive.config.name} — #{current_site.name}")
+- else
+  title= escape_once(Locomotive.config.name)
+
+= csrf_meta_tag
+
+- key = Rails.application.config.session_options[:key]
+
+meta name='key-param' content=Rails.application.config.session_options[:key]
+meta name='key-token' content=cookies[key]
+
+link rel="icon" type="image/png" href="#{asset_url('locomotive/favicon.png')}" sizes="32x32"
+
+javascript:
+  window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' }
+
+= stylesheet_link_tag     'locomotive/application', media: 'screen'
+= javascript_include_tag  'locomotive'
+
+= render 'locomotive/shared/main_app_head_before_backbone'
+
+javascript:
+  window.locale                     = '#{I18n.locale}';
+  window.content_locale             = '#{::Mongoid::Fields::I18n.locale}';
+
+  $(document).ready(function() {
+
+    window.application_view = new Locomotive.Views.ApplicationView({
+      flash:      #{{flash_messages_to_json}},
+      view:       #{backbone_view_class_name}
+    });
+    window.application_view.render();
+
+  });
+
+= yield :head
+
+= render 'locomotive/shared/main_app_head'

data/app/views/locomotive/shared/{_header.html.haml → _header.html.slim}

@@ -1,11 +1,11 @@
-%nav.navbar.navbar-default{ role: 'navigation' }
+nav.navbar.navbar-default role='navigation'
 
   .container-fluid
 
     .navbar-header
 
-      %button{ type: 'button', class: 'navbar-toggle' }
-        %span.sr-only Toggle navigation
+      button type='button' class='navbar-toggle'
+        span.sr-only Toggle navigation
         .icon-bar
         .icon-bar
         .icon-bar
@@ -13,18 +13,18 @@
       .navbar-brand.hidden-xs
         = render 'locomotive/shared/header/brand'
 
-      %ul.nav.navbar-nav.navbar-site.visible-xs
-        %li
+      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
+      ul.nav.navbar-nav.navbar-site
+        li
           = render 'locomotive/shared/header/site'
 
-      %ul.nav.navbar-nav.navbar-right.account-menu-wrapper
-        %li.dropdown
+      ul.nav.navbar-nav.navbar-right.account-menu-wrapper
+        li.dropdown
           = render 'locomotive/shared/header/account'
 
-          %ul.dropdown-menu{ role: 'menu' }
+          ul.dropdown-menu role='menu'
             = render 'locomotive/shared/header/account_menu'

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

@@ -0,0 +1,11 @@
+.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|
+      li
+        a href="?content_locale=#{locale}"
+          = flag_tag locale, '17x17'
+          |  
+          = t(locale, scope: 'locomotive.locales')

data/app/views/locomotive/shared/{_sidebar.html.haml → _sidebar.html.slim}

@@ -8,8 +8,14 @@
 
 = render 'locomotive/shared/sidebar/link', icon: 'fa-picture-o', label: t('.assets'), url: content_assets_path(current_site)
 
+- if current_site.localized?
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-globe', label: t('.translations'), url: translations_path(current_site)
+
 = render 'locomotive/shared/sidebar/link', icon: 'fa-gear', label: t('.settings'), url: edit_current_site_path(current_site)
 
+- if policy(current_site).show_developers_documentation?
+  = render 'locomotive/shared/sidebar/link', icon: 'fa-book', label: t('.developers'), url: developers_documentation_path(current_site)
+
 = render 'locomotive/shared/sidebar/link', icon: 'fa-suitcase', label: t(:sites, scope: 'locomotive.shared.header'), url: sites_path, section_class: 'visible-xs-block'
 
 = render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }, section_class: 'visible-xs-block'

data/app/views/locomotive/shared/actions/{_contents.html.haml → _contents.html.slim}

@@ -1,7 +1,7 @@
 - if policy(Locomotive::ContentType).index?
   .action
     = link_to new_content_type_path, class: 'button' do
-      %i.icon-plus
+      i.icon-plus
       = t('locomotive.content_types.index.new')
 
 = locale_picker_link

data/app/views/locomotive/shared/header/{_account.html.haml → _account.html.slim}

@@ -4,4 +4,4 @@
 
   = t('locomotive.shared.header.welcome', name: @current_locomotive_account.name_was)
 
-  %span.caret
+  span.caret

data/app/views/locomotive/shared/header/_account_menu.html.slim

@@ -0,0 +1,5 @@
+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)
+li= link_to t(:help, scope: 'locomotive.shared.header'), 'http://doc.locomotivecms.com'
+li class="divider"
+li= link_to t(:logout, scope: 'locomotive.shared.header'), destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }

data/app/views/locomotive/shared/header/_brand.html.slim

@@ -0,0 +1,5 @@
+span.default><
+  = link_to sites_path do
+    = image_tag 'locomotive/logo.png'
+    | Locomotive
+

data/app/views/locomotive/shared/header/{_site.html.haml → _site.html.slim}

@@ -4,5 +4,5 @@
 - else
   = link_to current_site.name_was, dashboard_path(current_site)
   = link_to preview_path(current_site) do
-    %span.arrow
-      %i.fa.fa-external-link
+    span.arrow
+      i.fa.fa-external-link

data/app/views/locomotive/shared/rte/{_image_popover.html.haml → _image_popover.html.slim}

@@ -1,4 +1,4 @@
-.image-dialog-content{ style: 'display: none' }
+.image-dialog-content style='display: none'
   = locomotive_form_for image_form, url: '#', defaults: { placeholder: false, hint: false } do |f|
     = f.inputs do
       = f.input :src
@@ -8,11 +8,11 @@
         [:right, 'wysiwyg-float-right']],
         label_method: ->(el) { t("simple_form.options.locomotive.rte_input_image_form.alignment.#{el.first}") }
 
-    %p.text-right
-      %a.btn.btn-success.btn-sm.apply
+    p.text-right
+      a.btn.btn-success.btn-sm.apply
         = f.submit_text
 
-       
+      |  
 
-      %a.btn.btn-default.btn-sm.cancel
+      a.btn.btn-default.btn-sm.cancel
         = f.submit_text :cancel

data/app/views/locomotive/shared/rte/{_link_popover.html.haml → _link_popover.html.slim}

@@ -1,4 +1,4 @@
-.link-dialog-content{ style: 'display: none' }
+.link-dialog-content style='display: none'
   = locomotive_form_for link_form, url: '#', defaults: { placeholder: false, hint: false } do |f|
     = f.inputs do
       = f.input :url
@@ -8,12 +8,12 @@
         label_method: ->(el) { t("simple_form.options.locomotive.rte_input_link_form.target.#{el.first}") }
       = f.input :title
 
-    %p.text-right
-      %a.btn.btn-success.btn-sm.apply
+    p.text-right
+      a.btn.btn-success.btn-sm.apply
         = f.submit_text
 
-       
+      |  
 
-      %a.btn.btn-default.btn-sm.cancel
+      a.btn.btn-default.btn-sm.cancel
         = f.submit_text :cancel
 

data/app/views/locomotive/shared/rte/_toolbar.html.slim

@@ -0,0 +1,62 @@
+.wysihtml5-toolbar id="wysihtml5-toolbar-#{wysihtml5_prefix}" style='display: none'
+
+  span.wysihtml5-toolbar-group
+    a data-wysihtml5-command='bold'
+      i.fa.fa-bold
+    a data-wysihtml5-command='italic'
+      i.fa.fa-italic
+    a data-wysihtml5-command='underline'
+      i.fa.fa-underline
+    a data-wysihtml5-command='strike'
+      i.fa.fa-strikethrough
+
+  span.wysihtml5-toolbar-group
+    a data-wysihtml5-command='justifyLeft'
+      i.fa.fa-align-left
+    a data-wysihtml5-command='justifyCenter'
+      i.fa.fa-align-center
+    a data-wysihtml5-command='justifyRight'
+      i.fa.fa-align-right
+    a data-wysihtml5-command='justifyFull'
+      i.fa.fa-align-justify
+
+  span.wysihtml5-toolbar-group
+    a data-wysihtml5-command='insertUnorderedList'
+      i.fa.fa-list-ul
+    a data-wysihtml5-command='insertOrderedList'
+      i.fa.fa-list-ol
+    a.style
+      i.fa.fa-paragraph
+
+    .style-dialog-content style='display: none'
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h1' H1
+      br
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h2' H2
+      br
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3' H3
+      br
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3' H4
+      br
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3' H5
+      br
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3' H6
+      br
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='p' P
+      br
+      a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='blockquote'
+        i.fa.fa-quote-right
+      br
+
+    a data-wysihtml5-command='createLink'
+      i.fa.fa-chain
+    = link_popover
+    a data-wysihtml5-command='removeLink'
+      i.fa.fa-chain-broken
+
+    a data-url=content_assets_path data-wysihtml5-command='insertFile'
+      i.fa.fa-file-o
+    = image_popover
+
+  span.wysihtml5-toolbar-group
+    a data-wysihtml5-action='change_view'
+      i.fa.fa-code