infopark_cloud_connector 6.9.0.3.197272233 → 6.9.1.3.22208381

data/app/views/rails_connector/objs/create_widget.html.erb

@@ -1 +1 @@
-<%= render_widget(@widget, @obj, params[:field_name], @container) %>
+<%= render_widget(@widget, @current_page, params[:field_name], @obj) %>

data/config/locales/de.rails_connector.models.yml

@@ -0,0 +1,6 @@
+de:
+  rails_connector:
+    errors:
+      models:
+        basic_obj:
+          has_children: 'Diese Seite hat Unterseiten.'

data/config/locales/en.rails_connector.models.yml

@@ -0,0 +1,6 @@
+en:
+  rails_connector:
+    errors:
+      models:
+        basic_obj:
+          has_children: 'This page has children.'

data/config/routes.rb

@@ -1,8 +1,24 @@
 Rails.application.routes.draw do
-  resources :objs, controller: 'rails_connector/objs', path: '__ipcms/objs', only: [:update, :destroy] do
+  resources :objs, controller: 'rails_connector/objs', path: '__ipcms/objs',
+      only: [:create, :update, :destroy] do
+    get :page_class_selection, on: :collection
+
     member do
       get :widget_class_selection
       post :create_widget
     end
   end
+
+  resources :tasks, controller: 'rails_connector/tasks', path: '__ipcms/tasks', only: [:show]
+
+  match '__ipcms/blobs/upload_permission' => 'rails_connector/blobs#upload_permission', via: :get
+
+  resources :workspaces,
+    controller: 'rails_connector/workspaces',
+    path: '__ipcms/workspaces',
+    only: [:index, :create, :update, :destroy] do
+      member do
+        put :publish
+      end
+    end
 end

data/lib/assets/javascripts/infopark_editing.js

@@ -9751,9 +9751,9 @@ var RLANG = {
         }
     }
 })(jQuery);
-//     Underscore.js 1.4.3
+//     Underscore.js 1.4.4
 //     http://underscorejs.org
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+//     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc.
 //     Underscore may be freely distributed under the MIT license.
 
 (function() {
@@ -9817,7 +9817,7 @@ var RLANG = {
   }
 
   // Current version.
-  _.VERSION = '1.4.3';
+  _.VERSION = '1.4.4';
 
   // Collection Functions
   // --------------------
@@ -9977,8 +9977,9 @@ var RLANG = {
   // Invoke a method (with arguments) on every item in a collection.
   _.invoke = function(obj, method) {
     var args = slice.call(arguments, 2);
+    var isFunc = _.isFunction(method);
     return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method : value[method]).apply(value, args);
+      return (isFunc ? method : value[method]).apply(value, args);
     });
   };
 
@@ -9988,10 +9989,10 @@ var RLANG = {
   };
 
   // Convenience version of a common use case of `filter`: selecting only objects
