locomotivecms 3.0.0.rc2 → 3.0.0.rc3

data/app/assets/stylesheets/locomotive/unauthorized/_keyframes.scss

@@ -0,0 +1,31 @@
+// =============================================================================
+// Keyframes
+// =============================================================================
+
+// Fades a element down while increasing its opacity.
+
+@keyframes fade-down {
+  0% {
+    opacity: .5;
+    transform: translateY(-10px);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+// Fades a element to the left while increasing its opacity.
+
+@keyframes fade-left {
+  0% {
+    opacity: .5;
+    transform: translateX(10px);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translateX(0);
+  }
+}

data/app/assets/stylesheets/locomotive/unauthorized/_notify.scss

@@ -0,0 +1,85 @@
+// =============================================================================
+// Notify
+// =============================================================================
+
+// Notifies the user with success messages or errors in the right bottom of the
+// page.
+
+// Settings
+// =============================================================================
+
+// Scaffolding notifications with a given color.
+// @param {Hex} $color color background and font.
+
+@mixin notification-generator($color) {
+  color: $color;
+  background-color: rgba(lighten($color, 55), .8);
+  .close {
+    color: rgba($color, .3);
+    &:hover {
+      color: rgba($color, .6);
+    }
+  }
+  [data-notify="icon"] {
+    color: $color;
+  }
+}
+
+// Components
+// =============================================================================
+
+[data-notify="container"] {
+  position: relative;
+  font-size: 0;
+  border: none;
+  box-shadow: 0 1px 10px rgba($black, .2);
+  animation: fade-left .5s ease-out;
+  .close {
+    position: absolute;
+    top: 50%;
+    right: 15px;
+    padding: 0;
+    margin-top: -12px;
+    font-size: 24px;
+    line-height: 1;
+    background: none;
+    border: 0;
+    &:focus,
+    &:active {
+      outline: none;
+    }
+  }
+}
+
+[data-notify="icon"] {
+  display: inline-block;
+  width: 15%;
+  margin-left: -7.5px;
+  font-size: 18px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+[data-notify="message"] {
+  display: inline-block;
+  width: 85%;
+  padding-right: 5%;
+  font-size: $font-size-base;
+  vertical-align: middle;
+}
+
+// Descendants
+// =============================================================================
+
+[data-notify="container"].alert-danger,
+[data-notify="container"].alert-error {
+  @include notification-generator($brand-danger);
+}
+
+[data-notify="container"].alert-success {
+  @include notification-generator($brand-success);
+}
+
+[data-notify="container"].alert-warning {
+  @include notification-generator($brand-warning);
+}

data/app/assets/stylesheets/locomotive/unauthorized/_public.scss

@@ -0,0 +1,129 @@
+// =============================================================================
+// Public
+// =============================================================================
+
+// Adds an outer div which is fixed and spans the entire viewport.
+
+.public-background {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  text-align: center;
+  background: linear-gradient(to bottom, $brand-primary 60px, $brand-primary 20%, $brand-primary-alt);
+}
+
+// Centers the content of a public page.
+.public-container {
+  height: 100%;
+  width: 100%;
+  text-align: center;
+  animation: fade-down 1s ease-out;
+  &:before {
+    content: ' ';
+    display: inline-block;
+    vertical-align: middle;
+    height: 100%;
+  }
+}
+
+// Wraps and centers all content of the public forms.
+
+.public-form-wrapper {
+  width: 480px;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+// Adds a logo above the public form.
+
+.public-logo {
+  display: inline-block;
+  img,
+  span {
+    display: inline-block;
+    vertical-align: middle;
+  }
+  img {
+    display: inline-block;
+    height: 26px;
+    margin-right: 10px;
+    vertical-align: middle;
+  }
+  span {
+    margin-top: 2px;
+    font-family: $font-family-sans-serif-brand;
+    font-size: 20px;
+    line-height: 1.6;
+    color: $white;
+  }
+}
+
+// Contains the form styling. Note that each form should have a different
+// height calculated.
+
+.public-form {
+  display: block;
+  padding: 50px;
+  margin: 25px 0 20px;
+  background: $white;
+  border-radius: $border-radius-base;
+  box-shadow: 0 1px 10px rgba($black, .2);
+  form {
+    display: block;
+    width: 100%;
+    text-align: left;
+  }
+  .btn {
+    margin-top: 22px;
+  }
+}
+
+// Styles intro title and text above the public form.
+
+.public-form-text {
+  display: block;
+  margin-bottom: 20px;
+  text-align: center;
+  h3 {
+    margin-bottom: 15px;
+  }
+  p {
+    margin-bottom: 30px;
+    color: $gray-light;
+  }
+}
+
+// Creates a link below the public form.
+
+.public-link {
+  display: inline-block;
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba($white, .7);
+  transition: color $base-transition-speed linear;
+  &:hover,
+  &:active,
+  &:focus {
+    color: $white;
+    text-decoration: none;
+    outline: none;
+  }
+}
+
+// Responsive
+// =============================================================================
+
+@media (max-width: $screen-xs-min) {
+  .public-form-wrapper {
+    left: 0;
+    padding: 20px 10px;
+    margin-left: 0;
+  }
+  .public-form {
+    display: inline-block;
+    padding: 50px 20px;
+  }
+}

data/app/assets/stylesheets/locomotive/unauthorized/_type.scss

@@ -0,0 +1,14 @@
+// =============================================================================
+// Type
+// =============================================================================
+
+@import "bootstrap/type";
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 0;
+}

data/app/assets/stylesheets/locomotive/unauthorized/_variables.scss

@@ -0,0 +1,54 @@
+// =============================================================================
+// Variables
+// =============================================================================
+
+// Shades of gray
+
+$black: #000;
+$gray-darkest: #232528;
+$gray-darker: lighten($gray-darkest, 15);
+$gray-dark: lighten($gray-darkest, 30);
+$gray: lighten($gray-darkest, 45);
+$gray-light: lighten($gray-darkest, 65);
+$gray-lighter: lighten($gray-darkest, 75);
+$gray-lightest: lighten($gray-darkest, 85);
+$white: #fff;
+
+// Colors
+
+$brand-primary: #54b9cd;
+$brand-primary-alt: #5488cc;
+$brand-success: #00aa8f;
+$brand-warning: #f0ad4e;
+$brand-danger: #d9684c;
+
+// Fonts
+
+$font-family-sans-serif: "Noto Sans", sans-serif;
+$font-family-sans-serif-brand: "Muli", sans-serif;
+$font-size-base: 14px;
+
+// Common
+
+$border-radius-base: 3px;
+$border-color-base: $gray-lighter;
+$padding-base-vertical: 12px;
+$padding-base-horizontal: 15px;
+$base-transition-speed: .3s;
+
+// Headings
+
+$headings-font-family: $font-family-sans-serif-brand;
+$headings-color: $gray-dark;
+
+// Forms
+
+$input-bg: $white;
+$input-color: $gray-dark;
+$input-border: $gray-lighter;
+$input-border-focus: $gray;
+$input-box-shadow-focus: 0;
+$input-color-placeholder: $gray-light;
+$state-danger-text: $brand-danger;
+
+@import "bootstrap/variables";

data/app/assets/stylesheets/locomotive/unauthorized.scss

@@ -0,0 +1,34 @@
+// =============================================================================
+// Unauthorized
+// =============================================================================
+
+// Stylesheet for all un-authorized pages like register, sign in, ...
+
+// Core variables and mixins
+
+@import "unauthorized/variables";
+@import "bootstrap/mixins";
+@import "unauthorized/keyframes";
+
+// Reset and dependencies
+
+@import "bootstrap/normalize";
+@import "font-awesome-sprockets";
+@import "font-awesome";
+
+// Core CSS
+
+@import "bootstrap/scaffolding";
+@import "unauthorized/type";
+@import "bootstrap/grid";
+@import "unauthorized/forms";
+@import "bootstrap/buttons";
+
+// Components
+
+@import "bootstrap/alerts";
+
+// Custom components
+
+@import "unauthorized/notify";
+@import "unauthorized/public";

data/app/helpers/locomotive/dashboard_helper.rb

@@ -89,7 +89,7 @@ module Locomotive
 
     def activity_bulk_content_assets(params)
       list = params[:assets].map do |asset|
-        if asset[:image]
+        if asset[:image] && asset[:id] && current_site.content_assets.where(_id: asset[:id]).exists?
           content_tag(:li, link_to(image_tag(Locomotive::Dragonfly.resize_url(asset[:url], '60x60#'), alt: asset[:name]), asset[:url]))
         else
           content_tag(:li, link_to(truncate(asset[:name], length: 20), asset[:url]))

data/app/inputs/locomotive/rte_input.rb

@@ -15,6 +15,7 @@ module Locomotive
           wysihtml5_prefix: wysihtml5_prefix,
           link_popover:     link_popover,
           image_popover:    image_popover,
+          table_popover:    table_popover
         })
     end
 
@@ -37,6 +38,13 @@ module Locomotive
       )).html_safe
     end
 
