scrivito_sdk 0.50.1 → 0.60.0.rc1

data/config/routes.rb

@@ -1,48 +1,15 @@
 Rails.application.routes.draw do
-  resources :objs, controller: 'scrivito/objs', path: '__scrivito/objs',
-      only: [:create, :update, :destroy], defaults: {format: :json} do
-    collection do
-      get :page_class_selection
-      get :search
-    end
-
-    member do
-      get :widget_class_selection
-      get :modification
-      get :widget_modification
-
-      post :copy
-      post :duplicate
-
-      put :revert
-      put :restore
-      put :mark_resolved
-      put :destroy_widget
-      put :revert_widget
-      put :restore_widget
-    end
-  end
-
-  resources :tasks, controller: 'scrivito/tasks', path: '__scrivito/tasks', only: [:show],
-    defaults: {format: :json}
-
-  get '__scrivito/blobs/upload_permission' => 'scrivito/blobs#upload_permission',
-    defaults: {format: :json}
-
-  resources :workspaces,
-    controller: 'scrivito/workspaces',
-    path: '__scrivito/workspaces',
-    only: [:index, :show, :create, :update, :destroy],
-    defaults: {format: :json} do
-      member do
-        put :rebase
-        put :publish
-        get :check
-      end
-    end
-
-  get '__scrivito/users/suggest' => 'scrivito/users#suggest', defaults: {format: :json}
-
-  get 'scrivito', to: 'scrivito/ui#index', as: 'scrivito_ui'
-  get 'scrivito/*application_path', to: 'scrivito/ui#index', format: false
+  get '/' => 'scrivito/cms_dispatch#index', as: :scrivito_root
+
+  match ':id(/*slug)',
+    to: 'scrivito/cms_dispatch#index',
+    constraints: { id: /\d+|[0-9a-f]{16}/ },
+    as: 'cms_id',
+    via: :all
+
+  match '/*permalink',
+    to: 'scrivito/cms_dispatch#index',
+    as: :scrivito_permalink,
+    format: false,
+    via: :all
 end

data/lib/assets/javascripts/scrivito_ui.js

@@ -23965,7 +23965,7 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   
 
 
-  return "<div class=\"scrivito_topbar\">\n  <div class=\"scrivito_first_level\">\n    <div id=\"scrivito_menu_bar_toggle\" class=\"scrivito_viewmodes_wrapper\"></div>\n    <div class=\"scrivito_button_bar scrivito_app scrivito_no_hover\"><span class=\"scrivito_logo\"></span></div>\n    <div id=\"scrivito_workspace_select\" class=\"scrivito_button_bar\"></div>\n    <div id=\"scrivito_current_page_menu\" class=\"scrivito_button_bar scrivito_right\"></div>\n    <div id=\"scrivito_current_page_restriction\"></div>\n    <div id=\"scrivito_menu_bar_saving_indicator\"></div>\n  </div>\n</div>\n";
+  return "<div class=\"scrivito_topbar\">\n  <div class=\"scrivito_first_level\">\n    <div id=\"scrivito_menu_bar_toggle\" class=\"scrivito_viewmodes_wrapper\"></div>\n    <div class=\"scrivito_button_bar scrivito_app scrivito_no_hover\"><span class=\"scrivito_logo\"></span></div>\n    <div id=\"scrivito_workspace_select\" class=\"scrivito_button_bar\"></div>\n    <div id=\"scrivito_current_page_menu\" class=\"scrivito_button_bar scrivito_right\"></div>\n    <div id=\"scrivito_current_page_restriction\"></div>\n    <div id=\"scrivito_menu_bar_warning\"></div>\n    <div id=\"scrivito_menu_bar_saving_indicator\"></div>\n  </div>\n</div>\n";
   });
   return this.ScrivitoHandlebarsTemplates["menu_bar"];
 }).call(this);
@@ -24002,6 +24002,22 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   });
   return this.ScrivitoHandlebarsTemplates["menu_bar_toggle"];
 }).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["menu_bar_warning"] = 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, options, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression;
