locomotive_cms 2.0.0.rc12 → 2.0.0

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

@@ -70,6 +70,7 @@ class Locomotive.Views.Shared.Fields.HasManyView extends Backbone.View
       el:           $("##{@options.name}-template-entry")
       parent_view:  @
       model:        @options.new_entry.clone() # by default, it does not matter
+      namespace:    @options.name # to avoid dom conflicts
 
     @target_entry_view.render()
 
@@ -100,7 +101,7 @@ class Locomotive.Views.Shared.Fields.HasManyView extends Backbone.View
   remove_entry: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    if confirm($(event.target).attr('data-confirm'))
+    if confirm($(event.target).data('confirm'))
       entry = @get_entry_from_element($(event.target))
       entry.set _destroy: true
 

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

@@ -80,7 +80,7 @@ class Locomotive.Views.Shared.Fields.ManyToManyView extends Backbone.View
   remove_entry: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    if confirm($(event.target).attr('data-confirm'))
+    if confirm($(event.target).data('confirm'))
       entry = @get_entry_from_element($(event.target))
       @collection.remove(entry)
 

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

@@ -22,7 +22,7 @@ class Locomotive.Views.Shared.Fields.SelectView extends Backbone.View
   render_for: (name, callback) ->
     @name = name; @on_save_callback = callback
 
-    @custom_field = @model.get('entries_custom_fields').find((field) => field.get('name') == @name)
+    @custom_field = @model.find_entries_custom_field(@name)
 
     @render()
 
@@ -54,9 +54,13 @@ class Locomotive.Views.Shared.Fields.SelectView extends Backbone.View
 
     @model.save {}, success: @on_save, error: @on_save
 
-  on_save: (model, response, xhr) =>
+  on_save: (model, response) =>
     $.rails.enableFormElements(@$buttons_pane)
     model._normalize()
+
+    # the field has been changed as well as its select options, so get a fresh copy.
+    @custom_field = model.find_entries_custom_field(@custom_field.get('name'))
+
     @$form.trigger('ajax:complete')
     @on_save_callback(@custom_field.get('select_options').sortBy((option) -> option.get('position'))) if @on_save_callback?
     @close()

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -4,6 +4,8 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
 
   el: '#content'
 
+  namespace: null
+
   render: ->
     # make title editable (if possible)
     @make_title_editable()
@@ -35,24 +37,25 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
 
     previous_attributes = _.clone @model.attributes
 
-    @model.save {},
+    xhr = @model.save {},
       headers:  options.headers
       silent:   true # since we pass an empty hash above, no need to trigger the callbacks
-      success: (model, response, xhr) =>
-        form.trigger('ajax:complete')
 
-        model.attributes = previous_attributes
+    xhr.success (model, response, _options) =>
+      form.trigger('ajax:complete')
+
+      model.attributes = previous_attributes
 
-        options.on_success(response, xhr) if options.on_success
+      options.on_success(model, xhr) if options.on_success
 
-      error: (model, xhr) =>
-        form.trigger('ajax:complete')
+    xhr.error (model, xhr) =>
+      form.trigger('ajax:complete')
 
-        errors = JSON.parse(xhr.responseText)
+      errors = JSON.parse(model.responseText)
 
-        @show_errors errors
+      @show_errors errors
 
-        options.on_error() if options.on_error
+      options.on_error() if options.on_error
 
   make_title_editable: ->
     title = @$('h2 a.editable')
@@ -109,8 +112,10 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
         @show_error attribute, message
 
   show_error: (attribute, message, html) ->
-    input = @$("##{@model.paramRoot}_#{attribute}")
-    input = @$("##{@model.paramRoot}_#{attribute}_id") if input.size() == 0
+    prefix = if @namespace? then "#{@namespace}_" else ''
+
+    input = @$("##{prefix}#{@model.paramRoot}_#{attribute}")
+    input = @$("##{prefix}#{@model.paramRoot}_#{attribute}_id") if input.size() == 0
 
     return unless input.size() > 0
 

data/app/assets/javascripts/locomotive/views/shared/list_item_view.js.coffee

@@ -18,5 +18,5 @@ class Locomotive.Views.Shared.ListItemView extends Backbone.View
   remove_item: (event) ->
     event.stopPropagation() & event.preventDefault()
 
-    if confirm $(event.target).attr('data-confirm')
+    if confirm $(event.target).data('confirm')
       @model.destroy()