+    def table_popover
+      remove_form(template.render(
+        partial:  'locomotive/shared/rte/table_popover',
+        locals:   { table_form: TableForm.new }
+      )).html_safe
+    end
+
     def remove_form(template)
       template.gsub(/<form([^<]*)>/, '')
         .gsub(/<input name="(utf8|authenticity_token)"([^<]*)>/, '')
@@ -50,5 +58,9 @@ module Locomotive
     class ImageForm < Struct.new(:src, :title, :alignment)
       include ActiveModel::Model
     end
+
+    class TableForm < Struct.new(:cols, :rows, :class_name, :head)
+      include ActiveModel::Model
+    end
   end
 end

data/app/models/locomotive/concerns/page/editable_elements.rb

@@ -8,8 +8,6 @@ module Locomotive
         included do
           embeds_many   :editable_elements, class_name: 'Locomotive::EditableElement', cascade_callbacks: true
 
-          # after_save    :remove_disabled_editable_elements
-
           accepts_nested_attributes_for :editable_elements
         end
 

data/app/models/locomotive/editable_element.rb

@@ -36,7 +36,7 @@ module Locomotive
     end
 
     def block_label
-      (@block_name || self.block).humanize
+      (@block_name || self.block).try(:humanize)
     end
 
     def disabled?

