locomotivecms 3.0.0.rc6 → 3.0.0.rc7

data/app/assets/stylesheets/locomotive/components/misc/_modal.scss

@@ -1,5 +1,5 @@
 .modal-content {
-  @include border-radius(3px);
+  border-radius: 3px;
 }
 
 .modal-title {

data/app/assets/stylesheets/locomotive/components/sidebar/_pages_tree.scss

@@ -97,7 +97,7 @@ $pt_warning_color:      #f89406;
       .sortable-placeholder {
         background-color: $pt_placeholder_color;
         height: 20px;
-        @include border-radius(10px);
+        border-radius: 10px;
         border: none;
       }
 

data/app/assets/stylesheets/locomotive/globals/_mixins.scss

@@ -6,52 +6,8 @@
   left: 0;
 }
 
-@mixin display-flex {
-  display: -webkit-box;      /* OLD - iOS 6-, Safari 3.1-6 */
-  display:    -moz-box;      /* OLD - Firefox 19- (buggy but mostly works) */
-  display: -ms-flexbox;      /* TWEENER - IE 10 */
-  display: -webkit-flex;     /* NEW - Chrome */
-  display:         flex;     /* NEW, Spec - Opera 12.1, Firefox 20+ */
-}
-
-@mixin flex-justify-content($alignment) {
-          justify-content: $alignment;
-
-  -webkit-box-pack: $alignment;
-     -moz-box-pack: $alignment;
-  -ms-flex-pack: $alignment;
-  -webkit-justify-content: $alignment;
-     -moz-justify-content: $alignment;
-}
-
-@mixin flex-align($alignment) {
-          align-items: $alignment;
-
-  -webkit-flex-align: $alignment;
-      -ms-flex-align: $alignment;
-  -webkit-align-items: $alignment;
-}
-
-@mixin flex-direction($direction) {
-          flex-direction: $direction;
-
-  -webkit-flex-direction: $direction;
-}
-
-@mixin flex-wrap {
-          flex-wrap: wrap;
-
-  -webkit-flex-wrap: wrap;
-}
-
-@mixin flex-justify-content($content) {
-          justify-content: $content;
-
-  -webkit-justify-content: $content;
-}
-
 @mixin locomotive_gradient {
-  @include background-image(linear-gradient(top, $background_gradient_start 60px, $background_gradient_start 20%, $background_gradient_end));
+  background: linear-gradient(to bottom, $background_gradient_start 60px, $background_gradient_start 20%, $background_gradient_end);
   background-position: left top;
   background-repeat: no-repeat;
   background-size: 100%;

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

@@ -5,7 +5,7 @@
 // Bootstrap variables
 // =============================================================================
 
-$brand-primary: #54b9cd !default;
+$brand-primary: #1c77c3 !default;
 $brand-success: #54cc68 !default;
 $brand-warning: #f0ad4e !default;
 $brand-danger: #d9684c !default;
@@ -67,7 +67,7 @@ $navbar-margin-bottom: 0 !default;
 $navbar-border-radius: 0 !default;
 $navbar-padding-vertical: 20px !default;
 $navbar-default-color: #fff !default;
-$navbar-default-bg: #59b9cc !default;
+$navbar-default-bg: $brand-primary !default;
 $navbar-default-border: transparent;
 $navbar-default-link-color: #fff !default;
 $navbar-default-link-hover-color: #eee !default;
@@ -162,7 +162,7 @@ $form_input_rte_command_active_color: #333;
 $content_list_item_background_color: #fff;
 $content_list_item_border_color: #dadada;
 $content_list_item_border_size: 1px;
-$content_list_item_border_hover_color: #54b9cd;
+$content_list_item_border_hover_color: #1c77c3;
 $content_list_item_border_hover_size: 4px;
 $content_list_item_link_color: #595959;
 $content_list_item_stamp_color: #949999;

data/app/assets/stylesheets/locomotive/layouts/_error.scss

@@ -23,10 +23,10 @@ body {
     right: $grid-gutter-width;
     left: $grid-gutter-width;
     .content {
-      @include display-flex;
-      @include flex-direction(column);
-      @include flex-align(center);
-      @include flex-justify-content(center);
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
       height: 100%;
     }
   }

data/app/assets/stylesheets/locomotive/layouts/_not_logged_in.scss

@@ -23,10 +23,10 @@ body {
     right: $grid-gutter-width;
     left: $grid-gutter-width;
     .content {
-      @include display-flex;
-      @include flex-direction(column);
-      @include flex-align(center);
-      @include flex-justify-content(center);
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
       height: 100%;
     }
   }

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

@@ -1,7 +1,6 @@
-@import "compass/css3/border-radius";
 @import "font-awesome/mixins";
 
-$button-background:     #54b9cd;
+$button-background:     #1c77c3;
 $button-border-color:   darken($button-background, 10%) !default;
 $button-color:          #fff;
 
@@ -42,7 +41,7 @@ $fa-version:            '4_4_0';
     background-image: none;
     border: none;
     border-bottom: 2px solid $button-border-color;
-    @include border-radius(3px);
+    border-radius: 3px;
     color: $button-color;
     cursor: pointer;
     display: inline-block;

data/app/controllers/locomotive/my_account_controller.rb

@@ -7,7 +7,7 @@ module Locomotive
 
     before_filter :load_account
 
-    layout '/locomotive/layouts/without_site'
+    layout '/locomotive/layouts/account'
 
     def edit
       authorize @account

data/app/helpers/locomotive/editable_elements_helper.rb

@@ -25,7 +25,7 @@ module Locomotive
         hint:         editable_element.hint,
         wrapper_html: {
           id:   "#{editable_element.type.to_s.dasherize}-#{editable_element._id}",
-          data: { block: editable_element.block || '' }
+          data: { block: editable_element.block || '', path: editable_element.path }
         }
       }.merge(options)
     end