-  // with specific `key:value` pairs.
-  _.where = function(obj, attrs) {
-    if (_.isEmpty(attrs)) return [];
-    return _.filter(obj, function(value) {
+  // containing specific `key:value` pairs.
+  _.where = function(obj, attrs, first) {
+    if (_.isEmpty(attrs)) return first ? void 0 : [];
+    return _[first ? 'find' : 'filter'](obj, function(value) {
       for (var key in attrs) {
         if (attrs[key] !== value[key]) return false;
       }
@@ -9999,6 +10000,12 @@ var RLANG = {
     });
   };
 
+  // Convenience version of a common use case of `find`: getting the first object
+  // containing specific `key:value` pairs.
+  _.findWhere = function(obj, attrs) {
+    return _.where(obj, attrs, true);
+  };
+
   // 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
@@ -10070,7 +10077,7 @@ var RLANG = {
   // An internal function used for aggregate "group by" operations.
   var group = function(obj, value, context, behavior) {
     var result = {};
-    var iterator = lookupIterator(value || _.identity);
+    var iterator = lookupIterator(value == null ? _.identity : value);
     each(obj, function(value, index) {
       var key = iterator.call(context, value, index, obj);
       behavior(result, key, value);
@@ -10324,9 +10331,8 @@ var RLANG = {
   var ctor = function(){};
 
   // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
+  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+  // available.
   _.bind = function(func, context) {
     var args, bound;
     if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
@@ -10343,11 +10349,20 @@ var RLANG = {
     };
   };
 
+  // Partially apply a function by creating a version that has had some of its
+  // arguments pre-filled, without changing its dynamic `this` context.
+  _.partial = function(func) {
+    var args = slice.call(arguments, 1);
+    return function() {
+      return func.apply(this, args.concat(slice.call(arguments)));
+    };
+  };
+
   // Bind all of an object's methods to that object. Useful for ensuring that
   // all callbacks defined on an object belong to it.
   _.bindAll = function(obj) {
     var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
+    if (funcs.length === 0) throw new Error("bindAll must be passed function names");
     each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
     return obj;
   };
@@ -10549,7 +10564,7 @@ var RLANG = {
     each(slice.call(arguments, 1), function(source) {
       if (source) {
         for (var prop in source) {
-          if (obj[prop] == null) obj[prop] = source[prop];
+          if (obj[prop] === void 0) obj[prop] = source[prop];
         }
       }
     });
@@ -10772,7 +10787,7 @@ var RLANG = {
       max = min;
       min = 0;
     }
-    return min + (0 | Math.random() * (max - min + 1));
+    return min + Math.floor(Math.random() * (max - min + 1));
   };
 
   // List of HTML entities for escaping.
@@ -10807,7 +10822,7 @@ var RLANG = {
   // If the value of the named property is a function then invoke it;
   // otherwise, return it.
   _.result = function(object, property) {
-    if (object == null) return null;
+    if (object == null) return void 0;
     var value = object[property];
     return _.isFunction(value) ? value.call(object) : value;
   };
@@ -10828,7 +10843,7 @@ var RLANG = {
   // Useful for temporary DOM ids.
   var idCounter = 0;
   _.uniqueId = function(prefix) {
-    var id = '' + ++idCounter;
+    var id = ++idCounter + '';
     return prefix ? prefix + id : id;
   };
 
@@ -10863,6 +10878,7 @@ var RLANG = {
   // Underscore templating handles arbitrary delimiters, preserves whitespace,
   // and correctly escapes quotes within interpolated code.
   _.template = function(text, data, settings) {
+    var render;
     settings = _.defaults({}, settings, _.templateSettings);
 
     // Combine delimiters into one regular expression via alternation.
@@ -10901,7 +10917,7 @@ var RLANG = {
       source + "return __p;\n";
 
     try {
-      var render = new Function(settings.variable || 'obj', '_', source);
+      render = new Function(settings.variable || 'obj', '_', source);
     } catch (e) {
       e.source = source;
       throw e;
@@ -10974,10 +10990,10 @@ var RLANG = {
 }).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
-  this.InfoparkHandlebarsTemplates["choose_widget_class_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.InfoparkHandlebarsTemplates["choose_obj_class_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [2,'>= 1.0.0-rc.3'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, stack2, options, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing;
+  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing;
 
 function program1(depth0,data) {
   
@@ -10991,44 +11007,39 @@ function program1(depth0,data) {
 function program2(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n        <div class=\"ip-widget_thumbnail ip_editing_widget_preview\" data-ip-widget-class-name=\"";
-  if (stack1 = helpers.widget_class_name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.widget_class_name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += "\n        <div class=\"ip-obj_class_thumbnail ip_editing_widget_preview\" data-ip-obj-class-name=\"";
+  if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + "\">\n          ";
-  if (stack1 = helpers.widget_markup) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.widget_markup; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if (stack1 = helpers.markup) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.markup; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n        </div>\n      ";
   return buffer;
   }
 
-  buffer += "<div class=\"ip-choose_widget_class_dialog ip_editing_modal_big\">\n\n  <div class=\"modal_header\">\n    <h3><i class=\"ip_editing_icon\" title=\"widget\">&#61498;</i> ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "choose_widget_class_dialog.title", options) : helperMissing.call(depth0, "translate", "choose_widget_class_dialog.title", options)))
-    + "</h3>\n    <p>";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "choose_widget_class_dialog.description", options) : helperMissing.call(depth0, "translate", "choose_widget_class_dialog.description", options)))
-    + "</p>\n  </div>\n\n  <div class=\"modal_body auto_height\">\n    ";
-  stack2 = helpers.each.call(depth0, depth0.widgets, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
-  if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n  </div>\n\n  <div class=\"modal_footer\">\n    <a href=\"#\" class=\"ip_editing_button cancel\">";
+  buffer += "<div class=\"ip-choose_obj_class_dialog ip_modal_big\">\n\n  <div class=\"modal_header\">\n    <h3><i class=\"ip_icon\">&#61498;</i>";
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</h3>\n  </div>\n\n  <div class=\"modal_body auto_height\">\n    ";
+  stack1 = helpers.each.call(depth0, depth0.obj_classes, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  </div>\n\n  <div class=\"modal_footer\">\n    <a href=\"#\" class=\"ip_button cancel\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "cancel", options) : helperMissing.call(depth0, "translate", "cancel", options)))
-    + "</a>\n    <a href=\"#\" class=\"ip_editing_button green confirm\"><i class=\"ip_editing_icon\">&#61503;</i> ";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "choose_widget_class_dialog.confirm", options) : helperMissing.call(depth0, "translate", "choose_widget_class_dialog.confirm", options)))
     + "</a>\n  </div>\n\n</div>\n";
   return buffer;
   });
-  return this.InfoparkHandlebarsTemplates["choose_widget_class_dialog"];
+  return this.InfoparkHandlebarsTemplates["choose_obj_class_dialog"];
 }).call(this);
 (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'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, helperMissing=helpers.helperMissing;
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
 
 function program1(depth0,data) {
   
@@ -11041,23 +11052,69 @@ function program1(depth0,data) {
   return buffer;
   }
 
-  buffer += "<div class=\"ip-confirmation_dialog ip_editing_modal_small\">\n  <div class=\"modal_header\">\n    <i class=\"ip_editing_icon\">&#61469;</i>\n    <h3 class=\"title\">";
+  buffer += "<div class=\"ip-confirmation_dialog ip_modal_small\">\n  <div class=\"modal_header\">\n    <i class=\"ip_icon\">";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "</i>\n    <h3 class=\"title\">";
   if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + "</h3>\n    ";
   stack1 = helpers['if'].call(depth0, depth0.description, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n  </div>\n  <div class=\"modal_footer\">\n    <a href=\"#\" class=\"ip_editing_button cancel\">";
+  buffer += "\n  </div>\n  <div class=\"modal_footer\">\n    <a href=\"#\" class=\"ip_button ";
+  if (stack1 = helpers.cancel_button_color) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.cancel_button_color; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + " cancel\">\n      ";
+  if (stack1 = helpers.cancel_button_text) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.cancel_button_text; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\n    </a>\n    <a href=\"#\" class=\"ip_button ";
+  if (stack1 = helpers.confirm_button_color) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.confirm_button_color; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + " confirm\">\n      ";
+  if (stack1 = helpers.confirm_button_text) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.confirm_button_text; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\n    </a>\n  </div>\n</div>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["confirmation_dialog"];
+}).call(this);
+(function() {
+  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
+  this.InfoparkHandlebarsTemplates["deactivate_menu_bar_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+
+
+  buffer += "<i class=\"ip_icon\" title=\"";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "cancel", options) : helperMissing.call(depth0, "translate", "cancel", options)))
-    + "</a>\n    <a href=\"#\" class=\"ip_editing_button blue confirm\">";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.deactivate_editing", options) : helperMissing.call(depth0, "translate", "menu_bar.deactivate_editing", options)))
+    + "\">&#xF06C;</i>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["deactivate_menu_bar_item"];
+}).call(this);
+(function() {
+  this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
+  this.InfoparkHandlebarsTemplates["delete_current_page_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [2,'>= 1.0.0-rc.3'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+
+
+  buffer += "<i class=\"ip_icon\">&#xF018;</i>\n<span class=\"ip_button_label\">";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "confirm", options) : helperMissing.call(depth0, "translate", "confirm", options)))
-    + "</a>\n  </div>\n</div>\n";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.delete_current_page", options) : helperMissing.call(depth0, "translate", "menu_bar.delete_current_page", options)))
+    + "</span>\n";
   return buffer;
   });
-  return this.InfoparkHandlebarsTemplates["confirmation_dialog"];
+  return this.InfoparkHandlebarsTemplates["delete_current_page_item"];
 }).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
@@ -11069,7 +11126,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 function program1(depth0,data) {
   
   var buffer = "", stack1;
-  buffer += "\n      <li class=\"ip_editing_menu_item\">\n        <span><i class=\"ip_editing_icon\">"
+  buffer += "\n      <li class=\"ip_menu_item\">\n        <span><i class=\"ip_icon\">"
     + escapeExpression(((stack1 = depth0.icon),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
     + "</i>"
     + escapeExpression(((stack1 = depth0.text),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
@@ -11081,7 +11138,7 @@ function program1(depth0,data) {
   if (stack1 = helpers.menu_id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.menu_id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "\">\n  <ul class=\"ip_editing_menu_box\">\n    ";
+    + "\">\n  <ul class=\"ip_menu_box\">\n    ";
   stack1 = helpers.each.call(depth0, depth0.items, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </ul>\n</div>\n";
@@ -11094,13 +11151,30 @@ function program1(depth0,data) {
   this.InfoparkHandlebarsTemplates["inplace_menu_icon"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [2,'>= 1.0.0-rc.3'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
 
 
-  return "<span class=\"ip_editing_marker\"><i class=\"ip_editing_icon\">&#xF03D;</i></span>\n";
+  buffer += "<span class=\"ip_editing_marker\" id=\"";
+  if (stack1 = helpers.menu_icon_id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.menu_icon_id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\"><i class=\"ip_icon\">&#xF03D;</i></span>\n";
+  return buffer;
   });
   return this.InfoparkHandlebarsTemplates["inplace_menu_icon"];
 }).call(this);
+(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'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  
+
+
+  return "<div class=\"ip_topbar\">\n  <div class=\"ip_first_level\">\n    <div class=\"ip_button_bar ip_app ip_no_hover\">\n      <span class=\"ip_logo\"></span>\n      <span class=\"ip_product_name\">CMS</span>\n    </div>\n\n    <div id=\"ip_select_workspace\" class=\"ip_button_bar\"></div>\n    <div id=\"ip_deactivate_editing\" class=\"ip_button_bar ip_right\"></div>\n    <div id=\"ip_delete_current_page\" class=\"ip_button_bar ip_right ip_red\"></div>\n  </div>\n</div>\n";
+  });
+  return this.InfoparkHandlebarsTemplates["menu_bar"];
+}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -11109,10 +11183,60 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   
 
 
-  return "<div class=\"ip-overlay ip_editing_overlay\"></div>\n";
+  return "<div class=\"ip-overlay ip_overlay\"></div>\n";
   });
   return this.InfoparkHandlebarsTemplates["overlay"];
 }).call(this);
+(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'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n      <p class=\"description\">";
+  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</p>\n    ";
+  return buffer;
+  }
+
+  buffer += "<div class=\"ip-prompt_dialog ip_modal_small\">\n  <div class=\"modal_header\">\n    <i class=\"ip_icon\">";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "</i>\n    <h3 class=\"title\">";
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</h3>\n    ";
+  stack1 = helpers['if'].call(depth0, depth0.description, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  </div>\n  <div class=\"modal_body\">\n    <input type=\"text\" value=\"";
+  if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\" placeholder=\"";
+  if (stack1 = helpers.placeholder) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.placeholder; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\"></input>\n  </div>\n  <div class=\"modal_footer\">\n    <a href=\"#\" class=\"ip_button cancel\">";
+  if (stack1 = helpers.cancel_button_text) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.cancel_button_text; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</a>\n    <a href=\"#\" class=\"ip_button ip_blue accept\">";
+  if (stack1 = helpers.accept_button_text) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.accept_button_text; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</a>\n  </div>\n</div>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["prompt_dialog"];
+}).call(this);
 (function() {
   this.InfoparkHandlebarsTemplates || (this.InfoparkHandlebarsTemplates = {});
   this.InfoparkHandlebarsTemplates["saving_overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -11121,7 +11245,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   
 
 
-  return "<div class=\"ip-saving-overlay ip_editing_overlay\">\n  <i class=\"ip_editing_icon ip_processing\">&#61475;</i>\n</div>\n";
+  return "<div class=\"ip-saving-overlay ip_overlay\">\n  <i class=\"ip_icon ip_processing\">&#61475;</i>\n</div>\n";
   });
   return this.InfoparkHandlebarsTemplates["saving_overlay"];
 }).call(this);
@@ -11142,39 +11266,212 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   });
   return this.InfoparkHandlebarsTemplates["title"];
 }).call(this);
+(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'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, self=this, functionType="function", escapeExpression=this.escapeExpression;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1, stack2;
+  buffer += "\n  ";
+  stack1 = helpers.unless.call(depth0, depth0.is_editable, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n\n  <li class=\"ip_menu_item\">\n    <span>\n      <i class=\"ip_icon\" title=\""
+    + escapeExpression(((stack1 = depth0.long_title),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+    + "\">\n        ";
+  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))
+    + "\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; }
+  buffer += "\n    </span>\n  </li>\n";
+  return buffer;
+  }
+function program2(depth0,data) {
+  
+  
+  return "\n    <li class=\"ip_menu_separator\"></li>\n  ";
+  }
+
+function program4(depth0,data) {
+  
+  
+  return "\n          &#xF011;\n        ";
+  }
+
+function program6(depth0,data) {
+  
+  
+  return "\n          &#xF064;\n        ";
+  }
+
+function program8(depth0,data) {
+  
+  
+  return "\n        <i class=\"ip_icon\" title=\"check\">&#61503;</i>\n      ";
+  }
+
+  stack1 = helpers.each.call(depth0, depth0.workspaces, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["workspace_select_list"];
+}).call(this);
+(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'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, stack2, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, functionType="function", self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "\n    <li class=\"ip_menu_separator\"></li>\n    <li class=\"ip_menu_item\">\n      <span id='ip-publish-current-ws'>\n        <i class=\"ip_icon\"\n          title=\"";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.publish_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.publish_working_copy", depth0.current_short_title, options)))
+    + " \">\n          &#xF064;\n        </i>\n        ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.publish_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.publish_working_copy", depth0.current_short_title, options)))
+    + "\n      </span>\n    </li>\n    <li class=\"ip_menu_item\">\n      <span id='ip-rename-current-ws'>\n        <i class=\"ip_icon\"\n          title=\"";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.rename_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.rename_working_copy", depth0.current_short_title, options)))
+    + " \">&#61519;</i>\n        ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.rename_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.rename_working_copy", depth0.current_short_title, options)))
+    + "\n      </span>\n    </li>\n    <li class=\"ip_menu_item\">\n      <span id='ip-delete-current-ws'>\n        <i class=\"ip_icon\"\n          title=\"";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.delete_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.delete_working_copy", depth0.current_short_title, options)))
+    + " \">&#61464;</i>\n        ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.delete_working_copy", depth0.current_short_title, options) : helperMissing.call(depth0, "translate", "menu_bar.delete_working_copy", depth0.current_short_title, options)))
+    + "\n      </span>\n    </li>\n  ";
+  return buffer;
+  }
+
+  buffer += "<i class=\"ip_icon\">&#xf011;</i>\n<span class=\"ip_button_label\">";
+  if (stack1 = helpers.current_long_title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.current_long_title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</span>\n\n<ul class=\"ip_menu_box\" style=\"display: none;\">\n  <li class=\"ip_menu_item\">\n    <span id='ip-create-new-ws'>\n      <i class=\"ip_icon\" title=\"";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.create_new_working_copy", options) : helperMissing.call(depth0, "translate", "menu_bar.create_new_working_copy", options)))
+    + "\">&#61474;</i>\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.create_new_working_copy", options) : helperMissing.call(depth0, "translate", "menu_bar.create_new_working_copy", options)))
+    + "\n    </span>\n  </li>\n  ";
+  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.current_workspace),stack1 == null || stack1 === false ? stack1 : stack1.is_editable), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n  <li class=\"ip_menu_separator\"></li>\n  <li class=\"ip_menu_item\" id=\"ip_replace_with_real_ws\">\n    <span>\n      <i class=\"ip_icon ip_spinning\"\n        title=\"";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.loading_workspaces", options) : helperMissing.call(depth0, "translate", "menu_bar.loading_workspaces", options)))
+    + "\">&#61475;</i>\n      ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar.loading_workspaces", options) : helperMissing.call(depth0, "translate", "menu_bar.loading_workspaces", options)))
+    + "\n    </span>\n  </li>\n</ul>\n";
+  return buffer;
+  });
+  return this.InfoparkHandlebarsTemplates["workspace_select_menu_bar_item"];
+}).call(this);
 $.i18n().load({
   'confirm': 'Bestätigen',
   'cancel': 'Abbrechen',
   'save': 'Speichern',
   'welcome': 'Willkommen',
-
-  'choose_widget_class_dialog.title': 'Widget Browser',
-  'choose_widget_class_dialog.description': 'Bitte wählen Sie einen Widget aus.',
-  'choose_widget_class_dialog.confirm': 'Widget einfügen',
+  'welcome_x': 'Willkommen $1',
+  'accept': 'Übernehmen',
+
+  'choose_obj_class_dialog.add_child_page.title': 'Seitenvorlage auswählen',
+  'choose_obj_class_dialog.add_widget.title': 'Widget auswählen',
+
+  'menu_bar.deactivate_editing': 'Direktbearbeitung deaktivieren',
+  'menu_bar.working_copy': 'Arbeitskopie',
+  'menu_bar.empty_workspace_title': '<leerer Titel>',
+  'menu_bar.published_workspace_title': 'Veröffentlichte Inhalte',
+  'menu_bar.loading_workspaces': 'Lade Arbeitskopien',
+  '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.',
+  'menu_bar.rename_working_copy': '"$1" umbenennen',
+  'menu_bar.rename_working_copy_desc': 'Bitte geben Sie den neuen Titel der Arbeitskopie ein.',
+  'menu_bar.rename': 'Umbenennen',
+  'menu_bar.delete_working_copy': '"$1" löschen',
+  'menu_bar.delete_ws_confirmation': 'Wirklich "$1" löschen?',
+  'menu_bar.delete_ws_confirmation_desc': 'Eine gelöschte Arbeitskopie kann nicht wiederhergestellt werden.',
+  'menu_bar.delete': 'Löschen',
+  'menu_bar.create': 'Anlegen',
+  'menu_bar.publish': 'Veröffentlichen',
+  'menu_bar.create_new_working_copy': 'Arbeitskopie anlegen',
+  'menu_bar.create_new_ws_confirmation': 'Arbeitskopie anlegen',
+  'menu_bar.create_new_ws_confirmation_desc': 'Bitte geben Sie den Titel der neuen Arbeitskopie ein.',
+  'menu_bar.create_new_ws_confirmation_placeholder': 'Neuer Titel',
+  'menu_bar.delete_current_page': 'Diese Seite löschen',
+
+  'child_list_menus.add_subpage': 'Neue Seite anlegen',
 
   'widget_menus.add_widget': 'Widget einfügen',
   'widget_menus.delete_widget': 'Widget löschen',
-  'widget_menus.open_in_admin_gui': ' In der Admin-GUI öffnen',
+  'widget_menus.open_in_admin_gui': ' Im Admin-GUI öffnen',
 
-  'commands.delete_widget.confirm_title': 'Sind Sie sicher, dass sie dieses Widget löschen wollen?',
-  'commands.delete_widget.confirm_description': 'Das kann nicht mehr rückgängig gemacht werden!'
+  'commands.delete_obj.confirm_title': 'Sind Sie sicher, dass sie diese Seite löschen wollen?',
+  'commands.delete_obj.confirm_description': 'Das kann nicht mehr rückgängig gemacht werden!',
+  'commands.delete_widget.confirm_title': 'Wirklich dieses Widget löschen?',
+  'commands.delete_widget.confirm_description': 'Ein gelöschtes Widget kann nicht wiederhergestellt werden.',
+
+  'image_upload.too_many_files': 'Nur eine Detei erlaubt.'
 }, 'de');
 $.i18n().load({
   'confirm': 'Confirm',
   'cancel': 'Cancel',
   'save': 'Save',
   'welcome': 'Welcome',
-
-  'choose_widget_class_dialog.title': 'Widget browser',
-  'choose_widget_class_dialog.description': 'Please select a widget.',
-  'choose_widget_class_dialog.confirm': 'Paste widget',
+  'welcome_x': 'Welcome $1',
+  'accept': 'Accept',
+
+  'choose_obj_class_dialog.add_child_page.title': 'Select Page Type',
+  'choose_obj_class_dialog.add_widget.title': 'Select Widget',
+
+  'menu_bar.deactivate_editing': 'deactivate in-place editing',
+  'menu_bar.working_copy': 'Working copy',
+  'menu_bar.empty_workspace_title': '<empty title>',
+  'menu_bar.published_workspace_title': 'Published content',
+  'menu_bar.loading_workspaces': 'Loading working copies',
+  '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.',
+  'menu_bar.rename_working_copy': 'Rename "$1"',
+  'menu_bar.rename_working_copy_desc': 'Please enter the new title of the working copy.',
+  'menu_bar.rename': 'Rename',
+  'menu_bar.delete_working_copy': 'Delete "$1"',
+  'menu_bar.delete_ws_confirmation': 'Really delete "$1"?',
+  'menu_bar.delete_ws_confirmation_desc': 'A deleted working copy cannot be restored.',
+  'menu_bar.delete': 'Delete',
+  'menu_bar.create': 'Create',
+  'menu_bar.publish': 'Publish',
+  'menu_bar.create_new_working_copy': 'Create working copy',
+  'menu_bar.create_new_ws_confirmation': 'Create a working copy',
+  'menu_bar.create_new_ws_confirmation_desc': 'Please enter the title of the new working copy.',
+  'menu_bar.create_new_ws_confirmation_placeholder': 'new title',
+  'menu_bar.delete_current_page': 'Delete this page',
+
+  'child_list_menus.add_subpage': 'Create new page',
 
   'widget_menus.add_widget': 'Insert widget',
-  'widget_menus.delete_widget': 'Remove widget',
+  'widget_menus.delete_widget': 'Delete widget',
   'widget_menus.open_in_admin_gui': 'Open in admin GUI',
 
-  'commands.delete_widget.confirm_title': 'Are you sure you want to delete this widget?',
-  'commands.delete_widget.confirm_description': 'This can not be undone!'
+  'commands.delete_obj.confirm_title': 'Are you sure you want to delete this page?',
+  'commands.delete_obj.confirm_description': 'This can not be undone!',
+  'commands.delete_widget.confirm_title': 'Really delete this widget?',
+  'commands.delete_widget.confirm_description': 'A deleted widget cannot be restored.',
+
+  'image_upload.too_many_files': 'Only one file allowed.'
 }, 'en');
 /*global alert:false */
 