data/app/services/locomotive/content_asset_service.rb

@@ -20,7 +20,7 @@ module Locomotive
         site.content_assets.create(params)
       end
 
-      valid_assets = assets.map { |a| a.errors.empty? ? { name: a.source_filename, url: a.source.url, image: a.image? } : nil }.compact
+      valid_assets = assets.map { |a| a.errors.empty? ? { name: a.source_filename, url: a.source.url, image: a.image?, id: a._id } : nil }.compact
       track_activity 'content_asset.created_bulk', parameters: { assets: valid_assets } unless valid_assets.empty?
 
       assets

data/app/services/locomotive/page_parsing_service.rb

@@ -35,8 +35,8 @@ module Locomotive
 
         element = elements.first.last
 
-        { name: block, label: element.block_label, priority: element.block_priority }
-      end.sort { |a, b| b[:priority] <=> a[:priority] }
+        { name: block, label: element.block_label, priority: element.block_priority || 0 }
+      end.compact.sort { |a, b| b[:priority] <=> a[:priority] }
     end
 
     private
@@ -147,6 +147,8 @@ module Locomotive
 
     def add_or_modify_editable_element(page, attributes)
       if element = page.editable_elements.by_block_and_slug(attributes[:block], attributes[:slug]).first
+        # FIXME: we don't want to deal here with the generic Locomotive::EditableElement class
+        element = page.editable_elements.with_same_class!(element, "Locomotive::#{attributes[:type].to_s.classify}".constantize)
         element.attributes = attributes
         element
       else

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

