infopark_cloud_connector 7.0.1 → 7.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhiM2EwZDc1YzNjZGNlZWRjZjkyYTU0NTYxZmNhNWRlMTFiMTNiMw==
+    YjJjMWIxMWM5ZDliZGZlZTNlNjg0OWNjOTVlNjkwMjg3NzZjNDgxZQ==
   data.tar.gz: !binary |-
-    NTRkODg1Y2FiNzM4NDNlZDRmZjEwY2U4MmUyNTgwODE3OTc1Zjk3ZA==
+    OGE3MDQ0YjUwNDJjMjEwNjYyNzIzY2VkNDBlYzAzMjcyOGZhZTk5NA==
 SHA512:
   metadata.gz: !binary |-
-    NDc5NTE4YzliODVkYTA4ZjQ0Y2QyZDVhNjE5YzFlMTYxZWVkN2Y0OGFlMGJl
-    ZjFiMzExMzZmNzE0NGQ0ZWY4NGI5OTliNzFlMzQwOTg5ZTQ2YTYxZDk3MDM3
-    OThhN2RmZWFhNjlmYmVhNWU1OWU0YmYwMTVkNmJmMzQzMWEwYjQ=
+    MTI5NGNiMTJjMDZjMWQ5NzVlMzU4MWQzOTEwZjY1ZGFjMDE3YjgyMDIwZmQy
+    MGY2YTNlZTI1MjFjYmNlZGYwMjc2N2NkODNkYzUwYWRiZWM5OWZiNDNhMzIy
+    NjUxZjdmMjM3NDM2ZDBkMjYyYmEzNDk1MTZlODUwMjU1NjRkYTE=
   data.tar.gz: !binary |-
-    ZDVjZDQ2ZDNlNDkyZDgwMzM4MThhZTM1YTJhMGNmZDIyMWNjNTE2NWY0NmY2
-    M2QzOGZiM2M5N2E3NzNkYmIyZjRjOWU0ZTU0NDM2ZWQ1ZTQ5Yjk4MzIyMzcw
-    N2FmNGRkYzYwMjMyMmRkODVjMTYxMDEzNWQ0MTU5NmVmYTU0Mjc=
+    ZmNmNDM5ZTAzYTY5OWMyZTJlMmE0MTNkNGMxODJlMTlkOWExOTJhMTIwYjQ3
+    ZThhYmUxMWI4ZGZlMzk0YzI1NGI0MjNjOWMxNzg4ODJhOWU3ZDBlYjRiYjc1
+    ZDExNzFiMTc4YTA5OTZlZjY0NGI4M2M5ODAxMmQxN2Q2NDRjMmE=

data/app/controllers/rails_connector/default_cms_controller.rb

@@ -8,20 +8,12 @@ module RailsConnector
   class DefaultCmsController < ApplicationController
     include CmsAccessible
     before_filter :load_object
-    before_filter :ensure_object_is_permitted
-    before_filter :set_google_expire_header
 
-    # Default Action. Delivers files directly if their mime type is not text/html
+    # Default Action. Delivers files directly if {BasicObj#binary?}.
+    # Otherwise the view is rendered.
     # @api public
     def index
-      deliver_file if @obj.mime_type != "text/html"
-    end
-
-    # Toggles edit markers. The current status is stored in the session.
-    # @api public
-    def toggle_editmarkers
-      session[:hide_editmarkers] = !session[:hide_editmarkers]
-      redirect_to cms_id_url(@obj)
+      deliver_file if @obj.binary?
     end
 
     # This method indicates if this controller should be used automatically when an Obj is

data/app/controllers/rails_connector/objs_controller.rb

@@ -124,9 +124,11 @@ module RailsConnector
       widget_pool_params.each_pair do |widget_id, widget_params|
         widget = obj.widget_from_pool(widget_id)
 
-        widget_params.each_pair do |param_name, param_value|
-          if widget.type_of_attribute(param_name) == 'html'
-            widget_params[param_name] = convert_html_links(param_value)
+        if widget_params.present?
+          widget_params.each_pair do |param_name, param_value|
+            if widget.type_of_attribute(param_name) == 'html'
+              widget_params[param_name] = convert_html_links(param_value)
+            end
           end
         end
       end
@@ -136,10 +138,10 @@ module RailsConnector
       ContentConversion.convert_html_links(html, request.host, request.port)
     end
 
-    def copy_obj(copied_attributes, target_path=nil)
-      copied_attributes.delete('id')
-      copied_attributes.delete('_last_changed')
-
+    def copy_obj(attributes, target_path=nil)
+      copied_attributes = attributes.reject do |key, _|
+        %w{id _last_changed _permalink}.include?(key)
+      end
       copied_attributes['_path'] = "#{target_path}/#{SecureRandom.hex(6)}"
 
       task_unaware_request(:post, "workspaces/#{Workspace.current.id}/objs", obj: copied_attributes)

data/app/helpers/rails_connector/default_cms_helper.rb

@@ -11,11 +11,10 @@ module RailsConnector
   # @api public
   module DefaultCmsHelper
     include DisplayHelper
