locomotive_cms 2.0.3 → 2.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzBmOTE4ZGVmMDU2MjQ0OWExNjRiYTE5YmNjM2U1MDA2ODcyZGI2NQ==
+  data.tar.gz: !binary |-
+    MDU5YTVkZDExMzdiYjEwYmJiYzhiNWIyNjMzYTRlMWRlOTViMjQ0ZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZDNhZDI1Nzk0ZmMwZmI3ZDIwOTc4NzI0NDlhZTljMjQ4MGZjYWM3N2JmNTAx
+    MDhlZDA2MGU4ODU0OWU2MzRjMDYxMmFiZWM4YWEwMjdiYmZjZTdjMTMxYTU4
+    NDA0MWUxMmNmZGYxMDI2MGVlMWE4MTg4YTExNDg2N2VlMTU1MDQ=
+  data.tar.gz: !binary |-
+    YzkyMWQ3NmQ3NjY3NTEzYTYyYzk4MzNiNTI3YmUyZGNkNTY2MDA4MDdkNTA4
+    NDhmZDc2NTY3ZDIxYTk1M2M2ZDFkNGZiZmY2OTIyNGZmZDczYjRkMTM5MWQw
+    YjEyODUyZmI2MmZiODdiODk4NDQ3MTFiNzZkMmYxZWVmMzJkNjg=

data/Gemfile

@@ -3,9 +3,6 @@
 
 source "https://rubygems.org"
 
-# net-scp 1.0.6 was yanked
-gem 'net-scp', '1.0.4'
-
 gemspec # Include gemspec dependencies
 
 group :assets do
@@ -24,12 +21,15 @@ end
 
 group :development do
   # gem 'custom_fields', path: '../gems/custom_fields' # for Developers
+  # gem 'custom_fields', github: 'locomotivecms/custom_fields'
   # 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-tinymce-rails', path: '../gems/tinymce-rails' # for Developers
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
 
+  # gem 'carrierwave-mongoid', git: 'git://github.com/locomotivecms/carrierwave-mongoid.git'
+
   gem 'unicorn' # Using unicorn_rails instead of webrick (default server)
 
 end

data/README.textile

@@ -1,4 +1,4 @@
-h1. Locomotive CMS
+h1. LocomotiveCMS
 
 "!https://secure.travis-ci.org/locomotivecms/engine.png!":http://travis-ci.org/locomotivecms/engine
 
@@ -6,7 +6,7 @@ h1. Locomotive CMS
 
 "!https://gemnasium.com/locomotivecms/engine.png(Dependency Status)!":https://gemnasium.com/locomotivecms/engine
 