@@ -11183,13 +11480,39 @@ var infopark = {
   suppress_alerts: false,
 
   alert: function(message) {
-    if (infopark.suppress_alerts) {
-      window.console.debug('Infopark alert: ' + message);
-    } else {
+    if (!infopark.suppress_alerts) {
       window.alert(message);
     }
   },
 
+  change_location: function(location) {
+    // this is a proxy method, so we can stub it easier.
+    window.location = location;
+  },
+
+  redirect_to: function(location) {
+    infopark.change_location(location);
+    // it returns an never resolved or rejected deferred.
+    return $.Deferred();
+  },
+
+  wait: function(seconds) {
+    // this is a proxy method, so we can stub it easier.
+    return $.Deferred(function(dfd) {
+      setTimeout(dfd.resolve, seconds * 1000);
+    });
+  },
+
+  // For testing purpose only.
+  reload_location: function() {
+    window.location.reload();
+  },
+
+  reload: function() {
+    infopark.reload_location();
+    return $.Deferred();
+  },
+
   center: function(elem) {
     if (elem.length === 1) {
       elem.css({
@@ -11200,6 +11523,19 @@ var infopark = {
     }
   },
 
+  ensure_fully_visible_within: function(elem, viewport_container, viewport_height) {
+    var viewport_offset = viewport_container.scrollTop();
+
+    var widget_offset = elem.offset().top;
+    var widget_height = elem.height();
+
+    if (viewport_offset > widget_offset) {
+      viewport_container.animate({scrollTop: widget_offset - 50});
+    } else if (widget_offset + widget_height > viewport_offset + viewport_height) {
+      viewport_container.animate({scrollTop: widget_height + widget_offset + 50 - viewport_height});
+    }
+  },
+
   describe_element: function(elem) {
     var description = elem.get(0).nodeName;
     if (elem.attr("id")) { description += "#"+elem.attr("id"); }
@@ -11212,7 +11548,33 @@ var infopark = {
     return "["+description+"]";
   },
 
-  admin_gui_base_url: null
+  add_enter_and_escape_action: function(enter_action, escape_action) {
+    var key_actions = {
+      13: enter_action,   // enter key
+      27: escape_action   // escape key
+    };
+
+    $(document).on('keyup.ip_enter_escape_action', function(e) {
+      if (key_actions[e.keyCode]) {
+        e.preventDefault();
+        key_actions[e.keyCode](e);
+      }
+    });
+  },
+
+  remove_enter_and_escape_action: function() {
+    $(document).off('keyup.ip_enter_escape_action');
+  },
+
+  admin_gui_base_url: null,
+
+  random_hex: function() {
+    var hex = Math.floor(Math.random() * Math.pow(16, 8)).toString(16);
+    while (hex.length < 8) {
+      hex = '0' + hex;
+    }
+    return hex;
+  }
 };
 (function() {
   var valid_locale = ['en', 'de'];
@@ -11232,9 +11594,9 @@ var infopark = {
         }
       },
 
-      translate: function(key) {
+      translate: function(key, param1) {
         $.i18n().locale = infopark.i18n.locale();
-        return $.i18n(key);
+        return $.i18n(key, param1);
       }
     }
   });
@@ -11244,22 +11606,30 @@ var infopark = {
 
   var event_handlers = {};
 
+  var current_workspace;
+
+  var real_activate = function(options) {
+    if(!infopark.editing.is_active()) {
+      editing_active = true;
+      $.cookie('infopark_editing_active', 'true', { path: '/' });
+      _.each($(event_handlers.activate), function(handler) {
+        handler(options || {});
+      });
+    }
+  };
+
   $.extend(infopark, {
     editing: {
       initialize: function() {
         if($.cookie('infopark_editing_active') === 'true') {
-          infopark.editing.activate();
+          real_activate({on_initialize: true});
         }
 
         $('body').append('<div id="ip-editing"></div>');
       },
 
       activate: function() {
-        editing_active = true;
-        $.cookie('infopark_editing_active', 'true', { path: '/' });
-        _.each($(event_handlers.activate), function(handler) {
-          handler();
-        });
+        return real_activate();
       },
 
       deactivate: function() {
@@ -11287,6 +11657,14 @@ var infopark = {
         event_handlers[event_name].push(handler);
       },
 
+      set_workspace: function(workspace) {
+        current_workspace = workspace;
+      },
+
+      workspace: function() {
+        return current_workspace;
+      },
+
       // for testing purposes only
       reset_event_handlers: function() {
         event_handlers = {};
@@ -11295,59 +11673,419 @@ var infopark = {
   });
 }());
 (function() {
-  $.extend(infopark, {
-    ajax: function(type, path, options) {
-      var base_url = window.location.protocol + '//' + window.location.host + '/__ipcms/';
-      return $.ajax(base_url + path, $.extend(options || {}, {
-        type: type, dataType: 'json', contentType: 'application/json; charset=utf-8'
-      })).fail(function(xhr, text_status, error) {
-        var error_description;
+  var handle_task = function(task) {
+    switch (task.status) {
+      case 'success':
+        return $.Deferred().resolve(task.result);
+      case 'error':
+        return $.Deferred().reject(task.message);
+      case 'open':
+        return infopark.wait(2).then(function() {
+          return single_ajax('GET', 'tasks/' + task.id).then(function(data) {
+            return handle_task(data);
+          });
+        });
+      default:
+        throw { message: "Invalid task (wrong status)", task: task };
+    }
+  };
+
+  var single_ajax = function(type, path, options) {
+    var base_url = window.location.protocol + '//' + window.location.host + '/__ipcms/';
+    if (options && options.data) {
+      options.data = JSON.stringify(options.data);
+    }
+    return $.ajax(base_url + path, $.extend(options || {}, {
+      type: type, dataType: 'json', contentType: 'application/json; charset=utf-8'
+    })).then(
+      function(result, text_status, xhr) {
+        return $.Deferred().resolve(result);
+      }, function(xhr, text_status, error) {
+        var error_message;
         try {
-          error_description = JSON.parse(xhr.responseText).error;
+          error_message = JSON.parse(xhr.responseText).error;
         } catch (SyntaxError) {}
 
-        if (!error_description) {
-          error_description = error;
+        if (!error_message) {
+          error_message = error;
         }
+        return $.Deferred().reject(error_message);
+      }
+    ).fail(function(error_message) {
+      infopark.alert(error_message);
+    });
+  };
 
-        infopark.alert(error_description);
+  $.extend(infopark, {
+    ajax: function(type, path, options) {
+      return single_ajax(type, path, options).then(function(result) {
+        if (result && result.task && _.size(result) === 1) {
+          return handle_task(result.task);
+        } else {
+          return $.Deferred().resolve(result);
+        }
       });
     }
   });
 }());
 (function() {
-  $.extend(infopark, {
-    cms_element: {
-      create_instance: function(dom_element) {
-        var that = {
-          dom_element: function() {
-            return dom_element;
-          }
-        };
+  var fade_time = 500;
+  var menu_bar_items_renderer = [];
 
-        return that;
+  var add_menu_bar = function(skip_fade) {
+    var body = $('body');
+    body.addClass('ip_editing_active');
+
+    var view = $(infopark.template.render('menu_bar'));
+
+    _.each(menu_bar_items_renderer, function(item_renderer) {
+      item_renderer(view);
+    });
+
+    view.hide();
+    body.append(view);
+    if (skip_fade) {
+      view.show();
+    } else {
+      view.slideDown(fade_time);
+    }
+  };
+
+  var remove_menu_bar = function() {
+    var dom_item = $('.ip_topbar');
+    dom_item.slideUp(fade_time, function() {
+      dom_item.remove();
+    });
+    $('body').removeClass('ip_editing_active');
+  };
+
+  $.extend(infopark, {
+    menu_bar: {
+      register_item_renderer: function(item_renderer) {
+        menu_bar_items_renderer.push(item_renderer);
       },
-      from_dom_element: function(dom_element) {
-        var cms_element = infopark.cms_element.create_instance(dom_element);
-        var special_element;
+      // this is for testing purposes only!
+      reset_menu_bar_items_renderer: function() {
+        menu_bar_items_renderer = [];
+      },
+      init: function() {
+        infopark.editing.on('activate', function(options) {
+          add_menu_bar(options.on_initialize === true);
+        });
 
-        _.detect(infopark.cms_element.definitions, function(definition) {
-          special_element = definition.create_instance(cms_element);
-          return special_element;
+        infopark.editing.on('deactivate', function() {
+          remove_menu_bar();
         });
+      }
+    }
+  });
+}());
+(function() {
+  var renderer = function(parent_view) {
+    var view = $(infopark.template.render('deactivate_menu_bar_item'));
+    parent_view.find('#ip_deactivate_editing').append(view);
+  };
 
-        return special_element;
-      },
-      definitions: []
+  $(document).on("click.ip-deactivate-editing", "#ip_deactivate_editing", function(e) {
+    e.preventDefault();
+    infopark.editing.deactivate();
+  });
+
+  $.extend(infopark, {
+    deactivate_menu_bar_item: {
+      init: function() {
+        infopark.menu_bar.register_item_renderer(renderer);
+      }
     }
   });
 }());
 (function() {
   $.extend(infopark, {
-    cms_field_element: {
-      create_instance: function(cms_element) {
-        var that = cms_element;
-
+    delete_current_page_item: {
+      init: function() {
+        infopark.menu_bar.register_item_renderer(function(target) {
+          if (infopark.obj.current_page()) {
+            target.find('#ip_delete_current_page').append(
+                $(infopark.template.render('delete_current_page_item')));
+          }
+        });
+      }
+    }
+  });
+
+  $(document).on('click.ip-delete-current-page', '#ip_delete_current_page', function(e) {
+    e.preventDefault();
+    infopark.commands.delete_obj(infopark.obj.current_page());
+  });
+}());
+(function() {
+  var t = infopark.i18n.translate;
+
+  var workspace_title_short =  function(workspace) {
+    if (workspace.is_editable()) {
+      if (workspace.title()) {
+        return workspace.title();
+      } else {
+        return t('menu_bar.empty_workspace_title');
+      }
+    } else {
+      return t('menu_bar.published_workspace_title');
+    }
+  };
+
+  var workspace_title_long = function(workspace) {
+    if (workspace.is_editable()) {
+      var title = t('menu_bar.working_copy') + ': ';
+      return title + workspace_title_short(workspace);
+    } else {
+      return workspace_title_short(workspace);
+    }
+  };
+
+  var renderer = function(view) {
+    var select_menu_view = $(infopark.template.render('workspace_select_menu_bar_item', {
+      current_workspace: infopark.editing.workspace(),
+      current_short_title: workspace_title_short(infopark.editing.workspace()),
+      current_long_title: workspace_title_long(infopark.editing.workspace())
+    }));
+
+    view.find('#ip_select_workspace').append(select_menu_view);
+  };
+
+  var default_click_action = function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    $('#ip_select_workspace .ip_menu_box').fadeToggle('50');
+  };
+
+  $(document).on("click.ip-toggle-ws-select", "#ip_select_workspace", function(e) {
+    default_click_action(e);
+
+    var replace_with_real_ws = $('#ip_select_workspace #ip_replace_with_real_ws');
+    if(replace_with_real_ws.length > 0) {
+      infopark.workspace.all().done(function(workspaces) {
+        var sorted_workspaces = _.sortBy(workspaces, function(ws) {
+          if(ws.is_editable()) {
+            return (ws.title() || '').toUpperCase();
+          } else {
+            return 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'; // max string
+          }
+        });
+
+        var handlebars_workspaces = _.map(sorted_workspaces, function(ws) {
+          return {
+            is_editable: ws.is_editable,
+            long_title: workspace_title_long(ws),
+            short_title: workspace_title_short(ws),
+            is_current_workspace: (ws.id() === infopark.editing.workspace().id())
+          };
+        });
+
+        var ws_list_view_html = infopark.template.render('workspace_select_list', {
+          workspaces: handlebars_workspaces
+        });
+        var ws_list_view = $($.trim(ws_list_view_html));
+
+        _.each(ws_list_view.find('span'), function(dom_element, index) {
+          $(dom_element).on('click.ip_open_workspace', function(e) {
+            default_click_action(e);
+            infopark.redirect_to("?_rc-ws=" + sorted_workspaces[index].id());
+          });
+        });
+
+        replace_with_real_ws.replaceWith(ws_list_view);
+      });
+    }
+  });
+
+  $(document).on("click.ip-create-ws", "#ip-create-new-ws", function(e) {
+    default_click_action(e);
+    infopark.prompt_dialog({
+      icon: '&#xF022;',
+      title: t('menu_bar.create_new_ws_confirmation'),
+      description: t('menu_bar.create_new_ws_confirmation_desc'),
+      placeholder: t('menu_bar.create_new_ws_confirmation_placeholder'),
+      accept_button_text: t('menu_bar.create')
+    }).done(function(title) {
+      infopark.with_saving_overlay(
+        infopark.workspace.create(title).then(function(new_workspace) {
+          return infopark.redirect_to('?_rc-ws=' + new_workspace.id());
+        })
+      );
+    });
+  });
+
+  $(document).on("click.ip-publish-ws", "#ip-publish-current-ws", function(e) {
+    default_click_action(e);
+    infopark.confirmation_dialog({
+      icon: '&#xF064;',
+      confirm_button_text: t('menu_bar.publish'),
+      title: t('menu_bar.publish_ws_confirmation', workspace_title_short(
+        infopark.editing.workspace())),
+      description: t('menu_bar.publish_ws_confirmation_desc')
+    }).done(function() {
+      infopark.with_saving_overlay(
+        infopark.editing.workspace().publish().then(function() {
+          return infopark.redirect_to('?_rc-ws=published');
+        })
+      );
+    });
+  });
+
+  $(document).on("click.ip-rename-ws", "#ip-rename-current-ws", function(e) {
+    default_click_action(e);
+    infopark.prompt_dialog({
+      icon: '&#xF04F;',
+      title: t('menu_bar.rename_working_copy', infopark.editing.workspace().title()),
+      description: t('menu_bar.rename_working_copy_desc'),
+      value: infopark.editing.workspace().title(),
+      accept_button_text: t('menu_bar.rename')
+    }).done(function(new_title) {
+      infopark.with_saving_overlay(
+        infopark.editing.workspace().rename(new_title).then(function() {
+          return infopark.redirect_to('?_rc-ws=' + infopark.editing.workspace().id());
+        })
+      );
+    });
+  });
+
+  $(document).on("click.ip-delete-ws", "#ip-delete-current-ws", function(e) {
+    default_click_action(e);
+    infopark.confirmation_dialog({
+      icon: '&#xF018;',
+      confirm_button_color: 'ip_red',
+      confirm_button_text: t('menu_bar.delete'),
+      title: t('menu_bar.delete_ws_confirmation', workspace_title_short(
+        infopark.editing.workspace())),
+      description: t('menu_bar.delete_ws_confirmation_desc')
+    }).done(function() {
+      infopark.with_saving_overlay(
+        infopark.editing.workspace().destroy().then(function(new_workspace) {
+          return infopark.redirect_to('?_rc-ws=published');
+        })
+      );
+    });
+  });
+
+  $.extend(infopark, {
+    workspace_select: {
+      init: function() {
+        infopark.menu_bar.register_item_renderer(renderer);
+      }
+    }
+  });
+}());
+(function() {
+
+  $.extend(infopark, {
+    blob: {
+      create: function(file) {
+        return get_upload_permission().then(function(permission) {
+          return upload_to_s3(file, permission);
+        });
+      },
+
+      // For testing purpose only.
+      get_form_data: function() {
+        return new FormData();
+      }
+    }
+  });
+
+  var get_upload_permission = function() {
+    return infopark.ajax('GET', 'blobs/upload_permission');
+  };
+
+  var upload_to_s3 = function(file, permission) {
+    var form_data = infopark.blob.get_form_data();
+    _.each(permission.fields, function(value, name) {
+      form_data.append(name, value);
+    });
+    form_data.append('file', file); // File must be appended last, otherwise S3 will complain.
+
+    return $.ajax({type: 'POST', url: permission.url, data: form_data,
+      // These are needed in order for jQuery to work properly with a FormData.
+      contentType: false,
+      processData: false
+    }).then(function() { return permission.blob; });
+  };
+
+}());
+(function() {
+  $.extend(infopark, {
+    child_list_element: {
+      create_instance: function(cms_element) {
+        if (cms_element.dom_element().attr('data-ip-child-list-path')) {
+          var that = cms_element;
+
+          $.extend(that, {
+            path: function() {
+              return that.dom_element().attr('data-ip-child-list-path');
+            },
+
+            fetch_page_class_selection: function() {
+              return infopark.ajax('GET', 'objs/page_class_selection');
+            },
+
+            create_child: function(obj_class) {
+              var name = infopark.random_hex();
+              var path = that.path() + "/" + name;
+
+              return infopark.obj.create({
+                _path: path,
+                _obj_class: obj_class
+              });
+            }
+          });
+
+          return that;
+        }
+      },
+      all: function() {
+        return _.map($('[data-ip-child-list-path]'), function(dom_element) {
+          return infopark.cms_element.from_dom_element($(dom_element));
+        });
+      }
+    }
+  });
+}());
+
+$(function() {
+  infopark.cms_element.definitions.push(infopark.child_list_element);
+});
+(function() {
+  $.extend(infopark, {
+    cms_element: {
+      create_instance: function(dom_element) {
+        var that = {
+          dom_element: function() {
+            return dom_element;
+          }
+        };
+
+        return that;
+      },
+      from_dom_element: function(dom_element) {
+        var cms_element = infopark.cms_element.create_instance(dom_element);
+        var special_element;
+
+        _.detect(infopark.cms_element.definitions, function(definition) {
+          special_element = definition.create_instance(cms_element);
+          return special_element;
+        });
+
+        return special_element;
+      },
+      definitions: []
+    }
+  });
+}());
+(function() {
+  $.extend(infopark, {
+    cms_field_element: {
+      create_instance: function(cms_element) {
+        var that = cms_element;
+
         $.extend(that, {
           field_name: function() {
             return that.dom_element().attr('data-ip-field-name');
@@ -11409,28 +12147,40 @@ var infopark = {
           id: function() {
             return id;
           },
+
           obj_class_name: function() {
             return obj_class_name;
           },
 
           save: function(data) {
-            var json_data = JSON.stringify({obj: data});
-            return infopark.ajax('PUT', 'objs/' + that.id(), {data: json_data}).then(
-              function(data, text_status, xhr) { return; }
+            return infopark.ajax('PUT', 'objs/' + that.id(), {data: {obj: data}}).then(
+              function(result) { return; }
             );
           },
 
           destroy: function() {
-            return infopark.ajax('DELETE', 'objs/' + that.id()).then(
-              function(data, text_status, xhr) { return data; }
-            );
+            return infopark.ajax('DELETE', 'objs/' + that.id());
           }
         };
 
         return that;
       },
 
-      current_container_id: null
+      create: function(data) {
+        return infopark.ajax('POST', 'objs', {data: {obj: data}}).then(
+          function(new_data) {
+            return infopark.obj.create_instance(new_data.id, new_data._obj_class);
+          }
+        );
+      },
+
+      current_page_id: null,
+
+      current_page: function() {
+        if (infopark.obj.current_page_id) {
+          return infopark.obj.create_instance(infopark.obj.current_page_id);
+        }
+      }
     }
   });
 }());
@@ -11514,17 +12264,18 @@ var infopark = {
             },
 
             create_widget: function(widget_class) {
-              var data = JSON.stringify({
+              var url = 'objs/' + that.obj().id() + '/create_widget';
+              var data = {
                 obj_class: widget_class,
-                container_id: infopark.obj.current_container_id,
+                current_page_id: infopark.obj.current_page().id(),
                 field_name: that.field_name()
-              });
+              };
 
-              var url = 'objs/' + that.obj().id() + '/create_widget';
-              return infopark.ajax('POST', url, {data: data}).then(
-                function(data, text_status, xhr) { return data; },
-                function(xhr, text_status, error) { return text_status; }
-              );
+              return infopark.ajax('POST', url, {data: data});
+            },
+
+            fetch_widget_class_selection: function() {
+              return infopark.ajax('GET', 'objs/_/widget_class_selection');
             }
           });
 
@@ -11542,6 +12293,54 @@ var infopark = {
 
   infopark.cms_element.definitions.push(infopark.widget_field_element);
 }());
+(function() {
+  $.extend(infopark, {
+    workspace: {
+      from_data: function(data) {
+        var that = {
+          id: function() {
+            return data.id;
+          },
+          title: function() {
+            return data.title;
+          },
+          is_editable: function() {
+            return that.id() !== 'published';
+          },
+          publish: function() {
+            if (that.is_editable()) {
+              return infopark.ajax('PUT', 'workspaces/' + that.id() + '/publish');
+            } else {
+              throw "publish not allowed for already published contents";
+            }
+          },
+          rename: function(new_title) {
+            return infopark.ajax('PUT', 'workspaces/' + that.id(),
+                {data: {workspace: {title: new_title}}});
+          },
+          destroy: function() {
+            return infopark.ajax('DELETE', 'workspaces/' + that.id());
+          }
+        };
+
+        return that;
+      },
+      all: function() {
+        return infopark.ajax('GET', 'workspaces').then(function(ws_data) {
+          return _.map(ws_data.results, function(workspace) {
+            return infopark.workspace.from_data(workspace);
+          });
+        });
+      },
+      create: function(title) {
+        return infopark.ajax('POST', 'workspaces', {data: {workspace: {title: title}}}).
+            then(function(ws_data) {
+          return infopark.workspace.from_data(ws_data);
+        });
+      }
+    }
+  });
+}());
 (function() {
   $.extend(infopark, {
     /*
@@ -11575,6 +12374,9 @@ var infopark = {
   var save_action = function(obj, event, key) {
     obj.$box.addClass('ip_field_saving');
 
+    if (!obj.opts.visual) {
+      obj.toggle();
+    }
     var item = infopark.cms_element.from_dom_element(obj.$content);
     item.save().done(function() {
       obj.$editor.destroyEditor();
@@ -11649,24 +12451,28 @@ var infopark = {
   };
 
   var add_onclick_redactor_handlers = function() {
-    _.each(cms_fields(), function(cms_field) {
-      var redactor_options = redactor_options_for_type(cms_field.field_type());
-      var dom_item = cms_field.dom_element();
-      if (redactor_options !== null) {
-        if(!($(dom_item).hasClass('ip_field_editable'))) {
-          $(dom_item).addClass('ip_field_editable');
-
-          $(dom_item).on('click.ip-editing', function(e) {
-            e.preventDefault();
-
-            if($(dom_item).data('redactor') === undefined) {
-              $(dom_item).html($(dom_item).attr('data-ip-field-original-content'));
-              $(dom_item).redactor(redactor_options);
-            }
-          });
+    if (infopark.editing.workspace().is_editable()) {
+      _.each(cms_fields(), function(cms_field) {
+        var redactor_options = redactor_options_for_type(cms_field.field_type());
+        var dom_item = cms_field.dom_element();
+        if (redactor_options !== null) {
+          if(!($(dom_item).hasClass('ip_field_editable'))) {
+            $(dom_item).addClass('ip_field_editable');
+
+            $(dom_item).on('click.ip-editing', function(e) {
+              e.preventDefault();
+
+              infopark.inplace_menus.close_all_menus();
+
+              if($(dom_item).data('redactor') === undefined) {
+                $(dom_item).html($(dom_item).attr('data-ip-field-original-content'));
+                $(dom_item).redactor(redactor_options);
+              }
+            });
+          }
         }
-      }
-    });
+      });
+    }
   };
 
   $.extend(infopark, {
@@ -11817,7 +12623,7 @@ var infopark = {
         }
         if(template === undefined) {
           if(infopark.template.load_templates_from_server) {
-            var url = "/app/assets/javascripts/templates/" + template_path + ".hbs";
+            var url = "/app/assets/javascripts/templates/" + template_path + ".hbs?" + Math.random();
             var source = jQuery.ajax(url, { async: false }).responseText;
             template = Handlebars.compile(source);
           } else {
@@ -11888,7 +12694,9 @@ var infopark = {
         if (view) {
           infopark.transition(view, function() {
             view.removeClass('show');
-          }).then(function() {
+          }).then(function(e) {
+            // Remove the view only if event is triggered by a "fade-out" transition.
+            if (e && $(e.target).hasClass('show')) { return; }
             view.remove();
             view = null;
           });
@@ -11917,90 +12725,177 @@ var infopark = {
 
   $.extend(infopark.confirmation_dialog, {
     open: function(options) {
+      if(!options.icon) {
+        options.icon = '&#xF01D;';
+      }
+      if(!options.cancel_button_text) {
+        options.cancel_button_text = infopark.i18n.translate('cancel');
+      }
+      if(!options.confirm_button_color) {
+        options.confirm_button_color = 'ip_blue';
+      }
+      if(!options.confirm_button_text) {
+        options.confirm_button_text = infopark.i18n.translate('confirm');
+      }
       var view = $(infopark.template.render('confirmation_dialog', options));
 
       $('#ip-editing').append(view);
 
       var deferred = $.Deferred();
 
-      view.find('.confirm').on('click', function() {
+      var click_action = function(e) {
+        e.preventDefault();
         close(view);
+      };
+
+      var confirm_action = function(e) {
+        click_action(e);
         deferred.resolve();
-      });
+      };
 
-      view.find('.cancel').on('click', function() {
-        close(view);
+      var cancel_action = function(e) {
+        click_action(e);
         deferred.reject();
-      });
+      };
+
+      view.find('.confirm').on('click', confirm_action);
+      view.find('.cancel').on('click', cancel_action);
 
       infopark.transition(view, function() {
         view.addClass('show');
       });
 
-      return infopark.with_overlay(deferred);
+      return infopark.with_dialog_behaviour(deferred, {
+        enter: confirm_action,
+        escape: cancel_action
+      });
     }
   });
 }());
 (function() {
   $.extend(infopark, {
-    choose_widget_class_dialog: function(widget_field_name) {
-      return infopark.choose_widget_class_dialog.open(widget_field_name);
+    prompt_dialog: function(options) {
+      return infopark.prompt_dialog.open(options);
     }
   });
 
-  var adjust = function(elem) {
-    infopark.center(elem);
-    infopark.invalidate_auto_height_for(elem);
-    infopark.update_auto_height_for(elem);
+  var close = function(view) {
+    infopark.transition(view, function() {
+      view.removeClass('show');
+    }).then(function() {
+      view.remove();
+      view = null;
+    });
   };
 
-  $(window).on('resize', function() {
-    _.each($('.ip-choose_widget_class_dialog'), function(elem) {
-      adjust($(elem));
-    });
+  $.extend(infopark.prompt_dialog, {
+    open: function(options) {
+      if (!options.icon) {
+        options.icon = '&#61468;';
+      }
+      if(!options.cancel_button_text) {
+        options.cancel_button_text = infopark.i18n.translate('cancel');
+      }
+      if(!options.accept_button_text) {
+        options.accept_button_text = infopark.i18n.translate('accept');
+      }
+
+      var view = $(infopark.template.render('prompt_dialog', options));
+
+      $('#ip-editing').append(view);
+
+      var deferred = $.Deferred();
+
+      var click_action = function(e) {
+        e.preventDefault();
+        close(view);
+      };
+
+      var accept_action = function(e) {
+        e.preventDefault();
+        var val = view.find('input').val();
+        if (val) {
+          click_action(e);
+          deferred.resolve(val);
+        }
+      };
+
+      var cancel_action = function(e) {
+        click_action(e);
+        deferred.reject();
+      };
+
+      view.find('.accept').on('click', accept_action);
+      view.find('.cancel').on('click', cancel_action);
+
+      infopark.transition(view, function() {
+        view.find('input').focus();
+        view.addClass('show');
+      });
+
+
+      return infopark.with_dialog_behaviour(deferred, {
+        enter: accept_action,
+        escape: cancel_action
+      });
+    }
+  });
+}());
+(function() {
+  $.extend(infopark, {
+    choose_obj_class_dialog: function(obj_class_selection, locale_path) {
+      return infopark.choose_obj_class_dialog.open(obj_class_selection, locale_path);
+    }
   });
 
-  var render = function(data) {
-    var deferred = $.Deferred();
+  $.extend(infopark.choose_obj_class_dialog, {
+    open: function(obj_class_selection, locale_path) {
+      var deferred = $.Deferred();
 
-    var widgets = _.map(data, function(widget_markup, widget_class_name) {
-      return {widget_class_name: widget_class_name, widget_markup: widget_markup};
-    });
+      var obj_classes = _.map(obj_class_selection, function(markup, name) {
+        return {name: name, markup: markup};
+      });
+
+      var view = $(infopark.template.render('choose_obj_class_dialog', {
+        obj_classes: obj_classes,
+        title: infopark.i18n.translate('choose_obj_class_dialog.' + locale_path + '.title'),
+        description: infopark.i18n.translate('choose_obj_class_dialog.' + locale_path + '.description')
+      }));
 
-    var view = $(infopark.template.render('choose_widget_class_dialog', {widgets: widgets}));
+      $('#ip-editing').append(view);
 
-    $('#ip-editing').append(view);
+      var accept_action = function(e) {
+        e.preventDefault();
+        close_dialog(view);
+        deferred.resolve($(this).attr('data-ip-obj-class-name'));
+      };
 
-    view.find('.ip-widget_thumbnail').on('click', function(e) {
-      e.preventDefault();
-      $('.ip-widget_thumbnail').removeClass('selected');
-      $(this).addClass('selected');
-    });
+      var cancel_action = function(e) {
+        e.preventDefault();
+        close_dialog(view);
+        deferred.reject();
+      };
 
-    view.find('.confirm').on('click', function() {
-      var widget_class_name = view.find('.ip-widget_thumbnail.selected').
-          attr('data-ip-widget-class-name');
-      if (widget_class_name) {
-        close(view);
-        deferred.resolve(widget_class_name);
-      }
-    });
+      view.find('.ip-obj_class_thumbnail').on('click', accept_action);
+      view.find('.cancel').on('click', cancel_action);
 
-    view.find('.cancel').on('click', function() {
-      close(view);
-      deferred.reject();
-    });
+      infopark.transition(view, function() {
+        view.addClass('show');
+      });
 
-    infopark.transition(view, function() {
-      view.addClass('show');
-    });
+      adjust_dialog(view);
 
-    adjust(view);
+      return infopark.with_dialog_behaviour(deferred, {escape: cancel_action});
+    }
+  });
 
-    return deferred;
+  var adjust_dialog = function(view) {
+    infopark.center(view);
+    infopark.invalidate_auto_height_for(view);
+    infopark.update_auto_height_for(view);
   };
 
-  var close = function(view) {
+  var close_dialog = function(view) {
     infopark.transition(view, function() {
       view.removeClass('show');
     }).then(function() {
@@ -12009,18 +12904,16 @@ var infopark = {
     });
   };
 
-  $.extend(infopark.choose_widget_class_dialog, {
-    open: function(widget_field_name) {
-      var path = 'objs/_/widget_class_selection';
-      return infopark.with_overlay(infopark.ajax('GET', path).then(function(data) {
-        return render(data);
-      }));
-    }
+  $(window).on('resize', function() {
+    _.each($('.ip-choose_obj_class_dialog'), function(elem) {
+      adjust_dialog($(elem));
+    });
   });
 }());
 (function() {
   var menu_define_callbacks = [];
   var dom_elements_with_menu = [];
+  var fade_time = 500;
 
   $.extend(infopark, {
     inplace_menus: {
@@ -12028,13 +12921,10 @@ var infopark = {
         menu_define_callbacks.push(menu_define_callback);
       },
       refresh_positions: function() {
-        _.each($('.ip_editing_marker'), function(marker_dom) {
-          var marker = $(marker_dom);
-          var menu = $('#' + marker.data('infopark-editing-menu-id'));
-
-          var widget_position = marker.parent().offset();
-          marker.offset(widget_position);
-          menu.offset(widget_position);
+        _.each($('.ip_editing_marker_menu'), function(menu_dom) {
+          var menu = $(menu_dom);
+          var marker = $('#' + menu.data('infopark-editing-menu-icon-id'));
+          menu.offset(marker.offset());
         });
       },
       reset_menu_define_callbacks: function() {
@@ -12053,7 +12943,6 @@ var infopark = {
           remove_markers_and_menus();
         });
       },
-
       close_all_menus: function() {
         remove_menus();
       }
@@ -12080,15 +12969,18 @@ var infopark = {
     _.each($(dom_elements_with_menu), function(dom_element, menu_index) {
       if(dom_element.children('.ip_editing_marker').length === 0) {
         var menu_id = 'ip_editing_marker_menu_' + menu_index;
+        var menu_icon_id = 'ip_editing_marker_menu_icon_' + menu_index;
+
         var dom_menu = dom_element.data('infopark-editing-menu');
 
-        var menu_icon = $(infopark.template.render('inplace_menu_icon', {}));
+        var menu_icon = $(infopark.template.render('inplace_menu_icon', {
+          menu_icon_id: menu_icon_id
+        }));
         menu_icon.data('infopark-editing-menu-id', menu_id);
         menu_icon.on('click.ip-menu-open', function(e) {
           e.preventDefault();
 
           var menu = $('#' + menu_id);
-          var fade_time = 500;
 
           var remove_menu = function() {
             menu.fadeOut(fade_time, function() {
@@ -12117,15 +13009,18 @@ var infopark = {
               });
             });
 
-            menu.offset(menu_icon.offset());
-            menu.fadeIn(fade_time);
+            menu.data('infopark-editing-menu-icon-id', menu_icon_id);
 
             $('body').append(menu);
+
+            // Bugfix IE: offset can not be set before append.
+            menu.offset(menu_icon.offset());
+            menu.find('.ip_menu_box').fadeIn(fade_time);
           } else {
             remove_menu();
           }
         });
-        dom_element.append(menu_icon);
+        dom_element.prepend(menu_icon);
       }
     });
   };
@@ -12136,7 +13031,9 @@ var infopark = {
   };
 
   var remove_menus = function() {
-    $('.ip_editing_marker_menu').remove();
+    $('.ip_editing_marker_menu').fadeOut(fade_time, function() {
+      $('.ip_editing_marker_menu').remove();
+    });
     _.each($(dom_elements_with_menu), function(dom_element) {
       dom_element.removeData('infopark-editing-menu');
     });
@@ -12151,51 +13048,84 @@ var infopark = {
   };
 }());
 
-$(window).resize(function () { infopark.inplace_menus.refresh_positions(); });
+$(window).on('resize', function () { infopark.inplace_menus.refresh_positions(); });
+$(window).on('load', function () { infopark.inplace_menus.refresh_positions(); });
 (function() {
   $.extend(infopark, {
     commands: {
 
+      new_child_page: function(child_list_element) {
+        return child_list_element.fetch_page_class_selection().then(function(selection) {
+          return infopark.choose_obj_class_dialog(selection, 'add_child_page').then(
+            function(obj_class) {
+              return infopark.with_saving_overlay(
+                child_list_element.create_child(obj_class).then(function(new_obj) {
+                  return infopark.redirect_to(new_obj.id());
+                })
+              );
+            }
+          );
+        });
+      },
+
+      delete_obj: function(obj) {
+        return infopark.confirmation_dialog({
+          title: infopark.i18n.translate('commands.delete_obj.confirm_title'),
+          description: infopark.i18n.translate('commands.delete_obj.confirm_description')
+        }).then(function() {
+          return infopark.with_saving_overlay(obj.destroy().then(function() {
+            return infopark.redirect_to('/');
+          }));
+        });
+      },
+
       add_widget: function(widget_field_element, widget_element) {
-        return function() {
-          return infopark.choose_widget_class_dialog().then(function(widget_class) {
-            infopark.with_saving_overlay(widget_field_element.create_widget(widget_class).
-                then(function(data) {
-              if (widget_element) {
-                widget_element.dom_element().after(data.markup);
-              } else {
-                widget_field_element.dom_element().append(data.markup);
-              }
-              infopark.editing.refresh();
-              return widget_field_element.save();
-            }));
+        return widget_field_element.fetch_widget_class_selection().then(function(selection) {
+          return infopark.choose_obj_class_dialog(selection, 'add_widget').then(function(obj_class) {
+            var new_dom_element;
+            infopark.with_saving_overlay(
+              widget_field_element.create_widget(obj_class).then(function(data) {
+                new_dom_element = $(data.markup);
+                if (widget_element) {
+                  widget_element.dom_element().after(new_dom_element);
+                } else {
+                  widget_field_element.dom_element().append(new_dom_element);
+                }
+                infopark.editing.refresh();
+                return widget_field_element.save();
+              })
+            ).then(function() {
+              infopark.ensure_fully_visible_within(new_dom_element, $('body'), $(window).height());
+            });
           });
-        };
+        });
       },
 
       delete_widget: function(widget_field_element, widget_element) {
-        return function() {
-          return infopark.confirmation_dialog({
-            title: infopark.i18n.translate('commands.delete_widget.confirm_title'),
-            description: infopark.i18n.translate('commands.delete_widget.confirm_description')
-          }).then(function() {
-            var delete_widget = function() {
-              widget_element.dom_element().remove();
-              infopark.editing.refresh();
-              return widget_field_element.save().then(function() {
-                return widget_element.obj().destroy();
-              });
-            };
-            infopark.with_saving_overlay(delete_widget());
-          });
-        };
+        return infopark.confirmation_dialog({
+          icon: '&#xF018;',
+          confirm_button_color: 'ip_red',
+          confirm_button_text: infopark.i18n.translate('menu_bar.delete'),
+          title: infopark.i18n.translate('commands.delete_widget.confirm_title'),
+          description: infopark.i18n.translate('commands.delete_widget.confirm_description')
+        }).then(function() {
+          var delete_widget = function() {
+            widget_element.dom_element().remove();
+            infopark.editing.refresh();
+            return widget_field_element.save().then(function() {
+              return widget_element.obj().destroy();
+            });
+          };
+          infopark.with_saving_overlay(delete_widget());
+        });
       },
 
       open_in_admin_gui: function(obj_id) {
-        return function() {
-          // New window has a name, so it can be easily identified in integration tests.
-          window.open(infopark.admin_gui_base_url + '#' + obj_id + ';dc', 'admin-gui', '_blank');
-        };
+        window.open(
+          infopark.admin_gui_base_url + '#' + obj_id + ';dc;' + infopark.editing.workspace().id(),
+          'admin-gui', // New window has a name, so it can be identified in integration tests.
+          'status=1,toolbar=1,location=1,menubar=1,scrollbars=1,resizable=1'
+        );
       }
 
     }
@@ -12206,39 +13136,47 @@ $(window).resize(function () { infopark.inplace_menus.refresh_positions(); });
     widget_menus: {
       init: function() {
         infopark.inplace_menus.define(function(menu) {
-          _.each(infopark.widget_field_element.all(), function(widget_field_element) {
-            var widget_elements = widget_field_element.widgets();
-
-            if (widget_elements.length === 0) {
-              menu.add_item(widget_field_element.dom_element(), {
-                title: infopark.i18n.translate('widget_menus.add_widget'),
-                icon: '\uF022',
-                execute: infopark.commands.add_widget(widget_field_element)
-              });
-            }
-
-            _.each(widget_elements, function(widget_element) {
-              var widget_dom_element = widget_element.dom_element();
-
-              menu.add_item(widget_dom_element, {
-                title: infopark.i18n.translate('widget_menus.add_widget'),
-                icon: '\uF022',
-                execute: infopark.commands.add_widget(widget_field_element, widget_element)
-              });
-
-              menu.add_item(widget_dom_element, {
-                title: infopark.i18n.translate('widget_menus.delete_widget'),
-                icon: '\uF03E',
-                execute: infopark.commands.delete_widget(widget_field_element, widget_element)
-              });
+          if (infopark.editing.workspace().is_editable()) {
+            _.each(infopark.widget_field_element.all(), function(widget_field_element) {
+              var widget_elements = widget_field_element.widgets();
+
+              if (widget_elements.length === 0) {
+                menu.add_item(widget_field_element.dom_element(), {
+                  title: infopark.i18n.translate('widget_menus.add_widget'),
+                  icon: '\uF022',
+                  execute: function() { infopark.commands.add_widget(widget_field_element); }
+                });
+              }
 
-              menu.add_item(widget_dom_element, {
-                title: infopark.i18n.translate('widget_menus.open_in_admin_gui'),
-                icon: '\uF000',
-                execute: infopark.commands.open_in_admin_gui(widget_element.obj().id())
+              _.each(widget_elements, function(widget_element) {
+                var widget_dom_element = widget_element.dom_element();
+
+                menu.add_item(widget_dom_element, {
+                  title: infopark.i18n.translate('widget_menus.add_widget'),
+                  icon: '\uF022',
+                  execute: function() {
+                    infopark.commands.add_widget(widget_field_element, widget_element);
+                  }
+                });
+
+                menu.add_item(widget_dom_element, {
+                  title: infopark.i18n.translate('widget_menus.delete_widget'),
+                  icon: '\uF018',
+                  execute: function() {
+                    infopark.commands.delete_widget(widget_field_element, widget_element);
+                  }
+                });
+
+                menu.add_item(widget_dom_element, {
+                  title: infopark.i18n.translate('widget_menus.open_in_admin_gui'),
+                  icon: '\uF000',
+                  execute: function() {
+                    infopark.commands.open_in_admin_gui(widget_element.obj().id());
+                  }
+                });
               });
             });
-          });
+          }
         });
       }
     }
@@ -12256,8 +13194,6 @@ $(window).resize(function () { infopark.inplace_menus.refresh_positions(); });
       // Called when actual dragging started.
       activate: function(event, ui) {
         var marker = ui.item.find('.ip_editing_marker');
-        marker.css('top', 0);
-        marker.css('left', 0);
         $('.ip_editing_marker').not(marker).hide();
         infopark.inplace_menus.close_all_menus();
       },
@@ -12277,11 +13213,11 @@ $(window).resize(function () { infopark.inplace_menus.refresh_positions(); });
     }
   });
 
-  var dom_elements_with_sorting = [];
-
   var create_or_refresh_widget_sorting = function() {
-    remove_widget_sorting();
-    create_widget_sorting();
+    if (infopark.editing.workspace().is_editable()) {
+      remove_widget_sorting();
+      create_widget_sorting();
+    }
   };
 
   var create_widget_sorting = function() {
@@ -12296,17 +13232,165 @@ $(window).resize(function () { infopark.inplace_menus.refresh_positions(); });
         deactivate: infopark.widget_sorting.deactivate,
         update: infopark.widget_sorting.update
       });
-
-      dom_elements_with_sorting.push(dom_element);
     });
   };
 
   var remove_widget_sorting = function() {
-    _.each(dom_elements_with_sorting, function(dom_element) {
-      dom_element.sortable('destroy');
+    _.each(infopark.widget_field_element.all(), function(widget_field_element) {
+      var dom_element = widget_field_element.dom_element();
+      if (dom_element.data('ui-sortable')) {
+        dom_element.sortable('destroy');
+      }
+    });
+  };
+}());
+(function() {
+  $.extend(infopark, {
+    child_list_menus: {
+      init: function() {
+        infopark.inplace_menus.define(function(menu) {
+          if (infopark.editing.workspace().is_editable()) {
+            _.each(infopark.child_list_element.all(), function(child_list_element) {
+              menu.add_item(child_list_element.dom_element(), {
+                title: infopark.i18n.translate('child_list_menus.add_subpage'),
+                icon: '\uF022',
+                execute: function() { infopark.commands.new_child_page(child_list_element); }
+              });
+            });
+          }
+        });
+      }
+    }
+  });
+}());
+(function() {
+  $.extend(infopark, {
+    hotkeys: {
+      add_actions_while: function(promise, key_map) {
+        var key_actions = {
+          13: key_map.enter,   // enter key
+          27: key_map.escape   // escape key
+        };
+
+        $(document).on('keyup.ip_hotkeys_add_actions_while', function(e) {
+          if (key_actions[e.keyCode]) {
+            e.preventDefault();
+            key_actions[e.keyCode](e);
+          }
+        });
+
+        return promise.always(function() {
+          $(document).off('keyup.ip_hotkeys_add_actions_while');
+        });
+      }
+    }
+  });
+}());
+(function() {
+  $.extend(infopark, {
+    with_dialog_behaviour: function(promise, key_map) {
+      return infopark.with_overlay(
+        infopark.hotkeys.add_actions_while(promise, key_map)
+      );
+    }
+  });
+}());
+(function() {
+
+  $.extend(infopark, {
+    image_upload: {
+      init: function() {
+        infopark.editing.on('activate', create_or_refresh_image_upload);
+        infopark.editing.on('refresh', create_or_refresh_image_upload);
+        infopark.editing.on('deactivate', remove_image_upload);
+
+        // Disable DnD for all elements by default to prevent the user
+        // from accidentally opening an image in browser.
+        $('body').on('dragover', function(e) { return false; });
+        $('body').on('drop', function(e) { return false; });
+      },
+
+      upload_image: function(event, dom_element) {
+        var data_transfer = event.originalEvent.dataTransfer;
+        if (!data_transfer) { return; }
+
+        var files = data_transfer.files;
+        if (files.length === 0) {
+          return;
+        } else if (files.length > 1) {
+          infopark.alert(infopark.i18n.translate('image_upload.too_many_files'));
+          dom_element.removeClass('ip_editing_dragover');
+          return;
+        }
+
+        var file = files[0];
+        var obj_id = dom_element.attr('data-ip-resource-source-obj-id');
+        var field_name = dom_element.attr('data-ip-resource-source-field-name');
+
+        var create_resource_obj = function(blob_id) {
+          var obj_name = file.name.replace(/[^a-z0-9_.$\-]/ig, '-');
+          var path = '_resources/' + infopark.random_hex() + '/' + obj_name;
+          return infopark.obj.create({ blob: blob_id, _path: path, _obj_class: 'Image' });
+        };
+
+        var link_resource_obj = function(resource_id) {
+          var attributes = {};
+          attributes[field_name] = [{obj_id: resource_id}];
+          return infopark.obj.create_instance(obj_id).save(attributes);
+        };
+
+        infopark.with_saving_overlay(
+          infopark.blob.create(file).then(function(blob_id) {
+            return create_resource_obj(blob_id).then(function(resource_data) {
+              return link_resource_obj(resource_data.id()).then(function() {
+                return infopark.reload();
+              });
+            });
+          })
+        );
+      }
+
+    }
+  });
+
+  var create_or_refresh_image_upload = function() {
+    remove_image_upload();
+    create_image_upload();
+  };
+
+  var create_image_upload = function() {
+    each_dom_element(function(dom_element) {
+      dom_element.on('dragover', function() {
+        dom_element.addClass('ip_editing_dragover');
+        return false;
+      });
+
+      dom_element.on('dragleave', function() {
+        dom_element.removeClass('ip_editing_dragover');
+        return false;
+      });
+
+      dom_element.on('drop', function(event) {
+        infopark.image_upload.upload_image(event, dom_element);
+        return false;
+      });
+    });
+  };
+
+  var remove_image_upload = function() {
+    each_dom_element(function(dom_element) {
+      dom_element.unbind('dragover');
+      dom_element.unbind('dragleave');
+      dom_element.unbind('drop');
     });
-    dom_elements_with_sorting = [];
   };
+
+  var each_dom_element = function(callback) {
+    _.each($('img[data-ip-resource-source-field-name]'), function(dom_element) {
+      callback($(dom_element));
+    });
+  };
+
 }());
 
 
@@ -12332,6 +13416,15 @@ $(window).resize(function () { infopark.inplace_menus.refresh_positions(); });
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -12344,5 +13437,11 @@ $(window).resize(function () { infopark.inplace_menus.refresh_positions(); });
 
 infopark.redactor.init();
 infopark.inplace_menus.init();
+infopark.deactivate_menu_bar_item.init();
+infopark.delete_current_page_item.init();
+infopark.workspace_select.init();
+infopark.menu_bar.init();
 infopark.widget_menus.init();
 infopark.widget_sorting.init();
+infopark.image_upload.init();
+infopark.child_list_menus.init();