-    include MarkerHelper
     include CmsAssetHelper
     include RailsConnector::CmsAssetHelper
-    include RailsConnector::TableOfContentsHelper
     include RailsConnector::EditingHelper
+    include RailsConnector::TableOfContentsHelper
     include RailsConnector::LayoutHelper
     include RailsConnector::CmsTagHelper
   end

data/app/helpers/rails_connector/default_cms_routing_helper.rb

@@ -24,6 +24,7 @@ module RailsConnector
 
     LINK_TO_UNREACHABLE = "#__target_object_not_reachable"
     LINK_TO_EMPTY_LINKLIST = "#__empty_linklist"
+    LINK_TO_EMPTY_BLOB = "#__empty_blob"
 
     def cms_path_or_url(target, path_or_url, options = {})
       if target.is_a?(Link)
@@ -52,20 +53,26 @@ module RailsConnector
 
     def cms_path_or_url_for_objs(obj, path_or_url, options = {})
       permalink = obj.permalink
-      ignore_body_data_url = options.delete(:ignore_body_data_url)
-      if permalink && !Configuration.editor_interface_enabled?
+      dont_resolve_blobs = options.delete(:dont_resolve_blobs)
+      if permalink
         __send__("cms_permalink_#{path_or_url}", options.merge(:permalink => permalink))
-      elsif obj.homepage? && !Configuration.editor_interface_enabled?
+      elsif obj.homepage?
         __send__("root_#{path_or_url}", options)
       else
-        if obj.body_data_url && !ignore_body_data_url
-          enforce_protocol_from_request(obj.body_data_url)
-        elsif obj.binary? && !obj.file_extension.blank?
-          __send__("cms_id_#{path_or_url}",
-            options.merge(:id => obj.id, :slug => obj.slug.presence, :format => obj.file_extension))
+        if obj.binary? && !dont_resolve_blobs
+          if obj.body_data_url
+            enforce_protocol_from_request(obj.body_data_url)
+          else
+            LINK_TO_EMPTY_BLOB
+          end
         else
-          routing_options = options.merge(:id => obj.id, :slug => obj.slug.presence)
-          __send__("cms_id_#{path_or_url}", routing_options)
+          __send__(
+            "cms_id_#{path_or_url}",
+            options.merge(
+              id: obj.id,
+              slug: obj.slug.presence
+            )
+          )
         end
       end
     end
@@ -77,7 +84,7 @@ module RailsConnector
         __send__("cms_#{path_or_url}", link.obj, options)
       else
         url = link.external_url
-        options.delete(:ignore_body_data_url)
+        options.delete(:dont_resolve_blobs)
         url = merge_options(url, options) if options.any?
         url
       end

data/app/helpers/rails_connector/display_helper.rb

@@ -26,30 +26,18 @@ module RailsConnector
 
     def display_original_value(value)
       case value
-        when HtmlString then convert_links(value, :ignore_body_data_url => true).html_safe
+        when HtmlString then convert_links(value, :dont_resolve_blobs => true).html_safe
         else display_value(value)
       end
     end
 
-    # Renders a field from the CMS, including an edit marker for the preview
-    # If the option :marker is +false+, no edit marker will be rendered.
+    # Renders a field from the CMS.
     #
     # <%= display_field @obj, :title %>
     #
-    # When creating an edit marker, all options except :marker are passed to {MarkerHelper#edit_marker}.
-    #
     # @api public
     def display_field(obj, attr, options = {})
-      options.reverse_merge!({
-        :marker => ![:id, :path, :created, :last_changed, :version].include?(attr.to_sym)
-        })
-      if options.delete :marker
-        edit_marker(obj, attr, options) do |obj, attr|
-          display_value obj[attr]
-        end
-      else
-        display_value obj[attr]
-      end
+      display_value obj[attr]
     end
 
     # Legacy method - deprecated

data/app/helpers/rails_connector/layout_helper.rb

@@ -11,7 +11,6 @@ module RailsConnector
       html = "".html_safe
       html += tag('meta', :name => 'generator',
           :content => "Rails Connector for Infopark CMS Fiona by Infopark AG (www.infopark.de)")
-      html += include_edit_marker_support
       html += include_editing_stylesheet
       html
     end
@@ -20,7 +19,6 @@ module RailsConnector
     # @api public
     def rails_connector_after_content_tags
       html = "".html_safe
-      html += render_marker_code
       html += include_editing_javascript
       html
     end

data/app/helpers/rails_connector/table_of_contents_helper.rb

@@ -1,22 +1,7 @@
 module RailsConnector
-
-  #
-  # This module contains a helper that can be used to build a table of contents of an object.
-  #
-  # @api public
   module TableOfContentsHelper
-
-    #
-    # The <tt>table_of_contents</tt> helper method gets an object as argument and returns an array,
-    # which can be used as the table of contents of the given object.
-    #
-    # The returned array consists of the child objects of the given object.
-    # The array is sorted according to the configured sort order and the sort keys.
-    # It also contains only objects which the current user is permitted to view.
-    #
-    # @api public
     def table_of_contents(obj)