data/app/helpers/locomotive/errors_helper.rb

@@ -16,7 +16,7 @@ module Locomotive
     end
 
     def no_site_message(error_type)
-      t(error_type, host: request.host, scope: 'locomotive.errors.no_site.messsage')
+      t(error_type, host: request.host, scope: 'locomotive.errors.no_site.message')
     end
 
   end

data/app/inputs/locomotive/api_key_input.rb

@@ -15,7 +15,7 @@ module Locomotive
     def regenerate_button
       url = options[:url]
       template.content_tag :button, I18n.t('simple_form.buttons.locomotive.account.new_api_key'),
-        class:  'btn btn-default btn-primary btn-sm',
+        class:  'btn btn-default btn-sm form-control-button',
         data:   {
           url:      url,
           confirm:  I18n.t('locomotive.messages.confirm')

data/app/inputs/locomotive/array_input.rb

@@ -66,7 +66,7 @@ module Locomotive
       if options[:select_options]
         template.select_tag(singularized_name, template.options_for_select(options[:select_options]), class: css)
       elsif data = options[:picker]
-        template.hidden_field_tag('id', '', class: css, data: data)
+        template.select_tag('id', '', class: css, data: data)
       else
         text_options = input_html_options.dup
         text_options[:class] << css

data/app/inputs/locomotive/document_picker_input.rb

@@ -9,18 +9,19 @@ module Locomotive
 
       row_wrapping do
         (col_wrapping('field col-xs-9', 11) do
-          hidden_field(data)
+          select_field(data)
         end) + (col_wrapping('button col-xs-3 text-right', 1) do
           link_to_edit
         end)
       end
     end
 
-    def hidden_field(data)
-      @builder.hidden_field(:"#{attribute_name}_id", {
-        class:  'form-control',
-        data:   data
-      })
+    def select_field(data)
+      @builder.collection_select(
+        :"#{attribute_name}_id", [selected_document].compact,
+        :_id, data[:label_method],
+        { include_blank: true }, { class: 'form-control', data: data }
+      )
     end
 
     def link_to_edit
@@ -42,11 +43,14 @@ module Locomotive
     end
 
     def document_label(label_method)
-      if document = self.object.send(attribute_name.to_sym)
-        document.send(label_method.to_sym)
-      else
-        nil
-      end
+      selected_document.try(label_method.to_sym)
+    end
+
+    def selected_document
+      return @selected_document if @selected_document_done
+
+      @selected_document_done = true
+      @selected_document      = self.object.send(attribute_name.to_sym)
     end
 
   end

data/app/inputs/locomotive/file_input.rb

@@ -8,7 +8,7 @@ module Locomotive
     include Locomotive::SimpleForm::BootstrapHelpers
 
     def input(wrapper_options = nil)
-      row_wrapping(data: { persisted: persisted_file?, persisted_file: persisted_file? }) do
+      row_wrapping(data: { persisted: persisted_file?, persisted_file: persisted_file?, resize_format: options[:resize_format] }) do
         file_html + buttons_html
       end
     end

data/app/inputs/locomotive/simple_image_input.rb

@@ -0,0 +1,88 @@
+module Locomotive
+  class SimpleImageInput < ::SimpleForm::Inputs::FileInput
+
+    extend Forwardable
+
+    def_delegators :template, :link_to, :content_tag, :image_tag
+
+    def input(wrapper_options = nil)
+      <<-EOF
+<div class="file-wrapper" #{file_wrapper_options}>
+  <div class="file-image">
+    #{image_html}
+    #{actions}
+  </div>
+  <label class="file">
+    #{file_input}
+    <span class="file-custom">
+      <span class="file-name">#{filename_html}</span>
+      <span class="file-browse">#{text(:browse)}</span>
+    </span>
+  </label>
+</div>
+      EOF
+    end
+
+    def file_input
+      @builder.file_field(attribute_name, input_html_options.merge(accept: 'image/*')) +
+      @builder.hidden_field(:"remove_#{attribute_name}", class: 'remove', value: '0') +
+      @builder.hidden_field(:"remote_#{attribute_name}_url", class: 'remote-url', value: '')
+    end
+
+    def image_html
+      url = resized_file_url || options[:default_url]
+      url ? template.image_tag(url) : ''
+    end
+
+    def actions
+      <<-EOF
+      <i class="fa fa-trash" data-action="delete"></i>
+      <i class="fa fa-undo" data-action="undo" style="display: none;"></i>
+      <span class="spinner" style="display: none;">
+        <i class="fa fa-circle-o-notch fa-spin" ></i>
+      </span>
+      EOF
+    end
+
+    def resize_format
+      options[:resize] || '96x96#'
+    end
+
+    def filename_html
+      if file?
+        template.link_to(File.basename(file.to_s), file.url, target: 'blank')
+      else
+        text(:none)
+      end
+    end
+
+    def file?
+      self.object.send(:"#{attribute_name}?")
+    end
+
+    def file
+      self.object.send(attribute_name.to_sym)
+    end
+
+    def resized_file_url
+      if file?
+        Locomotive::Dragonfly.resize_url file.url, resize_format
+      end
+    end
+
+    def file_wrapper_options
+      {
+        resize:         resize_format,
+        persisted:      file?,
+        url:            resized_file_url,
+        default_url:    options[:default_url],
+        no_file_label:  text(:none)
+      }.map { |k, value| "data-#{k.to_s.dasherize}=\"#{value}\"" }.join(' ')
+    end
+
+    def text(name)
+      I18n.t(name, scope: 'locomotive.inputs.file')
+    end
+
+  end
+end

data/app/models/locomotive/concerns/site/locales.rb

@@ -31,6 +31,8 @@ module Locomotive
           self.locales.size > 1
         end
 
+        # TODO: use the Steam service instead
+        #
         # Returns the fullpath of a page in the context of the current locale (I18n.locale)
         # or the one passed in parameter. It also depends on the default site locale.
         #

data/app/models/locomotive/editable_element.rb

@@ -39,6 +39,10 @@ module Locomotive
       (@block_name || self.block).try(:humanize)
     end
 
+    def path
+      [block, slug].compact.join('--').gsub('/', '--')
+    end
+
     def disabled?
       !!self.disabled # the original method does not work quite well with the localization
     end

data/app/models/locomotive/editable_file.rb

@@ -8,6 +8,7 @@ module Locomotive
 
     ## fields ##
     field :default_source_url, localize: true
+    field :resize_format
 
     ## callbacks ##
     after_initialize :init_localized_source

data/app/policies/locomotive/site_policy.rb

@@ -46,11 +46,11 @@ module Locomotive
     end
 
     def permitted_attributes
-      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain, :private_access, :password]
+      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain, :private_access, :password, :prefix_default_locale]
       hash  = { domains: [], locales: [], url_redirections: [] }
 
       unless update_advanced?
