locomotive_cms 2.0.0.rc9 → 2.0.0.rc10

data/Gemfile

@@ -12,6 +12,7 @@ group :development do
   # gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github
 
   # gem 'locomotive-aloha-rails', :path => '../gems/aloha-rails' # for Developers
+  # gem 'locomotive_liquid', :path => '../gems/liquid' # for Developers
 
   gem 'rspec-rails', '~> 2.8.0' # In order to have rspec tasks and generators
   gem 'rspec-cells'
@@ -34,18 +35,18 @@ group :test do
 
   # gem 'growl-glue'
 
-  gem 'cucumber-rails', :require => false
-  gem 'poltergeist'
-  gem 'rspec-rails', '~> 2.8.0'
+  gem 'cucumber-rails',     :require => false
+  gem 'poltergeist',        '~> 0.7.0'
+  gem 'rspec-rails',        '~> 2.8.0'
   gem 'shoulda-matchers'
 
   gem 'factory_girl_rails', '~> 1.6.0'
   gem 'pickle'
-  gem 'mocha', '0.9.12' # :git => 'git://github.com/floehopper/mocha.git'
+  gem 'mocha',              '0.9.12' # :git => 'git://github.com/floehopper/mocha.git'
 
   gem 'capybara'
 
-  gem 'xpath', '~> 0.1.4'
+  gem 'xpath',              '~> 0.1.4'
 
   gem 'json_spec'
 

data/app/assets/javascripts/locomotive/inline_editor.js.coffee

@@ -16,7 +16,7 @@
 #= require_tree ./views/inline_editor
 
 window.Locomotive =
-  mounted_on:   '/locomotive' # default path
+  mounted_on:   window.Locomotive.mounted_on
   Models:       {}
   Collections:  {}
   Views:        {}

data/app/assets/javascripts/locomotive/models/custom_field_select_option.js.coffee

@@ -1,5 +1,8 @@
 class Locomotive.Models.CustomFieldSelectOption extends Backbone.Model
 
+  destroyed: ->
+    @get('_destroy') == true
+
   toJSONForSave: ->
     _.tap {}, (hash) =>
       for key, value of @.toJSON()

data/app/assets/javascripts/locomotive/models/site.js.coffee

@@ -13,7 +13,8 @@ class Locomotive.Models.Site extends Backbone.Model
 
     @set domains: domains, memberships: memberships
 
-  includes_domain: (name) ->
+  includes_domain: (name_with_port) ->
+    name = name_with_port.replace(/:[0-9]*/, '')
     name == @domain_with_domain() || _.any(@get('domains'), (domain) -> domain.get('name') == name)
 
   domain_with_domain: ->

data/app/assets/javascripts/locomotive/views/content_entries/_form_view.js.coffee

@@ -6,6 +6,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
   el: '#content'
 
+  _select_field_view: null
+
   _file_field_views: []
 
   _has_many_field_views: []
@@ -16,6 +18,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
     'submit': 'save'
 
   initialize: ->
+    @content_type ||= new Locomotive.Models.ContentType(@options.content_type)
+
     @model ||= new Locomotive.Models.ContentEntry(@options.content_entry)
 
     Backbone.ModelBinding.bind @
@@ -29,6 +33,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
     @enable_richtexteditor()
 
+    @enable_select_fields()
+
     @enable_file_fields()
 
     @enable_has_many_fields()
@@ -60,6 +66,26 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
       $(textarea).tinymce(settings)
 