-      obj.sorted_toclist.reject { |o| not o.permitted_for_user?(current_user) }
+      obj.sorted_toclist
     end
   end
 end

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## /Network/Servers/xs2.infopark/Users/develop/dcc/tmp/Rails_Connector__Kris__dev__93/repos/cloud_connector/config/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Tue Nov 12 13:43:40 2013 UTC
+## Converted at: Thu Nov 21 10:33:57 2013 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/config/cms_routes.rb

@@ -4,9 +4,6 @@ Rails.application.routes.draw do
     :to => 'rails_connector/cms_dispatch#index',
     :constraints => { :id => /\d+|[0-9a-f]{16}/ },
     :as => "cms_id"
-  match 'toggle_markers/:id',
-    :to => 'rails_connector/cms_dispatch#toggle_editmarkers',
-    :as => "toggle_markers"
   match '/*permalink',
     :to => 'rails_connector/cms_dispatch#index',
     :as => 'cms_permalink',

data/lib/assets/javascripts/infopark_editing.js

@@ -2318,32 +2318,45 @@ THE SOFTWARE.
 
 */
 
-// lib/handlebars/base.js
-
-/*jshint eqnull:true*/
-
-this.Handlebars = {};
+// lib/handlebars/browser-prefix.js
+var Handlebars = {};
 
