scrivito_sdk 0.66.0 → 0.70.0.rc1

data/lib/assets/javascripts/scrivito_ui.js

@@ -26089,37 +26089,127 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   var buffer = "", stack1, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
 
 
-  buffer += "<div class=\"scrivito_changes_overview scrivito_modal_large scrivito_adjust_dialog\" >\n\n  <div class=\"scrivito_modal_header\">\n    <h3>\n      <i class=\"scrivito_icon\">&#xf080;</i>\n      ";
+  buffer += "<div class=\"scrivito_changes_overview scrivito_modal_large scrivito_adjust_dialog\" >\n  <div class=\"scrivito_changes_dialog_content scrivito_auto_height\"></div>\n  <div class=\"scrivito_modal_footer\">\n    <a href=\"#\" class=\"scrivito_button scrivito_cancel scrivito_green\">";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.title", depth0.selected_workspace_title, options) : helperMissing.call(depth0, "translate", "changes_dialog.title", depth0.selected_workspace_title, options)))
-    + "\n      <span id=\"scrivito_obj_count\" class=\"scrivito_hidden\">\n        (<span id=\"scrivito_loaded_obj_count\"></span> / <span id=\"scrivito_total_obj_count\"></span>)\n      </span>\n    </h3>\n  </div>\n  <div class=\"scrivito_modal_body scrivito_auto_height\">\n\n    <table class=\"scrivito_changes_table\">\n      <thead>\n        <tr>\n          <th><span class=\"scrivito_sortable\" data-scrivito-private-sort-by=\"modification\">";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "done", options) : helperMissing.call(depth0, "translate", "done", options)))
+    + "</a>\n  </div>\n</div>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["changes_dialog"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["changes_dialog/content"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, stack2, functionType="function", escapeExpression=this.escapeExpression, helperMissing=helpers.helperMissing, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1, stack2;
+  buffer += "<span>("
+    + escapeExpression(((stack1 = ((stack1 = depth0.objs),stack1 == null || stack1 === false ? stack1 : stack1.length)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
+    + " / ";
+  if (stack2 = helpers.total) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
+  else { stack2 = depth0.total; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
+  buffer += escapeExpression(stack2)
+    + ")</span>";
+  return buffer;
+  }
+
+function program3(depth0,data) {
+  
+  var buffer = "", stack1, stack2;
+  buffer += "\n    <table class=\"scrivito_changes_table\">\n      ";
+  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.objs),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n\n      <tbody>\n        ";
+  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.objs),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.program(9, program9, data),fn:self.program(6, program6, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n      </tbody>\n    </table>\n  ";
+  return buffer;
+  }
+function program4(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "\n        <thead>\n          <tr>\n            <th>\n              <span data-scrivito-sort-by=\"_modification\">\n                ";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.modification", options) : helperMissing.call(depth0, "translate", "changes_dialog.modification", options)))
+    + "\n              </span>\n            </th>\n            <th><span>";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.row.change", options) : helperMissing.call(depth0, "translate", "changes_dialog.row.change", options)))
-    + "</span></th>\n          <th><span class=\"scrivito_sortable\" data-scrivito-private-sort-by=\"rights\">";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.rights", options) : helperMissing.call(depth0, "translate", "changes_dialog.rights", options)))
+    + "</span></th>\n            <th><span>";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.row.rights", options) : helperMissing.call(depth0, "translate", "changes_dialog.row.rights", options)))
-    + "</span></th>\n          <th><span>";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.description_for_editor", options) : helperMissing.call(depth0, "translate", "changes_dialog.description_for_editor", options)))
+    + "</span></th>\n            <th>\n              <span data-scrivito-sort-by=\"_obj_class_name\">\n                ";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.row.description_for_editor", options) : helperMissing.call(depth0, "translate", "changes_dialog.row.description_for_editor", options)))
-    + "</span></th>\n          <th><span class=\"scrivito_sortable\" data-scrivito-private-sort-by=\"obj_class_name\">";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.obj_class_name", options) : helperMissing.call(depth0, "translate", "changes_dialog.obj_class_name", options)))
+    + "\n              </span>\n            </th>\n            <th>\n              <span data-scrivito-sort-by=\"_last_changed\">\n                ";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.row.type", options) : helperMissing.call(depth0, "translate", "changes_dialog.row.type", options)))
-    + "</span></th>\n          <th><span class=\"scrivito_sortable sort_down\" data-scrivito-private-sort-by=\"last_changed\">";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.last_changed", options) : helperMissing.call(depth0, "translate", "changes_dialog.last_changed", options)))
+    + "\n              </span>\n            </th>\n          </tr>\n        </thead>\n      ";
+  return buffer;
+  }
+
+function program6(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n          ";
+  stack1 = helpers.each.call(depth0, depth0.objs, {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n        ";
+  return buffer;
+  }
+function program7(depth0,data) {
+  
+  var stack1, options;
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.row.last_changed", options) : helperMissing.call(depth0, "translate", "changes_dialog.row.last_changed", options)))
-    + "</span></th>\n        </tr>\n      </thead>\n      <tbody id=\"scrivito_changes_table_loaded\">\n      </tbody>\n      <tbody id=\"scrivito_changes_table_empty_result\" class=\"scrivito_hidden\">\n        <tr>\n          <td colspan=\"5\">\n            ";
+  return escapeExpression(((stack1 = helpers.render),stack1 ? stack1.call(depth0, "changes_dialog/row", depth0, options) : helperMissing.call(depth0, "render", "changes_dialog/row", depth0, options)));
+  }
+
+function program9(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "\n          <tr>\n            <td class=\"scrivito_empty_result\" colspan=\"5\">";
   options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.empty_result", options) : helperMissing.call(depth0, "translate", "changes_dialog.empty_result", options)))
-    + "\n          </td>\n        </tr>\n      </tbody>\n      <tbody id=\"scrivito_changes_table_loading\">\n        <tr>\n          <td colspan=\"5\">\n            <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i>\n          </td>\n        </tr>\n      </tbody>\n\n    </table>\n\n    <span class=\"scrivito_load_more scrivito_hidden\">";
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.empty", options) : helperMissing.call(depth0, "translate", "changes_dialog.empty", options)))
+    + "</td>\n          </tr>\n        ";
+  return buffer;
+  }
+
+function program11(depth0,data) {
+  
+  
+  return "\n    <tr><td colspan=\"5\"><i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i></td></tr>\n  ";
+  }
+
+function program13(depth0,data) {
+  
+  var buffer = "", stack1, options;
+  buffer += "<span class=\"scrivito_load_more\">";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "changes_dialog.more", options) : helperMissing.call(depth0, "translate", "changes_dialog.more", options)))
-    + "</span>\n\n  </div>\n  <div class=\"scrivito_modal_footer\">\n    <a class=\"scrivito_button scrivito_cancel scrivito_green\" href=\"#\">";
-  options = {hash:{},data:data};
-  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "done", options) : helperMissing.call(depth0, "translate", "done", options)))
-    + "</a>\n  </div>\n\n</div>\n";
+    + "</span>";
+  return buffer;
+  }
+
+  buffer += "<div class=\"scrivito_modal_header\">\n  <h3>\n    <i class=\"scrivito_icon\">&#xf080;</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)
+    + "\n    ";
+  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.objs),stack1 == null || stack1 === false ? stack1 : stack1.length), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n  </h3>\n</div>\n\n<div class=\"scrivito_modal_body scrivito_auto_height\">\n  ";
+  stack2 = helpers['if'].call(depth0, depth0.is_loaded, {hash:{},inverse:self.program(11, program11, data),fn:self.program(3, program3, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n\n  ";
+  stack2 = helpers['if'].call(depth0, depth0.has_more, {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n</div>\n";
   return buffer;
   });
-  return this.ScrivitoHandlebarsTemplates["changes_dialog"];
+  return this.ScrivitoHandlebarsTemplates["changes_dialog/content"];
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
@@ -26137,7 +26227,7 @@ function program1(depth0,data) {
 function program3(depth0,data) {
   
   var buffer = "", stack1, stack2, options;
-  buffer += "\n    <span class=\"scrivito_restriction\" title=\"";
+  buffer += "\n      <span class=\"scrivito_restriction\" title=\"";
   options = {hash:{},data:data};
   stack2 = ((stack1 = helpers.array_to_title),stack1 ? stack1.call(depth0, depth0.restriction_messages, options) : helperMissing.call(depth0, "array_to_title", depth0.restriction_messages, options));
   if(stack2 || stack2 === 0) { buffer += stack2; }
@@ -26148,53 +26238,45 @@ function program3(depth0,data) {
 function program5(depth0,data) {
   
   
-  return "\n    <span></span>\n    ";
+  return "\n      <span></span>\n    ";
   }
 
 function program7(depth0,data) {
   
   var buffer = "", stack1, options;
-  buffer += "\n      <span><time datetime=\"";
+  buffer += "\n      <span>\n        <time datetime=\"";
   if (stack1 = helpers.last_changed) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.last_changed; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + "\" title=\"";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.localize_date),stack1 ? stack1.call(depth0, depth0.last_changed, options) : helperMissing.call(depth0, "localize_date", depth0.last_changed, options)))
-    + "\">\n        ";
+    + "\">\n          ";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.localize_date_relative),stack1 ? stack1.call(depth0, depth0.last_changed, options) : helperMissing.call(depth0, "localize_date_relative", depth0.last_changed, options)))
-    + "\n      </time></span>\n    ";
+    + "\n        </time>\n      </span>\n    ";
   return buffer;
   }
 
-  buffer += "<tr class=\"scrivito_link_to_obj\" title=\"";
+  buffer += "<tr title=\"";
   if (stack1 = helpers.tooltip) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.tooltip; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "\"\n    data-scrivito-private-changes-list-obj-id=\"";
+    + "\" data-scrivito-obj-id=\"";
   if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "\"\n    data-scrivito-private-changes-list-obj-modification=\"";