+  enable_select_fields: ->
+    @_select_field_view = new Locomotive.Views.Shared.Fields.SelectView model: @content_type
+
+    _.each @model.get('select_custom_fields'), (name) =>
+      $input_wrapper = @$("##{@model.paramRoot}_#{name}_id_input")
+
+      $input_wrapper.append(ich.edit_select_options_button())
+
+      $input_wrapper.find('a.edit-options-button').bind 'click', (event) =>
+        event.stopPropagation() & event.preventDefault()
+
+        @_select_field_view.render_for name, (options) =>
+          # refresh the options of the select box
+          $select = $input_wrapper.find('select')
+          $select.find('option[value!=""]').remove()
+
+          _.each options, (option) =>
+            unless option.destroyed()
+              $select.append(new Option(option.get('name'), option.get('id'), false, option.get('id') == @model.get("#{name}_id")))
+
   enable_file_fields: ->
     _.each @model.get('file_custom_fields'), (name) =>
       view = new Locomotive.Views.Shared.Fields.FileView model: @model, name: name
@@ -107,6 +133,7 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
     @$('li.input.toggle input[type=checkbox]').checkToggle('sync')
 
   remove: ->
+    @_select_field_view.remove()
     _.each @_file_field_views, (view) => view.remove()
     _.each @_has_many_field_views, (view) => view.remove()
     _.each @_many_to_many_field_views, (view) => view.remove()

data/app/assets/javascripts/locomotive/views/content_entries/_popup_form_view.js.coffee

@@ -34,7 +34,13 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
         actions = @$('.dialog-actions').appendTo($(@el).parent()).addClass('ui-dialog-buttonpane ui-widget-content ui-helper-clearfix')
 
         actions.find('#close-link').click (event) => @close(event)
-        actions.find('input[type=submit]').click (event) => @save(event)
+        actions.find('input[type=submit]').click (event) =>
+          # since the submit buttons are outside the form, we have to mimic the behaviour of a basic form
+          $form = @el.find('form'); $buttons_pane = $(event.target).parent()
+
+          $.rails.disableFormElements($buttons_pane)
+
+          $form.trigger('submit').bind 'ajax:complete', => $.rails.enableFormElements($buttons_pane)
 
       open: (event, ui, extra) =>
         $(@el).dialog('overlayEl').bind 'click', => @close()

data/app/assets/javascripts/locomotive/views/content_types/_form_view.js.coffee

@@ -45,9 +45,12 @@ class Locomotive.Views.ContentTypes.FormView extends Locomotive.Views.Shared.For
       lineNumbers:      false
       passDelay:        50
       tabMode:          'shift'
-      theme:            'default medium'
+      theme:            'default'
       onChange: (editor) => @model.set(raw_item_template: editor.getValue())
 
+  after_inputs_fold: ->
+    @editor.refresh()
+
   enable_public_submission_checkbox: ->
     @_enable_checkbox 'public_submission_enabled',
       on_callback: => @$('#content_type_public_submission_accounts_input').show()

data/app/assets/javascripts/locomotive/views/content_types/select_options_view.js.coffee

@@ -10,6 +10,7 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
     'click a.add':      'add_entry'
     'click span.name':  'edit_entry'
     'click a.remove':   'remove_entry'
+    'click a.drag':     'do_nothing'
 
   initialize: ->
     _.bindAll(@, 'refresh_position_entries', '_insert_entry')
@@ -41,6 +42,9 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
       select_option = @collection.getByCid($(view_dom).attr('data-cid'))
       select_option.set position: index
 
+  do_nothing: (event) ->
+    event.stopPropagation() & event.preventDefault()
+
   add_entry: (event) ->
     event.stopPropagation() & event.preventDefault()
 
@@ -67,7 +71,7 @@ class Locomotive.Views.ContentTypes.SelectOptionsView extends Backbone.View
     view_dom      = link.closest('li')
     select_option = @collection.getByCid(view_dom.attr('data-cid'))
 
-    if confirm(link.attr('date-confirm'))
+    if confirm(link.attr('data-confirm'))
       if select_option.isNew()
         @collection.remove(select_option)
       else

data/app/assets/javascripts/locomotive/views/inline_editor/toolbar_view.js.coffee

@@ -20,8 +20,6 @@ class Locomotive.Views.InlineEditor.ToolbarView extends Backbone.View
     @
 
   notify: (aloha_editable) ->