-(function(Handlebars) {
+(function(Handlebars, undefined) {
+;
+// lib/handlebars/base.js
 
-Handlebars.VERSION = "1.0.0-rc.3";
-Handlebars.COMPILER_REVISION = 2;
+Handlebars.VERSION = "1.0.0-rc.4";
+Handlebars.COMPILER_REVISION = 3;
 
 Handlebars.REVISION_CHANGES = {
   1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-  2: '>= 1.0.0-rc.3'
+  2: '== 1.0.0-rc.3',
+  3: '>= 1.0.0-rc.4'
 };
 
 Handlebars.helpers  = {};
 Handlebars.partials = {};
 
+var toString = Object.prototype.toString,
+    functionType = '[object Function]',
+    objectType = '[object Object]';
+
 Handlebars.registerHelper = function(name, fn, inverse) {
-  if(inverse) { fn.not = inverse; }
-  this.helpers[name] = fn;
+  if (toString.call(name) === objectType) {
+    if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); }
+    Handlebars.Utils.extend(this.helpers, name);
+  } else {
+    if (inverse) { fn.not = inverse; }
+    this.helpers[name] = fn;
+  }
 };
 
 Handlebars.registerPartial = function(name, str) {
-  this.partials[name] = str;
+  if (toString.call(name) === objectType) {
+    Handlebars.Utils.extend(this.partials,  name);
+  } else {
+    this.partials[name] = str;
+  }
 };
 
 Handlebars.registerHelper('helperMissing', function(arg) {
@@ -2354,13 +2367,9 @@ Handlebars.registerHelper('helperMissing', function(arg) {
   }
 });
 
-var toString = Object.prototype.toString, functionType = "[object Function]";
-
 Handlebars.registerHelper('blockHelperMissing', function(context, options) {
   var inverse = options.inverse || function() {}, fn = options.fn;
 
-
-  var ret = "";
   var type = toString.call(context);
 
   if(type === functionType) { context = context.call(this); }
@@ -2451,23 +2460,17 @@ Handlebars.registerHelper('if', function(context, options) {
 });
 
 Handlebars.registerHelper('unless', function(context, options) {
-  var fn = options.fn, inverse = options.inverse;
-  options.fn = inverse;
-  options.inverse = fn;
-
-  return Handlebars.helpers['if'].call(this, context, options);
+  return Handlebars.helpers['if'].call(this, context, {fn: options.inverse, inverse: options.fn});
 });
 
 Handlebars.registerHelper('with', function(context, options) {
-  return options.fn(context);
+  if (!Handlebars.Utils.isEmpty(context)) return options.fn(context);
 });
 
 Handlebars.registerHelper('log', function(context, options) {
   var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
   Handlebars.log(level, context);
 });
-
-}(this.Handlebars));
 ;
 // lib/handlebars/utils.js
 
@@ -2491,48 +2494,61 @@ Handlebars.SafeString.prototype.toString = function() {
   return this.string.toString();
 };
 
-(function() {
-  var escape = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': "&quot;",
-    "'": "&#x27;",
-    "`": "&#x60;"
-  };
+var escape = {
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': "&quot;",
+  "'": "&#x27;",
+  "`": "&#x60;"
+};
 
-  var badChars = /[&<>"'`]/g;
-  var possible = /[&<>"'`]/;
+var badChars = /[&<>"'`]/g;
+var possible = /[&<>"'`]/;
 
-  var escapeChar = function(chr) {
-    return escape[chr] || "&amp;";
-  };
+var escapeChar = function(chr) {
+  return escape[chr] || "&amp;";
+};
 
-  Handlebars.Utils = {
-    escapeExpression: function(string) {
-      // don't escape SafeStrings, since they're already safe
-      if (string instanceof Handlebars.SafeString) {
-        return string.toString();
-      } else if (string == null || string === false) {
-        return "";
+Handlebars.Utils = {
+  extend: function(obj, value) {
+    for(var key in value) {
+      if(value.hasOwnProperty(key)) {
+        obj[key] = value[key];
       }
+    }
+  },
 
-      if(!possible.test(string)) { return string; }
-      return string.replace(badChars, escapeChar);
-    },
+  escapeExpression: function(string) {
+    // don't escape SafeStrings, since they're already safe
+    if (string instanceof Handlebars.SafeString) {
+      return string.toString();
+    } else if (string == null || string === false) {
+      return "";
+    }
 
-    isEmpty: function(value) {
-      if (!value && value !== 0) {
-        return true;
-      } else if(Object.prototype.toString.call(value) === "[object Array]" && value.length === 0) {
-        return true;
-      } else {
-        return false;
-      }
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = string.toString();
+
+    if(!possible.test(string)) { return string; }
+    return string.replace(badChars, escapeChar);
+  },
+
+  isEmpty: function(value) {
+    if (!value && value !== 0) {
+      return true;
+    } else if(toString.call(value) === "[object Array]" && value.length === 0) {
+      return true;
+    } else {
+      return false;
     }
-  };
-})();;
+  }
+};
+;
 // lib/handlebars/runtime.js
+
 Handlebars.VM = {
   template: function(templateSpec) {
     // Just add water
@@ -2543,13 +2559,11 @@ Handlebars.VM = {
       program: function(i, fn, data) {
         var programWrapper = this.programs[i];
         if(data) {
-          return Handlebars.VM.program(fn, data);
-        } else if(programWrapper) {
-          return programWrapper;
-        } else {
-          programWrapper = this.programs[i] = Handlebars.VM.program(fn);
-          return programWrapper;
+          programWrapper = Handlebars.VM.program(i, fn, data);
+        } else if (!programWrapper) {
+          programWrapper = this.programs[i] = Handlebars.VM.program(i, fn);
         }
+        return programWrapper;
       },
       programWithDepth: Handlebars.VM.programWithDepth,
       noop: Handlebars.VM.noop,
@@ -2581,21 +2595,27 @@ Handlebars.VM = {
     };
   },
 
-  programWithDepth: function(fn, data, $depth) {
-    var args = Array.prototype.slice.call(arguments, 2);
+  programWithDepth: function(i, fn, data /*, $depth */) {
+    var args = Array.prototype.slice.call(arguments, 3);
 
-    return function(context, options) {
+    var program = function(context, options) {
       options = options || {};
 
       return fn.apply(this, [context, options.data || data].concat(args));
     };
+    program.program = i;
+    program.depth = args.length;
+    return program;
   },
-  program: function(fn, data) {
-    return function(context, options) {
+  program: function(i, fn, data) {
+    var program = function(context, options) {
       options = options || {};
 
       return fn(context, options.data || data);
     };
+    program.program = i;
+    program.depth = 0;
+    return program;
   },
   noop: function() { return ""; },
   invokePartial: function(partial, name, context, helpers, partials, data) {
@@ -2616,6 +2636,9 @@ Handlebars.VM = {
 
 Handlebars.template = Handlebars.VM.template;
 ;
+// lib/handlebars/browser-suffix.js
+})(Handlebars);
+;
 /*!
  * jQuery Cookie Plugin v1.3.1
  * https://github.com/carhartl/jquery-cookie
@@ -5380,9 +5403,9 @@ if (typeof module !== 'undefined' && module.exports) {
 }
 
 ;
-//     Underscore.js 1.4.4
+//     Underscore.js 1.5.2
 //     http://underscorejs.org
-//     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc.
+//     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
 
 (function() {
@@ -5390,7 +5413,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // Baseline setup
   // --------------
 
-  // Establish the root object, `window` in the browser, or `global` on the server.
+  // Establish the root object, `window` in the browser, or `exports` on the server.
   var root = this;
 
   // Save the previous value of the `_` variable.
@@ -5403,11 +5426,12 @@ if (typeof module !== 'undefined' && module.exports) {
   var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
 
   // Create quick reference variables for speed access to core prototypes.
-  var push             = ArrayProto.push,
-      slice            = ArrayProto.slice,
-      concat           = ArrayProto.concat,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
+  var
+    push             = ArrayProto.push,
+    slice            = ArrayProto.slice,
+    concat           = ArrayProto.concat,
+    toString         = ObjProto.toString,
+    hasOwnProperty   = ObjProto.hasOwnProperty;
 
   // All **ECMAScript 5** native function implementations that we hope to use
   // are declared here.
@@ -5446,7 +5470,7 @@ if (typeof module !== 'undefined' && module.exports) {
   }
 
   // Current version.
-  _.VERSION = '1.4.4';
+  _.VERSION = '1.5.2';
 
   // Collection Functions
   // --------------------
@@ -5459,14 +5483,13 @@ if (typeof module !== 'undefined' && module.exports) {
     if (nativeForEach && obj.forEach === nativeForEach) {
       obj.forEach(iterator, context);
     } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
+      for (var i = 0, length = obj.length; i < length; i++) {
         if (iterator.call(context, obj[i], i, obj) === breaker) return;
       }
     } else {
-      for (var key in obj) {
-        if (_.has(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
+      var keys = _.keys(obj);
+      for (var i = 0, length = keys.length; i < length; i++) {
+        if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
       }
     }
   };
@@ -5478,7 +5501,7 @@ if (typeof module !== 'undefined' && module.exports) {
     if (obj == null) return results;
     if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
     each(obj, function(value, index, list) {
-      results[results.length] = iterator.call(context, value, index, list);
+      results.push(iterator.call(context, value, index, list));
     });
     return results;
   };
@@ -5553,7 +5576,7 @@ if (typeof module !== 'undefined' && module.exports) {
     if (obj == null) return results;
     if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
     each(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) results[results.length] = value;
+      if (iterator.call(context, value, index, list)) results.push(value);
     });
     return results;
   };
@@ -5637,7 +5660,7 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Return the maximum element or (element-based computation).
   // Can't optimize arrays of integers longer than 65,535 elements.
-  // See: https://bugs.webkit.org/show_bug.cgi?id=80797
+  // See [WebKit Bug 80797](https://bugs.webkit.org/show_bug.cgi?id=80797)
   _.max = function(obj, iterator, context) {
     if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
       return Math.max.apply(Math, obj);
@@ -5646,7 +5669,7 @@ if (typeof module !== 'undefined' && module.exports) {
     var result = {computed : -Infinity, value: -Infinity};
     each(obj, function(value, index, list) {
       var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed >= result.computed && (result = {value : value, computed : computed});
+      computed > result.computed && (result = {value : value, computed : computed});
     });
     return result.value;
   };
@@ -5665,7 +5688,8 @@ if (typeof module !== 'undefined' && module.exports) {
     return result.value;
   };
 
-  // Shuffle an array.
+  // Shuffle an array, using the modern version of the
+  // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle).
   _.shuffle = function(obj) {
     var rand;
     var index = 0;
@@ -5678,6 +5702,16 @@ if (typeof module !== 'undefined' && module.exports) {
     return shuffled;
   };
 
+  // Sample **n** random values from an array.
+  // If **n** is not specified, returns a single random element from the array.
+  // The internal `guard` argument allows it to work with `map`.
+  _.sample = function(obj, n, guard) {
+    if (arguments.length < 2 || guard) {
+      return obj[_.random(obj.length - 1)];
+    }
+    return _.shuffle(obj).slice(0, Math.max(0, n));
+  };
+
   // An internal function to generate lookup iterators.
   var lookupIterator = function(value) {
     return _.isFunction(value) ? value : function(obj){ return obj[value]; };
@@ -5688,9 +5722,9 @@ if (typeof module !== 'undefined' && module.exports) {
     var iterator = lookupIterator(value);
     return _.pluck(_.map(obj, function(value, index, list) {
       return {
-        value : value,
-        index : index,
-        criteria : iterator.call(context, value, index, list)
+        value: value,
+        index: index,
+        criteria: iterator.call(context, value, index, list)
       };
     }).sort(function(left, right) {
       var a = left.criteria;
@@ -5699,38 +5733,41 @@ if (typeof module !== 'undefined' && module.exports) {
         if (a > b || a === void 0) return 1;
         if (a < b || b === void 0) return -1;
       }
-      return left.index < right.index ? -1 : 1;
+      return left.index - right.index;
     }), 'value');
   };
 
   // An internal function used for aggregate "group by" operations.
-  var group = function(obj, value, context, behavior) {
-    var result = {};
-    var iterator = lookupIterator(value == null ? _.identity : value);
-    each(obj, function(value, index) {
-      var key = iterator.call(context, value, index, obj);
-      behavior(result, key, value);
-    });
-    return result;
+  var group = function(behavior) {
+    return function(obj, value, context) {
+      var result = {};
+      var iterator = value == null ? _.identity : lookupIterator(value);
+      each(obj, function(value, index) {
+        var key = iterator.call(context, value, index, obj);
+        behavior(result, key, value);
+      });
+      return result;
+    };
   };
 
   // Groups the object's values by a criterion. Pass either a string attribute
   // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
-      (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
-    });
-  };
+  _.groupBy = group(function(result, key, value) {
+    (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
+  });
+
+  // Indexes the object's values by a criterion, similar to `groupBy`, but for
+  // when you know that your index values will be unique.
+  _.indexBy = group(function(result, key, value) {
+    result[key] = value;
+  });
 
   // Counts instances of an object that group by a certain criterion. Pass
   // either a string attribute to count by, or a function that returns the
   // criterion.
-  _.countBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key) {
-      if (!_.has(result, key)) result[key] = 0;
-      result[key]++;
-    });
-  };
+  _.countBy = group(function(result, key) {
+    _.has(result, key) ? result[key]++ : result[key] = 1;
+  });
 
   // Use a comparator function to figure out the smallest index at which
   // an object should be inserted so as to maintain order. Uses binary search.
@@ -5745,7 +5782,7 @@ if (typeof module !== 'undefined' && module.exports) {
     return low;
   };
 
-  // Safely convert anything iterable into a real, live array.
+  // Safely create a real, live array from anything iterable.
   _.toArray = function(obj) {
     if (!obj) return [];
     if (_.isArray(obj)) return slice.call(obj);
@@ -5767,7 +5804,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // allows it to work with `_.map`.
   _.first = _.head = _.take = function(array, n, guard) {
     if (array == null) return void 0;
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
+    return (n == null) || guard ? array[0] : slice.call(array, 0, n);
   };
 
   // Returns everything but the last entry of the array. Especially useful on
@@ -5782,10 +5819,10 @@ if (typeof module !== 'undefined' && module.exports) {
   // values in the array. The **guard** check allows it to work with `_.map`.
   _.last = function(array, n, guard) {
     if (array == null) return void 0;
-    if ((n != null) && !guard) {
-      return slice.call(array, Math.max(array.length - n, 0));
-    } else {
+    if ((n == null) || guard) {
       return array[array.length - 1];
+    } else {
+      return slice.call(array, Math.max(array.length - n, 0));
     }
   };
 
@@ -5804,8 +5841,11 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Internal implementation of a recursive `flatten` function.
   var flatten = function(input, shallow, output) {
+    if (shallow && _.every(input, _.isArray)) {
+      return concat.apply(output, input);
+    }
     each(input, function(value) {
-      if (_.isArray(value)) {
+      if (_.isArray(value) || _.isArguments(value)) {
         shallow ? push.apply(output, value) : flatten(value, shallow, output);
       } else {
         output.push(value);
@@ -5814,7 +5854,7 @@ if (typeof module !== 'undefined' && module.exports) {
     return output;
   };
 
-  // Return a completely flattened version of an array.
+  // Flatten out an array, either recursively (by default), or just one level.
   _.flatten = function(array, shallow) {
     return flatten(array, shallow, []);
   };
@@ -5848,7 +5888,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // Produce an array that contains the union: each distinct element from all of
   // the passed-in arrays.
   _.union = function() {
-    return _.uniq(concat.apply(ArrayProto, arguments));
+    return _.uniq(_.flatten(arguments, true));
   };
 
   // Produce an array that contains every item shared between all the
@@ -5872,11 +5912,10 @@ if (typeof module !== 'undefined' && module.exports) {
   // Zip together multiple lists into a single array -- elements that share
   // an index go together.
   _.zip = function() {
-    var args = slice.call(arguments);
-    var length = _.max(_.pluck(args, 'length'));
+    var length = _.max(_.pluck(arguments, "length").concat(0));
     var results = new Array(length);
     for (var i = 0; i < length; i++) {
-      results[i] = _.pluck(args, "" + i);
+      results[i] = _.pluck(arguments, '' + i);
     }
     return results;
   };
@@ -5887,7 +5926,7 @@ if (typeof module !== 'undefined' && module.exports) {
   _.object = function(list, values) {
     if (list == null) return {};
     var result = {};
-    for (var i = 0, l = list.length; i < l; i++) {
+    for (var i = 0, length = list.length; i < length; i++) {
       if (values) {
         result[list[i]] = values[i];
       } else {
@@ -5905,17 +5944,17 @@ if (typeof module !== 'undefined' && module.exports) {
   // for **isSorted** to use binary search.
   _.indexOf = function(array, item, isSorted) {
     if (array == null) return -1;
-    var i = 0, l = array.length;
+    var i = 0, length = array.length;
     if (isSorted) {
       if (typeof isSorted == 'number') {
-        i = (isSorted < 0 ? Math.max(0, l + isSorted) : isSorted);
+        i = (isSorted < 0 ? Math.max(0, length + isSorted) : isSorted);
       } else {
         i = _.sortedIndex(array, item);
         return array[i] === item ? i : -1;
       }
     }
     if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
-    for (; i < l; i++) if (array[i] === item) return i;
+    for (; i < length; i++) if (array[i] === item) return i;
     return -1;
   };
 
@@ -5941,11 +5980,11 @@ if (typeof module !== 'undefined' && module.exports) {
     }
     step = arguments[2] || 1;
 
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
+    var length = Math.max(Math.ceil((stop - start) / step), 0);
     var idx = 0;
-    var range = new Array(len);
+    var range = new Array(length);
 
-    while(idx < len) {
+    while(idx < length) {
       range[idx++] = start;
       start += step;
     }
@@ -5964,7 +6003,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // available.
   _.bind = function(func, context) {
     var args, bound;
-    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+    if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
     if (!_.isFunction(func)) throw new TypeError;
     args = slice.call(arguments, 2);
     return bound = function() {
@@ -6020,17 +6059,23 @@ if (typeof module !== 'undefined' && module.exports) {
   };
 
   // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time.
-  _.throttle = function(func, wait) {
-    var context, args, timeout, result;
+  // during a given window of time. Normally, the throttled function will run
+  // as much as it can, without ever going more than once per `wait` duration;
+  // but if you'd like to disable the execution on the leading edge, pass
+  // `{leading: false}`. To disable execution on the trailing edge, ditto.
+  _.throttle = function(func, wait, options) {
+    var context, args, result;
+    var timeout = null;
     var previous = 0;
+    options || (options = {});
     var later = function() {
-      previous = new Date;
+      previous = options.leading === false ? 0 : new Date;
       timeout = null;
       result = func.apply(context, args);
     };
     return function() {
       var now = new Date;
+      if (!previous && options.leading === false) previous = now;
       var remaining = wait - (now - previous);
       context = this;
       args = arguments;
@@ -6039,7 +6084,7 @@ if (typeof module !== 'undefined' && module.exports) {
         timeout = null;
         previous = now;
         result = func.apply(context, args);
-      } else if (!timeout) {
+      } else if (!timeout && options.trailing !== false) {
         timeout = setTimeout(later, remaining);
       }
       return result;
@@ -6051,16 +6096,24 @@ if (typeof module !== 'undefined' && module.exports) {
   // N milliseconds. If `immediate` is passed, trigger the function on the
   // leading edge, instead of the trailing.
   _.debounce = function(func, wait, immediate) {
-    var timeout, result;
+    var timeout, args, context, timestamp, result;
     return function() {
-      var context = this, args = arguments;
+      context = this;
+      args = arguments;
+      timestamp = new Date();
       var later = function() {
-        timeout = null;
-        if (!immediate) result = func.apply(context, args);
+        var last = (new Date()) - timestamp;
+        if (last < wait) {
+          timeout = setTimeout(later, wait - last);
+        } else {
+          timeout = null;
+          if (!immediate) result = func.apply(context, args);
+        }
       };
       var callNow = immediate && !timeout;
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
+      if (!timeout) {
+        timeout = setTimeout(later, wait);
+      }
       if (callNow) result = func.apply(context, args);
       return result;
     };
@@ -6105,7 +6158,6 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Returns a function that will only be executed after being called N times.
   _.after = function(times, func) {
-    if (times <= 0) return func();
     return function() {
       if (--times < 1) {
         return func.apply(this, arguments);
@@ -6121,28 +6173,39 @@ if (typeof module !== 'undefined' && module.exports) {
   _.keys = nativeKeys || function(obj) {
     if (obj !== Object(obj)) throw new TypeError('Invalid object');
     var keys = [];
-    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
+    for (var key in obj) if (_.has(obj, key)) keys.push(key);
     return keys;
   };
 
   // Retrieve the values of an object's properties.
   _.values = function(obj) {
-    var values = [];
-    for (var key in obj) if (_.has(obj, key)) values.push(obj[key]);
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var values = new Array(length);
+    for (var i = 0; i < length; i++) {
+      values[i] = obj[keys[i]];
+    }
     return values;
   };
 
   // Convert an object into a list of `[key, value]` pairs.
   _.pairs = function(obj) {
-    var pairs = [];
-    for (var key in obj) if (_.has(obj, key)) pairs.push([key, obj[key]]);
+    var keys = _.keys(obj);
+    var length = keys.length;
+    var pairs = new Array(length);
+    for (var i = 0; i < length; i++) {
+      pairs[i] = [keys[i], obj[keys[i]]];
+    }
     return pairs;
   };
 
   // Invert the keys and values of an object. The values must be serializable.
   _.invert = function(obj) {
     var result = {};
-    for (var key in obj) if (_.has(obj, key)) result[obj[key]] = key;
+    var keys = _.keys(obj);
+    for (var i = 0, length = keys.length; i < length; i++) {
+      result[obj[keys[i]]] = keys[i];
+    }
     return result;
   };
 
@@ -6217,7 +6280,7 @@ if (typeof module !== 'undefined' && module.exports) {
   // Internal recursive comparison function for `isEqual`.
   var eq = function(a, b, aStack, bStack) {
     // Identical objects are equal. `0 === -0`, but they aren't identical.
-    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
+    // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal).
     if (a === b) return a !== 0 || 1 / a == 1 / b;
     // A strict comparison is necessary because `null == undefined`.
     if (a == null || b == null) return a === b;
@@ -6259,6 +6322,13 @@ if (typeof module !== 'undefined' && module.exports) {
       // unique nested structures.
       if (aStack[length] == a) return bStack[length] == b;
     }
+    // Objects with different constructors are not equivalent, but `Object`s
+    // from different frames are.
+    var aCtor = a.constructor, bCtor = b.constructor;
+    if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
+                             _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
+      return false;
+    }
     // Add the first object to the stack of traversed objects.
     aStack.push(a);
     bStack.push(b);
@@ -6275,13 +6345,6 @@ if (typeof module !== 'undefined' && module.exports) {
         }
       }
     } else {
-      // Objects with different constructors are not equivalent, but `Object`s
-      // from different frames are.
-      var aCtor = a.constructor, bCtor = b.constructor;
-      if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
-                               _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
-        return false;
-      }
       // Deep compare objects.
       for (var key in a) {
         if (_.has(a, key)) {
@@ -6405,7 +6468,7 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Run a function **n** times.
   _.times = function(n, iterator, context) {
-    var accum = Array(n);
+    var accum = Array(Math.max(0, n));
     for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i);
     return accum;
   };
@@ -6426,8 +6489,7 @@ if (typeof module !== 'undefined' && module.exports) {
       '<': '&lt;',
       '>': '&gt;',
       '"': '&quot;',
-      "'": '&#x27;',
-      '/': '&#x2F;'
+      "'": '&#x27;'
     }
   };
   entityMap.unescape = _.invert(entityMap.escape);
@@ -6448,8 +6510,8 @@ if (typeof module !== 'undefined' && module.exports) {
     };
   });
 
-  // If the value of the named property is a function then invoke it;
-  // otherwise, return it.
+  // If the value of the named `property` is a function then invoke it with the
+  // `object` as context; otherwise, return it.
   _.result = function(object, property) {
     if (object == null) return void 0;
     var value = object[property];
@@ -6458,7 +6520,7 @@ if (typeof module !== 'undefined' && module.exports) {
 
   // Add your own custom functions to the Underscore object.
   _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
+    each(_.functions(obj), function(name) {
       var func = _[name] = obj[name];
       _.prototype[name] = function() {
         var args = [this._wrapped];
@@ -6620,7 +6682,7 @@ if (typeof module !== 'undefined' && module.exports) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["choose_obj_class_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing;
 
@@ -6646,7 +6708,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["choose_obj_class_list"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
 
@@ -6684,7 +6746,7 @@ function program2(depth0,data) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["confirmation_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
 
@@ -6734,7 +6796,7 @@ function program1(depth0,data) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["edit_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, options, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
 
@@ -6757,7 +6819,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["editable_workspace_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
 
@@ -6797,7 +6859,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["element_overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   
 
@@ -6809,7 +6871,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["inplace_menu"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
 
@@ -6843,7 +6905,7 @@ function program1(depth0,data) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["inplace_menu_icon"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
 
@@ -6860,7 +6922,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["menu_bar"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   
 
@@ -6872,7 +6934,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["menu_bar_dropdown"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, self=this, functionType="function";
 
@@ -6929,7 +6991,7 @@ function program2(depth0,data) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   
 
@@ -6941,7 +7003,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["prompt_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
 
@@ -6991,7 +7053,7 @@ function program1(depth0,data) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["saving_indicator"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
 
@@ -7010,7 +7072,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["saving_overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   
 
@@ -7022,7 +7084,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["title"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
 
@@ -7039,7 +7101,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["workspace_form_select_list"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
 
@@ -7084,7 +7146,7 @@ function program4(depth0,data) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["workspace_select_list"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, self=this, functionType="function", escapeExpression=this.escapeExpression;
 
@@ -7100,7 +7162,7 @@ function program1(depth0,data) {
   stack2 = helpers['if'].call(depth0, depth0.is_editable, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
   buffer += "\n      </i>\n      "
-    + escapeExpression(((stack1 = depth0.short_title),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+    + escapeExpression(((stack1 = depth0.select_title),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
     + "\n      ";
   stack2 = helpers['if'].call(depth0, depth0.is_current_workspace, {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
@@ -7141,7 +7203,7 @@ function program8(depth0,data) {
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["workspace_select_menu_bar_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
-  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, stack2, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, functionType="function", self=this;
 
@@ -7227,6 +7289,7 @@ $.i18n().load({
   'menu_bar.empty_workspace_title': '<leerer Titel>',
   'menu_bar.published_workspace_title': 'Veröffentlichte Inhalte',
   'menu_bar.loading_workspaces': 'Lade Arbeitskopien',
+  'menu_bar.select_working_copy': '"$1" auswählen',
   'menu_bar.publish_working_copy': '"$1" veröffentlichen',
   'menu_bar.publish_ws_confirmation': '"$1" veröffentlichen?',
   'menu_bar.publish_ws_confirmation_desc': 'Eine Arbeitskopie zu veröffentlichen ist endgültig. Dieser Vorgang kann nicht rückgängig gemacht werden.',
@@ -7311,6 +7374,7 @@ $.i18n().load({
   'menu_bar.empty_workspace_title': '<empty title>',
   'menu_bar.published_workspace_title': 'Published content',
   'menu_bar.loading_workspaces': 'Loading working copies',
+  'menu_bar.select_working_copy': 'Select "$1"',
   'menu_bar.publish_working_copy': 'Publish "$1"',
   'menu_bar.publish_ws_confirmation': 'Publish "$1"?',
   'menu_bar.publish_ws_confirmation_desc': 'Publishing a working copy is final. This action cannot be undone.',
@@ -7948,6 +8012,12 @@ var infopark = {
     }
   };
 
+  var workspace_title_select = function(workspace) {
+    var title = workspace_title_short(workspace);
+
+    return t('menu_bar.select_working_copy', title);
+  };
+
   var renderer = function(view) {
     var select_menu_view = $(infopark.template.render('workspace_select_menu_bar_item', {
       current_workspace: infopark.editing.workspace(),
@@ -7978,7 +8048,7 @@ var infopark = {
           return {
             is_editable: ws.is_editable,
             long_title: workspace_title_long(ws),
-            short_title: workspace_title_short(ws),
+            select_title: workspace_title_select(ws),
             is_current_workspace: (ws.id() === infopark.editing.workspace().id())
           };
         });