+
+
+  buffer += "<span class=\"scrivito_menu_bar_warning scrivito_hidden\">\n  <i class=\"scrivito_icon\">&#xf021;</i>\n  <span class=\"scrivito_button_label\"><span>";
+  options = {hash:{},data:data};
+  buffer += escapeExpression(((stack1 = helpers.translate),stack1 ? stack1.call(depth0, "menu_bar_warning.warning", options) : helperMissing.call(depth0, "translate", "menu_bar_warning.warning", options)))
+    + "</span></span>\n</div>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["menu_bar_warning"];
+}).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
   this.ScrivitoHandlebarsTemplates["menu_item"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -24584,7 +24600,7 @@ $.i18n().load({
   'menu_item.spinner.loading': 'Laden...',
 
   'choose_obj_class_dialog.add_child_page.title': 'Seitenvorlage auswählen',
-  'choose_obj_class_dialog.add_widget.title': 'Widget auswählen',
+  'choose_obj_class_dialog.create_widget.title': 'Widget auswählen',
 
   'editable_ws_dialog.title.select_or_create': 'Arbeitskopie wählen',
   'editable_ws_dialog.title.select': 'Arbeitskopie auswählen',
@@ -24626,6 +24642,11 @@ $.i18n().load({
   'saving_indicator_item.saving': 'Wird gespeichert...',
   'saving_indicator_item.saved': 'Änderungen gespeichert',
 
+  'menu_bar_warning.warning': 'JS-Konsole überprüfen',
+  'menu_bar_warning.open_console': 'Es gibt Warnhinweise. Bitte öffnen Sie die JavaScript-Konsole, um Details zu erfahren.',
+
+  'inplace_marker.overlapping': 'Zwei oder mehrere Menü-Handles überschneiden sich. Bitte passen Sie Ihr CSS an. Die folgenden Menü-Handles überschneiden sich:',
+
   'widget_marker.widget_is_new': 'Widget ist neu',
   'widget_marker.widget_is_edited': 'Widget wurde geändert',
   'widget_marker.widget_is_edited_and_dragged_here': 'Widget wurde geändert und hierher gezogen',
@@ -24660,6 +24681,9 @@ $.i18n().load({
   'commands.rebase_workspace.title': 'Aktualisieren',
   'commands.rebase_workspace.tooltip': 'Arbeitskopie "$1" is veraltet. Bitte aktualisieren Sie sie.',
   'commands.rebase_workspace.uptodate': 'Arbeitskopie "$1" muss nicht aktualisiert werden.',
+  'commands.rebase_workspace.has_conflicts.title': 'Geänderte Inhalte wurden zwischenzeitlich veröffentlicht',
+  'commands.rebase_workspace.has_conflicts.description': 'Ihre Arbeitskopie konnte nicht vollständig aktualisiert werden. Einige Inhalte wurden auch in einer anderen Arbeitskopie geändert, die inzwischen veröffentlicht wurde. Bitte entnehmen Sie die Details der Liste der Änderungen.',
+  'commands.rebase_workspace.open_changes_dialog': 'Änderungen anzeigen',
 
   'commands.delete_workspace.title': 'Löschen',
   'commands.delete_workspace.dialog.title': 'Wirklich "$1" löschen?',
@@ -24732,7 +24756,9 @@ $.i18n().load({
   'commands.sort_items.auto_sort': 'Diese Navigation wird automatisch sortiert.',
   'commands.sort_items.too_less_children': 'Die Navigation kann nicht sortiert werden, weil sie weniger als zwei Elemente enthält.',
 
-  'commands.add_widget.title': 'Widget einfügen',
+  'commands.choose_and_create_widget.title': 'Widget einfügen',
+  'commands.choose_and_create_widget.disabled': 'Es ist nicht erlaubt in dieses Feld Widgets einzufügen',
+  'commands.create_widget.title': '$1 einfügen',
 
   'commands.add_content.title': 'Inhalt einfügen',
   'commands.add_content.not_allowed': 'Es ist nicht erlaubt in dieses Feld beliebige Inhalte einzufügen',
@@ -24746,8 +24772,8 @@ $.i18n().load({
   'commands.save_widget_to_clipboard.content_title': 'Inhalt zum Kopieren markieren',
   'commands.save_widget_to_clipboard.widget_title': 'Widget zum Kopieren markieren',
 
-  'commands.copy_widget_from_clipboard.content_title': 'Kopie des markierten Inhalts anhängen',
-  'commands.copy_widget_from_clipboard.widget_title': 'Kopie des markierten Widgets anhängen',
+  'commands.copy_widget_from_clipboard.content_title': 'Kopie des markierten Inhalts einfügen',
+  'commands.copy_widget_from_clipboard.widget_title': 'Kopie des markierten Widgets einfügen',
   'commands.copy_widget_from_clipboard.paste_forbidden': 'Aufgrund ihres Typs kann das Widget hier nicht eingefügt werden. Nur Widgets der folgenden Typen können hierher verschoben oder kopiert werden: $1',
 
   'commands.delete_widget.content_title': 'Inhalt löschen',
@@ -24768,8 +24794,8 @@ $.i18n().load({
   'commands.publish_workspace.dialog.confirm': 'Veröffentlichen',
   'commands.publish_workspace.dialog.title': '"$1" veröffentlichen?',
   'commands.publish_workspace.dialog.description': 'Eine Arbeitskopie zu veröffentlichen ist endgültig. Dieser Vorgang kann nicht rückgängig gemacht werden.',
-  'commands.publish_workspace.error_dialog.title': 'Fehler beim Publizieren',
-  'commands.publish_workspace.error_dialog.description': 'Ihre Arbeitskopie konnte nicht veröffentlicht werden. Bitte entnehmen Sie die Details der Liste der Änderungen.',
+  'commands.publish_workspace.error_dialog.title': 'Arbeitskopie konnte nicht veröffentlicht werden',
+  'commands.publish_workspace.error_dialog.description': 'Bitte entnehmen Sie die Details der Liste der Änderungen.',
   'commands.publish_workspace.error_dialog.confirm': 'Liste der Änderungen',
   'commands.publish_workspace.alert.invalid_certificates': 'Die Arbeitskopie konnte nicht veröffentlicht werden, weil mindestens ein Benutzer gerade Inhalte darin ändert.',
 
@@ -24812,7 +24838,7 @@ $.i18n().load({
   'menu_item.spinner.loading': 'Loading...',
 
   'choose_obj_class_dialog.add_child_page.title': 'Select Page Type',
-  'choose_obj_class_dialog.add_widget.title': 'Select Widget',
+  'choose_obj_class_dialog.create_widget.title': 'Select Widget',
 
   'editable_ws_dialog.title.select_or_create': 'Choose a working copy',
   'editable_ws_dialog.title.select': 'Select a working copy',
@@ -24854,6 +24880,11 @@ $.i18n().load({
   'saving_indicator_item.saving': 'Saving...',
   'saving_indicator_item.saved': 'Changes saved',
 
+  'menu_bar_warning.warning': 'Check JS console',
+  'menu_bar_warning.open_console': 'There are warnings. Please open the JavaScript console for details.',
+
+  'inplace_marker.overlapping': 'Two or more menu handles are overlapping. Please adjust your CSS. The following menu handles are overlapping:',
+
   'widget_marker.widget_is_new': 'Widget is new',
   'widget_marker.widget_is_edited': 'Widget has been modified',
   'widget_marker.widget_is_edited_and_dragged_here': 'Widget has been modified and dragged here',
@@ -24888,6 +24919,9 @@ $.i18n().load({
   'commands.rebase_workspace.title': 'Update',
   'commands.rebase_workspace.tooltip': 'Working copy "$1" is outdated. Please update it.',
   'commands.rebase_workspace.uptodate': 'Working copy "$1" is up to date.',
+  'commands.rebase_workspace.has_conflicts.title': 'Changed content has been published intermediately',
+  'commands.rebase_workspace.has_conflicts.description': 'Your working copy could not be fully updated. Some of its content has also been altered in a different working copy that has been published in the meantime. Please refer to the changes list for details.',
+  'commands.rebase_workspace.open_changes_dialog': 'Show changes',
 
   'commands.delete_workspace.title': 'Delete',
   'commands.delete_workspace.dialog.title': 'Really delete "$1"?',
@@ -24962,7 +24996,9 @@ $.i18n().load({
 
   'obj_sorting_dialog.title': 'Sort items',
 
-  'commands.add_widget.title': 'Insert widget',
+  'commands.choose_and_create_widget.title': 'Insert widget',
+  'commands.choose_and_create_widget.disabled': 'It is not allowed to insert widgets in this field',
+  'commands.create_widget.title': 'Insert $1',
 
   'commands.add_content.title': 'Insert content',
   'commands.add_content.not_allowed': 'It is not allowed to insert random content into this field.',
@@ -24974,8 +25010,8 @@ $.i18n().load({
   'commands.save_widget_to_clipboard.content_title': 'Mark content for copying',
   'commands.save_widget_to_clipboard.widget_title': 'Mark widget for copying',
 
-  'commands.copy_widget_from_clipboard.content_title': 'Append copy of marked content',
-  'commands.copy_widget_from_clipboard.widget_title': 'Append copy of marked widget',
+  'commands.copy_widget_from_clipboard.content_title': 'Insert copy of marked content',
+  'commands.copy_widget_from_clipboard.widget_title': 'Insert copy of marked widget',
   'commands.copy_widget_from_clipboard.paste_forbidden': 'Due to its type, the widget cannot be moved or copied here. Only widgets of the following types can be inserted here: $1',
 
   'commands.delete_widget.content_title': 'Delete content',
@@ -24996,9 +25032,9 @@ $.i18n().load({
   'commands.publish_workspace.dialog.confirm': 'Publish',
   'commands.publish_workspace.dialog.title': 'Publish "$1"?',
   'commands.publish_workspace.dialog.description': 'Publishing a working copy is final. This action cannot be undone.',
-  'commands.publish_workspace.error_dialog.title': 'Error while publishing',
-  'commands.publish_workspace.error_dialog.description': 'Your working copy could not be published. Please check the changes list for details.',
-  'commands.publish_workspace.error_dialog.confirm': 'Open Changes List',
+  'commands.publish_workspace.error_dialog.title': 'Working copy could not be published',
+  'commands.publish_workspace.error_dialog.description': 'Please check the changes list for details.',
+  'commands.publish_workspace.error_dialog.confirm': 'Open changes list',
   'commands.publish_workspace.alert.invalid_certificates': 'The working copy could not be published because at least one user is currently modifying content in it.',
 
   'ajax.error': 'Communication with the CMS failed with error: $1',
@@ -25046,6 +25082,15 @@ var scrivito = {};
       }
     },
 
+    warn: function() {
+      if (scrivito.is_development_mode) {
+        scrivito.menu_bar_warning.show();
+      }
+      if (window.console) {
+        window.console.warn.apply(window.console, arguments);
+      }
+    },
+
     log_error: function(message, exception) {
       if (window.console) {
         window.console.error(message, exception);
@@ -25157,9 +25202,7 @@ var scrivito = {};
         message += ' Please use "' + alternative + '" instead.';
       }
 
-      if (window.console) {
-        window.console.warn(message);
-      }
+      scrivito.warn(message);
     },
 
     // @api public
@@ -25337,6 +25380,8 @@ var scrivito = {};
     // FIXME content-widget
     enable_content_upload: false,
 
+    is_development_mode: false,
+
     init: function(config) {
       scrivito.config = config;
 
@@ -25346,8 +25391,11 @@ var scrivito = {};
       scrivito.user.init(config.user);
       scrivito.user_permissions.init(config.user_permissions);
 
+      scrivito.is_development_mode = config.is_development_mode;
+
       scrivito.inplace_marker.init();
       scrivito.menu_bar_saving_indicator.init();
+      scrivito.menu_bar_warning.init();
       scrivito.menu_bar_toggle.init();
       scrivito.current_page_menu.init();
       scrivito.current_page_restriction.init();
@@ -25356,10 +25404,10 @@ var scrivito = {};
 
       scrivito.child_list_commands.init();
       scrivito.widget_commands.init();
-      scrivito.widget_field_commands.init();
+      scrivito.widgetlist_field_commands.init();
 
       scrivito.child_list_marker.init();
-      scrivito.widget_field_marker.init();
+      scrivito.widgetlist_field_marker.init();
       scrivito.widget_marker.init();
 
       scrivito.menus.init();
@@ -25458,7 +25506,7 @@ var scrivito = {};
         } else {
           var cms_element = build_cms_element(dom_element);
           cms_element.set_original_content(content);
-          return cms_element.save(content).fail(function(error) {
+          return cms_element.save(content).then(function() { return; }, function(error) {
             return {message: error.message};
           });
         }
@@ -26177,6 +26225,34 @@ var scrivito = {};
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    menu_bar_warning: {
+      init: function() {
+        scrivito.menu_bar.register_item_renderer(function(parent_view) {
+          scrivito.menu_bar_warning.create(
+              parent_view.find('#scrivito_menu_bar_warning'));
+        });
+      },
+
+      create: function(parent_view) {
+        parent_view.append(scrivito.template.render('menu_bar_warning'));
+        $(parent_view).on('click', function() {
+          scrivito.alert_dialog(scrivito.t('menu_bar_warning.open_console'));
+          scrivito.menu_bar_warning.hide();
+        });
+      },
+
+      show: function() {
+        $('.scrivito_menu_bar_warning').show();
+      },
+
+      hide: function() {
+        $('.scrivito_menu_bar_warning').hide();
+      }
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     menu_bar_toggle: {
@@ -26693,6 +26769,7 @@ var scrivito = {};
     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;
 
     return $.ajax({type: 'POST', url: permission.url, data: form_data,
       // These are needed in order for jQuery to work properly with a FormData.
@@ -27048,7 +27125,9 @@ var scrivito = {};
 
             return request_promise.then(function(model_data) {
               var field_data = model_data[that.field_name()];
-              return _.isArray(field_data) ? field_data[0] : field_data;
+              if (field_data) {
+                return field_data[0];
+              }
             });
           },
 
@@ -27457,7 +27536,9 @@ var scrivito = {};
           },
 
           destroy: function() {
-            return scrivito.ajax('DELETE', 'objs/' + that.id());
+            return scrivito.ajax('DELETE', 'objs/' + that.id()).then(function(result) {
+              return result.redirect_to;
+            });
           },
 
           destroy_widget: function(widget_id) {
@@ -27473,10 +27554,6 @@ var scrivito = {};
             return scrivito.ajax('PUT', 'objs/'+that.id()+'/revert_widget?widget_id='+widget_id);
           },
 
-          update_widget_modification: function(widget_id) {
-            return scrivito.ajax('GET', 'objs/' + that.id() + '/widget_modification?widget_id=' + widget_id);
-          },
-
           restore: function() {
             return scrivito.ajax('PUT', 'objs/' + that.id() + '/restore');
           },
@@ -27507,10 +27584,15 @@ var scrivito = {};
             });
           },
 
-          update_modification: function() {
-            return scrivito.ajax('GET', 'objs/' + that.id() + '/modification').then(function(data) {
+          reload: function() {
+            return scrivito.ajax('GET', 'objs/'+that.id()).then(function(data) {
+              params.has_conflict = data.has_conflict;
               params.modification = data.modification;
             });
+          },
+
+          reload_widget: function(widget_id) {
+            return scrivito.ajax('GET', 'objs/'+that.id()+'/widget?widget_id='+widget_id);
           }
         };
 
@@ -27855,7 +27937,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[that.id()];
+              return obj_data._widget_pool[0][that.id()];
             });
           },
 
@@ -27894,8 +27976,8 @@ var scrivito = {};
             return scrivito.ajax('GET', that.markup_url(action_name), {dataType: 'html'});
           },
 
-          update_modification: function() {
-            return that.obj().update_widget_modification(that.id()).then(function(data) {
+          reload: function() {
+            return that.obj().reload_widget(that.id()).then(function(data) {
               options.modification = data.modification;
             });
           }
@@ -27970,9 +28052,9 @@ var scrivito = {};
 }());
 (function() {
   $.extend(scrivito, {
-    widget_field_element: {
+    widgetlist_field_element: {
       create_instance: function(cms_element) {
-        if (cms_element.dom_element().attr('data-scrivito-field-type') === 'widget') {
+        if (cms_element.dom_element().attr('data-scrivito-field-type') === 'widgetlist') {
           var that = scrivito.cms_field_element.create_instance(cms_element);
 
           $.extend(that, {
@@ -28002,17 +28084,28 @@ var scrivito = {};
               }
             },
 
-            create_widget: function(widget_class, widget_element) {
-              return add_widget({create: {_obj_class: widget_class}}, widget_element);
-            },
+            add_widget: function(widget_spec, widget_element) {
+              var position;
+              if (widget_element) {
+                position = widget_element.dom_element()
+                    .prevAll('[data-scrivito-private-widget-id]').length;
+              } else {
+                position = that.widget_elements().length;
+              }
 
-            copy_widget: function(params, widget_element) {
-              return add_widget({copy: params}, widget_element);
-            },
+              var content = that.content();
+              content.splice(position, 0, widget_spec);
 
-            create_content_widget: function(content, widget_element) {
-              return add_widget({create: {_obj_class: 'Scrivito::ContentWidget', content: content}},
-                widget_element);
+              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 widget = scrivito.widget.create_instance(that.obj(), new_widget_id);
+                return prepend_widget(widget, widget_element);
+              });
             },
 
             fetch_widget_class_selection: function() {
@@ -28026,12 +28119,28 @@ var scrivito = {};
             },
 
             allowed_classes: function() {
-              var allowed_classes = that.dom_element().attr('data-scrivito-private-field-widget-allowed-classes');
+              return _.map(allowed_classes_json(), function(obj_class) {
+                return obj_class.name;
+              });
+            },
 
-              if (allowed_classes) {
-                return JSON.parse(allowed_classes);
-              } else {
-                return null;
+            allowed_classes_for_create: function() {
+              return _.without(that.allowed_classes(), 'Scrivito::ContentWidget');
+            },
+
+            can_create_widget: function() {
+              return that.allowed_classes_for_create().length !== 0;
+            },
+
+            can_choose_widget_class: function() {
+              return that.allowed_classes_for_create().length > 1;
+            },
+
+            description_for_allowed_class: function(class_name) {
+              var allowed_class = _.findWhere(allowed_classes_json(), {name: class_name});
+
+              if (allowed_class) {
+                return allowed_class.description;
               }
             },
 
@@ -28047,9 +28156,17 @@ var scrivito = {};
 
             is_content_widget_allowed: function() {
               return that.is_valid_child_class('Scrivito::ContentWidget');
-            },
+            }
+          });
+
+          var allowed_classes_json = function() {
+            var allowed_classes = that.dom_element().attr('data-scrivito-private-field-widget-allowed-classes');
+
+            return JSON.parse(allowed_classes);
+          };
 
-            prepend_widget_markup: function(widget_markup, widget_element) {
+          var prepend_widget = function(widget, widget_element) {
+            return widget.fetch_show_markup().then(function(widget_markup) {
               var dom_element = $($.trim(widget_markup));
               if (widget_element) {
                 widget_element.dom_element().before(dom_element);
@@ -28057,36 +28174,11 @@ var scrivito = {};
                 that.dom_element().prepend(dom_element);
               }
               scrivito.gui.new_content(dom_element.get(0));
-              return dom_element;
-            },
-
-            append_widget_markup: function(widget_markup, widget_element) {
-              var dom_element = $($.trim(widget_markup));
-              if (widget_element) {
-                widget_element.dom_element().after(dom_element);
-              } else {
-                that.dom_element().append(dom_element);
-              }
-              scrivito.gui.new_content(dom_element.get(0));
-              return dom_element;
-            }
-          });
 
-          var add_widget = function(widget_spec, widget_element) {
-            var position;
-            if (widget_element) {
-              position = widget_element.dom_element()
-                  .prevAll('[data-scrivito-private-widget-id]').length + 1;
-            } else {
-              position = that.widget_elements().length;
-            }
-
-            var content = that.content();
-            content.splice(position, 0, widget_spec);
+              scrivito.ensure_fully_visible_within_application_window(dom_element);
+              scrivito.widget_sorting.update_placeholder(that);
 
-            return that.save(content).then(function(field_data) {
-              var new_widget_id = field_data.list[position].widget;
-              return scrivito.widget.create_instance(that.obj(), new_widget_id);
+              return widget;
             });
           };
 
@@ -28095,12 +28187,12 @@ var scrivito = {};
       },
 
       all: function(root_element) {
-        return scrivito.cms_element.all('[data-scrivito-field-type="widget"]', root_element);
+        return scrivito.cms_element.all('[data-scrivito-field-type="widgetlist"]', root_element);
       }
     }
   });
 
-  scrivito.cms_element.definitions.push(scrivito.widget_field_element);
+  scrivito.cms_element.definitions.push(scrivito.widgetlist_field_element);
 }());
 (function() {
   $.extend(scrivito, {
@@ -28180,6 +28272,13 @@ var scrivito = {};
             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();
+              return size === 0 ? promise.reject() : promise.resolve();
+            });
           }
         };
 
@@ -29089,8 +29188,7 @@ var scrivito = {};
 
       refresh: function() {
         if (!scrivito.editing_context.is_view_mode()) {
-          scrivito.application_window.document().dom_element()
-            .find('.scrivito_editing_marker').remove();
+          all_markers().remove();
 
           _.each(callbacks, function(callback) {
             callback(builder);
@@ -29100,6 +29198,15 @@ var scrivito = {};
         }
       },
 
+      are_overlapping: function(dom_element1, dom_element2) {
+        var a = dom_element1.getBoundingClientRect();
+        var b = dom_element2.getBoundingClientRect();
+        return a.left <= b.right  &&
+               b.left <= a.right  &&
+               a.top  <= b.bottom &&
+               b.top  <= a.bottom;
+      },
+
       // For test purpose only.
       reset_callbacks: function() {
         callbacks = [];
@@ -29107,12 +29214,29 @@ var scrivito = {};
     }
   });
 
+  var all_markers = function() {
+    return scrivito.application_window.document().dom_element().find('.scrivito_editing_marker');
+  };
+
+  var warn_on_overlap = function(marker_dom) {
+    var overlapping = _.filter(all_markers().not(marker_dom), function(other_marker_dom) {
+      return scrivito.inplace_marker.are_overlapping(marker_dom, other_marker_dom);
+    });
+    if (overlapping.length > 0) {
+      scrivito.warn.apply(null,
+          _.flatten([scrivito.t('inplace_marker.overlapping'), marker_dom, overlapping]));
+    }
+  };
+
   var builder = {
     activate_for: function(cms_element, options) {
       var marker = $(scrivito.template.render('inplace_marker',
           $.extend({icon: '\uf000'}, options || {})));
 
       marker.on('click', function() {
+        if (scrivito.is_development_mode) {
+          warn_on_overlap(marker[0]);
+        }
         scrivito.menus.toggle(marker, cms_element.menu());
         return false;
       });
@@ -29221,11 +29345,11 @@ var scrivito = {};
 (function() {
   $.extend(scrivito, {
     add_content_command: function(cms_element) {
-      var widget_field_element, widget_element;
+      var widgetlist_field_element, widget_element;
       if (cms_element.widget_field) {
         widget_element = cms_element;
       } else {
-        widget_field_element = cms_element;
+        widgetlist_field_element = cms_element;
       }
 
       return scrivito.command.create_instance({
@@ -29235,32 +29359,34 @@ var scrivito = {};
 
         present: function() {
           return scrivito.select_content && scrivito.editing_context.is_editing_mode() &&
-            (widget_element || widget_field_element.is_empty());
+            (widget_element || widgetlist_field_element.is_empty());
         },
 
         disabled: function() {
-          if (!(widget_field_element || widget_element.widget_field())
+          if (!(widgetlist_field_element || widget_element.widget_field())
               .is_content_widget_allowed()) {
             return scrivito.t('commands.add_content.not_allowed');
           }
         },
 
         execute: function() {
-          if (!widget_field_element) {
-            widget_field_element = widget_element.widget_field();
+          if (!widgetlist_field_element) {
+            widgetlist_field_element = widget_element.widget_field();
           }
 
           scrivito.select_content().then(function(contents) {
             var content = contents[0];
             if (content) {
-              var create_widget = widget_field_element.create_content_widget(content, widget_element);
-              scrivito.with_saving_overlay(create_widget.then(function(widget) {
-                return widget.fetch_show_markup().then(function(markup) {
-                  var dom_element = widget_field_element.append_widget_markup(markup, widget_element);
-                  scrivito.ensure_fully_visible_within_application_window(dom_element);
-                  scrivito.widget_sorting.update_placeholder(widget_field_element);
-                });
-              }));
+              var widget_params = {
+                create: {
+                  _obj_class: 'Scrivito::ContentWidget',
+                  content: content
+                }
+              };
+
+              scrivito.with_saving_overlay(
+                widgetlist_field_element.add_widget(widget_params, widget_element)
+              );
             }
           });
         }
@@ -29294,41 +29420,39 @@ var scrivito = {};
 }());
 (function() {
   $.extend(scrivito, {
-    add_widget_command: function(cms_element) {
-      var widget_field_element, widget_element;
+    choose_and_create_widget_command: function(cms_element) {
+      var widgetlist_field_element, widget_element;
       if (cms_element.widget_field) {
         widget_element = cms_element;
+        widgetlist_field_element = widget_element.widget_field();
       } else {
-        widget_field_element = cms_element;
+        widgetlist_field_element = cms_element;
       }
 
       return scrivito.command.create_instance({
-        id: 'scrivito.sdk.add_widget',
-        title: scrivito.t('commands.add_widget.title'),
+        id: 'scrivito.sdk.choose_and_create_widget',
+        title: scrivito.t('commands.choose_and_create_widget.title'),
         icon: '&#xf022;',
 
         present: function() {
           return scrivito.editing_context.is_editing_mode() &&
-            (widget_element || widget_field_element.is_empty());
+            (widget_element || widgetlist_field_element.is_empty()) &&
+            (widgetlist_field_element.can_choose_widget_class() ||
+            !widgetlist_field_element.can_create_widget());
         },
 
-        execute: function() {
-          if (!widget_field_element) {
-            widget_field_element = widget_element.widget_field();
+        disabled: function() {
+          if (!widgetlist_field_element.can_create_widget()) {
+            return scrivito.t('commands.choose_and_create_widget.disabled');
           }
+        },
 
-          var selection = widget_field_element.fetch_widget_class_selection();
-          var choose_widget_obj_class = scrivito.choose_obj_class_dialog(selection, 'add_widget');
-          return choose_widget_obj_class.then(function(obj_class) {
+        execute: function() {
+          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) {
             return scrivito.with_saving_overlay(
-              widget_field_element.create_widget(obj_class, widget_element).then(function(widget) {
-                return widget.fetch_show_markup().then(function(widget_markup) {
-                  var dom_element = widget_field_element
-                      .append_widget_markup(widget_markup, widget_element);
-                  scrivito.ensure_fully_visible_within_application_window(dom_element);
-                  scrivito.widget_sorting.update_placeholder(widget_field_element);
-                });
-              })
+              widgetlist_field_element.add_widget({create: {_obj_class: obj_class}}, widget_element)
             );
           });
         }
@@ -29369,11 +29493,11 @@ var scrivito = {};
 (function() {
   $.extend(scrivito, {
     copy_widget_from_clipboard_command: function(cms_element) {
-      var widget_field_element, widget_element;
+      var widgetlist_field_element, widget_element;
       if (cms_element.widget_field) {
         widget_element = cms_element;
       } else {
-        widget_field_element = cms_element;
+        widgetlist_field_element = cms_element;
       }
 
       return scrivito.command.create_instance({
@@ -29388,40 +29512,72 @@ var scrivito = {};
         present: function() {
           return scrivito.editing_context.is_editing_mode() &&
             scrivito.widget_clipboard.is_present() &&
-            (widget_element || widget_field_element.is_empty());
+            (widget_element || widgetlist_field_element.is_empty());
         },
 
         disabled: function() {
-          if (!widget_field_element) {
-            widget_field_element = widget_element.widget_field();
+          if (!widgetlist_field_element) {
+            widgetlist_field_element = widget_element.widget_field();
           }
           var widget_class_name = scrivito.widget_clipboard.widget().widget_class_name();
-          if (!widget_field_element.is_valid_child_class(widget_class_name)) {
+          if (!widgetlist_field_element.is_valid_child_class(widget_class_name)) {
             return scrivito.t('commands.copy_widget_from_clipboard.paste_forbidden',
-                widget_field_element.allowed_classes().join(', '));
+                widgetlist_field_element.allowed_classes().join(', '));
           }
         },
 
         execute: function() {
-          if (!widget_field_element) {
-            widget_field_element = widget_element.widget_field();
+          if (!widgetlist_field_element) {
+            widgetlist_field_element = widget_element.widget_field();
           }
           var widget = scrivito.widget_clipboard.widget();
           var workspace_id = scrivito.widget_clipboard.workspace_id();
-          var copy_widget = widget_field_element.copy_widget({
-            workspace_id: workspace_id,
-            obj_id: widget.obj().id(),
-            widget_id: widget.id()
-          }, widget_element);
-          return scrivito.with_saving_overlay(copy_widget.then(function(widget) {
-            return widget.fetch_show_markup().then(function(widget_markup) {
-              var dom_element = widget_field_element
-                  .append_widget_markup(widget_markup, widget_element);
-              scrivito.ensure_fully_visible_within_application_window(dom_element);
-              scrivito.widget_sorting.update_placeholder(widget_field_element);
-              scrivito.inplace_marker.refresh();
-            });
-          }));
+          var copy_params = {
+            copy: {
+              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)
+          );
+        }
+      });
+    }
+  });
+}());
+(function() {
+  $.extend(scrivito, {
+    create_widget_command: function(cms_element) {
+      var widgetlist_field_element, widget_element, description, obj_class;
+      if (cms_element.widget_field) {
+        widget_element = cms_element;
+        widgetlist_field_element = widget_element.widget_field();
+      } else {
+        widgetlist_field_element = cms_element;
+      }
+
+      obj_class = widgetlist_field_element.allowed_classes_for_create()[0];
+      description = widgetlist_field_element.description_for_allowed_class(obj_class);
+
+      return scrivito.command.create_instance({
+        id: 'scrivito.sdk.create_widget',
+        title: scrivito.t('commands.create_widget.title', description),
+        icon: '&#xf022;',
+
+        present: function() {
+          return scrivito.editing_context.is_editing_mode() &&
+            (widget_element || widgetlist_field_element.is_empty()) &&
+            widgetlist_field_element.can_create_widget() &&
+            !widgetlist_field_element.can_choose_widget_class();
+        },
+
+        execute: function() {
+          var widget_params = {create: {_obj_class: obj_class}};
+          return scrivito.with_saving_overlay(
+            widgetlist_field_element.add_widget(widget_params, widget_element)
+          );
         }
       });
     }
@@ -29498,12 +29654,12 @@ var scrivito = {};
             confirm_button_text: scrivito.t('commands.delete_obj.dialog.confirm'),
             confirm_button_color: 'red'
           }).then(function() {
-            return scrivito.with_saving_overlay(obj.destroy().then(function() {
+            return scrivito.with_saving_overlay(obj.destroy().then(function(redirect_to) {
               if (scrivito.obj_clipboard.is_present() &&
                   scrivito.obj_clipboard.obj().id() === obj.id()) {
                 scrivito.obj_clipboard.clear();
               }
-              return scrivito.redirect_to(scrivito.root_path());
+              return scrivito.redirect_to(redirect_to);
             }));
           });
         }
@@ -29531,13 +29687,13 @@ var scrivito = {};
             confirm_button_text: scrivito.t('commands.delete_widget.dialog.confirm'),
             confirm_button_color: 'red'
           }).then(function() {
-            var widget_field_element = widget_element.widget_field();
+            var widgetlist_field_element = widget_element.widget_field();
             var widget = widget_element.widget();
             widget_element.dom_element().remove();
-            if (widget_field_element.is_empty()) {
+            if (widgetlist_field_element.is_empty()) {
               scrivito.inplace_marker.refresh();
             }
-            scrivito.widget_sorting.update_placeholder(widget_field_element);
+            scrivito.widget_sorting.update_placeholder(widgetlist_field_element);
 
             return widget.destroy().then(function() {
               if (scrivito.widget_clipboard.is_present() &&
@@ -29714,7 +29870,6 @@ var scrivito = {};
         scrivito.confirmation_dialog({
           title: scrivito.t('commands.publish_workspace.error_dialog.title'),
           description: scrivito.t('commands.publish_workspace.error_dialog.description'),
-          color: 'red',
           icon: '&#xf033;',
           confirm_button_text: scrivito.t('commands.publish_workspace.error_dialog.confirm')
         }).then(function() {
@@ -29775,7 +29930,14 @@ var scrivito = {};
 
         execute: function() {
           scrivito.with_saving_overlay(workspace.rebase().then(function() {
-            return scrivito.reload();
+            return workspace.has_conflicts().then(function() {
+              return scrivito.confirmation_dialog({
+                title: scrivito.t('commands.rebase_workspace.has_conflicts.title'),
+                description: scrivito.t('commands.rebase_workspace.has_conflicts.description'),
+                confirm_button_text: scrivito.t('commands.rebase_workspace.open_changes_dialog'),
+                cancel_button_text: scrivito.t('close')
+              }).done(function() { scrivito.changes_dialog.open(); });
+            }).always(function() { return scrivito.application_window.reload(); });
           }));
         }
       });
@@ -29898,7 +30060,7 @@ var scrivito = {};
         },
 
         update: function() {
-          return obj.update_modification();
+          return obj.reload();
         },
 
         execute: function() {
@@ -29945,7 +30107,7 @@ var scrivito = {};
           }
         },
 
-        update: function() { return widget.update_modification(); },
+        update: function() { return widget.reload(); },
 
         execute: function() {
           return scrivito.confirmation_dialog({
@@ -30204,9 +30366,10 @@ var scrivito = {};
         if (!scrivito.editing_context.is_view_mode()) {
           scrivito.on('content', function(content) {
             _.each(scrivito.widget_element.all($(content)), function(widget_element) {
-              var widget_field_element = widget_element.widget_field();
+              var widgetlist_field_element = widget_element.widget_field();
               widget_element.set_menu([
-                scrivito.add_widget_command(widget_element),
+                scrivito.create_widget_command(widget_element),
+                scrivito.choose_and_create_widget_command(widget_element),
                 //
                 // FIXME content-widget
                 //
@@ -30227,19 +30390,20 @@ var scrivito = {};
 }());
 (function() {
   $.extend(scrivito, {
-    widget_field_commands: {
+    widgetlist_field_commands: {
       init: function() {
         if (scrivito.editing_context.is_editing_mode()) {
           scrivito.on('content', function(content) {
-            _.each(scrivito.widget_field_element.all($(content)), function(widget_field_element) {
-              widget_field_element.set_menu([
-                scrivito.add_widget_command(widget_field_element),
+            _.each(scrivito.widgetlist_field_element.all($(content)), function(widgetlist_field_element) {
+              widgetlist_field_element.set_menu([
+                scrivito.create_widget_command(widgetlist_field_element),
+                scrivito.choose_and_create_widget_command(widgetlist_field_element),
                 //
                 // FIXME content-widget
                 //
-                // scrivito.add_content_command(widget_field_element),
-                scrivito.copy_widget_from_clipboard_command(widget_field_element)
-              ].concat(widget_field_element.menu()));
+                // scrivito.add_content_command(widgetlist_field_element),
+                scrivito.copy_widget_from_clipboard_command(widgetlist_field_element)
+              ].concat(widgetlist_field_element.menu()));
             });
           });
         }
@@ -30266,13 +30430,13 @@ var scrivito = {};
 }());
 (function() {
   $.extend(scrivito, {
-    widget_field_marker: {
+    widgetlist_field_marker: {
       init: function() {
         scrivito.inplace_marker.define(function(inplace_marker) {
           if (scrivito.editing_context.is_editing_mode()) {
-            _.each(scrivito.widget_field_element.all(), function(widget_field_element) {
-              if (widget_field_element.is_empty()) {
-                inplace_marker.activate_for(widget_field_element);
+            _.each(scrivito.widgetlist_field_element.all(), function(widgetlist_field_element) {
+              if (widgetlist_field_element.is_empty()) {
+                inplace_marker.activate_for(widgetlist_field_element);
               }
             });
           }
@@ -30287,8 +30451,8 @@ var scrivito = {};
       init: function() {
         scrivito.inplace_marker.define(function(inplace_marker) {
           if (scrivito.editing_context.selected_workspace.is_editable()) {
-            _.each(scrivito.widget_field_element.all(), function(widget_field_element) {
-              _.each(widget_field_element.widget_elements(), function(widget_element) {
+            _.each(scrivito.widgetlist_field_element.all(), function(widgetlist_field_element) {
+              _.each(widgetlist_field_element.widget_elements(), function(widget_element) {
                 var show_as_modified = widget_element.widget().is_modified() ||
                     widget_element.widget().is_placement_modified();
                 if (scrivito.editing_context.is_editing_mode() ||
@@ -30424,10 +30588,10 @@ var scrivito = {};
 
         var widget_element = scrivito.cms_element.from_dom_element(ui.item);
         var widget_class_name = widget_element.widget().widget_class_name();
-        _.each(widget_field_elements, function(widget_field_element) {
-          var dom_element = cms_document.local_jquery(widget_field_element.dom_element());
+        _.each(widgetlist_field_elements, function(widgetlist_field_element) {
+          var dom_element = cms_document.local_jquery(widgetlist_field_element.dom_element());
           if (dom_element.data('ui-sortable')) {
-            if (widget_field_element.is_valid_child_class(widget_class_name)) {
+            if (widgetlist_field_element.is_valid_child_class(widget_class_name)) {
               dom_element.addClass('scrivito_widget_drop_allowed');
             } else {
               dom_element.sortable('disable');
@@ -30443,8 +30607,8 @@ var scrivito = {};
 
         // Drag the _last_ widget out of a widget field and then drop it back.
         if (!ui.sender) {
-          var widget_field_element = scrivito.cms_element.from_dom_element(ui.item).widget_field();
-          scrivito.widget_sorting.update_placeholder(widget_field_element);
+          var widgetlist_field_element = scrivito.cms_element.from_dom_element(ui.item).widget_field();
+          scrivito.widget_sorting.update_placeholder(widgetlist_field_element);
         }
 
         scrivito.inplace_marker.refresh();
@@ -30479,19 +30643,19 @@ var scrivito = {};
       // The bug in http://bugs.jqueryui.com/ticket/5671 is still present.
       over: function(event, ui) {
         if (ui.sender) {
-          var widget_field_element = scrivito.cms_element.from_dom_element(ui.sender);
+          var widgetlist_field_element = scrivito.cms_element.from_dom_element(ui.sender);
           // If "over" is triggered, then exactly one item has been removed from the sender field.
-          var number_of_widget_elements = widget_field_element.widget_elements().length - 1;
-          scrivito.widget_sorting.update_placeholder(widget_field_element,
+          var number_of_widget_elements = widgetlist_field_element.widget_elements().length - 1;
+          scrivito.widget_sorting.update_placeholder(widgetlist_field_element,
               number_of_widget_elements);
         }
       },
 
-      update_placeholder: function(widget_field_element, number_of_widget_elements) {
-        var dom_element = widget_field_element.dom_element();
+      update_placeholder: function(widgetlist_field_element, number_of_widget_elements) {
+        var dom_element = widgetlist_field_element.dom_element();
 
         if (number_of_widget_elements === undefined) {
-          number_of_widget_elements = widget_field_element.widget_elements().length;
+          number_of_widget_elements = widgetlist_field_element.widget_elements().length;
         }
 
         if (number_of_widget_elements === 0) {
@@ -30503,21 +30667,21 @@ var scrivito = {};
     }
   });
 
-  var widget_field_elements = [];
+  var widgetlist_field_elements = [];
   var widget_field_dom_elements = [];
 
   var create = function(root_element) {
     var cms_document = scrivito.cms_document.from(root_element);
 
     if (scrivito.editing_context.visible_workspace.is_editable()) {
-      _.each(scrivito.widget_field_element.all(root_element), function(widget_field_element) {
-        var dom_element = cms_document.local_jquery(widget_field_element.dom_element());
+      _.each(scrivito.widgetlist_field_element.all(root_element), function(widgetlist_field_element) {
+        var dom_element = cms_document.local_jquery(widgetlist_field_element.dom_element());
         if (!dom_element.data('ui-sortable')) {
           dom_element.sortable({
             items: '> [data-scrivito-private-widget-id]',
             handle: '> .scrivito_editing_marker',
             placeholder: 'scrivito_widget_drop_placeholder',
-            connectWith: '*[data-scrivito-field-type="widget"]',
+            connectWith: '*[data-scrivito-field-type="widgetlist"]',
 
             start:  scrivito.widget_sorting.start,
             stop:   scrivito.widget_sorting.stop,
@@ -30529,32 +30693,32 @@ var scrivito = {};
             tolerance: 'pointer'        // jQuery fails to correctly determine the intersection.
           });
 
-          scrivito.widget_sorting.update_placeholder(widget_field_element);
+          scrivito.widget_sorting.update_placeholder(widgetlist_field_element);
 
-          widget_field_elements.push(widget_field_element);
+          widgetlist_field_elements.push(widgetlist_field_element);
           widget_field_dom_elements.push(dom_element);
         }
       });
     }
   };
 
-  var add_changes = function(changes, widget_field_element) {
-    var parent_widget = widget_field_element.parent_widget();
+  var add_changes = function(changes, widgetlist_field_element) {
+    var parent_widget = widgetlist_field_element.parent_widget();
     if (parent_widget) {
-      add_widget_changes(changes, widget_field_element, parent_widget.id());
+      add_widget_changes(changes, widgetlist_field_element, parent_widget.id());
     } else {
-      add_field_changes(changes, widget_field_element);
+      add_field_changes(changes, widgetlist_field_element);
     }
   };
 
-  var add_field_changes = function(changes, widget_field_element) {
-    changes[widget_field_element.field_name()] = widget_field_element.content();
+  var add_field_changes = function(changes, widgetlist_field_element) {
+    changes[widgetlist_field_element.field_name()] = widgetlist_field_element.content();
   };
 
-  var add_widget_changes = function(changes, widget_field_element, parent_widget_id) {
+  var add_widget_changes = function(changes, widgetlist_field_element, parent_widget_id) {
     if (!changes._widget_pool) { changes._widget_pool = {}; }
     if (!changes._widget_pool[parent_widget_id]) { changes._widget_pool[parent_widget_id] = {}; }
-    add_field_changes(changes._widget_pool[parent_widget_id], widget_field_element);
+    add_field_changes(changes._widget_pool[parent_widget_id], widgetlist_field_element);
   };
 }());
 (function() {
@@ -30563,8 +30727,8 @@ var scrivito = {};
       init: function() {
         scrivito.on('content', function(content) {
           if (scrivito.in_editable_view()) {
-            _.each(scrivito.widget_field_element.all($(content)), function(widget_field_element) {
-              scrivito.content_upload.create(widget_field_element);
+            _.each(scrivito.widgetlist_field_element.all($(content)), function(widgetlist_field_element) {
+              scrivito.content_upload.create(widgetlist_field_element);
             });
 
             _.each(scrivito.widget_element.all($(content)), function(widget_element) {
@@ -30574,9 +30738,9 @@ var scrivito = {};
         });
       },
 
-      create: function(widget_field_element, widget_element) {
-        var dropzone = (widget_element || widget_field_element).dom_element();
-        var is_active = function() { return widget_element || widget_field_element.is_empty(); };
+      create: function(widgetlist_field_element, widget_element) {
+        var dropzone = (widget_element || widgetlist_field_element).dom_element();
+        var is_active = function() { return widget_element || widgetlist_field_element.is_empty(); };
 
         dropzone.on('dragenter', function() {
           if (is_active()) {
@@ -30599,7 +30763,7 @@ var scrivito = {};
             if (data_transfer) {
               var files = data_transfer.files;
               if (files.length === 1) {
-                scrivito.content_upload.upload(files[0], widget_field_element, widget_element);
+                scrivito.content_upload.upload(files[0], widgetlist_field_element, widget_element);
               }
             }
           }
@@ -30607,21 +30771,14 @@ var scrivito = {};
         });
       },
 
-      upload: function(file, widget_field_element, widget_element) {
+      upload: function(file, widgetlist_field_element, widget_element) {
         var name = file.name.replace(/[^a-z0-9_.$\-]/ig, '-');
         var path = '_resources/'+Math.floor(Math.random() * 1000)+'/'+name;
         var obj_class = scrivito.default_obj_class_for_content_type(file.type);
 
         var create_obj = scrivito.create_obj({blob: file, _path: path, _obj_class: obj_class});
         scrivito.with_saving_overlay(create_obj.then(function(obj) {
-          var create_widget = widget_field_element.create_content_widget(obj.id, widget_element);
-          return create_widget.then(function(widget) {
-            return widget.fetch_show_markup().then(function(markup) {
-              var dom_element = widget_field_element.prepend_widget_markup(markup, widget_element);
-              scrivito.ensure_fully_visible_within_application_window(dom_element);
-              scrivito.widget_sorting.update_placeholder(widget_field_element);
-            });
-          });
+          return widgetlist_field_element.create_content_widget(obj.id, widget_element);
         }));
       }
     }
@@ -31015,6 +31172,7 @@ var scrivito = {};
 
 
 
+
 
 
 //