-    window.bar = aloha_editable
-
     element_id  = aloha_editable.obj.attr('data-element-id')
     @model.get('editable_elements').get(element_id).set
       content: aloha_editable.getContents()

data/app/assets/javascripts/locomotive/views/pages/edit_view.js.coffee

@@ -20,6 +20,9 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
         else
           @refresh_editable_elements()
 
+        # refresh the show link
+        @$('#local-actions-bar > a.show').attr('href', "/#{@model.get('fullpath')}")
+
       error: (model, xhr) =>
         form.trigger('ajax:complete')
 

data/app/assets/javascripts/locomotive/views/shared/fields/select_view.js.coffee

@@ -0,0 +1,83 @@
+Locomotive.Views.Shared ||= {}
+Locomotive.Views.Shared.Fields ||= {}
+
+class Locomotive.Views.Shared.Fields.SelectView extends Backbone.View
+
+  el: '#edit-select-option-entries'
+
+  select_options_view: null
+
+  initialize: ->
+    _.bindAll(@, 'save', 'on_save')
+
+    @create_dialog()
+
+    super()
+
+  render: ->
+    @render_select_options_view()
+
+    @open()
+
+  render_for: (name, callback) ->
+    @name = name; @on_save_callback = callback
+
+    @custom_field = @model.get('entries_custom_fields').find((field) => field.get('name') == @name)
+
+    @render()
+
+  create_dialog: ->
+    @dialog = $(@el).dialog
+      autoOpen: false
+      modal:    true
+      zIndex:   window.application_view.unique_dialog_zindex()
+      width:    770,
+      create: (event, ui) =>
+        $(@el).prev().find('.ui-dialog-title').html(@$('h2').html())
+        @$('h2').remove()
+
+        @$form =          @$('.placeholder').formSubmitNotification() # fake form
+        @$buttons_pane =  @$('.dialog-actions').appendTo($(@el).parent()).addClass('ui-dialog-buttonpane ui-widget-content ui-helper-clearfix')
+
+        @$buttons_pane.find('#close-link').click (event) => @close(event)
+        @$buttons_pane.find('input[type=submit]').click @save
+
+      open: (event, ui, extra) =>
+        $(@el).dialog('overlayEl').bind 'click', => @close()
+        # nothing to do
+
+  save: (event) ->
+    event.stopPropagation() & event.preventDefault()
+
+    @$form.trigger 'ajax:beforeSend'
+    $.rails.disableFormElements(@$buttons_pane)
+
+    @model.save {}, success: @on_save, error: @on_save
+
+  on_save: (model, response, xhr) =>
+    $.rails.enableFormElements(@$buttons_pane)
+    model._normalize()
+    @$form.trigger('ajax:complete')
+    @on_save_callback(@custom_field.get('select_options').sortBy((option) -> option.get('position'))) if @on_save_callback?
+    @close()
+
+  render_select_options_view: ->
+    @select_options_view.remove() if @select_options_view?
+
+    @select_options_view = new Locomotive.Views.ContentTypes.SelectOptionsView
+      model:      @custom_field
+      collection: @custom_field.get('select_options')
+
+    @$('.placeholder').append(@select_options_view.render().el)
+
+  open: ->
+    $(@el).dialog('open')
+
+  close: (event) ->
+    event.stopPropagation() & event.preventDefault() if event?
+    $(@el).dialog('overlayEl').unbind('click')
+    $(@el).dialog('close')
+
+  center: ->
+    $(@el).dialog('option', 'position', 'center')
+

data/app/assets/stylesheets/locomotive/backoffice/application.css.scss

@@ -328,3 +328,16 @@ p span.code {
   color: #8B8D9A;
   @include single-text-shadow(#fff, 0px, 0px, 1px);
 }
+
+/* ___ dialog box to edit select options ___ */
+
+#edit-select-option-entries {
+  .placeholder {
+    @include tiny-buttons-group;
+    @include select-options-edit-style;
+
+    .list {
+      height: auto;
+    }
+  }
+}