data/app/assets/javascripts/locomotive/views/sites/membership_entry_view.js.coffee

@@ -14,7 +14,8 @@ class Locomotive.Views.Sites.MembershipEntryView extends Backbone.View
 
     $(@el).html(ich.membership_entry(data))
 
-    $(@el).attr('data-role', @model.get('role'))
+    $(@el).data('role', @model.get('role'))
+    $(@el).attr('data-role', @model.get('role')) # for testing purpose
 
     @$('select').val(@model.get('role'))
 

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

@@ -7,8 +7,9 @@ class Locomotive.Views.Snippets.FormView extends Locomotive.Views.Shared.FormVie
   el: '#content'
 
   events:
-    'click    a#image-picker-link': 'open_image_picker'
-    'submit':                       'save'
+    'click a#image-picker-link':   'open_image_picker'
+    'click a#copy-template-link':  'replace_template'
+    'submit':                      'save'
 
   initialize: ->
     _.bindAll(@, 'insert_image')
@@ -35,7 +36,10 @@ class Locomotive.Views.Snippets.FormView extends Locomotive.Views.Shared.FormVie
     return @
 
   slugify_name: ->
-    @$('#snippet_name').slugify(target: @$('#snippet_slug'))
+    @$('#snippet_name').slugify
+      target:     @$('#snippet_slug')
+      url:        window.permalink_service_url
+      underscore: true
 
   open_image_picker: (event) ->
     event.stopPropagation() & event.preventDefault()
@@ -47,6 +51,18 @@ class Locomotive.Views.Snippets.FormView extends Locomotive.Views.Shared.FormVie
     @editor.replaceSelection(text)
     @image_picker_view.close()
 
+  replace_template: (event) ->
+    event.stopPropagation() & event.preventDefault()
+
+    link = $(event.target).closest('a')
+
+    $.rails.ajax
+      url:       link.attr('href')
+      type:      'get'
+      dataType:  'json'
+      success:  (data) =>
+        @editor.setValue(data.template)
+
   enable_liquid_editing: ->
     input = @$('#snippet_template')
     @editor = CodeMirror.fromTextArea input.get()[0],

data/app/assets/javascripts/locomotive/views/theme_assets/index_view.js.coffee

@@ -22,6 +22,8 @@ class Locomotive.Views.ThemeAssets.IndexView extends Backbone.View
 
     @render_media()
 
+    @render_others()
+
     return @
 
   build_uploader: ->
@@ -47,8 +49,9 @@ class Locomotive.Views.ThemeAssets.IndexView extends Backbone.View
           headers:  { 'X-Flash': true }
 
   insert_asset: (model) ->
+    window.foo = model
     list_view = @pick_list_view(model.get('content_type'))
-    list_view.collection.add(model)
+    list_view.collection.add(model) if list_view?
 
   render_snippets: ->
     @render_list 'snippets', @options.snippets, Locomotive.Views.Snippets.ListView
@@ -65,6 +68,9 @@ class Locomotive.Views.ThemeAssets.IndexView extends Backbone.View
   render_media: ->
     @render_list 'media', @options.media, Locomotive.Views.ThemeAssets.ListView, ich.media_list
 
+  render_others: ->
+    @render_list 'others', @options.others, Locomotive.Views.ThemeAssets.ListView, ich.others_list
+
   render_list: (type, collection, view_klass, template) ->
     return if @$("##{type}-anchor").size() == 0
 
@@ -83,6 +89,7 @@ class Locomotive.Views.ThemeAssets.IndexView extends Backbone.View
       when 'javascript', 'stylesheet' then 'js-and-css'
       when 'media'                    then 'media'
       when 'font'                     then 'fonts'
+      when 'other'                    then 'others'
 
     _.find @_lists_views, (view) => view.options.type == type
 

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

@@ -0,0 +1,20 @@
+#= require ../shared/form_view
+
+Locomotive.Views.Translations ||= {}
+
+class Locomotive.Views.Translations.FormView extends Locomotive.Views.Shared.FormView
+
+  el: '#content'
+
+  events:
+    'submit': 'save'
+
+  initialize: ->
+    @model = new Locomotive.Models.Translation(@options.translation)
+
+    Backbone.ModelBinding.bind @
+
+  render: ->
+    super()
+
+    return @

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

@@ -0,0 +1,6 @@
+Locomotive.Views.Translations ||= {}
+
+class Locomotive.Views.Translations.EditView extends Locomotive.Views.Translations.FormView
+
+  save: (event) ->
+    @save_in_ajax event