@@ -2,7 +2,7 @@
 
 - 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')
+    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-style-path=stylesheet_path('locomotive/live_editing_iframe') data-edit-label=t('.iframe.buttons.edit')
 
 
 

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

@@ -1,14 +1,19 @@
-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 charset="utf-8"
+    meta http-equiv="x-ua-compatible" content="ie=edge"
+
+    title= escape_once(strip_tags(title) + " | Locomotive")
+
     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_include_tag  'locomotive/not_logged_in'
-    = stylesheet_link_tag     'locomotive/not_logged_in', media: 'screen'
+    = stylesheet_link_tag     'locomotive/unauthorized', media: 'screen'
 
     javascript:
       window.flash_messages = #{{flash_messages_to_json}};
@@ -16,11 +21,10 @@ html xmlns='http://www.w3.org/1999/xhtml' lang=I18n.locale
     = yield :head
 
   body class=[controller.controller_name, flash.empty? ? '' : 'with-flash'].join(' ')
-    .wrapper.container-fluid
-      .main
-        .content
-          h1
+    .public-background
+      .public-container
+        .public-form-wrapper
+          = link_to root_path, class: 'public-logo' do
             = image_tag 'locomotive/logo.png'
-            |  
-            == title
+            span Locomotive
           = yield

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

@@ -1,18 +1,18 @@
-- title current_site ? current_site.name : t('locomotive.not_logged_in.title')
+- title t('locomotive.passwords.edit.title')
 
-= locomotive_form_for(resource, as: resource_name, url: locomotive_account_password_path, html: { method: :put }) do |f|
+.public-form
+  .public-form-text
+    h3= t('locomotive.passwords.edit.title')
+    p= t('locomotive.passwords.edit.description')
 
-  = f.hidden_field :reset_password_token
+  = locomotive_form_for(resource, as: resource_name, url: locomotive_account_password_path, html: { method: :put }) do |f|
+    = f.hidden_field :reset_password_token
 
-  = f.inputs do
-    = f.input :password, label: t('.password'), required: false
-    = f.input :password_confirmation, label: t('.password_confirmation'), required: false
-
-  = f.actions do
-    = f.button :submit, t('.submit'), class: 'btn'
-
-    br
-
-    p= link_to t('.link').html_safe, new_locomotive_account_session_path
+    = f.inputs do
+      = f.input :password, label: t('.password'), required: false
+      = f.input :password_confirmation, required: false, label: false, placeholder: t('locomotive.passwords.edit.password_confirmation')
 
+    = f.actions do
+      = f.button :submit, t('.submit'), class: 'btn btn-primary'
 
+= link_to t('.link').html_safe, new_locomotive_account_session_path, class: "public-link"

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

@@ -1,17 +1,20 @@
-- title current_site ? current_site.name : t('locomotive.not_logged_in.title')
+- title t('locomotive.passwords.new.title')
 
-= locomotive_form_for(resource, as: resource_name, url: locomotive_account_password_path) do |f|
+.public-form
+  .public-form-text
+    h3= t('locomotive.passwords.new.title')
+    p= t('locomotive.passwords.new.description')
 
-  = f.hidden_field :reset_password_token
+  = locomotive_form_for(resource, as: resource_name, url: locomotive_account_password_path) do |f|
 
-  = f.inputs do
-    = flash_message
-    = f.input :email, label: t('.email'), required: false
+    = f.hidden_field :reset_password_token
 
-  = f.actions do
-    = f.button :submit, t('.submit'), class: 'btn'
+    = f.inputs do
+      = flash_message
+      = f.input :email, label: t('.email'), required: false
 
-    br
+    = f.actions do
+      = f.button :submit, t('.submit'), class: 'btn btn-primary'
 