data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss

@@ -121,56 +121,7 @@ form.formtastic {
           top: 0px;
           right: 10px;
 
-          a.add {
-            @include gray-button;
-
-            padding-left: 10px;
-          }
-
-          a.edit, a.remove, a.toggle, a.drag {
-            display: inline-block;
-            width: 16px;
-            height: 16px;
-
-            position: relative;
-            top: 4px;
-
-            outline: none;
-            text-indent: -9999px;
-
-            &.edit {
-              background: transparent image-url("locomotive/list/icons/pencil_off.png") repeat 0 0;
-              &:hover {
-                background-image: image-url("locomotive/list/icons/pencil.png");
-              }
-            }
-
-            &.remove {
-              background: transparent image-url("locomotive/list/icons/trash_off.png") repeat 0 0;
-              &:hover {
-                background-image: image-url("locomotive/list/icons/trash.png");
-              }
-            }
-
-            &.toggle {
-              background: transparent image-url("locomotive/list/icons/toggle_off.png") repeat 0 0;
-              &:hover {
-                background-image: image-url("locomotive/list/icons/toggle.png");
-              }
-              &.open {
-                @include rotate(180deg);
-              }
-              @include single-transition(transform, 0.5s);
-            }
-
-            &.drag {
-              cursor: move;
-              background: transparent image-url("locomotive/list/icons/move_off.png") repeat 0 0;
-              &:hover {
-                background-image: image-url("locomotive/list/icons/move.png");
-              }
-            }
-          }
+          @include tiny-buttons-group;
         }
 
         &:last-child {
@@ -306,6 +257,14 @@ form.formtastic {
 
         } // li.text
 
+        &.select {
+          @include locomotive-link;
+
+          a.edit-options-button {
+            margin-left: 10px;
+          }
+        } // li.select_with_edit
+
         &.locale, &.locales {
           .list {
             margin-left: 150px;
@@ -528,46 +487,7 @@ form.formtastic {
         } // li.no-label
 
         &.select-options {
-          .list {
-            line-height: auto;
-
-            ul, li, > span.actions {
-              float: left;
-            }
-
-            ul {
-              width: 558px;
-              min-height: 34px;
-
-              li.entry {
-                background: #c2e0f0;
-                @include border-radius(2px);
-
-                padding: 0 55px 0 8px;
-                margin: 2px 10px 8px 0;
-                height: auto;
-
-                color: #29739b;
-                line-height: 24px;
-
-                span.name {
-                  cursor: pointer;
-                  @include text-shadow(#fff 0px 1px 1px);
-                }
-
-                span.actions {
-                  line-height: 20px;
-                  right: 8px;
-                }
-              }
-            } // .list ul
-
-            > span.actions {
-              position: static;
-              margin-left: 15px;
-              line-height: 24px;
-            } // .list .actions
-          }
+          @include select-options-edit-style;
         } // li.select-options
 
         &.relationship {
@@ -700,17 +620,15 @@ form.formtastic {
             }
 
             .required-input {
-              label {
-                float: none;
-                width: auto;
-
+              span {
+                color: #585A69;
                 font-weight: normal;
               }
 
               .toggleSwitch {
                 display: inline-block;
                 position: relative;
-                top: 0px;
+                top: 5px;
 
                 margin-left: 5px;
               }
@@ -766,6 +684,18 @@ form.formtastic {
             }
           } // li.string, li.password
 
+          &.toggle {
+            label {
+              width: 174px;
+              padding-top: 0px;
+              line-height: 24px;
+            }
+
+            .toggleSwitch {
+              top: 3px;
+            }
+          } // li.toggle
+
           p.inline-hints {
             margin-left: 174px;
           }