-        plain -= [:timezone_name, :robots_txt, :cache_enabled]
+        plain -= [:timezone_name, :robots_txt, :cache_enabled, :prefix_default_locale]
         hash.delete(:locales)
         hash.delete(:url_redirections)
       end

data/app/uploaders/locomotive/theme_asset_uploader.rb

@@ -10,7 +10,7 @@ module Locomotive
     end
 
     def extension_white_list
-      %w(jpg jpeg gif png css js swf flv eot svg ttf woff woff2 otf ico htc map)
+      %w(jpg jpeg gif png css js swf flv eot svg svgz ttf woff woff2 otf ico htc map html cur)
     end
 
     def apply_content_type_exception(value)

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

@@ -1,6 +1,8 @@
 = f.inputs :advanced do
   = f.input :locales, as: :array, template: :locale, template_url: new_locale_current_site_path(current_site), select_options: options_for_site_locales
 
+  = f.input :prefix_default_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' }

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

@@ -16,7 +16,7 @@
           = 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])
+          = g.input :source, editable_element_input_options(editable_element, index, as: :file, select_content_asset: true, resize_format: editable_element.resize_format, hidden_fields: [:content, :default_source_url])
 
         - 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']] })

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

@@ -1,2 +1,9 @@
-h2.text-center
-  == t('.message')
+.public-box
+  .public-intro
+    h3.text-center
+      == error_title
+
+  br
+
+  p.text-center
+    == t('.message')

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

@@ -1,2 +1,9 @@
-h2.text-center
-  == t('.message')
+.public-box
+  .public-intro
+    h3.text-center
+      == error_title
+
+  br
+
+  p.text-center
+    == t('.message')