data/app/assets/javascripts/locomotive/views/translations/new_view.js.coffee

@@ -0,0 +1,8 @@
+Locomotive.Views.Translations ||= {}
+
+class Locomotive.Views.Translations.NewView extends Locomotive.Views.Translations.FormView
+
+  save: (event) ->
+    @save_in_ajax event,
+      on_success: (response, xhr) ->
+        window.location.href = xhr.getResponseHeader('location')

data/app/assets/javascripts/tinymce/plugins/jqueryinlinepopups/editor_plugin.js

@@ -43,7 +43,7 @@
     },
 
     open : function(f, p) {
-      console.log(f);
+      // console.log(f);
 
       f = f || {};
       p = p || {};
@@ -125,7 +125,7 @@
       // iFramed document
       else
       {
-        console.log(f);
+        // console.log(f);
         var iframe = $('<iframe />', {
           id: id + '_ifr',
           frameborder: 0

data/app/assets/javascripts/tinymce/plugins/locomotive_media/editor_plugin.js

@@ -74,5 +74,6 @@
   });
 
   // Register plugin
+  tinymce.PluginManager.requireLangPack('locomotive_media');
   tinymce.PluginManager.add('locomotive_media', tinymce.plugins.LocomotiveMediaPicker);
 })();

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/en.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('en.locomotive_media',{"image_desc": "Insert media"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/fr.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('fr.locomotive_media',{"image_desc": "Insérer média"});

data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/ru.js

@@ -0,0 +1 @@
+tinyMCE.addI18n('ru.locomotive_media',{"image_desc": "Вставить изображение"});

data/app/assets/stylesheets/locomotive.css

@@ -4,7 +4,8 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require locomotive/blueprint/screen.css
- *= require locomotive/jquery
+ *= require locomotive/jquery/ui.css
+ *= require locomotive/font-awesome
  *= require formtastic
  *= require codemirror
  *= require codemirror/themes/neat

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

@@ -120,22 +120,12 @@
       }
 
       a.remove {
-        display: inline-block;
-        width: 16px;
-        height: 16px;
-        margin-left: 10px;
-
-        position: relative;
-        top: 4px;
-
-        outline: none;
-
-        background: transparent image-url("locomotive/list/icons/trash_off.png") repeat 0 0;
+        @include icon-button;
 
-        text-indent: -9999px;
+        margin: 0 0 0 5px;
 
         &:hover {
-          background-image: image-url("locomotive/list/icons/trash.png");
+          background: #e72635;
         }
       }
     }

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

@@ -3,6 +3,40 @@
 @import "compass/css3/images";
 @import "compass/css3/text-shadow";
 
