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

data/app/assets/stylesheets/locomotive/base/form/_popover.scss

@@ -34,6 +34,28 @@
             }
           }
         }
+
+        &.select {
+          .form-wrapper {
+            border: none;
+            .form-control {
+              border-width: 3px;
+              height: 28px;
+              line-height: 28px;
+
+              .select2-choice {
+                padding-left: 0px;
+                height: 28px;
+                line-height: 14px;
+
+                .select2-arrow {
+                  top: -8px;
+                  height: 28px;
+                }
+              }
+            }
+          }
+        }
       }
     }
 

data/app/assets/stylesheets/locomotive/base/form/_rte.scss

@@ -1,6 +1,6 @@
 .simple_form {
 
-  fieldset .input.rte {
+  fieldset .input.rte, fieldset .input.markdown {
 
     .form-wrapper {
 
@@ -15,6 +15,7 @@
           font-size: $form_input_rte_command_font_size;
           color: $form_input_rte_command_color;
           margin-right: 6px;
+          cursor: pointer;
 
           &.wysihtml5-command-active {
             color: $form_input_rte_command_active_color;

data/app/assets/stylesheets/locomotive/components/_activity_feed.scss

@@ -5,6 +5,7 @@ $activity_feed_time_color:        #949999;
 .activity-feed {
   list-style: none;
   border-left: 1px solid #ddd;
+  padding-top: 1px;
   padding-left: 50px;
 
   margin-left: 40px;

data/app/assets/stylesheets/locomotive/components/_dashboard.scss

@@ -0,0 +1,29 @@
+body.dashboard {
+
+  .main {
+    h3 {
+      color: $main_title_color;
+      font-size: 16px;
+
+      &.url {
+        strong {
+          display: inline-block;
+          margin-left: 10px;
+          font-size: 18px;
+          color: $paragraph_color;
+          font-weight: bold;
+        }
+      }
+
+      .btn {
+        margin-left: 10px;
+      }
+    }
+
+    .activity-feed {
+      margin-top: 30px;
+    }
+
+  }
+
+}

data/app/assets/stylesheets/locomotive/components/_live_editing.scss

@@ -1,5 +1,17 @@
 body.live-editing {
 
+  .slide-sidebar {
+    position: fixed;
+    background: #383838;
+    height: 100%;
+    width: $live_editing_expand_bar_width;
+    z-index: 999;
+
+    .bar {
+      @include control-window-button;
+    }
+  }
+
   .content .close-button, .content .expand-button {
     @include control-window-button;
     z-index: 995;
@@ -29,7 +41,7 @@ body.live-editing {
 
   .preview {
     border-left: $live_editing_content_width solid #fff;
-    left: -$live_editing_content_width;
+    left: -$live_editing_content_width + $live_editing_expand_bar_width;
   }
 
   .content {

data/app/assets/stylesheets/locomotive/components/_main.scss

@@ -2,7 +2,7 @@
 
   background: $main_background_color;
 
-  > .row:first-child, .header-row {
+  .header-row {
 
     padding: 20px 0px;
 

data/app/assets/stylesheets/locomotive/components/_transitions.scss

@@ -28,6 +28,27 @@ body.slide-right-sidebar {
 
 body.live-editing {
 
+  // SIDEBAR
+  .slide-sidebar {
+    .bar {
+      @include transition(opacity 0.3s ease-in-out);
+    }
+    .sidebar {
+      @include transform(translate3d(0, 0, 0));
+      @include transition(transform 0.2s ease-in-out);
+    }
+
+    &:hover {
+      .bar {
+        @include opacity(0);
+      }
+      .sidebar {
+        @include transform(translate3d($sidebar_width, 0, 0));
+      }
+    }
+  }
+
+
   // STATE: SHRINKED
 
   .content {
@@ -53,7 +74,7 @@ body.live-editing {
     // STATE: EXPANDED
 
     .content {
-      @include transform(translate3d($live_editing_content_width - 2em, 0, 0));
+      @include transform(translate3d($live_editing_content_width - $live_editing_expand_bar_width, 0, 0));
 
       @include transition(transform 0.3s ease-in-out, background-color 0.1s ease-in-out 0.2s);
       > .inner {
@@ -66,8 +87,8 @@ body.live-editing {
     }
 
     .preview {
-      @include transform(translate3d($live_editing_content_width - 2em, 0, 0));
-      border-left-width: 2em;
+      @include transform(translate3d($live_editing_content_width - $live_editing_expand_bar_width, 0, 0));
+      border-left-width: $live_editing_expand_bar_width;
       @include transition(transform 0.3s ease-in-out);
     }
 

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

@@ -9,6 +9,7 @@
 
   section {
     border-bottom: 1px solid $sidebar_section_border_color;
+    -webkit-font-smoothing: subpixel-antialiased; // avoid thin fonts in Safari when the sidebar is sliding
 
     h1 {
       font-size: $sidebar_title_font_size;

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

@@ -464,8 +464,8 @@ $nav-tabs-active-link-hover-border-color:      $brand-primary !default; // #5199
 // $state-info-bg:                  #d9edf7 !default;
 // $state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !default;
 
-$state-warning-text:                #8a6d3b !default;
-$state-warning-bg:                  #fcf8e3 !default;
+$state-warning-text:                #8a6d3b !default; /*#8a6d3b !default;*/
+$state-warning-bg:                  #fcf8e3 !default; /* #fcf8e3 !default; */
 // $state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
 
 // $state-danger-text:              #a94442 !default;

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

@@ -37,13 +37,14 @@ $drawer_background_color:                 white;
 $drawer_title_color:                      #666;
 
 $control_window_button_size:              30px;
-$control_window_button_color:             #fff; //#333;
-$control_window_background_color:         #333;
+$control_window_button_color:             #fff;
+$control_window_background_color:         #383838;
 
 $live_editing_content_width:                40em;
 $live_editing_content_border_color:         $navbar-default-bg;
 $live_editing_content_background_color:     #fff;
-$live_editing_content_alt_background_color: #333;
+$live_editing_content_alt_background_color: #383838;
+$live_editing_expand_bar_width:             2em;
 
 $form_input_background_color:             #f7f7f7;
 $form_input_hovered_background_color:     #f7f8d1;

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

@@ -1,5 +1,9 @@
 body.live-editing {
 
+  .slide-sidebar {
+
+  }
+
   .preview {
     position: absolute;
     top: 0px;

data/app/controllers/locomotive/concerns/locale_helpers_controller.rb

@@ -36,6 +36,7 @@ module Locomotive
       end
 
       def setup_i18n_fallbacks
+        ::Mongoid::Fields::I18n.clear_fallbacks
         (current_site.try(:locales) || []).each do |locale|
           ::Mongoid::Fields::I18n.fallbacks_for(locale, current_site.locale_fallbacks(locale))
         end

data/app/controllers/locomotive/content_entries_controller.rb

@@ -18,7 +18,7 @@ module Locomotive
 
     def index
       authorize ContentEntry
-      @content_entries = service.all(params.slice(:page, :per_page, :q, :where))
+      @content_entries = service.all(list_params)
       respond_with @content_entries
     end
 
@@ -45,7 +45,7 @@ module Locomotive
     end
 
     def new
-      @content_entry = @content_type.entries.build(params[:content_entry])
+      @content_entry = @content_type.entries.build(params[:content_entry] ? content_entry_params : {})
       respond_with @content_entry
     end
 
@@ -92,6 +92,14 @@ module Locomotive
       @service ||= Locomotive::ContentEntryService.new(load_content_type, current_locomotive_account)
     end
 
+    def list_params
+      if @content_type.order_manually?
+        params.slice(:q, :where).merge(no_pagination: true)
+      else
+        params.slice(:page, :per_page, :q, :where)
+      end
+    end
+
     def content_entry_params
       params.require(:content_entry).permit(service.permitted_attributes)
     end

data/app/controllers/locomotive/pages_controller.rb

@@ -25,6 +25,7 @@ module Locomotive
 
     def edit
       authorize @page
+      @page.find_layout
       respond_with @page
     end
 
@@ -53,7 +54,7 @@ module Locomotive
     end
 
     def page_params
-      params.require(:page).permit(:title, :layout_id, :slug, :parent_id, :listed, :published, :redirect, :redirect_url, :redirect_type, :seo_title, :meta_description, :meta_keywords)
+      params.require(:page).permit(:title, :layout_id, :slug, :parent_id, :listed, :published, :redirect, :redirect_url, :redirect_type, :seo_title, :meta_description, :meta_keywords, :cache_enabled)
     end
 
     def service

data/app/controllers/locomotive/passwords_controller.rb

@@ -3,17 +3,33 @@ module Locomotive
 
     include Locomotive::Concerns::WithinSiteController
 
-    within_site_only_if_existing
+    within_site_only_if_existing true
 
     layout '/locomotive/layouts/not_logged_in'
 
     helper Locomotive::BaseHelper
 
+    before_filter :set_locale
+
+    def update
+      super do |resource|
+        if params[:locomotive_account].try(:[], 'password').blank?
+          resource.errors.add_on_blank(:password)
+        end
+      end
+    end
+
     private
 
     def after_sending_reset_password_instructions_path_for(resource_name)
       new_locomotive_account_session_path
     end
 
+    def set_locale
+      if current_site?
+        I18n.locale = current_site.accounts.first.locale
+      end
+    end
+
   end
 end

data/app/helpers/locomotive/base_helper.rb

@@ -37,6 +37,7 @@ module Locomotive
     def locomotive_form_for(object, *args, &block)
       options = args.extract_options!
       options[:wrapper] = :locomotive
+      (options[:data] ||= {})[:blank_required_fields_message] = t(:blank_required_fields, scope: 'simple_form')
       simple_form_for(object, *(args << options.merge(builder: Locomotive::FormBuilder)), &block)
     end
 
@@ -220,5 +221,23 @@ module Locomotive
       end
     end
 
+    # cache keys
+
+    def cache_key_for_sidebar
+      "#{Locomotive::VERSION}/site/#{current_site._id}/sidebar/#{current_site.last_modified_at.to_i}/role/#{current_membership.role}/locale/#{::Mongoid::Fields::I18n.locale}"
+    end
+
+    def cache_key_for_sidebar_pages
+      count          = current_site.pages.count
+      max_updated_at = current_site.pages.max(:updated_at).try(:utc).try(:to_s, :number).to_i
+      "#{Locomotive::VERSION}/site/#{current_site._id}/sidebar/pages-#{count}-#{max_updated_at}/locale/#{::Mongoid::Fields::I18n.locale}"
+    end
+
+    def cache_key_for_sidebar_content_types
+      count          = current_site.content_types.count
+      max_updated_at = current_site.content_entries.max(:updated_at).try(:utc).try(:to_s, :number).to_i
+      "#{Locomotive::VERSION}/site/#{current_site._id}/sidebar/content_types-#{count}-#{max_updated_at}"
+    end
+
   end
 end

data/app/helpers/locomotive/content_types_helper.rb

@@ -14,7 +14,8 @@ module Locomotive
       link = edit_content_entry_path(current_site, content_type.slug, entry)
 
       if content_type.entry_template.blank?
-        link_to entry._label, link  # default one
+        label = entry._label(content_type).presence || t(:untranslated, scope: 'locomotive.shared.list')
+        link_to label, link  # default one
       else
         assigns   = { 'site' => current_site, 'entry' => entry.to_liquid(content_type), 'link' => link, 'today' => Date.today, 'now' => Time.zone.now }
         registers = { site: current_site, locale: ::Mongoid::Fields::I18n.locale.to_s, services: Locomotive::Steam::Services.build_instance }

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -164,12 +164,25 @@ module Locomotive
       { as: :string }
     end
 
+    def color_custom_field_options(field, entry)
+      {
+        as: :color,
+        wrapper_html: { class: 'color' }
+      }
+    end
+
     def tags_custom_field_options(field, entry)
       { wrapper_html: { class: 'tags' } }
     end
 
     def text_custom_field_options(field, entry)
-      { as: field.text_formatting ? :rte : :text }
+      type = case field.text_formatting
+      when 'html', nil, ''  then :rte
+      when 'markdown'       then :markdown
+      else :text
+      end
+
+      { as: type }
     end
 
     def custom_field_picker_options(field, slug)

data/app/helpers/locomotive/dashboard_helper.rb

@@ -1,6 +1,18 @@
 module Locomotive
   module DashboardHelper
 
+    def current_site_url
+      if current_site.domains.blank?
+        preview_url(current_site)
+      else
+        URI.join('http://' + current_site.domains.first).tap do |uri|
+          uri.port = request.port if request.port != 80 && request.port != 443
+        end.to_s
+      end
+    end
+
+    # Activity
+
     def activity_to_icon(activity)
       case activity.domain
       when 'site'             then 'fa-cog'

data/app/helpers/locomotive/editable_elements_helper.rb

@@ -10,6 +10,14 @@ module Locomotive
       end
     end
 
+    def editable_text_format_to_input_type(editable_element)
+      case editable_element.format
+      when 'html'     then :rte
+      when 'markdown' then :markdown
+      else :text
+      end
+    end
+
     def editable_element_input_options(editable_element, index, options = {})
       {
         label:        editable_element_label(editable_element),
@@ -33,10 +41,7 @@ module Locomotive
     end
 
     def nice_editable_elements_path
-      _path = params[:preview_path] || current_site.localized_page_fullpath(@page, current_content_locale)
-      _path = 'index' if _path.blank?
-
-      truncate('/' + _path, length: 50)
+      preview_page_path(@page)
     end
 
     def options_for_page_blocks(blocks)

data/app/helpers/locomotive/pages_helper.rb

@@ -34,18 +34,9 @@ module Locomotive
       layouts = current_site.pages.layouts.map do |_layout|
         [_layout.title, _layout._id]
       end
-      [[t(:no_layout, scope: 'locomotive.pages.form'), 'parent']] + layouts
+      @page.index? ? layouts : [[t(:no_layout, scope: 'locomotive.pages.form'), 'parent']] + layouts
     end
 
-    # def options_for_page_response_type
-    #   [
-    #     ['HTML', 'text/html'],
-    #     ['RSS', 'application/rss+xml'],
-    #     ['XML', 'text/xml'],
-    #     ['JSON', 'application/json']
-    #   ]
-    # end
-
     def options_for_page_redirect_type
       [
         [t('.redirect_type.permanent'), 301],
@@ -53,9 +44,5 @@ module Locomotive
       ]
     end
 
-    # def page_response_type_to_string(page)
-    #   options_for_page_response_type.detect { |t| t.last == page.response_type }.try(:first) || '—'
-    # end
-
   end
 end