locomotive_cms 2.0.0.rc7 → 2.0.0.rc8

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -44,7 +44,7 @@ module Locomotive
 
     def options_for_content_type
       current_site.content_types.map do |c|
-        c != @content_type ? [c.name, c.klass_with_custom_fields(:entries).to_s] : nil
+        [c.name, c.klass_with_custom_fields(:entries).to_s]
       end.compact
     end
 

data/app/models/locomotive/ability.rb

@@ -37,6 +37,8 @@ module Locomotive
       can :touch, Site do |site|
         site == @site
       end
+
+      can :read, ContentType
     end
 
     def setup_designer_permissions!

data/app/models/locomotive/content_entry.rb

@@ -45,9 +45,11 @@ module Locomotive
         self.send((type || self.content_type).label_field_name.to_sym)
       end
 
-      value.respond_to?(:to_label) ? value.to_label : value
+      value.respond_to?(:to_label) ? value.to_label : value.to_s
     end
 
+    alias :to_label :_label
+
     def translated?
       if self.respond_to?(:"#{self._label_field_name}_translations")
         self.send(:"#{self._label_field_name}_translations").key?(::Mongoid::Fields::I18n.locale.to_s) #rescue false
@@ -86,7 +88,7 @@ module Locomotive
     end
 
     def as_json(options = {})
-      self.to_presenter.as_json
+      self.to_presenter(options).as_json
     end
 
     protected

data/app/models/locomotive/content_type.rb

@@ -84,6 +84,13 @@ module Locomotive
       self.class.class_name_to_content_type(class_name, self.site)
     end
 
+    def label_field_id=(value)
+      # update the label_field_name if the label_field_id is changed
+      new_label_field_name = self.entries_custom_fields.where(:_id => value).first.try(:name)
+      self.label_field_name = new_label_field_name
+      super(value)
+    end
+
     def label_field_name=(value)
       # mandatory if we allow the API to set the label field name without an id of the field
       @new_label_field_name = value unless value.blank?

data/app/models/locomotive/extensions/content_type/default_values.rb

@@ -27,7 +27,7 @@ module Locomotive
 
         def set_label_field
           if @new_label_field_name.present?
-            self.label_field_id = self.entries_custom_fields.detect { |f| f.name == @new_label_field_name.underscore }._id
+            self.label_field_id = self.entries_custom_fields.detect { |f| f.name == @new_label_field_name.underscore }.try(:_id)
           end
 
           # unknown label_field_name, get the first one instead

data/app/models/locomotive/extensions/page/redirect.rb

@@ -9,7 +9,7 @@ module Locomotive
 
           ## fields ##
           field :redirect,      :type => Boolean, :default => false
-          field :redirect_url,  :type => String
+          field :redirect_url,  :type => String, :localize => true
 
           ## validations ##
           validates_presence_of :redirect_url, :if => :redirect

data/app/models/locomotive/extensions/page/tree.rb

@@ -19,11 +19,14 @@ module Locomotive
           ## indexes ##
           index :position
           index [[:depth, Mongo::ASCENDING], [:position, Mongo::ASCENDING]]
+
+          alias_method_chain :rearrange, :identity_map
+          alias_method_chain :rearrange_children, :identity_map
         end
 
         module ClassMethods
 
-          # Returns the pages tree from the site with the most minimal amount of queries.
+          # Returns the tree of pages from the site with the most minimal amount of queries.
           # This method should only be used for read-only purpose since
           # the mongodb returns the minimal set of required attributes to build
           # the tree.
@@ -101,6 +104,16 @@ module Locomotive
 
         protected
 
+        def rearrange_with_identity_map
+          ::Mongoid::IdentityMap.clear
+          rearrange_without_identity_map
+        end
+
+        def rearrange_children_with_identity_map
+          self.children.reset
+          rearrange_children_without_identity_map
+        end
+
         def persist_depth
           self.attributes['depth'] = self.depth
           self.depth_will_change!

data/app/models/locomotive/site.rb