-Locomotive is a simple but powerful CMS based on liquid templates and mongodb database. At my company ("NoCoffee":http://www.nocoffee.fr), we use it for our clients when they request a simple website.
+LocomotiveCMS is a simple but powerful CMS based on liquid templates and mongodb database. At my company ("NoCoffee":http://www.nocoffee.fr), we use it for our clients when they request a simple website.
 
 If we have to give a couple of features to describe our application, there will be:
 
@@ -28,7 +28,7 @@ h2. Gems
 Here is a short list of main gems / technologies used in the application.
 
 * Rails 3.2.13
-* Mongoid 2.4.9 (with MongoDB 2.0)
+* Mongoid 3.1.3 (with MongoDB 2.x)
 * Liquid
 * Devise
 * Carrierwave
@@ -39,7 +39,7 @@ Here is a short list of main gems / technologies used in the application.
 
 h2. Installation
 
-See the "installation documentation on the official website":http://doc.locomotivecms.com/installation/requirements
+See the "installation documentation on the official website":http://doc.locomotivecms.com
 
 h2. Upgrading
 
@@ -51,9 +51,9 @@ h2. Community
 * Join us on IRC "#locomotivecms at irc.freenode.net!":http://webchat.freenode.net/
 * "Follow us on twitter":http://twitter.com/locomotivecms
 
-h2. Contributing to Locomotive
+h2. Contributing to LocomotiveCMS
 
-Locomotive CMS is an open source project, we encourage contributions. If you have found a bug and want to contribute a fix, or have a new feature you would like to add, follow the steps below to get your patch into the project:
+LocomotiveCMS is an open source project, we encourage contributions. If you have found a bug and want to contribute a fix, or have a new feature you would like to add, follow the steps below to get your patch into the project:
 
 * Install ruby and mongoDB
 * Clone the project <code>git clone git@github.com:locomotivecms/engine.git</code>
@@ -81,7 +81,7 @@ h2. Credits
 
 "Rodrigo Alvarez":http://blog.codecaster.es/ for his plugin named Congo which gave us a good starting point and for his availability for (very late) tech discussions.
 
-"Emmanuel Grard":http://www.grardesign.com designed the awesome locomotive illustration in the locomotivecms.com landing page.
+"Emmanuel Grard":http://www.grardesign.com designed the awesome locomotive illustration in the old locomotivecms.com landing page.
 
 "Font Awesome":http://fortawesome.github.com/Font-Awesome for providing the best icons. Make the whole back-office Retina-ready.
 

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

@@ -1,2 +1,5 @@
+#= require aloha/lib/require
+#= require aloha/lib/vendor/jquery-1.7.2
+#= require aloha/lib/vendor/jquery-ui-1.9.0.custom-aloha
 #= require ./utils/aloha_settings
 #= require aloha

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

@@ -16,7 +16,7 @@ class Locomotive.Models.Page extends Backbone.Model
 
   toJSON: ->
     _.tap super, (hash) =>
-      _.each ['fullpath', 'localized_fullpaths', 'templatized_from_parent', 'target_klass_name_text', 'content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text'], (key) => delete hash[key]
+      _.each ['fullpath', 'localized_fullpaths', 'templatized_from_parent', 'target_klass_name_text', 'content_type_id_text', 'edit_url', 'parent_id_text', 'response_type_text', 'translated_in'], (key) => delete hash[key]
 
       delete hash['editable_elements']
       hash.editable_elements = @get('editable_elements').toJSONForSave() if @get('editable_elements')? && @get('editable_elements').length > 0

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

@@ -5,13 +5,11 @@ class Locomotive.Models.Site extends Backbone.Model
   urlRoot: "#{Locomotive.mounted_on}/sites"
 
   initialize: ->
-    # Be careful, domains_without_subdomain becomes domains
-    domains = _.map @get('domains_without_subdomain'), (name) =>
-      new Locomotive.Models.Domain(name: name)
-
-    memberships = new Locomotive.Models.MembershipsCollection(@get('memberships'))
+    @_fix_attributes()
 
-    @set domains: domains, memberships: memberships
+    # After save, need to fix the attributes again
+    this.on 'sync', ->
+      @_fix_attributes()
 
   includes_domain: (name_with_port) ->
     name = name_with_port.replace(/:[0-9]*/, '')
@@ -22,10 +20,22 @@ class Locomotive.Models.Site extends Backbone.Model
 
   toJSON: ->
     _.tap super, (hash) =>
+      _.each ['locales_text'], (key) => delete hash[key]
       delete hash.memberships
       hash.memberships_attributes = @get('memberships').toJSONForSave() if @get('memberships')? && @get('memberships').length > 0
       delete hash.domains
       hash.domains = _.map(@get('domains'), (domain) -> domain.get('name'))
+      hash.locales = _.flatten([@get('locales')])
+
+  _fix_attributes: ->
+    # Be careful, domains_without_subdomain becomes domains
+    domains = _.map @get('domains_without_subdomain'), (name) =>
+      new Locomotive.Models.Domain(name: name)
+
+    memberships = new Locomotive.Models.MembershipsCollection(@get('memberships'))
+
+    @set domains: domains, memberships: memberships
+
 
 class Locomotive.Models.CurrentSite extends Locomotive.Models.Site
 

data/app/assets/javascripts/locomotive/utils/aloha_settings.js.coffee

@@ -29,7 +29,7 @@ window.Aloha.settings =
         crop:   false
 
   i18n:
-    available: ['en', 'fr', 'pl', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl']
+    available: ['en', 'fr', 'pl', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl', 'ja']
 
   sidebar:
     disabled: true

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

@@ -31,6 +31,8 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
 
     @enable_checkboxes()
 
+    @enable_tags()
+
     @enable_datepickers()
 
     @enable_richtexteditor()
@@ -50,6 +52,9 @@ class Locomotive.Views.ContentEntries.FormView extends Locomotive.Views.Shared.F
   enable_checkboxes: ->
     @$('li.input.toggle input[type=checkbox]').checkToggle()
 
+  enable_tags: ->
+    @$('li.input.tags input[type=text]').tagit(allowSpaces: true)
+
   enable_datepickers: ->
     @$('li.input.date input[type=text]').datepicker()
 

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

@@ -7,6 +7,7 @@ class Locomotive.Views.MyAccount.EditView extends Locomotive.Views.Shared.FormVi
   el: '#content'
 
   events:
+    'click .api_key.input button': 'regenerate_api_key'
     'submit': 'save'
 
   initialize: ->
@@ -21,4 +22,17 @@ class Locomotive.Views.MyAccount.EditView extends Locomotive.Views.Shared.FormVi
     if @model.get('locale') == window.locale
       @save_in_ajax(event)
 
+  regenerate_api_key: (event) ->
+    event.stopPropagation() & event.preventDefault()
+
+    button = $(event.target)
+
+    if confirm(button.data('confirm'))
+      $.rails.ajax
+        url:        button.data('url')
+        type:       'put'
+        dataType:   'json'
+        success:    (data) =>
+          button.prev('code').html(data.api_key)
+
 

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

@@ -115,7 +115,7 @@ class Locomotive.Views.Pages.FormView extends Locomotive.Views.Shared.FormView
     @$('#page_slug').bind 'change', ((event) => @touched_url = true)
 
   listen_for_url_changes: ->
-    setInterval (=> (@change_page_url() & @touched_url = false) if @touched_url), 2000
+    setInterval (=> (@change_page_url() & @touched_url = false) if @touched_url), 1200
 
   change_page_url: ->
     $.rails.ajax

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

@@ -21,7 +21,8 @@ class Locomotive.Views.Pages.EditView extends Locomotive.Views.Pages.FormView
           @refresh_editable_elements()
 
         # refresh the show link
-        @$('#local-actions-bar > a.show').attr('href', "/#{@model.get('fullpath')}")
+        fullpath = @model.get('localized_fullpaths')[window.content_locale]
+        @$('#local-actions-bar > a.show').attr('href', "/#{fullpath}")
 
       error: (model, xhr) =>
         form.trigger('ajax:complete')

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

@@ -0,0 +1 @@
+tinyMCE.addI18n('de.locomotive_media',{"image_desc": "Medien einfügen"});

data/app/assets/stylesheets/locomotive.css

@@ -5,6 +5,7 @@
  *= require_self
  *= require locomotive/blueprint/screen.css
  *= require locomotive/jquery/ui.css
+ *= require locomotive/jquery.tagit.css
  *= require locomotive/font-awesome
  *= require formtastic
  *= require codemirror

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

@@ -231,17 +231,20 @@ form.formtastic {
           }
         } // div.inline-errors
 
-        &.string, &.password {
+        &.string, &.password, &.numeric {
           label {
             padding-top: 2px;
           }
 
-          input[type=text], input[type=password] {
+          input[type=text], input[type=password], input[type=number] {
             @include default-input-style;
-
             width: 700px;
           }
 
+          input[type=number] {
+            width: 150px;
+          }
+
           &.highlighted {
             label {
               padding-top: 7px;
@@ -440,6 +443,18 @@ form.formtastic {
           }
         } // li.file
 
+        &.api_key {
+          code {
+            color: #000;
+            font-weight: bold;
+            font-family: Monaco, monospace;
+          }
+          button.regenerate {
+            @include blue-button;
+            margin-left: 10px;
+          }
+        }
+
         &.subdomain {
 
           em {

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

@@ -66,7 +66,7 @@ body {
 
     #global-actions-bar {
       position: absolute;
-      top: 75px;
+      top: 70px;
       right: 8px;
 
       color: #8b8d9a;

data/app/assets/stylesheets/locomotive/backoffice/menu/main.css.scss

@@ -12,7 +12,10 @@
   li.entry {
     float: left;
     position: relative;
-    padding: 6px 6px 0 6px;
+
+    padding: 0px 0px 0 6px;
+    margin-left: -42px;
+
     height: 29px;
     line-height: 29px;
     overflow: hidden;
@@ -108,6 +111,7 @@
 
     &:first-child {
       z-index: 990;
+      margin-left: 0;
       a {
         @include border-top-left-radius(4px);
         padding-left: 10px;
@@ -120,8 +124,8 @@
       }
     }
 
-    @for $i from 1 through 5 {
-      &.entry-#{$i} { left: -42px * $i; z-index: 990 - $i; }
+    @for $i from 1 through 10 {
+      &.entry-#{$i} { z-index: 990 - $i; }
     }
   }
 }

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

@@ -0,0 +1,37 @@
+@import "compass/css3/border-radius";
+@import "compass/css3/text-shadow";
+@import "locomotive/shared/helpers";
+@import "buttons";
+
+/* ___ pagination ___ */
+
+nav.pagination {
+  text-align: center;
+
+  a {
+    @include gray-button;
+    margin: 0px 1px;
+  }
+
+  span.current {
+    @include gray-button;
+    margin: 0px 1px;
+
+    @include background-image(linear-gradient(#13496c, #175b88));
+    @include box-shadow(rgba(0, 0, 0, 0.9) 0px -1px 0px 0px, rgba(0, 0, 0, 0.7) 0px 1px 0px 0px);
+    @include single-text-shadow(#000, 0px, 1px, 0px);
+
+    color: #fff;
+    font-weight: bold;
+    padding-top: 0px;
+
+    &:hover {
+      color: #fff;
+    }
+  }
+
+  a, span.current {
+    padding-left: 12px;
+    padding-right: 12px;
+  }
+}

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

@@ -0,0 +1,49 @@
+@import "locomotive/shared/helpers";
+
+ul.tagit {
+  width: 650px;
+  padding: 5px;
+  @include default-input-style;
+  @include border-radius(0px);
+
+  li {
+    margin: 2px 5px 2px 0;
+    line-height: 18px;
+    font-size: 11px;
+
+    &.tagit-choice-read-only {
+      padding: 1px 5px 1px;
+    }
+
+    &.tagit-choice-editable {
+      padding: 1px 20px 1px 5px;
+    }
+
+    &.tagit-choice-read-only, &.tagit-choice-editable {
+      @include border-radius(2px);
+      background: #c2e0f0;
+      border-color: #719fb8;
+      span {
+        color: #29739b;
+        @include text-shadow(rgba(#fff, 0.7) 0px 1px 0px);
+      }
+      span.ui-icon-close {
+        background: none;
+        text-indent: 0px;
+        text-align: center;
+        &:before {
+          position: relative;
+          top: -1px;
+          text-indent: 0px;
+          font-family: FontAwesome;
+          font-size: 9px;
+          content: "\f00d";
+        }
+      }
+    }
+
+    &.tagit-new {
+      padding: 2px 0 0 0;
+    }
+  }
+}

data/app/cells/locomotive/content_locale_picker/show.html.haml

@@ -1,7 +1,7 @@
 #content-locale-picker
   %ul
     - @locales.each do |locale|
-      %li{ :'data-locale' => locale, :class => "#{'selected' if @locale == locale}" }
+      %li{ :'data-locale' => locale, class: "#{'selected' if @locale == locale}" }
         = flag_tag(locale)
 
         %span.text= locale

data/app/cells/locomotive/global_actions_cell.rb

@@ -12,20 +12,20 @@ module Locomotive
     protected
 
     def build_list
-      add :welcome, :url => edit_my_account_url, :i18n_options => {
-        :key    => 'locomotive.shared.header.welcome',
-        :arg    => :name,
-        :value  => @current_locomotive_account.name
+      add :welcome, url: edit_my_account_url, i18n_options: {
+        key:    'locomotive.shared.header.welcome',
+        arg:    :name,
+        value:  @current_locomotive_account.name
       }
 
-      add :see, :url => current_site_url, :id => 'viewsite', :target => '_blank'
+      add :see, url: current_site_url, id: 'viewsite', target: '_blank'
 
       if Locomotive.config.multi_sites? && current_locomotive_account.sites.size > 1
-        add :switch, :url => '#', :id => 'sites-picker-link'
+        add :switch, url: '#', id: 'sites-picker-link'
       end
 
-      add :help, :url => 'http://doc.locomotivecms.com/templates/basics', :class => 'tutorial', :id => 'help', :target => '_blank'
-      add :logout, :url => destroy_locomotive_session_url, :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
+      add :help, url: 'http://doc.locomotivecms.com', class: 'tutorial', id: 'help', target: '_blank'
+      add :logout, url: destroy_locomotive_session_url, data: { confirm: t('locomotive.messages.confirm') }, method: :delete
     end
 
     def localize_label(label, options = {})