-    p
-      = link_to t('.link').html_safe, new_locomotive_account_session_path
+
+= link_to t('.link').html_safe, new_locomotive_account_session_path, class: "public-link"

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

@@ -1,17 +1,18 @@
-- title t('locomotive.not_logged_in.title')
+- title t('locomotive.registrations.new.title')
 
-= locomotive_form_for resource, as: resource_name, url: sign_up_path do |f|
+.public-form
+  .public-form-text
+    h3= t('locomotive.registrations.new.title')
+    p= t('locomotive.registrations.new.description')
 
-  = f.inputs do
-    = f.input :name, required: true, autofocus: true
-    = f.input :email, required: true
-    = f.input :password, required: true, hint: !@minimum_password_length.nil?
-    = f.input :password_confirmation, required: true
+  = locomotive_form_for resource, as: resource_name, url: sign_up_path do |f|
+    = f.inputs do
+      = f.input :name, required: true, autofocus: true
+      = f.input :email, required: true
+      = f.input :password, required: true, hint: !@minimum_password_length.nil?
+      = f.input :password_confirmation, required: true, label: false, placeholder: t('locomotive.registrations.new.confirm_password')
 
-  = f.actions do
-    = f.button :submit, t('.submit'), class: 'btn'
+    = f.actions do
+      = f.button :submit, t('.submit'), class: 'btn btn-primary'
 
-    br
-
-    p
-      = link_to t('.sign_in'), new_locomotive_account_session_path
+= link_to t('.sign_in'), new_locomotive_account_session_path, class: 'public-link'

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

@@ -1,20 +1,21 @@
-- title current_site ? current_site.name : t('locomotive.not_logged_in.title')
+- title t('locomotive.sessions.new.title')
 
-- set_error_from_flash(resource, :email)
+.public-form
+  .public-form-text
+    h3= t('locomotive.sessions.new.title')
 
-= locomotive_form_for(resource, as: resource_name, url: locomotive_account_session_path) do |f|
+  - set_error_from_flash(resource, :email)
 
-  = f.hidden_field :remember_me, value: 'true'
+  = locomotive_form_for(resource, as: resource_name, url: locomotive_account_session_path) do |f|
 
-  = 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 }
+    = f.hidden_field :remember_me, value: 'true'
 
-  = f.actions do
-    = f.button :submit, t('.submit'), class: 'btn'
+    = 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 }
 
-    - if current_site.nil?
+    = f.actions do
+      = f.button :submit, t('.submit'), class: 'btn btn-primary'
 
-      br
-
-      p= link_to t('.sign_up').html_safe, sign_up_path
+- if current_site.nil?
+  = link_to t('.sign_up').html_safe, sign_up_path, class: 'public-link'

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

@@ -7,36 +7,6 @@
       i.fa.fa-italic
 
   span.wysihtml5-toolbar-group
-    / a data-markdown-command='insertUnorderedList'
-    /   i.fa.fa-list-ul
-    / a data-markdown-command='insertOrderedList'
-    /   i.fa.fa-list-ol
-    / a.style
-    /   i.fa.fa-paragraph
-
-    / .style-dialog-content style='display: none'
-    /   a data-markdown-command='formatBlock' data-markdown-command-value='h1' H1
-    /   br
-    /   a data-markdown-command='formatBlock' data-markdown-command-value='h2' H2
-    /   br
-    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H3
-    /   br
-    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H4
-    /   br
-    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H5
-    /   br
-    /   a data-markdown-command='formatBlock' data-markdown-command-value='h3' H6
-    /   br
-    /   a data-markdown-command='formatBlock' data-markdown-command-value='blockquote'
-    /     i.fa.fa-quote-right
-    /   br
-
-    / a data-markdown-command='createLink'
-    /   i.fa.fa-chain
-    / = link_popover
-    / a data-markdown-command='removeLink'
-    /   i.fa.fa-chain-broken
-
     a data-url=content_assets_path data-markdown-command='insertFile'
       i.fa.fa-file-o
     = image_popover