@@ -54,8 +54,12 @@ module Locomotive
       Locomotive::Liquid::Drops::Site.new(self)
     end
 
+    def to_presenter(options = {})
+      Locomotive::SitePresenter.new(self, options)
+    end
+
     def as_json(options = {})
-      Locomotive::SitePresenter.new(self, options).as_json
+      self.to_presenter(options).as_json
     end
 
     protected

data/app/models/locomotive/theme_asset.rb

@@ -145,7 +145,7 @@ module Locomotive
     def escape_shortcut_urls(text)
       return if text.blank?
 
-      text.gsub(/[("'](\/(stylesheets|javascripts|images|media)\/(([^;.]+)\/)*([a-z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
+      text.gsub(/[("'](\/(stylesheets|javascripts|images|media)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
 
         sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '')
 

data/app/presenters/locomotive/membership_presenter.rb

@@ -1,7 +1,7 @@
 module Locomotive
   class MembershipPresenter < BasePresenter
 
-    delegate :role, :to => :source
+    delegate :role, :account_id, :to => :source
 
     def name
       self.source.account.name
@@ -26,8 +26,13 @@ module Locomotive
     end
 
     def included_methods
-      super + %w(name email role role_name can_update grant_admin)
+      super + %w(account_id name email role role_name can_update grant_admin)
     end
 
+    # def light_as_json
+    #   methods = included_methods.clone - %w(name email)
+    #   self.as_json(methods)
+    # end
+
   end
 end

data/app/presenters/locomotive/site_presenter.rb

@@ -15,5 +15,10 @@ module Locomotive
       super + %w(name locales domain_name subdomain domains robots_txt seo_title meta_keywords meta_description domains_without_subdomain memberships)
     end
 
+    def as_json_for_html_view
+      methods = included_methods.clone - %w(memberships)
+      self.as_json(methods)
+    end
+
   end
 end

data/app/views/locomotive/content_assets/_picker.html.haml

@@ -11,9 +11,9 @@
     = link_to t('locomotive.buttons.close'), '#', :id => 'close-link'
 
     .button-wrapper.upload
-      = form_tag theme_assets_url(:json), :class => 'quick-upload' do
-        = file_field_tag 'theme_asset[source]', :multiple => 'multiple'
-        = link_to t('locomotive.theme_assets.image_picker.upload'), theme_assets_url(:json), :class => 'new', :id => 'upload-link'
+      = form_tag content_assets_url(:json), :class => 'quick-upload' do
+        = file_field_tag 'content_asset[source]', :multiple => 'multiple'
+        = link_to t('locomotive.content_assets.image_picker.upload'), content_assets_url(:json), :class => 'new', :id => 'upload-link'
 
 %script{ :type => 'text/html', :id => 'content_asset' }
 

data/app/views/locomotive/content_entries/_form.html.haml

@@ -3,7 +3,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    content_entry: #{@content_entry.to_json}
+    content_entry: #{j @content_entry.to_json.html_safe}
 
 = f.inputs :name => :attributes do
   - @content_type.ordered_entries_custom_fields.each_with_index do |field, index|

data/app/views/locomotive/content_types/_form.html.haml

@@ -3,8 +3,8 @@
 
 - content_for :backbone_view_data do
   :plain
-    content_type: #{@content_type.persisted? ? @content_type.to_json : 'null'},
-    inverse_of_list: #{options_for_content_type_inverse_of.to_json}
+    content_type: #{j @content_type.persisted? ? @content_type.to_json.html_safe : 'null'},
+    inverse_of_list: #{j options_for_content_type_inverse_of.to_json.html_safe}
 
 = f.inputs :name => :information do
 

data/app/views/locomotive/current_site/_form.html.haml

@@ -4,7 +4,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    site:   #{@site.to_json(:current_account => current_locomotive_account, :current_site => current_site)},
+    site:   #{j @site.to_json(:current_account => current_locomotive_account, :current_site => current_site).html_safe},
     errors: #{@site.errors.to_json}
 
 = f.inputs :name => :information  do

data/app/views/locomotive/custom_fields/types/_many_to_many.html.haml

@@ -1,10 +1,10 @@
 - if field.ui_enabled?
   - target_content_type = Locomotive::ContentType.class_name_to_content_type(field.class_name, current_site)
 
-  = f.input     name.to_sym,
-    :label      => field.label,
-    :hint       => field.hint,
-    :as         => :'Locomotive::Empty',
+  = f.input       name.to_sym,
+    :label        => field.label,
+    :hint         => field.hint,
+    :as           => :'Locomotive::Empty',
     :wrapper_html => { :id => "content_entry_#{name}_input", :class => 'empty relationship input' }
 
   - content_for :head do
@@ -38,4 +38,4 @@
 
   - content_for :backbone_view_data do
     :plain
-      , all_#{name}_entries: #{target_content_type.list_or_group_entries.to_json}
+      , all_#{name}_entries: #{j target_content_type.list_or_group_entries.to_json(:depth => 1).html_safe}

data/app/views/locomotive/my_account/edit.html.haml

@@ -2,7 +2,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    account: #{@account.to_json}
+    account: #{j @account.to_json.html_safe}
 
 - content_for :submenu do
   = render_cell 'locomotive/settings_menu', :show

data/app/views/locomotive/pages/_form.html.haml

@@ -5,7 +5,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    page: #{@page.to_presenter.as_json_for_html_view.to_json}
+    page: #{j @page.to_presenter.as_json_for_html_view.to_json.html_safe}
 
 - if can?(:manage, @page)
 

data/app/views/locomotive/public/pages/show_toolbar.html.haml

@@ -20,8 +20,8 @@
         window.content_locale = '#{::Mongoid::Fields::I18n.locale}';
 
         Locomotive.mounted_on       = '#{Locomotive.mounted_on}';
-        Locomotive.current_site     = new Locomotive.Models.Site(#{current_site.to_json});
-        Locomotive.current_account  = new Locomotive.Models.Account(#{current_locomotive_account.to_json});
+        Locomotive.current_site     = new Locomotive.Models.Site(#{j current_site.to_json.html_safe});
+        Locomotive.current_account  = new Locomotive.Models.Account(#{j current_locomotive_account.to_json.html_safe});
 
         $(document).ready(function() {
 

data/app/views/locomotive/public/sitemaps/show.xml.builder

@@ -11,14 +11,14 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
       if page.templatized?
         page.content_type.entries.visible.each do |c|
           xml.url do
-            xml.loc page_url(page, { :content => c, :host => true })
+            xml.loc page_url(page, { :content => c })
             xml.lastmod c.updated_at.to_date.to_s('%Y-%m-%d')
             xml.priority 0.9
           end
         end
       else
         xml.url do
-          xml.loc page_url(page, { :host => true })
+          xml.loc page_url(page)
           xml.lastmod page.updated_at.to_date.to_s('%Y-%m-%d')
           xml.priority 0.9
         end

data/app/views/locomotive/shared/_form_actions.html.haml

@@ -9,6 +9,6 @@
 
   .span-12.last
     %p
-      = submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label, :disable_with => t('.disable_with'), :'data-sending-form-message' => t('locomotive.messages.sending_form')
+      = submit_tag button_label.is_a?(Symbol) ? t(".#{button_label}") : button_label, :'data-disable-with' => t('.disable_with'), :'data-sending-form-message' => t('locomotive.messages.sending_form')
 
   .clear

data/app/views/locomotive/shared/_head.html.haml

@@ -19,8 +19,8 @@
     window.locale         = '#{I18n.locale}';
     window.content_locale = '#{::Mongoid::Fields::I18n.locale}';
 
-    Locomotive.current_site     = new Locomotive.Models.Site(#{current_site.to_json});
-    Locomotive.current_account  = new Locomotive.Models.Account(#{current_locomotive_account.to_json});
+    Locomotive.current_site     = new Locomotive.Models.Site(#{j current_site.to_presenter.as_json_for_html_view.to_json.html_safe});
+    Locomotive.current_account  = new Locomotive.Models.Account(#{j current_locomotive_account.to_json.html_safe});
 
     $(document).ready(function() {
 

data/app/views/locomotive/snippets/_form.html.haml

@@ -3,7 +3,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    snippet: #{@snippet.persisted? ? @snippet.to_presenter.as_json_for_html_view.to_json : 'null'}
+    snippet: #{j @snippet.persisted? ? @snippet.to_presenter.as_json_for_html_view.to_json.html_safe : 'null'}
 
 = f.inputs :name => :information do
   = f.input :name, :wrapper_html => { :class => 'highlighted' }

data/app/views/locomotive/theme_assets/_form.html.haml

@@ -3,7 +3,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    theme_asset: #{@theme_asset.persisted? ? @theme_asset.to_json : 'null'}
+    theme_asset: #{j @theme_asset.persisted? ? @theme_asset.to_json.html_safe : 'null'}
 
 = f.hidden_field :performing_plain_text
 

data/app/views/locomotive/theme_assets/index.html.haml

@@ -16,11 +16,11 @@
 
 - content_for :backbone_view_data do
   :plain
-    snippets:           #{can?(:manage, Locomotive::Snippet) ? @snippets.map { |snippet| snippet.to_presenter.as_json_for_html_view }.to_json : 'null'},
-    images:             #{theme_assets_to_json(@assets[:images])},
-    media:              #{theme_assets_to_json(@assets[:media])},
-    js_and_css_assets:  #{can?(:manage, Locomotive::ThemeAsset) ? theme_assets_to_json(@js_and_css_assets) : 'null'},
-    fonts:              #{can?(:manage, Locomotive::ThemeAsset) ? theme_assets_to_json(@assets[:fonts]) : 'null'}
+    snippets:           #{j can?(:manage, Locomotive::Snippet) ? @snippets.map { |snippet| snippet.to_presenter.as_json_for_html_view }.to_json.html_safe : 'null'},
+    images:             #{j theme_assets_to_json(@assets[:images]).html_safe},
+    media:              #{j theme_assets_to_json(@assets[:media]).html_safe},
+    js_and_css_assets:  #{j can?(:manage, Locomotive::ThemeAsset) ? theme_assets_to_json(@js_and_css_assets).html_safe : 'null'},
+    fonts:              #{j can?(:manage, Locomotive::ThemeAsset) ? theme_assets_to_json(@assets[:fonts]).html_safe : 'null'}
 
 - content_for :submenu do
   = render_cell 'locomotive/settings_menu', :show

data/config/locales/admin_ui.de.yml

@@ -1,14 +1,15 @@
 de:
   locomotive:
-    buttons:
-      login: Einloggen
-      send_password: Senden
-      change_password: Update
-      new_item: "+ hinzufügen"
-      switch_to_site: Los
-      delete: "Löschen"
-      close: "Schließen"
-
+    errors:
+      "500":
+        title: Anwendungs-Fehler
+        notice: "Entschuldigung, irgendetwas ist hier schief gelaufen."
+        link: "→ Zurück zur Anwendung"
+      "404":
+        title: Seite nicht gefunden
+        notice: "Die angefragte Seite existiert nicht."
+        link: "→ Zurück zur Anwendung"
+        
     locales:
       en: Englisch
       de: Deutsch
@@ -16,12 +17,22 @@ de:
       pt-BR: "Bras. Portugiesisch"
       it: Italienisch
       nl: Niederländisch
-      "no": Norwegisch
+      nb: Norwegisch
       es: Spanisch
       ru: Russisch
+      
+    buttons:
+      login: Einloggen
+      send_password: Senden
+      change_password: Update
+      new_item: "+ hinzufügen"
+      switch_to_site: Los
+      delete: "Löschen"
+      close: "Schließen"
 
     messages:
       confirm: Sind Sie sicher ?
+      sending_form: "Formular wird gesendet"
 
     shared:
       header:
@@ -39,8 +50,10 @@ de:
         account: Mein Zugang
         site: Webseite
         theme_assets: Dateien
+      list:
+        untranslated: "Nicht übersetzt"
       form:
-        change_file: Ändern
+        change_file: ändern
         delete_file: Löschen
         cancel: Abbrechen
       form_actions:
@@ -48,24 +61,14 @@ de:
         create: Neu
         update: Speichern
         send: Senden
-        disable_with: "locomotive.disable_with.form_actions"
+        disable_with: "Transfer..."
       footer:
-        who_is_behind: "Dienst entwickelt von %{development} und entworfen von <a href=\"http://www.sachagreif.com\">Sacha Greif</a> &mdash; <small>version</small> %{version}"
-
-    errors:
-      "500":
-        title: Anwendungs-Fehler
-        notice: "Entschuldigung, irgendetwas ist hier schief gelaufen."
-        link: "&rarr; Zurück zur Anwendung"
-      "404":
-        title: Seite nicht gefunden
-        notice: "Die angefragte Seite existiert nicht."
-        link: "&rarr; Zurück zur Anwendung"
+        who_is_behind: "LocomitveCMS - entwickelt von %{development} und entworfen von <a href=\"http://www.sachagreif.com\">Sacha Greif</a> &mdash; <small>version</small> %{version}"
 
     notifications:
       new_content_entry:
         subject: "[%{type}] neu"
-        title: "Hi %{name}, nur damit Sie Bescheid wissen! Am %{date} wurde folgende neue Instanz erstellt."
+        title: "Hi %{name}, nur damit Sie Bescheid wissen, am %{date} wurde eine neue Instanz erstellt."
         type: "Model: %{type}"
 
     sites_picker:
@@ -157,16 +160,16 @@ de:
 
     sites:
       new:
-        title: Neuer Webseite
-        help: "Fülle das folgende Formular aus, um einen neuen Webseiteen zu erstellen."
+        title: Neue Webseite
+        help: "Füllen Sie das folgende Formular aus, um eine neue Webseite zu erstellen."
       domains:
         empty: "Bisher sind keine Domains/Hostnamen an diese Seite gebunden. Wenn Sie unten Domains/Hostnamen angeben, achten Sie bitte darauf <b>Ihren DNS Server zu prüfen/aktualisieren.</b>"
 
     current_site:
       edit:
         new_membership: Account hinzufügen
-        help: "Der Name des Webseiteen kann durch einen Klick auf den Namen bearbeitet werden."
-        ask_for_name: "Bitte geben Sie den neuen Namen der Webseite an"
+        help: "Der Name der Webseiten kann durch einen Klick auf den Namen bearbeitet werden."
+        ask_for_name: "Bitte geben Sie den neuen Namen der Webseite ein"
 
     memberships:
       roles:
@@ -195,10 +198,11 @@ de:
         new: neue Datei
         snippets: Snippets
         css_and_js: Style und Javascript
-        fonts: Fonts
         images: Bilder
         media: Medien
+        fonts: Fonts
         no_items: "Momentan gibt es keine Dateien. Klicken Sie einfach <a href='%{url}'>hier</a>, um die erste Datei zu erstellen."
+        quick_upload: Schneller Upload
       asset:
         updated_at: Aktualisiert am
       new:
@@ -291,13 +295,15 @@ de:
         explanations: "Es ist fast geschafft. Bitte geben Sie Ihrer ersten Webseite einen Namen und wählen Sie eine Sprache aus."
         default_site_locale: Sprachauswahl
         default_site_locales_hints: Sie können später weitere Sprachen im Einstellungsdialog vornehmen.
-        next: Webseite erstellen
+        next: Webseite erstellen      
+        back_to_default_template: "Klicken Sie <a href='#'>hier</a> um die Standardeinstellungen wieder herzustellen"
+
 
     public:
       pages:
         show_toolbar:
           statuses:
-            loading: "Lade...."
+            loading: "Laden..."
             disabled: "Inline Editor deaktiviert"
           labels:
             save_changes: "Änderungen speichern: "