+@mixin icon-button {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  line-height: 16px;
+
+  padding: 0px 0px;
+
+  border-radius: 50%;
+  background: #808080;
+
+  outline: none;
+  text-align: center;
+  text-decoration: none;
+  font-size: 13px;
+  font-weight: normal;
+  color: #fff;
+
+  @media screen and (-webkit-min-device-pixel-ratio:0) {
+    i {
+      vertical-align: middle;
+    }
+  }
+
+  i {
+    height: 16px;
+    width: 16px;
+    line-height: 16px;
+    font-weight: normal;
+
+    @include single-text-shadow(#000, 0px, 0px, 0px);
+  }
+}
+
 @mixin black-button {
   display: inline-block;
 
@@ -81,7 +115,7 @@
 
 @mixin gray-button {
   position: relative;
-  padding: 2px 10px 3px 31px;
+  padding: 2px 10px 3px 14px;
 
   background-color: #ebedf4;
   @include border-radius(10px);
@@ -95,23 +129,12 @@
 
   outline: none;
 
-  em {
-    position: absolute;
-    top: 5px;
-    left: 10px;
-
-    display: block;
-    height: 16px;
-    width: 16px;
-
-    background: transparent image-url("locomotive/icons/actions.png") no-repeat 0 0;
+  i {
+    position: relative;
+    right: 5px;
+    font-size: 9px;
   }
 
-  &.show em { background-position: 0 0; }
-  &.edit em { background-position: 0 -16px; top: 2px; left: 12px; }
-  &.download em { background-position: 0 -32px; }
-  &.new em { background-position: 0 -48px; top: 4px; left: 13px; }
-
   &:hover, &.hover {
     text-decoration: none;
     color: #333;

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

@@ -3,6 +3,7 @@
 @import "compass/css3/images";
 @import "compass/css3/text-shadow";
 @import "locomotive/shared/helpers";
+@import "buttons";
 @import "box";
 
 /* ___ boxes ___ */
@@ -75,12 +76,22 @@ ul.list {
       font-size: 11px;
       color: #8b8d9a;
 
+      height: 30px;
+      line-height: 30px;
+
       a {
-        position: relative;
-        top: 4px;
         margin-left: 10px;
       }
 
+      a.remove {
+        @include icon-button;
+
+        margin: 0 0 0 5px;
+
+        &:hover {
+          background: #e72635;
+        }
+      }
     } // li div.more
   } // ul.list li
 }
@@ -96,25 +107,6 @@ ul.list {
       display: none;
     }
 
-    .more {
-
-      a.remove {
-        display: inline-block;
-        width: 16px;
-        height: 16px;
-
-        margin-left: 7px;
-        outline: none;
-
-        background: transparent image-url("locomotive/list/icons/trash_off.png") repeat 0 0;
-
-        text-indent: -9999px;
-
-        &:hover {
-          background-image: image-url("locomotive/list/icons/trash.png");
-        }
-      }
-    } // li div.more
   } // li.item
 
   &.sortable {
@@ -159,15 +151,19 @@ ul.list {
 
     > .toggler {
       position: absolute;
-      top: 10px;
-      left: -18px;
+      top: 0px;
+      left: -25px;
       cursor: pointer;
+
+      color: #808080;
+      font-size: 20px;
     }
 
     .inner {
       position: relative;
       margin-bottom: 10px;
       height: 30px;
+      line-height: 30px;
       clear: both;
 
       background: #ebedf4;
@@ -189,8 +185,6 @@ ul.list {
       a {
         @include hover-link;
 
-        position: relative;
-        top: 4px;
         margin-left: 26px;
 
         color: #1f82bc;
@@ -199,18 +193,23 @@ ul.list {
         @include single-text-shadow(#fff, 1px, 1px, 1px);
       }
 
-      &.hidden a { font-style: italic; font-weight: normal; }
+      & > i {
+        vertical-align: middle;
+        font-size: 18px;
+        color: #b3b5c7;
+        @include single-text-shadow(#fff, 1px, 1px, 1px);
+      }
 
       span.untranslated {
         @include label;
         background-color: #F89406;
-        top: 3px;
+        top: -1px;
         left: 5px;
       }
 
       span.response-type {
         @include label;
-        top: 3px;
+        top: -1px;
         left: 5px;
       }
 
@@ -222,20 +221,16 @@ ul.list {
         font-size: 11px;
         color: #8b8d9a;
 
-        a.remove {
-          display: inline-block;
-          width: 16px;
-          height: 16px;
-
-          margin-left: 7px;
-          outline: none;
+        height: 30px;
+        line-height: 30px;
 
-          background: transparent image-url("locomotive/list/icons/trash_off.png") repeat 0 0;
+        a.remove {
+          @include icon-button;
 
-          text-indent: -9999px;
+          margin: 0 0 0 5px;
 
           &:hover {
-            background-image: image-url("locomotive/list/icons/trash.png");
+            background: #e72635;
           }
         }
       }
@@ -248,10 +243,20 @@ ul.list {
         }
 
         .more {
-          padding-top: 7px;
+          // padding-top: 7px;
         }
       }
     }
+
+    &.unpublished {
+      > .inner {
+        a {
+          font-style: italic;
+          font-weight: normal;
+        }
+      }
+    }
+
   } // #pages-list li
 
   ul {
@@ -259,28 +264,12 @@ ul.list {
 
     li {
       .more {
-        padding-top: 3px !important;
+        // padding-top: 3px !important;
       }
     }
 
     &.folder {
 
-      li {
-        em {
-          background-position: left -31px;
-          cursor: move;
-        }
-
-        &.templatized > .inner > a {
-          padding-right: 24px;
-          background: transparent image-url("locomotive/list/icons/template.png") no-repeat right 2px;
-        }
-
-        &.redirect > .inner > a {
-          padding-right: 24px;
-          background: transparent image-url("locomotive/list/icons/redirect.png") no-repeat right 1px;
-        }
-      } // ul.folder li
     } // ul.folder
   } // ul
 } // #pages-list