-  if (stack1 = helpers.modification) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.modification; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\"\n    data-scrivito-private-changes-list-obj-is-binary=\"";
-  if (stack1 = helpers.is_binary) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.is_binary; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
-  buffer += escapeExpression(stack1)
-    + "\">\n  <td><span class=\"scrivito_changes_state ";
+    + "\">\n  <td>\n    <span class=\"scrivito_changes_state ";
   if (stack1 = helpers.modification) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.modification; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + " ";
   stack1 = helpers['if'].call(depth0, depth0.has_conflict, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\"></span></td>\n  <td>\n    ";
+  buffer += "\">\n    </span>\n  </td>\n\n  <td>\n    ";
   stack1 = helpers['if'].call(depth0, depth0.has_restriction, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n  </td>\n  <td><span class=\"scrivito_title\">";
+  buffer += "\n  </td>\n\n  <td><span class=\"scrivito_title\">";
   if (stack1 = helpers.description_for_editor) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.description_for_editor; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
@@ -26202,7 +26284,7 @@ function program7(depth0,data) {
   if (stack1 = helpers.obj_class_name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.obj_class_name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "</span></td>\n  <td>\n    ";
+    + "</span></td>\n\n  <td>\n    ";
   stack1 = helpers.unless.call(depth0, depth0.is_deleted, {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n  </td>\n</tr>\n";
@@ -26238,41 +26320,78 @@ helpers = helpers || Handlebars.helpers; data = data || {};
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
-  this.ScrivitoHandlebarsTemplates["choose_obj_class_list"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.ScrivitoHandlebarsTemplates["choose_obj_class_dialog/item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
+
+
+  buffer += "<div class=\"scrivito_obj_class_thumbnail scrivito_editing_widget_preview\"\n    data-scrivito-private-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.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;
+  });
+  return this.ScrivitoHandlebarsTemplates["choose_obj_class_dialog/item"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["choose_obj_class_dialog/list"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  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, self=this;
 
 function program1(depth0,data) {
   
-  var buffer = "", stack1;
-  buffer += "\n  ";
-  stack1 = helpers['with'].call(depth0, depth0, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
-  if(stack1 || stack1 === 0) { buffer += stack1; }
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n  <div class=\"scrivito_editing_widget_preview_divider\">\n    <span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "choose_obj_class_dialog.last_used", options) : helperMissing.call(depth0, "translate", "choose_obj_class_dialog.last_used", options)))
+    + "</span>\n  </div>\n\n  ";
+  stack2 = helpers.each.call(depth0, ((stack1 = depth0.obj_class_selection),stack1 == null || stack1 === false ? stack1 : stack1.recent), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
   buffer += "\n";
   return buffer;
   }
 function program2(depth0,data) {
   
-  var buffer = "", stack1;
-  buffer += "\n    <div class=\"scrivito_obj_class_thumbnail scrivito_editing_widget_preview\" data-scrivito-private-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.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  ";
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n    ";
+  options = {hash:{},data:data};
+  stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "choose_obj_class_dialog/item", depth0, options) : helperMissing.call(depth0, "render", "choose_obj_class_dialog/item", depth0, options));
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n  ";
   return buffer;
   }
 
-  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; }
+function program4(depth0,data) {
+  
+  var buffer = "", stack1, stack2, options;
+  buffer += "\n  ";
+  options = {hash:{},data:data};
+  stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "choose_obj_class_dialog/item", depth0, options) : helperMissing.call(depth0, "render", "choose_obj_class_dialog/item", depth0, options));
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n";
+  return buffer;
+  }
+
+  stack2 = helpers['if'].call(depth0, ((stack1 = depth0.obj_class_selection),stack1 == null || stack1 === false ? stack1 : stack1.recent), {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
+  buffer += "\n\n<div class=\"scrivito_editing_widget_preview_divider\">\n  <span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "choose_obj_class_dialog.all", options) : helperMissing.call(depth0, "translate", "choose_obj_class_dialog.all", options)))
+    + "</span>\n</div>\n\n";
+  stack2 = helpers.each.call(depth0, ((stack1 = depth0.obj_class_selection),stack1 == null || stack1 === false ? stack1 : stack1.all), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
+  if(stack2 || stack2 === 0) { buffer += stack2; }
   buffer += "\n";
   return buffer;
   });
-  return this.ScrivitoHandlebarsTemplates["choose_obj_class_list"];
+  return this.ScrivitoHandlebarsTemplates["choose_obj_class_dialog/list"];
 }).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
@@ -26672,6 +26791,94 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   });
   return this.ScrivitoHandlebarsTemplates["element_overlay"];
 }).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["iframe_dialog"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
+
+function program1(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "scrivito_";
+  if (stack1 = helpers.color) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.color; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1);
+  return buffer;
+  }
+
+function program3(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n      ";
+  stack1 = helpers['with'].call(depth0, depth0.cancel, {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n    ";
+  return buffer;
+  }
+function program4(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n        <a href=\"#\" class=\"scrivito_button scrivito_cancel ";
+  stack1 = helpers['if'].call(depth0, depth0.color, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n          ";
+  stack1 = helpers['if'].call(depth0, depth0.title, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n        </a>\n      ";
+  return buffer;
+  }
+function program5(depth0,data) {
+  
+  var stack1;
+  if (stack1 = helpers.title) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.title; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  return escapeExpression(stack1);
+  }
+
+function program7(depth0,data) {
+  
+  
+  return escapeExpression((typeof depth0 === functionType ? depth0.apply(depth0) : depth0));
+  }
+
+function program9(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n      ";
+  stack1 = helpers['with'].call(depth0, depth0.confirm, {hash:{},inverse:self.noop,fn:self.program(10, program10, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n    ";
+  return buffer;
+  }
+function program10(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n        <a href=\"#\" class=\"scrivito_button scrivito_confirm ";
+  stack1 = helpers['if'].call(depth0, depth0.color, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n          ";
+  stack1 = helpers['if'].call(depth0, depth0.title, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n        </a>\n      ";
+  return buffer;
+  }
+
+  buffer += "<div id=\"scrivito_iframe_dialog\"\n    class=\"scrivito_modal_large scrivito_adjust_dialog ";
+  stack1 = helpers['if'].call(depth0, depth0.color, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\">\n  <div class=\"scrivito_modal_body scrivito_auto_height\"></div>\n  <div class=\"scrivito_modal_footer\">\n    ";
+  stack1 = helpers.unless.call(depth0, depth0.disable_cancel, {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n    ";
+  stack1 = helpers.unless.call(depth0, depth0.disable_confirm, {hash:{},inverse:self.noop,fn:self.program(9, program9, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n  </div>\n</div>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["iframe_dialog"];
+}).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
   this.ScrivitoHandlebarsTemplates["inplace_marker"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -26749,7 +26956,7 @@ function program5(depth0,data) {
   buffer += "\">\n    ";
   stack1 = helpers.each.call(depth0, depth0.menu_items, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n  </ul>\n</div>\n";
+  buffer += "\n    <li class=\"scrivito_menu_box_overlay\"></li>\n  </ul>\n</div>\n";
   return buffer;
   });
   return this.ScrivitoHandlebarsTemplates["menu"];
@@ -27147,6 +27354,23 @@ function program1(depth0,data) {
   });
   return this.ScrivitoHandlebarsTemplates["obj_sorting_dialog"];
 }).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["option_marker"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
+  this.compilerInfo = [3,'>= 1.0.0-rc.4'];
+helpers = helpers || Handlebars.helpers; data = data || {};
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
+
+
+  buffer += "<span class=\"scrivito_option_marker scrivito_";
+  if (stack1 = helpers.position) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.position; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\">\n  <i class=\"scrivito_icon scrivito_icon_marker_plus\"></i>\n</span>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["option_marker"];
+}).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
   this.ScrivitoHandlebarsTemplates["overlay"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -27315,56 +27539,56 @@ function program2(depth0,data) {
 function program4(depth0,data) {
   
   var buffer = "", stack1, stack2, options;
-  buffer += "\n      <li class=\"scrivito_menu_separator\">\n        <span>";
+  buffer += "\n    <li class=\"scrivito_menu_separator\">\n      <span>";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "workspace_select.this_workspace", options) : helperMissing.call(depth0, "translate", "workspace_select.this_workspace", options)))
-    + "</span>\n      </li>\n      ";
+    + "</span>\n    </li>\n    ";
   stack2 = helpers.each.call(depth0, ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.for_editable), {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n      <li class=\"scrivito_menu_separator\"></li>\n    ";
+  buffer += "\n    <li class=\"scrivito_menu_separator\"></li>\n  ";
   return buffer;
   }
 function program5(depth0,data) {
   
   var buffer = "", stack1, stack2, options;
-  buffer += "\n        ";
+  buffer += "\n      ";
   options = {hash:{},data:data};
   stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "workspace_select/menu_item", depth0, options) : helperMissing.call(depth0, "render", "workspace_select/menu_item", depth0, options));
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n      ";
+  buffer += "\n    ";
   return buffer;
   }
 
 function program7(depth0,data) {
   
   var buffer = "", stack1, stack2, options;
-  buffer += "\n      <li class=\"scrivito_menu_separator\"></li>\n      ";
+  buffer += "\n    <li class=\"scrivito_menu_separator\"></li>\n    ";
   options = {hash:{},data:data};
   stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.select_published), options) : helperMissing.call(depth0, "render", "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.select_published), options));
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n    ";
+  buffer += "\n  ";
   return buffer;
   }
 
   stack1 = helpers['with'].call(depth0, depth0.selected_workspace, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\n\n<div class=\"scrivito_menu_box scrivito_hidden\">\n  <ul>\n    ";
+  buffer += "\n\n<ul class=\"scrivito_menu_box scrivito_hidden\">\n  ";
   stack2 = helpers['if'].call(depth0, ((stack1 = depth0.selected_workspace),stack1 == null || stack1 === false ? stack1 : stack1.is_editable), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n\n    <li class=\"scrivito_menu_separator\">\n      <span>";
+  buffer += "\n\n  <li class=\"scrivito_menu_separator\">\n    <span>";
   options = {hash:{},data:data};
   buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "workspace_select.other_workspaces", options) : helperMissing.call(depth0, "translate", "workspace_select.other_workspaces", options)))
-    + "</span>\n    </li>\n\n    ";
+    + "</span>\n  </li>\n\n  ";
   options = {hash:{},data:data};
   stack2 = ((stack1 = helpers.render),stack1 ? stack1.call(depth0, "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.create_workspace), options) : helperMissing.call(depth0, "render", "workspace_select/menu_item", ((stack1 = depth0.commands),stack1 == null || stack1 === false ? stack1 : stack1.create_workspace), options));
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n\n    ";
+  buffer += "\n\n  ";
   stack2 = helpers.unless.call(depth0, ((stack1 = depth0.selected_workspace),stack1 == null || stack1 === false ? stack1 : stack1.is_published), {hash:{},inverse:self.noop,fn:self.program(7, program7, data),data:data});
   if(stack2 || stack2 === 0) { buffer += stack2; }
-  buffer += "\n\n    <li class=\"scrivito_menu_item scrivito_workspace_list\">\n      <span>\n        <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</i>\n        ";
+  buffer += "\n\n  <li class=\"scrivito_menu_item scrivito_workspace_list\">\n    <span>\n      <i class=\"scrivito_icon scrivito_spinning\">&#xf023;</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</div>\n";
+    + "\n    </span>\n  </li>\n\n  <li class=\"scrivito_menu_box_overlay\"></li>\n</ul>\n";
   return buffer;
   });
   return this.ScrivitoHandlebarsTemplates["workspace_select"];
@@ -27545,6 +27769,8 @@ $.i18n().load({
 
   'choose_obj_class_dialog.add_child_page.title': 'Seitenvorlage auswählen',
   'choose_obj_class_dialog.create_widget.title': 'Widget auswählen',
+  'choose_obj_class_dialog.last_used': 'Zuletzt verwendet',
+  'choose_obj_class_dialog.all': 'Alle (a - z)',
 
   'editable_ws_dialog.title.select_or_create': 'Arbeitskopie wählen',
   'editable_ws_dialog.title.select': 'Arbeitskopie auswählen',
@@ -27614,13 +27840,13 @@ $.i18n().load({
   'child_list_menu.description': 'Elemente von $1',
 
   'changes_dialog.title': 'Änderungen von "$1"',
-  'changes_dialog.empty_result': 'In dieser Arbeitskopie wurde nichts geändert.',
+  'changes_dialog.empty': 'In dieser Arbeitskopie wurde nichts geändert.',
   'changes_dialog.more': 'Mehr...',
-  'changes_dialog.row.change': 'Änderung',
-  'changes_dialog.row.rights': 'Veröffentlichen erlaubt',
-  'changes_dialog.row.description_for_editor': 'Titel',
-  'changes_dialog.row.type': 'Typ',
-  'changes_dialog.row.last_changed': 'Letzte Änderung',
+  'changes_dialog.modification': 'Änderung',
+  'changes_dialog.rights': 'Veröffentlichen erlaubt',
+  'changes_dialog.description_for_editor': 'Titel',
+  'changes_dialog.obj_class_name': 'Typ',
+  'changes_dialog.last_changed': 'Letzte Änderung',
 
   'current_page_link_dialog.title': 'Diese Seite teilen',
   'current_page_link_dialog.description': 'Mit dieser URL können Sie die aktuelle Seite als Teil dieser Arbeitskopie teilen. Die Empfänger müssen angemeldet sein und Zugriff auf die Arbeitskopie haben.',
@@ -27804,6 +28030,8 @@ $.i18n().load({
 
   'choose_obj_class_dialog.add_child_page.title': 'Select Page Type',
   'choose_obj_class_dialog.create_widget.title': 'Select Widget',
+  'choose_obj_class_dialog.last_used': 'Last used',
+  'choose_obj_class_dialog.all': 'All (a - z)',
 
   'editable_ws_dialog.title.select_or_create': 'Choose a working copy',
   'editable_ws_dialog.title.select': 'Select a working copy',
@@ -27873,13 +28101,13 @@ $.i18n().load({
   'child_list_menu.description': 'Items of $1',
 
   'changes_dialog.title': 'Changes to "$1"',
-  'changes_dialog.empty_result': 'Nothing was changed in this working copy.',
+  'changes_dialog.empty': 'Nothing was changed in this working copy.',
   'changes_dialog.more': 'More...',
-  'changes_dialog.row.change': 'Change',
-  'changes_dialog.row.rights': 'Publishing permitted',
-  'changes_dialog.row.description_for_editor': 'Title',
-  'changes_dialog.row.type': 'Type',
-  'changes_dialog.row.last_changed': 'Last change',
+  'changes_dialog.modification': 'Change',
+  'changes_dialog.rights': 'Publishing permitted',
+  'changes_dialog.description_for_editor': 'Title',
+  'changes_dialog.obj_class_name': 'Type',
+  'changes_dialog.last_changed': 'Last change',
 
   'current_page_link_dialog.title': 'Share this page',
   'current_page_link_dialog.description': 'Using the URL below, you can share the current page as part of this working copy. The recipients need to be logged in and have access to the working copy.',
@@ -28041,6 +28269,8 @@ var scrivito = {};
 (function() {
   var inited = false;
 
+  var ui_config_attr_name = 'data-scrivito-private-ui-config';
+
   var wait_until_write_ends = function() {
     var deferred = $.Deferred();
     if (scrivito.write_monitor.is_writing()) {
@@ -28060,6 +28290,18 @@ var scrivito = {};
     return {message: error.message};
   };
 
+  var restore_prior_attr = function(promise, dom_element, attr_name) {
+    var prior_attr = dom_element.attr(attr_name);
+    promise.always(function() {
+      if (prior_attr) {
+        dom_element.attr(attr_name, prior_attr);
+      } else {
+        // jQuery#removeAttr violates CSP by assigning an empty value.
+        dom_element.get(0).removeAttribute(attr_name);
+      }
+    });
+  };
+
   _.extend(scrivito, {
     suppress_alerts: false,
 
@@ -28095,6 +28337,36 @@ var scrivito = {};
       return scrivito.redirect_to(scrivito.editing_context.location(params).href());
     },
 
+    open_obj: function(obj) {
+      if (obj.is_binary() && (
+          obj.is_edited() ||
+          obj.is_new() && !scrivito.editing_context.is_deleted_mode() ||
+          obj.is_deleted() && scrivito.editing_context.is_deleted_mode())) {
+        scrivito.resource_dialog.open(obj);
+      } else {
+        var url = scrivito.root_path();
+        var params = {};
+
+        if (obj.is_binary()) {
+          url = '/__scrivito/resource_details/';
+          params.return_to = document.URL;
+        }
+
+        if (obj.is_new() && scrivito.editing_context.is_deleted_mode()) {
+          params._scrivito_display_mode = 'added';
+        }
+
+        if (obj.is_deleted() && !scrivito.editing_context.is_deleted_mode()) {
+          params._scrivito_display_mode = 'deleted';
+        }
+
+        url += obj.id();
+        if (!_.isEmpty(params)) { url += '?'+$.param(params); }
+
+        scrivito.with_saving_overlay(scrivito.redirect_to(url));
+      }
+    },
+
     // For testing purpose only.
     location: function() {
       return window.location;
@@ -28202,7 +28474,6 @@ var scrivito = {};
       scrivito.warn(message);
     },
 
-    // @api public
     on: function(event, callback) {
       if (event === 'load') {
         scrivito.gui.on('open', function() {
@@ -28229,14 +28500,12 @@ var scrivito = {};
       }
     },
 
-    // @api public
     create_obj: function(attributes) {
       return scrivito.obj.create(attributes).then(function(obj) {
         return {id: obj.id()};
       }, convert_internal_error);
     },
 
-    // @api public
     delete_obj: function(id) {
       if (id) {
         return scrivito.obj.create_instance({id: id}).destroy()
@@ -28246,9 +28515,8 @@ var scrivito = {};
       }
     },
 
-    // @api public
     is_current_page_restricted: function() {
-      var current_page = scrivito.application_window.document().page();
+      var current_page = scrivito.application_document().page();
       if (current_page) {
         return current_page.has_restriction();
       }
@@ -28258,7 +28526,6 @@ var scrivito = {};
       return $.Deferred();
     },
 
-    // @api public
     trigger: function(event_name, dom_element) {
       if (event_name === 'content') {
         _.each($(dom_element), function(e) {
@@ -28273,7 +28540,6 @@ var scrivito = {};
       }
     },
 
-    // @api public
     in_editable_view: function() {
       return scrivito.editing_context.display_mode === 'editing' &&
           scrivito.editing_context.visible_workspace.is_editable();
@@ -28329,17 +28595,14 @@ var scrivito = {};
       scrivito.info_dialog(scrivito.t('workspace_limit_exceeded.message'));
     },
 
-    // @api public
     register_default_obj_class_for_content_type: function(mapping) {
       scrivito.obj_class_defaults.register(mapping);
     },
 
-    // @api public
     default_obj_class_for_content_type: function(content_type) {
       return scrivito.obj_class_defaults.lookup(content_type);
     },
 
-    // @api public
     configure_menu_order: function(order) {
       scrivito.menu_order = order;
     },
@@ -28373,20 +28636,46 @@ var scrivito = {};
       }
     },
 
-    // @api beta
     register_select_content: function(select_content) {
       scrivito.select_content = select_content;
     },
 
-    // @api public
     page_menu: function(cms_document) {
       return scrivito.menu_builder.create_instance(cms_document);
     },
 
+    custom_dialog: function(iframe, doc, content, options) {
+      var dialog = scrivito.iframe_dialog.open(iframe, options);
+      dialog.when_open.done(function(dialog_body) {
+        var panel = scrivito.full_screen_panel(doc, dialog.when_closed);
+        panel.css('background-color', dialog_body.css('background-color'));
+        panel.append(content);
+      });
+      return {when_closed: dialog.when_closed};
+    },
+
     register_browse_content: function (browse_content) {
       scrivito.browse_content = browse_content;
     },
 
+    ui_config: function() {
+      return scrivito.dom_config.read($('body'), ui_config_attr_name);
+    },
+
+    // For test purpose only.
+    mock_ui_config: function(config) {
+      if (config) {
+        scrivito.dom_config.write($('body'), ui_config_attr_name, config);
+      } else {
+        $('body').removeAttr(ui_config_attr_name);
+      }
+    },
+
+    restore_styles_afterwards: function(promise, dom_element) {
+      restore_prior_attr(promise, dom_element, 'class');
+      restore_prior_attr(promise, dom_element, 'style');
+    },
+
     // FIXME content-widget
     enable_content_upload: false,
 
@@ -28404,6 +28693,7 @@ var scrivito = {};
       scrivito.is_development_mode = config.is_development_mode;
 
       scrivito.inplace_marker.init();
+      scrivito.option_marker.init();
       scrivito.menu_bar_saving_indicator.init();
       scrivito.menu_bar_device_toggle.init();
       scrivito.menu_bar_warning.init();
@@ -28430,6 +28720,8 @@ var scrivito = {};
       scrivito.widget_reloading.init();
       scrivito.widget_sorting.init();
 
+      scrivito.no_turbolinks.init();
+
       // FIXME content-widget
       if (scrivito.enable_content_upload) {
         scrivito.content_upload.init();
@@ -28440,6 +28732,7 @@ var scrivito = {};
       window.onbeforeunload = scrivito.warn_before_unloading;
 
       scrivito.url_update(scrivito.application_window, scrivito.cms_window.from(window));
+      scrivito.application_window.use_fragment_of(scrivito.cms_window.from(window));
 
       inited = true;
     }
@@ -28570,19 +28863,17 @@ var scrivito = {};
 
 }());
 (function() {
-  var attr_name = 'data-scrivito-private-config';
-  var selector  = '[' + attr_name + ']';
-
   _.extend(scrivito, {
     dom_config: {
-      read: function(dom_element) {
+      read: function(dom_element, attr_name) {
+        var selector  = '[' + attr_name + ']';
         var config = dom_element.find(selector).addBack(selector).attr(attr_name);
         if (config) {
           return JSON.parse(config);
         }
       },
 
-      write: function(dom_element, config) {
+      write: function(dom_element, attr_name, config) {
         dom_element.attr(attr_name, JSON.stringify(config));
       }
     }
@@ -28638,16 +28929,6 @@ var scrivito = {};
     }
   };
 
-  var assert_no_turbolinks = function() {
-    if (scrivito.application_window.browser_window().Turbolinks) {
-      scrivito.alert_dialog(
-        'You have Turbolinks enabled. ' +
-        'Scrivito does not yet support Turbolink. ' +
-        'Please remove it from your assets.'
-      );
-    }
-  };
-
   _.extend(scrivito, {
     gui: {
       start: function() {
@@ -28660,7 +28941,6 @@ var scrivito = {};
         $('body').append('<div id="scrivito_editing"></div>');
         run_open_callbacks();
         scrivito.gui.run_content_callbacks(window.document);
-        assert_no_turbolinks();
 
         is_started = true;
       },
@@ -29329,9 +29609,8 @@ var scrivito = {};
             .attr('class', 'scrivito_icon scrivito_icon_'+device);
         };
 
-        $('#scrivito_ui').addClass('scrivito_iframe_resize_bg');
-
         scrivito.menu_bar.register_item_renderer(function(menu_bar) {
+          $('#scrivito_ui').addClass('scrivito_iframe_resize_bg');
           device_toggle = $(scrivito.template.render('menu_bar_device_toggle',
             {device: current_device()}
           )).appendTo(menu_bar.find('#scrivito_menu_bar_device_toggle'));
@@ -29349,8 +29628,11 @@ var scrivito = {};
                 }
               },
               execute: function() {
-                toggle_device(device);
-                $('iframe[name=scrivito_application]').addClass('scrivito_iframe_animate_resize');
+                var iframe = $('iframe[name=scrivito_application]');
+                scrivito.transition(iframe, function() {
+                  toggle_device(device);
+                  iframe.addClass('scrivito_iframe_animate_resize');
+                }).done(function() { iframe.removeClass('scrivito_iframe_animate_resize'); });
               }
             });
           });
@@ -29592,14 +29874,14 @@ var scrivito = {};
   _.extend(scrivito, {
     current_page_restriction: {
       init: function() {
-        var current_page = scrivito.application_window.document().page();
-        if (current_page && current_page.has_restriction()) {
-          scrivito.menu_bar.register_item_renderer(function(menu_bar) {
+        scrivito.menu_bar.register_item_renderer(function(menu_bar) {
+          var current_page = scrivito.application_document().page();
+          if (current_page && current_page.has_restriction()) {
             $(scrivito.template.render('current_page_restriction', {
               restriction_messages: current_page.restriction_messages
             })).appendTo(menu_bar.find('#scrivito_current_page_restriction'));
-          });
-        }
+          }
+        });
       }
     }
   });
@@ -29661,240 +29943,88 @@ var scrivito = {};
                     has_separator: selected_workspace.is_published() && commands.length,
                     commands: commands
                   }
-                ));
-
-                _.each(commands, function(command) { bind_command(command); });
-              }).always(function() {
-                spinner.removeAttr('data-scrivito-private-loading');
-              });
-            }
-
-            return false;
-          });
-        });
-      }
-    }
-  });
-}());
-(function() {
-  _.extend(scrivito, {
-    changes_dialog: {
-      open: function() {
-        loaded_objs = [];
-        total_obj_count = 0;
-        batch = basic_batch();
-
-        view = $(scrivito.template.render('changes_dialog', {
-          selected_workspace_title: scrivito.editing_context.selected_workspace.title()
-        }));
-
-        $('#scrivito_editing').append(view);
-        var next_loader = view.find('.scrivito_load_more');
-
-        target = view.find('#scrivito_changes_table_loaded');
-        var spinner = view.find('#scrivito_changes_table_loading');
-        var empty_result = view.find('#scrivito_changes_table_empty_result');
-
-        var obj_count = view.find('#scrivito_obj_count');
-
-        loaded_obj_count_ref = view.find('#scrivito_loaded_obj_count');
-        total_obj_count_ref = view.find('#scrivito_total_obj_count');
-
-        load_markup = function() {
-          loading_in_progress = true;
-          spinner.show();
-
-          batch.load_batch().then(function(data, next) {
-            loading_in_progress = false;
-
-            batch = next;
-            if (!batch) {
-              next_loader.hide();
-            } else {
-              next_loader.show();
-            }
-
-            if (data.total > 0) {
-              loaded_objs = loaded_objs.concat(data.hits);
-              total_obj_count = data.total;
-
-              render_objs(loaded_objs);
-            } else {
-              empty_result.show();
-            }
-
-            spinner.hide();
-
-            loaded_obj_count_ref.text(loaded_objs.length);
-            total_obj_count_ref.text(total_obj_count);
-            obj_count.show();
-
-            view.on('click.scrivito_link_to_obj', '.scrivito_link_to_obj', function(e) {
-              var element = $(e.currentTarget);
-              var obj_id = element.attr('data-scrivito-private-changes-list-obj-id');
-              var obj_modification = element.attr(
-                  'data-scrivito-private-changes-list-obj-modification');
-              var obj_is_binary = element.attr('data-scrivito-private-changes-list-obj-is-binary');
-
-              if (can_use_resource_dialog_directly(obj_modification, obj_is_binary)) {
-                var loaded_obj = _.find(loaded_objs, function(obj) {
-                  return obj.id === obj_id;
-                });
-                scrivito.resource_dialog.open(scrivito.obj.create_instance(loaded_obj));
-              } else {
-                scrivito.changes_dialog.redirect_to_obj(obj_id, obj_modification, obj_is_binary);
-              }
-
-              return false;
-            });
-          });
-        };
-
-        next_loader.on('click', load_markup);
-        load_markup();
-        activate_sorting();
-
-        var deferred = $.Deferred();
-
-        cancel = function() {
-          scrivito.dialog.close(view);
-          deferred.resolve();
-          return false;
-        };
-
-        view.find('.scrivito_cancel').on('click', cancel);
-
-        scrivito.dialog.open_and_adjust(view);
-        return scrivito.with_dialog_behaviour(view, deferred, {escape: cancel});
-      },
+                ));
 
-      redirect_to_obj: function(obj_id, modification, is_binary) {
-        var base_url = scrivito.root_path();
-        var query_params = {};
+                _.each(commands, function(command) { bind_command(command); });
+              }).always(function() {
+                spinner.removeAttr('data-scrivito-private-loading');
+              });
+            }
 
-        if (!!is_binary) {
-          base_url += '__scrivito/resource_details/';
-          query_params.return_to = document.URL;
-        }
+            return false;
+          });
+        });
+      }
+    }
+  });
+}());
+(function() {
+  var dialog;
 
-        if (modification === 'deleted' && !scrivito.editing_context.is_deleted_mode()) {
-          query_params._scrivito_display_mode = 'deleted';
-        }
+  _.extend(scrivito, {
+    changes_dialog: {
+      open: function() {
+        var promise = $.Deferred();
+        dialog = $(scrivito.template.render('changes_dialog')).appendTo($('#scrivito_editing'));
+        open_batch(scrivito.obj_changes());
 
-        if (modification === 'new' && scrivito.editing_context.is_deleted_mode()) {
-          query_params._scrivito_display_mode = 'added';
-        }
+        var close = function() {
+          scrivito.dialog.close_without_transition(dialog);
+          promise.resolve();
+          return false;
+        };
 
-        cancel();
-        var redirect_url = base_url + obj_id;
-        if (!_.isEmpty(query_params)) {
-          redirect_url += '?' + $.param(query_params);
-        }
-        scrivito.with_saving_overlay(scrivito.redirect_to(redirect_url));
+        dialog.find('.scrivito_cancel').on('click', close);
+        scrivito.dialog.open_and_adjust_without_transition(dialog);
+        return scrivito.with_dialog_behaviour(dialog, promise, {escape: close});
       }
     }
   });
 
-  var batch;
-  var view;
-  var loaded_obj_count_ref;
-  var total_obj_count_ref;
-  var loaded_objs;
-  var total_obj_count;
-  var target;
-  var load_markup;
-  var loading_in_progress;
-  var cancel;
-
-  var can_use_resource_dialog_directly = function(modification, is_binary) {
-    return is_binary && (
-        modification === 'edited' ||
-        modification === 'deleted' && scrivito.editing_context.is_deleted_mode() ||
-        modification === 'new' && !scrivito.editing_context.is_deleted_mode());
-  };
-
-  var basic_batch = function() {
-    return scrivito.
-      obj_where('_modification', 'equals', ['new', 'edited', 'deleted']).
-      batch_size(100).
-      order('_last_changed').
-      reverse_order().
-      format('_default').
-      include_deleted();
+  var open_batch = function(chainable_search, objs) {
+    render(chainable_search);
+    chainable_search.load_batch().then(function(result, next) {
+      objs = (objs || []).concat(_.map(result.hits, function(hit) {
+        return scrivito.obj.create_instance(hit);
+      }));
+      render(chainable_search, result, objs, next);
+    });
   };
 
-  var render_objs = function(obj_specs) {
-    target.html(_.map(obj_specs, function(obj_spec) {
-      return scrivito.template.render('changes_dialog/row', scrivito.obj.create_instance(obj_spec));
+  var render = function(chainable_search, result, objs, next) {
+    var view = dialog.find('.scrivito_changes_dialog_content');
+    view.html(scrivito.template.render('changes_dialog/content', {
+      title: scrivito.t('changes_dialog.title', scrivito.editing_context.selected_workspace.title()),
+      is_loaded: !!result,
+      total: result && result.total,
+      objs: objs,
+      has_more: !!next
     }));
-  };
+    scrivito.update_auto_height_for(view);
 
-  var activate_sorting = function() {
-    var sortables = view.find('.scrivito_sortable');
-
-    view.on('click.scrivito_sortable', '.scrivito_sortable', function() {
-      if (loading_in_progress) {
-        return;
-      }
+    view.find('[data-scrivito-sort-by="'+chainable_search.query().order+'"]')
+      .addClass('scrivito_'+(chainable_search.query().reverse_order ? 'sort_down' : 'sort_up'));
 
+    view.find('[data-scrivito-sort-by]').on('click', function() {
       var sortable = $(this);
-      var sorting_by = {};
-      sorting_by.attribute = sortable.attr('data-scrivito-private-sort-by');
-
-      var order_was_asc = sortable.hasClass('sort_up');
-      if (order_was_asc) {
-        sorting_by.order = 'desc';
-      } else {
-        sorting_by.order = 'asc';
-      }
-      sortables.removeClass('sort_up').removeClass('sort_down');
-
-      var local_sort = function() {
-        var sort_function_or_attribute = sorting_by.attribute;
-
-        if (sort_function_or_attribute === 'rights') {
-          sort_function_or_attribute = function(obj) {
-            return -obj.restriction_messages.length;
-          };
-        }
-
-        var objs = _.sortBy(loaded_objs, sort_function_or_attribute);
-
-        if (sorting_by.order === 'desc') {
-          objs = objs.reverse();
-        }
-
-        render_objs(objs);
-      };
-
-      var backend_sort = function() {
-        batch = basic_batch();
-        batch.order('_' + sorting_by.attribute);
-
-        if (sorting_by.order === 'asc') {
-          batch.reverse_order();
-        }
-
-        loaded_objs = [];
-        render_objs(loaded_objs);
-        load_markup();
-      };
-
-      if (loaded_objs.length === total_obj_count || sorting_by.attribute === 'rights') {
-        local_sort();
-      } else {
-        backend_sort();
-      }
+      var chainable_search = scrivito.obj_changes();
+      chainable_search.order(sortable.attr('data-scrivito-sort-by'));
+      if (sortable.hasClass('scrivito_sort_down')) { chainable_search.reverse_order(); }
+      open_batch(chainable_search);
+      return false;
+    });
 
-      if (sorting_by.order === 'asc') {
-        sortable.addClass('sort_up');
-      } else {
-        sortable.addClass('sort_down');
-      }
+    view.find('[data-scrivito-obj-id]').on('click', function() {
+      var obj_id = $(this).attr('data-scrivito-obj-id');
+      scrivito.open_obj(_.find(objs, function(obj) { return obj.id() === obj_id; }));
+      return false;
     });
 
+    view.find('.scrivito_load_more').on('click', function() {
+      open_batch(next, objs);
+      return false;
+    });
   };
-
 }());
 (function() {
   _.extend(scrivito, {
@@ -29910,13 +30040,13 @@ var scrivito = {};
       view.find('input').focus().select();
 
       var done = function() {
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         deferred.resolve();
         return false;
       };
       view.find('.scrivito_done').on('click', done);
 
-      scrivito.dialog.open_and_adjust(view);
+      scrivito.dialog.open_and_adjust_with_transition(view);
       scrivito.with_dialog_behaviour(view, deferred, {enter: done, escape: done});
     }
   });
@@ -29945,6 +30075,31 @@ var scrivito = {};
 
   scrivito.obj_class_defaults.reset();
 }());
+(function() {
+  _.extend(scrivito, {
+    obj_class_selection: {
+      store: function(obj_class) {
+        var new_storage = get_storage();
+        new_storage.unshift(obj_class);
+        new_storage = _.uniq(new_storage);
+        new_storage = _.take(new_storage, 200);
+        scrivito.storage.set(scrivito.obj_class_selection.storage_key, new_storage);
+      },
+
+      recent: function(valid_obj_classes) {
+        var recent_valid_obj_classes = _.intersection(get_storage(), valid_obj_classes);
+        return _.take(recent_valid_obj_classes, 5);
+      },
+
+      // for testing only
+      storage_key: 'obj_class_selection.used_classes'
+    }
+  });
+
+  var get_storage = function() {
+    return scrivito.storage.get(scrivito.obj_class_selection.storage_key) || [];
+  };
+}());
 (function() {
   var expando = "scrivito_cms_element";
 
@@ -29971,6 +30126,18 @@ var scrivito = {};
 
           set_menu: function(menu) {
             dom_element.data('scrivito-menu', menu);
+          },
+
+          enrich_obj_classes_with_recent: function(obj_classes_markup) {
+            var sorted_all = _.map(obj_classes_markup, function(obj_class_markup) {
+              return obj_class_markup.name;
+            }).sort();
+            var recent = scrivito.obj_class_selection.recent(sorted_all);
+
+            return {
+              all: format_obj_classes(sorted_all, obj_classes_markup),
+              recent: format_obj_classes(recent, obj_classes_markup)
+            };
           }
         };
 
@@ -30016,22 +30183,48 @@ var scrivito = {};
       }
     }
   });
+
+  var format_obj_classes = function(obj_classes, obj_classes_markup) {
+    return _.map(obj_classes, function(obj_class) {
+      return {
+        name: obj_class,
+        markup: _.find(obj_classes_markup, function(obj_class_markup) {
+          return obj_class_markup.name === obj_class;
+        }).markup
+      };
+    });
+  };
 }());
 (function() {
   _.extend(scrivito, {
     blob: {
-      create: function(file) {
+      create: function(obj_id, binary) {
+        var uploaded_binary = binary.is_uploaded_binary ? binary : scrivito.blob.upload_binary(binary);
         return get_upload_permission().then(function(permission) {
           scrivito.write_monitor.start_write();
-          return upload_to_s3(file, permission).always(function() {
-            scrivito.write_monitor.end_write();
-          });
+          return upload_to_s3(uploaded_binary, permission).then(function(blob) {
+            return activate_upload(obj_id, blob, binary.filename, binary.content_type)
+              .then(function() { return blob; });
+          }).always(function() { scrivito.write_monitor.end_write(); });
         });
       },
 
       // For testing purpose only.
       get_form_data: function() {
         return new FormData();
+      },
+
+      upload_binary: function(params) {
+        var blob = params.blob || params.file;
+        if (!blob) { $.error('need blob or file'); }
+        if (!params.content_type) { params.content_type = blob.type; }
+        if (!params.filename) {
+          if (params.blob) { $.error('blob needs a filename'); }
+          params.filename = blob.name;
+        }
+        params.filename = params.filename.replace(/[^\w\-_\.$]/g, '-');
+
+        return $.extend(params, {is_uploaded_binary: true});
       }
     }
   });
@@ -30040,15 +30233,17 @@ var scrivito = {};
     return scrivito.ajax('GET', 'blobs/upload_permission');
   };
 
-  var upload_to_s3 = function(file, permission) {
+  var upload_to_s3 = function(binary, permission) {
     var form_data = scrivito.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.
 
-    permission.blob.filename = file.name.replace(/[^\w\-_\.$]/g, '-');
-    permission.blob.content_type = file.type;
+    // File must be appended last, otherwise S3 will complain.
+    form_data.append('file', binary.blob || binary.file);
+
+    permission.blob.filename = binary.filename;
+    permission.blob.content_type = binary.content_type;
 
     return $.ajax({type: 'POST', url: permission.url, data: form_data,
       // These are needed in order for jQuery to work properly with a FormData.
@@ -30057,6 +30252,14 @@ var scrivito = {};
     }).then(function() { return permission.blob; });
   };
 
+  var activate_upload = function(obj_id, blob, filename, content_type) {
+    return scrivito.ajax('PUT', 'blobs/activate_upload', {data: {
+      obj_id: obj_id,
+      upload: blob,
+      filename: filename,
+      content_type: content_type
+    }});
+  };
 }());
 (function() {
   _.extend(scrivito, {
@@ -30079,8 +30282,10 @@ var scrivito = {};
             },
 
             fetch_page_class_selection: function() {
-              return scrivito.ajax('GET', 'objs/page_class_selection?' +
-                  $.param({parent_path: that.path()}));
+              var request_path = 'objs/page_class_selection?' + $.param({parent_path: that.path()});
+              return scrivito.ajax('GET', request_path).then(function(obj_classes_markup) {
+                return that.enrich_obj_classes_with_recent(obj_classes_markup);
+              });
             },
 
             allowed_classes: function() {
@@ -30090,6 +30295,7 @@ var scrivito = {};
 
             create_child: function(obj_class) {
               var id = scrivito.random_id();
+              scrivito.obj_class_selection.store(obj_class);
               return scrivito.obj.create({
                 _id: id,
                 _path: that.path() + '/' + id,
@@ -30200,6 +30406,7 @@ var scrivito = {};
   });
 
   var additional_public_api = {};
+  var page_config_attr_name = 'data-scrivito-private-page-config';
 
   var create_instance = function(cms_element) {
     var that = cms_element;
@@ -30209,6 +30416,7 @@ var scrivito = {};
       install_public_api: function() {
         local_$().fn.scrivito = scrivito.jquery_plugin;
 
+        // @api public
         browser_window.scrivito = _.extend({}, additional_public_api, {
           on: local_on_function,
           trigger: scrivito.trigger,
@@ -30219,12 +30427,25 @@ var scrivito = {};
           in_editable_view: scrivito.in_editable_view,
           register_default_obj_class_for_content_type: scrivito.register_default_obj_class_for_content_type,
           default_obj_class_for_content_type: scrivito.default_obj_class_for_content_type,
-          register_select_content: scrivito.register_select_content,
+          register_select_content: scrivito.register_select_content, // @api beta
           configure_menu_order: scrivito.configure_menu_order,
-          page_menu: function() { return scrivito.page_menu(that); }
+          upload_binary: scrivito.blob.upload_binary,
+          page_menu: function() { return scrivito.page_menu(that); },
+          // @api beta
+          dialog: function(content, options) {
+            var iframe = that.window().iframe();
+            return scrivito.custom_dialog(iframe, browser_document, content, options);
+          }
         });
       },
 
+      assert_user_logged_in: function() {
+        if (that.user_id() !== scrivito.user.current.id()) {
+          // editing is either no longer allowed, or user changed => closing UI
+          scrivito.change_location(window.location, window.parent);
+        }
+      },
+
       connect: function() {
         if (connected) { $.error("document connected twice!"); }
 
@@ -30248,11 +30469,9 @@ var scrivito = {};
         });
       },
 
-      page: function() {
-        var config = scrivito.dom_config.read(that.dom_element());
-        if (config && !_.isEmpty(config.current_page)) {
-          return scrivito.obj.create_instance(config.current_page);
-        }
+      add_app_extensions: function() {
+        var app_extension_tags = scrivito.ui_config().app_extension_tags;
+        browser_window.document.write(app_extension_tags);
       },
 
       window: function() {
@@ -30282,14 +30501,36 @@ var scrivito = {};
         }
       },
 
+      page: function() {
+        var config = that.page_config();
+        if (config && !_.isEmpty(config.current_page)) {
+          return scrivito.obj.create_instance(config.current_page);
+        }
+      },
+
+      user_id: function() {
+        var config = that.page_config();
+        if (config) {
+          return config.user_id;
+        }
+      },
+
+      page_config: function() {
+        return scrivito.dom_config.read(that.dom_element().find('body'), page_config_attr_name);
+      },
+
       // For test purpose only.
-      mock_config: function(config) {
-        scrivito.dom_config.write(that.dom_element().find('body'), config);
+      mock_page_config: function(config) {
+        if (config) {
+          scrivito.dom_config.write(that.dom_element().find('body'), page_config_attr_name, config);
+        } else {
+          that.dom_element().find('body').removeAttr(page_config_attr_name);
+        }
       },
 
       // For test purpose only.
       mock_current_page: function(attrs) {
-        that.mock_config({current_page: attrs});
+        that.mock_page_config({current_page: attrs});
       }
     });
 
@@ -30299,7 +30540,15 @@ var scrivito = {};
     var browser_window = browser_document.defaultView;
 
     var local_$ = function() {
-      return browser_window.jQuery;
+      if (browser_window.jQuery) {
+        return browser_window.jQuery;
+      } else {
+        var jquery_missing = 'jQuery is missing! ' +
+            'In order for Scrivito to work, jQuery is needed. ' +
+            'Please add jQuery to your assets.';
+        scrivito.alert_dialog(jquery_missing);
+        $.error(jquery_missing);
+      }
     };
 
     var connected = false;
@@ -30404,10 +30653,7 @@ var scrivito = {};
             }
 
             return request_promise.then(function(model_data) {
-              var field_data = model_data[that.field_name()];
-              if (field_data) {
-                return field_data[0];
-              }
+              return model_data[that.field_name()];
             });
           },
 
@@ -30568,6 +30814,17 @@ var scrivito = {};
         return with_saving_overlay(scrivito.redirect_to(location, browser_window));
       },
 
+      use_fragment_of: function(other_cms_window) {
+        if (that === other_cms_window) { return; }
+
+        var ui_hash = other_cms_window.browser_window().location.hash;
+        if (ui_hash) {
+          var src_uri = new URI(that.iframe().src);
+          src_uri.fragment(ui_hash);
+          that.iframe().src = src_uri.href();
+        }
+      },
+
       is_frame: function() {
         return browser_window.parent !== browser_window;
       },
@@ -30693,22 +30950,26 @@ var scrivito = {};
 
   var serialize_date = function(date) {
     return date.getUTCFullYear().toString() +
-      format_date_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
-      format_date_number(date.getUTCDate()) +
-      format_date_number(date.getUTCHours()) +
-      format_date_number(date.getUTCMinutes()) +
-      format_date_number(date.getUTCSeconds());
+      '-' + format_date_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
+      '-' + format_date_number(date.getUTCDate()) +
+      'T' + format_date_number(date.getUTCHours()) +
+      ':' + format_date_number(date.getUTCMinutes()) +
+      ':' + format_date_number(date.getUTCSeconds()) +
+      'Z';
   };
 
-  var convert_attrs = function(attrs) {
+  var convert_attrs = function(obj_id, attrs) {
     var collected_promises = _.map(attrs, function(value, field_name) {
       if (is_file(value)) {
-        return scrivito.blob.create(value).then(function(value) {
-          return [field_name, value];
+        return scrivito.blob.create(obj_id, {file: value}).then(function(blob) {
+          return [field_name, blob];
+        });
+      } else if (value && value.is_uploaded_binary) {
+        return scrivito.blob.create(obj_id, value).then(function(blob) {
+          return [field_name, blob];
         });
-      } else {
-        return $.Deferred().resolve([field_name, scrivito.obj.serialize_value(value)]);
       }
+      return $.Deferred().resolve([field_name, scrivito.obj.serialize_value(value)]);
     });
 
     return $.when.apply(this, collected_promises).then(function() {
@@ -30716,10 +30977,10 @@ var scrivito = {};
     });
   };
 
-  var convert_widget_pool = function(widget_pool) {
+  var convert_widget_pool = function(obj_id, widget_pool) {
     if (widget_pool) {
       var conversion_promises = _.map(widget_pool, function(attrs, widget_id) {
-        return convert_attrs(attrs).then(function(converted_attrs) {
+        return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
           return [widget_id, converted_attrs];
         });
       });
@@ -30732,9 +30993,9 @@ var scrivito = {};
     }
   };
 
-  var prepare_attrs = function(attrs) {
-    return convert_widget_pool(attrs._widget_pool).then(function(widget_pool) {
-      return convert_attrs(attrs).then(function(converted_attrs) {
+  var prepare_attrs = function(obj_id, attrs) {
+    return convert_widget_pool(obj_id, attrs._widget_pool).then(function(widget_pool) {
+      return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
         converted_attrs._widget_pool = widget_pool;
         return converted_attrs;
       });
@@ -30816,7 +31077,7 @@ var scrivito = {};
           },
 
           save: function(attrs) {
-            return prepare_attrs(attrs).then(function(prepared_attrs) {
+            return prepare_attrs(that.id(), attrs).then(function(prepared_attrs) {
               return scrivito.ajax('PUT', 'objs/'+that.id(), {data: {obj: prepared_attrs}});
             });
           },
@@ -30912,7 +31173,7 @@ var scrivito = {};
       },
 
       create: function(attrs) {
-        return prepare_attrs(attrs).then(function(prepared_attrs) {
+        return prepare_attrs(scrivito.random_id(), attrs).then(function(prepared_attrs) {
           return scrivito.ajax('POST', 'objs', {data: {obj: prepared_attrs}}).then(function(data) {
             return scrivito.obj.create_instance(data);
           });
@@ -30921,6 +31182,18 @@ var scrivito = {};
     }
   });
 }());
+(function() {
+  _.extend(scrivito, {
+    obj_changes: function() {
+      return scrivito.obj_where('_modification', 'equals', ['new', 'edited', 'deleted']).
+        batch_size(100).
+        order('_last_changed').
+        reverse_order().
+        format('_default').
+        include_deleted();
+    }
+  });
+}());
 (function() {
   _.extend(scrivito, {
     obj_element: {
@@ -31242,7 +31515,7 @@ var scrivito = {};
           save: function(widget_attributes) {
             var obj_attributes = build_obj_attributes(widget_attributes);
             return that.obj().save(obj_attributes).then(function(obj_data) {
-              return obj_data._widget_pool[0][that.id()];
+              return obj_data._widget_pool[that.id()];
             });
           },
 
@@ -31389,37 +31662,46 @@ var scrivito = {};
               return that.widget_elements().length === 0;
             },
 
-            add_widget: function(widget_spec, widget_element) {
-              var position;
+            add_widget: function(widget_spec, widget_element, position) {
+              var index;
               if (widget_element) {
-                position = widget_element.dom_element()
-                    .prevAll('[data-scrivito-private-widget-id]').length;
+                index = widget_element.dom_element()
+                  .prevAll('[data-scrivito-private-widget-id]').length;
+                if (position === 'bottom') { index += 1; }
               } else {
-                position = that.widget_elements().length;
+                index = that.widget_elements().length;
               }
 
               var content = that.content();
-              content.splice(position, 0, widget_spec);
+              content.splice(index, 0, widget_spec);
 
               return that.save(content).then(function(field_data) {
-                var new_widget_id;
-                if (field_data.list) {
-                  new_widget_id = field_data.list[position].widget;
-                } else {
-                  new_widget_id = field_data[position];
-                }
+                var new_widget_id = field_data[index];
                 var widget = scrivito.widget.create_instance(that.obj(), new_widget_id);
-                return prepend_widget(widget, widget_element);
+                return insert_widget(widget, widget_element, position);
               });
             },
 
+            add_widget_via_create: function(widget_params, widget_element, position) {
+              scrivito.obj_class_selection.store(widget_params._obj_class);
+              return that.add_widget({create: widget_params}, widget_element, position);
+            },
+
+            add_widget_via_copy: function(widget_params, widget_element, position) {
+              return that.add_widget({copy: widget_params}, widget_element, position);
+            },
+
             fetch_widget_class_selection: function() {
               var params = {field_name: that.field_name()};
               if (that.widget()) {
                 params.widget_id = that.widget().id();
               }
-              return scrivito.ajax('GET', 'objs/' + that.obj().id() + '/widget_class_selection?' +
-                  $.param(params));
+              var request_path = 'objs/' + that.obj().id() + '/widget_class_selection?' +
+                  $.param(params);
+
+              return scrivito.ajax('GET', request_path).then(function(obj_classes_markup) {
+                return that.enrich_obj_classes_with_recent(obj_classes_markup);
+              });
             },
 
             allowed_classes: function() {
@@ -31482,12 +31764,16 @@ var scrivito = {};
               .attr('data-scrivito-private-field-widget-allowed-classes'));
           };
 
-          var prepend_widget = function(widget, widget_element) {
+          var insert_widget = function(widget, widget_element, position) {
             return widget.fetch_markup(that.template_name(), that.inner_tag()).then(
               function(widget_markup) {
                 var dom_element = $($.trim(widget_markup));
                 if (widget_element) {
-                  widget_element.dom_element().before(dom_element);
+                  if (position === 'bottom') {
+                    widget_element.dom_element().after(dom_element);
+                  } else {
+                    widget_element.dom_element().before(dom_element);
+                  }
                 } else {
                   that.dom_element().prepend(dom_element);
                 }
@@ -31586,12 +31872,6 @@ var scrivito = {};
             return scrivito.ajax('DELETE', 'workspaces/' + that.id());
           },
 
-          fetch_memberships: function() {
-            return scrivito.ajax('GET', 'workspaces/' + that.id()).then(function(details) {
-              return details.memberships;
-            });
-          },
-
           has_conflicts: function() {
             return scrivito.obj_where('_conflicts', 'equals', true).size().then(function(size) {
               var promise = $.Deferred();
@@ -31917,17 +32197,23 @@ var scrivito = {};
   _.extend(scrivito, {
     template: {
       load_templates_from_server: false,
+      template_cache: {},
 
       render: function(template_path, data) {
         var template;
         if(typeof ScrivitoHandlebarsTemplates !== 'undefined') {
           template = ScrivitoHandlebarsTemplates[template_path];
         }
-        if(template === undefined) {
+        if(!template) {
           if(scrivito.template.load_templates_from_server) {
-            var url = "/app/assets/javascripts/templates/" + template_path + ".hbs?" + Math.random();
-            var source = jQuery.ajax(url, { async: false }).responseText;
-            template = Handlebars.compile(source);
+            template = scrivito.template.template_cache[template_path];
+            if(!template) {
+              var url = "/app/assets/javascripts/templates/" + template_path + ".hbs?" +
+                  Math.random();
+              var source = jQuery.ajax(url, { async: false }).responseText;
+              template = Handlebars.compile(source);
+              scrivito.template.template_cache[template_path] = template;
+            }
           } else {
             throw('could not load template' + template_path);
           }
@@ -32111,14 +32397,14 @@ var scrivito = {};
       var promise = $.Deferred();
 
       var close = function() {
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         promise.resolve();
         return false;
       };
 
       view.find('.scrivito_close').on('click', close);
 
-      scrivito.dialog.open_and_center(view);
+      scrivito.dialog.open_and_center_with_transition(view);
 
       return scrivito.with_dialog_behaviour(view, promise, {enter: close, escape: close});
     },
@@ -32156,13 +32442,13 @@ var scrivito = {};
       var deferred = $.Deferred();
 
       var accept = function() {
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         deferred.resolve();
         return false;
       };
 
       var cancel = function() {
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         deferred.reject();
         return false;
       };
@@ -32170,7 +32456,7 @@ var scrivito = {};
       view.find('.scrivito_confirm').on('click', accept);
       view.find('.scrivito_cancel').on('click', cancel);
 
-      scrivito.dialog.open_and_center(view);
+      scrivito.dialog.open_and_center_with_transition(view);
       return scrivito.with_dialog_behaviour(view, deferred, {enter: accept, escape: cancel});
     },
 
@@ -32202,14 +32488,14 @@ var scrivito = {};
       var accept = function() {
         var val = view.find('input').val();
         if (val) {
-          scrivito.dialog.close(view);
+          scrivito.dialog.close_with_transition(view);
           deferred.resolve(val);
         }
         return false;
       };
 
       var cancel = function() {
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         deferred.reject();
         return false;
       };
@@ -32217,7 +32503,7 @@ var scrivito = {};
       view.find('.scrivito_accept').on('click', accept);
       view.find('.scrivito_cancel').on('click', cancel);
 
-      scrivito.dialog.open_and_center(view).then(function() {
+      scrivito.dialog.open_and_center_with_transition(view).then(function() {
         view.find('input').focus();
       });
 
@@ -32228,25 +32514,34 @@ var scrivito = {};
 (function() {
   _.extend(scrivito, {
     dialog: {
-      open: function(view) {
+      open_without_transition: function(view) {
+        view.addClass('scrivito_show');
+      },
+
+      open_and_adjust_without_transition: function(view) {
+        scrivito.dialog.open_without_transition(view);
+        scrivito.dialog.adjust(view);
+      },
+
+      open_with_transition: function(view) {
         return scrivito.transition(view, function() {
-          view.addClass('scrivito_show');
+          scrivito.dialog.open_without_transition(view);
         });
       },
 
-      open_and_adjust: function(view) {
-        return scrivito.dialog.open(view).then(function() {
+      open_and_adjust_with_transition: function(view) {
+        return scrivito.dialog.open_with_transition(view).then(function() {
           scrivito.dialog.adjust(view);
         });
       },
 
-      open_and_center: function(view) {
-        return scrivito.dialog.open(view).then(function() {
+      open_and_center_with_transition: function(view) {
+        return scrivito.dialog.open_with_transition(view).then(function() {
           scrivito.center(view);
         });
       },
 
-      close: function(view) {
+      close_with_transition: function(view) {
         scrivito.transition(view, function() {
           view.removeClass('scrivito_show');
         }).then(function() {
@@ -32255,6 +32550,12 @@ var scrivito = {};
         });
       },
 
+      close_without_transition: function(view) {
+        view.removeClass('scrivito_show');
+        view.remove();
+        view = null;
+      },
+
       adjust: function(view) {
         scrivito.invalidate_auto_height_for(view);
         scrivito.update_auto_height_for(view);
@@ -32308,8 +32609,8 @@ var scrivito = {};
       }));
 
       obj_classes_deferred.done(function(obj_class_selection) {
-        var selection_view = scrivito.template.render('choose_obj_class_list',
-            {obj_classes: obj_class_selection});
+        var selection_view = scrivito.template.render('choose_obj_class_dialog/list',
+            {obj_class_selection: obj_class_selection});
 
         selection_view = $($.trim(selection_view));
 
@@ -32317,7 +32618,7 @@ var scrivito = {};
 
         view.on('click', '.scrivito_obj_class_thumbnail', function(e) {
           e.preventDefault();
-          scrivito.dialog.close(view);
+          scrivito.dialog.close_without_transition(view);
           deferred.resolve($(this).attr('data-scrivito-private-obj-class-name'));
         });
       });
@@ -32325,14 +32626,14 @@ var scrivito = {};
       $('#scrivito_editing').append(view);
 
       var cancel = function() {
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_without_transition(view);
         deferred.reject();
         return false;
       };
 
       view.find('.scrivito_cancel').on('click', cancel);
 
-      scrivito.dialog.open_and_adjust(view);
+      scrivito.dialog.open_and_adjust_without_transition(view);
       return scrivito.with_dialog_behaviour(view, deferred, {escape: cancel});
     }
   });
@@ -32368,25 +32669,20 @@ var scrivito = {};
           var modal_size = iframe.contents().find('['+size_attr+']').attr(size_attr);
           if (_.contains(['small', 'medium', 'large'], modal_size)) {
             view.removeClass('scrivito_modal_medium');
-            scrivito.transition(view, function() {
-              view.addClass('scrivito_modal_' + modal_size);
-            }).then(function() {
-              scrivito.dialog.adjust(view);
-            });
-          } else {
-            scrivito.dialog.adjust(view);
+            view.addClass('scrivito_modal_' + modal_size);
           }
+          scrivito.dialog.adjust(view);
         });
 
         var cancel = function() {
           indicator.destroy();
-          scrivito.dialog.close(view);
+          scrivito.dialog.close_without_transition(view);
           deferred.resolve();
           return false;
         };
 
         view.find('.scrivito_cancel').on('click', cancel);
-        scrivito.dialog.open_and_adjust(view);
+        scrivito.dialog.open_and_adjust_without_transition(view);
         return scrivito.with_dialog_behaviour(view, deferred, {escape: cancel});
       }
     }
@@ -32396,14 +32692,17 @@ var scrivito = {};
   _.extend(scrivito, {
     menus: {
       open: function(dom_element, commands, options) {
-        scrivito.close_all_menus();
-
         var menu = $(scrivito.template.render('menu', _.extend(options || {}, {
           menu_items: _.map(scrivito.pattern_sort(commands, scrivito.menu_order), function(command) {
             return scrivito.menu_item.create_instance(command);
           })
         })));
 
+        menu.find('.scrivito_menu_box_overlay').on('click', function() {
+          menu.data('scrivito-menu-close')();
+          return false;
+        });
+
         dom_element.data('scrivito-menu-dom', menu);
 
         menu.data('scrivito-menu-close', function() {
@@ -32506,15 +32805,6 @@ var scrivito = {};
     }
   });
 }());
-(function() {
-  _.extend(scrivito, {
-    close_all_menus: function() {
-      _.each($('.scrivito_editing_marker_menu'), function(menu) {
-        $(menu).data('scrivito-menu-close')();
-      });
-    }
-  });
-}());
 (function() {
   var callbacks = [];
 
@@ -32626,6 +32916,38 @@ var scrivito = {};
     }
   };
 }());
+(function() {
+  _.extend(scrivito, {
+    option_marker: {
+      init: function() {
+        scrivito.on('content', function(content) {
+          if (scrivito.editing_context.is_editing_mode()) {
+            _.each(scrivito.widget_element.all($(content)), function(widget_element) {
+              if (!widget_element.has_widgetlist()) {
+                scrivito.option_marker.create(widget_element, 'top');
+                scrivito.option_marker.create(widget_element, 'bottom');
+              }
+            });
+          }
+        });
+      },
+
+      create: function(widget_element, position) {
+        var marker = $(scrivito.template.render('option_marker', {position: position}));
+        marker.appendTo(widget_element.dom_element());
+        marker.on('click', function() {
+          var widgetlist_field_element = widget_element.widget_field();
+          if (widgetlist_field_element.can_choose_widget_class()) {
+            scrivito.choose_and_create_widget_command(widget_element, position).execute();
+          } else {
+            scrivito.create_widget_command(widget_element, position).execute();
+          }
+          return false;
+        });
+      }
+    }
+  });
+}());
 (function() {
   _.extend(scrivito, {
     resource_dialog: {
@@ -32633,20 +32955,21 @@ var scrivito = {};
         if (config.obj) {
           var obj = scrivito.obj.create_instance(config.obj);
           scrivito.gui.on('open', function() {
-            scrivito.resource_dialog.open(obj).then(function() {
+            scrivito.resource_dialog.open(obj, config.return_to).then(function() {
               return scrivito.with_saving_overlay(scrivito.redirect_to(config.return_to));
             });
           });
         }
       },
 
-      open: function(obj) {
+      open: function(obj, return_to) {
         var title = scrivito.t('resource_dialog.title', obj.obj_class_name());
         return scrivito.details_dialog.open(obj.details_src(), title, obj, [
           scrivito.revert_obj_command(obj, 'resource_dialog.commands.revert_obj'),
           scrivito.restore_obj_command(obj, 'resource_dialog.commands.restore_obj'),
           scrivito.mark_resolved_obj_command(obj, 'resource_dialog.commands.mark_resolved_obj'),
-          scrivito.delete_obj_command(obj, 'resource_dialog.commands.delete_obj')
+          scrivito.delete_obj_command(obj, 'resource_dialog.commands.delete_obj',
+            return_to || '/'+scrivito.application_document().page().id())
         ]);
       }
     }
@@ -32711,6 +33034,99 @@ var scrivito = {};
     return target;
   };
 }());
+(function() {
+  _.extend(scrivito, {
+    iframe_dialog: {
+      open: function(iframe, options) {
+        iframe = $(iframe);
+        options = options || {};
+
+        var iframe_container;
+        if (!iframe.parent().is('body')) {
+          iframe_container = iframe.closest('#scrivito_editing > div');
+        }
+
+        var view = $(scrivito.template.render('iframe_dialog', {
+          color: options.color,
+          confirm: options.confirm || scrivito.t('confirm'),
+          cancel: options.cancel || scrivito.t('cancel'),
+          disable_confirm: options.confirm === false,
+          disable_cancel: options.cancel === false
+        }));
+
+        $('#scrivito_editing').append(view);
+
+        var dialog_body = view.find('.scrivito_modal_body');
+        var when_closed = $.Deferred();
+
+        var confirm = function() {
+          scrivito.dialog.close_without_transition(view);
+          when_closed.resolve();
+          return false;
+        };
+
+        var cancel = function() {
+          scrivito.dialog.close_without_transition(view);
+          when_closed.reject();
+          return false;
+        };
+
+        view.find('.scrivito_confirm').on('click', confirm);
+        view.find('.scrivito_cancel').on('click', cancel);
+
+        scrivito.with_dialog_behaviour(view, when_closed, {enter: confirm, escape: cancel});
+        scrivito.dialog.open_and_adjust_without_transition(view);
+
+        scrivito.restore_styles_afterwards(when_closed, iframe);
+        iframe.css('z-index', scrivito.iframe_dialog.z_index(view) + 1);
+
+        if (iframe_container) {
+          scrivito.restore_styles_afterwards(when_closed, iframe_container);
+          iframe_container.addClass('scrivito_dialog_mode');
+        } else {
+          iframe.attr('class', ''); // Remove device toggle classes.
+        }
+
+        var adjust = function() {
+          // Make sure to never manipulate the iFrame after the dialog has been closed.
+          if (when_closed.state() !== 'pending') { return; }
+          iframe.width(dialog_body.width());
+          iframe.height(dialog_body.height());
+          iframe.offset(dialog_body.offset());
+        };
+
+        $(window).on('resize', adjust);
+        adjust();
+
+        return {
+          when_open: $.Deferred().resolve(dialog_body),
+          when_closed: when_closed.promise()
+        };
+      },
+
+      // For test purpose only.
+      z_index: function(view) {
+        return parseInt(view.css('z-index'), 10);
+      }
+    }
+  });
+}());
+(function() {
+  _.extend(scrivito, {
+    full_screen_panel: function(doc, promise) {
+      var body = $(doc).find('body');
+      var panel = $('<div class="scrivito_full_screen_panel"></div>');
+
+      body.append(panel);
+      promise.always(function() { panel.detach(); });
+
+      scrivito.restore_styles_afterwards(promise, body);
+      body.css('overflow', 'hidden');
+
+      return panel;
+    }
+  });
+}());
 (function() {
   _.extend(scrivito, {
     add_content_command: function(cms_element) {
@@ -32747,14 +33163,12 @@ var scrivito = {};
             var content = contents[0];
             if (content) {
               var widget_params = {
-                create: {
-                  _obj_class: 'Scrivito::ContentWidget',
-                  content: content
-                }
+                _obj_class: 'Scrivito::ContentWidget',
+                content: content
               };
 
               scrivito.with_saving_overlay(
-                widgetlist_field_element.add_widget(widget_params, widget_element)
+                widgetlist_field_element.add_widget_via_create(widget_params, widget_element)
               );
             }
           });
@@ -32789,7 +33203,7 @@ var scrivito = {};
 }());
 (function() {
   _.extend(scrivito, {
-    choose_and_create_widget_command: function(cms_element) {
+    choose_and_create_widget_command: function(cms_element, position) {
       var widgetlist_field_element, widget_element;
       if (cms_element.widget_field) {
         widget_element = cms_element;
@@ -32820,9 +33234,9 @@ var scrivito = {};
           var choose_obj_class = scrivito.choose_obj_class_dialog(
             widgetlist_field_element.fetch_widget_class_selection(), 'create_widget');
           return choose_obj_class.then(function(obj_class) {
+            var widget_params = {_obj_class: obj_class};
             return scrivito.with_saving_overlay(
-              widgetlist_field_element.add_widget({create: {_obj_class: obj_class}}, widget_element)
-            );
+              widgetlist_field_element.add_widget_via_create(widget_params, widget_element, position));
           });
         }
       });
@@ -32901,15 +33315,13 @@ var scrivito = {};
           }
           var widget = scrivito.widget_clipboard.widget();
           var workspace_id = scrivito.widget_clipboard.workspace_id();
-          var copy_params = {
-            copy: {
-              workspace_id: workspace_id,
-              obj_id: widget.obj().id(),
-              widget_id: widget.id()
-            }
+          var widget_params = {
+            workspace_id: workspace_id,
+            obj_id: widget.obj().id(),
+            widget_id: widget.id()
           };
           return scrivito.with_saving_overlay(
-            widgetlist_field_element.add_widget(copy_params, widget_element)
+            widgetlist_field_element.add_widget_via_copy(widget_params, widget_element)
           );
         }
       });
@@ -32918,7 +33330,7 @@ var scrivito = {};
 }());
 (function() {
   _.extend(scrivito, {
-    create_widget_command: function(cms_element) {
+    create_widget_command: function(cms_element, position) {
       var widgetlist_field_element, widget_element, description, obj_class;
       if (cms_element.widget_field) {
         widget_element = cms_element;
@@ -32943,10 +33355,9 @@ var scrivito = {};
         },
 
         execute: function() {
-          var widget_params = {create: {_obj_class: obj_class}};
+          var params = {_obj_class: obj_class};
           return scrivito.with_saving_overlay(
-            widgetlist_field_element.add_widget(widget_params, widget_element)
-          );
+            widgetlist_field_element.add_widget_via_create(params, widget_element, position));
         }
       });
     }
@@ -33003,7 +33414,7 @@ var scrivito = {};
 }());
 (function() {
   _.extend(scrivito, {
-    delete_obj_command: function(obj, translations_namespace) {
+    delete_obj_command: function(obj, translations_namespace, redirect_target) {
       if (!translations_namespace) {
         translations_namespace = 'commands.delete_obj';
       }
@@ -33040,7 +33451,11 @@ var scrivito = {};
                   scrivito.obj_clipboard.obj().id() === obj.id()) {
                 scrivito.obj_clipboard.clear();
               }
-              return scrivito.redirect_to(redirect_to);
+              var redirect_url = URI({
+                path: scrivito.root_path() + (redirect_target || redirect_to)
+              });
+              redirect_url.normalizePath();
+              return scrivito.redirect_to(redirect_url.path());
             }));
           });
         }
@@ -33723,16 +34138,16 @@ var scrivito = {};
         icon: '&#xf030;',
 
         execute: function() {
-          workspace.fetch_memberships().then(function(memberships) {
-            var title = scrivito.t('commands.workspace_settings.dialog.title', workspace.title());
-            scrivito.workspace_settings_dialog.open(title, memberships).then(function(memberships) {
+          var title = scrivito.t('commands.workspace_settings.dialog.title', workspace.title());
+          scrivito.workspace_settings_dialog.open(title, workspace.memberships()).then(
+            function(memberships) {
               scrivito.with_saving_overlay(
                 workspace.update({memberships: memberships}).then(function() {
                   return scrivito.reload();
                 })
               );
-            });
-          });
+            }
+          );
         }
       });
     }
@@ -33800,7 +34215,6 @@ var scrivito = {};
         if (!scrivito.editing_context.is_view_mode()) {
           scrivito.on('content', function(content) {
             _.each(scrivito.widget_element.all($(content)), function(widget_element) {
-              var widgetlist_field_element = widget_element.widget_field();
               widget_element.set_menu([
                 scrivito.create_widget_command(widget_element),
                 scrivito.choose_and_create_widget_command(widget_element),
@@ -34054,8 +34468,6 @@ var scrivito = {};
         var cms_document = scrivito.cms_document.from(ui.item);
         cms_document.dom_element().find('body').addClass('scrivito_widget_dragging_active');
 
-        scrivito.close_all_menus();
-
         var widget_element = scrivito.cms_element.from_dom_element(ui.item);
         var widget_class_name = widget_element.widget().widget_class_name();
         _.each(widgetlist_field_elements, function(widgetlist_field_element) {
@@ -34193,6 +34605,23 @@ var scrivito = {};
     add_field_changes(changes._widget_pool[widget_id], widgetlist_field_element);
   };
 }());
+(function() {
+  _.extend(scrivito, {
+    no_turbolinks: {
+      init: function() {
+        scrivito.gui.on('document', function(cms_document) {
+          if (cms_document.browser_window().Turbolinks) {
+            scrivito.alert_dialog(
+              'You have Turbolinks enabled. ' +
+              'Scrivito does not yet support Turbolinks. ' +
+              'Please remove it from your assets.'
+            );
+          }
+        });
+      }
+    }
+  });
+}());
 (function() {
   _.extend(scrivito, {
     content_upload: {
@@ -34328,7 +34757,7 @@ var scrivito = {};
 
       var create_workspace = function() {
         var title = $('#scrivito_new_ws_name').val();
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         scrivito.with_saving_overlay(scrivito.workspace.create(title)).then(function(workspace) {
           deferred.resolve(workspace.id());
         }, function() { deferred.reject(); });
@@ -34336,12 +34765,12 @@ var scrivito = {};
 
       var select_workspace = function() {
         var ws_id = $('select#scrivito_list_of_ws').val();
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         deferred.resolve(ws_id);
       };
 
       var cancel_action = function() {
-        scrivito.dialog.close(view);
+        scrivito.dialog.close_with_transition(view);
         deferred.reject();
         return false;
       };
@@ -34349,7 +34778,7 @@ var scrivito = {};
       view.find('.scrivito_confirm').on('click', confirm_action);
       view.find('.scrivito_cancel').on('click', cancel_action);
 
-      scrivito.dialog.open_and_center(view);
+      scrivito.dialog.open_and_center_with_transition(view);
 
       if (can_select) {
         view.find('.scrivito_input_list_of_ws').click();
@@ -34393,14 +34822,14 @@ var scrivito = {};
           });
           deferred.resolve(sorted_children);
 
-          scrivito.dialog.close(view);
+          scrivito.dialog.close_without_transition(view);
 
           return false;
         };
 
         var cancel_action = function(e) {
           deferred.reject();
-          scrivito.dialog.close(view);
+          scrivito.dialog.close_without_transition(view);
 
           return false;
         };
@@ -34408,7 +34837,7 @@ var scrivito = {};
         view.find('.scrivito_confirm').on('click', confirm_action);
         view.find('.scrivito_cancel').on('click', cancel_action);
 
-        scrivito.dialog.open_and_adjust(view);
+        scrivito.dialog.open_and_adjust_without_transition(view);
 
         return scrivito.with_dialog_behaviour(view, deferred, {
           enter: confirm_action,
@@ -34438,13 +34867,13 @@ var scrivito = {};
             new_memberships[user_id] = {role: 'owner'};
           });
           promise.resolve(new_memberships);
-          scrivito.dialog.close(view);
+          scrivito.dialog.close_without_transition(view);
           return false;
         };
 
         var cancel = function() {
           promise.reject();
-          scrivito.dialog.close(view);
+          scrivito.dialog.close_without_transition(view);
           return false;
         };
 
@@ -34478,7 +34907,7 @@ var scrivito = {};
         view.find('.scrivito_confirm').on('click', confirm);
         view.find('.scrivito_cancel').on('click', cancel);
 
-        scrivito.dialog.open_and_adjust(view);
+        scrivito.dialog.open_and_adjust_without_transition(view);
 
         view.on('keyup', function(e) {
           if ((e.keyCode === 13 || e.keyCode === 27) &&
@@ -34650,6 +35079,9 @@ var scrivito = {};
 
 
 
+
+
+
 
 
 
@@ -34677,6 +35109,7 @@ var scrivito = {};
 
 
 
+
 //
 
 
@@ -34688,28 +35121,25 @@ var scrivito = {};
     // Fallback behavior in case that application window renders a page with no SDK, e.g. an error
     // or a static page.
     iframe.on('load', function() {
-      var has_config = !!scrivito.application_document().dom_element()
-        .find('[data-scrivito-private-config]').length;
-      var has_sdk = !!scrivito.application_window.browser_window().scrivito;
+      var application_document = scrivito.application_document();
+      var browser_window = scrivito.application_window.browser_window();
+
+      var has_config = !!application_document.page_config();
+      var has_sdk = !!browser_window.scrivito;
 
       // The application window is completely missing the SDK and the config.
       if (!has_config && !has_sdk) {
         // Install jQuery in order to allow correct application document bootstrapping.
-        var browser_window = scrivito.application_window.browser_window();
         if (!browser_window.jQuery) { browser_window.jQuery = jQuery; }
         if (!browser_window.$) { browser_window.$ = $; }
 
         // Bootstrap the application document.
-        var application_document = scrivito.application_document();
         application_document.install_public_api();
-        if (!scrivito.is_inited()) {
-          // Start the UI if it is the first open, which responds with an error.
-          // Use the fallback config with no page context.
-          scrivito.init(scrivito.dom_config.read($('body')));
-          scrivito.gui.start();
-        }
         application_document.connect();
       }
     });
+
+    scrivito.init(scrivito.ui_config());
+    scrivito.gui.start();
   });
 }());