scrivito_sdk 0.40.0 → 0.41.0.rc1

data/lib/assets/javascripts/scrivito_ui.js

@@ -23777,9 +23777,9 @@ function program5(depth0,data) {
   return escapeExpression(stack1);
   }
 
-  buffer += "<li class=\"scrivito_menu_item scrivito_";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += "<li class=\"scrivito_menu_item ";
+  if (stack1 = helpers.dom_id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.dom_id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + " ";
   stack1 = helpers['if'].call(depth0, depth0.is_disabled, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
@@ -23787,11 +23787,10 @@ function program5(depth0,data) {
   buffer += "\">\n  <span title=\"";
   stack1 = helpers['if'].call(depth0, depth0.is_enabled, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "\">\n    <i class=\"scrivito_icon\">";
+  buffer += "\">\n    ";
   if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
   else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   if(stack1 || stack1 === 0) { buffer += stack1; }
-  buffer += "</i>";
   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)
@@ -23800,6 +23799,40 @@ function program5(depth0,data) {
   });
   return this.ScrivitoHandlebarsTemplates["menu_item"];
 }).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["menu_item/customer_icon"] = 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 += "<i class=\"scrivito_customer_icon sci_";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\"></i>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["menu_item/customer_icon"];
+}).call(this);
+(function() {
+  this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
+  this.ScrivitoHandlebarsTemplates["menu_item/factory_icon"] = 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";
+
+
+  buffer += "<i class=\"scrivito_icon\">";
+  if (stack1 = helpers.icon) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.icon; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "</i>\n";
+  return buffer;
+  });
+  return this.ScrivitoHandlebarsTemplates["menu_item/factory_icon"];
+}).call(this);
 (function() {
   this.ScrivitoHandlebarsTemplates || (this.ScrivitoHandlebarsTemplates = {});
   this.ScrivitoHandlebarsTemplates["menu_item/spinner"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
@@ -24170,11 +24203,15 @@ function program7(depth0,data) {
   return escapeExpression(stack1);
   }
 
-  buffer += "<li id=\"scrivito_";
-  if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += "<li id=\"";
+  if (stack1 = helpers.dom_id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.dom_id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
-    + "\" class=\"scrivito_menu_item\n    ";
+    + "\" class=\"scrivito_menu_item ";
+  if (stack1 = helpers.dom_id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.dom_id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "\n    ";
   stack1 = helpers['if'].call(depth0, depth0.is_action_required, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
   if(stack1 || stack1 === 0) { buffer += stack1; }
   buffer += "\n    ";
@@ -24397,7 +24434,8 @@ $.i18n().load({
   'commands.revert_obj.dialog.description': 'Verworfene Änderungen können nicht wiederhergestellt werden.',
   'commands.revert_obj.dialog.confirm': 'Verwerfen',
 
-  'commands.revert_widget.title': 'Änderungen am Widget verwerfen',
+  'commands.revert_widget.content_title': 'Änderungen am Inhalt verwerfen',
+  'commands.revert_widget.widget_title': 'Änderungen am Widget verwerfen',
   'commands.revert_widget.rtc_workspace': 'Dieses Widget ist Teil der "rtc"-Arbeitskopie, bei der Änderungen an Widgets nicht verworfen werden können.',
   'commands.revert_widget.is_new': 'Dies ist ein neues Widget. Um die Erstellung dieses Widgets rückgängig zu machen, löschen Sie es bitte.',
   'commands.revert_widget.is_not_modified': 'Dieses Widget wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
@@ -24436,18 +24474,24 @@ $.i18n().load({
 
   'commands.add_widget.title': 'Widget 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',
+
   'obj_sorting_dialog.title': 'Elemente sortieren',
 
   'commands.widget_details.title': 'Widget-Eigenschaften',
   'commands.widget_details.no_details_view': 'Dieses Widget hat keine Eigenschaften',
   'commands.widget_details.dialog.title': 'Eigenschaften von "$1"',
 
-  'commands.save_widget_to_clipboard.title': 'Widget zum Kopieren markieren',
+  '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.title': 'Kopie des markierten Widgets anhängen',
+  '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.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.title': 'Widget löschen',
+  'commands.delete_widget.content_title': 'Inhalt löschen',
+  'commands.delete_widget.widget_title': 'Widget löschen',
   'commands.delete_widget.dialog.title': 'Wirklich dieses Widget löschen?',
   'commands.delete_widget.dialog.description': 'Ein gelöschtes Widget kann nicht wiederhergestellt werden.',
   'commands.delete_widget.dialog.confirm': 'Löschen',
@@ -24612,7 +24656,8 @@ $.i18n().load({
   'commands.revert_obj.dialog.description': 'Discarded changes cannot be restored.',
   'commands.revert_obj.dialog.confirm': 'Discard',
 
-  'commands.revert_widget.title': 'Discard changes to widget',
+  'commands.revert_widget.content_title': 'Discard changes to content',
+  'commands.revert_widget.widget_title': 'Discard changes to widget',
   'commands.revert_widget.rtc_workspace': 'This widget is part of the "rtc" working copy, for which discarding changes to a widgets is not supported.',
   'commands.revert_widget.is_new': 'This is a new widget. To discard the creation of this widget, please delete it.',
   'commands.revert_widget.is_not_modified': 'This widget has not been modified. Therefore, nothing can be discarded.',
@@ -24653,16 +24698,22 @@ $.i18n().load({
 
   'commands.add_widget.title': 'Insert widget',
 
+  'commands.add_content.title': 'Insert content',
+  'commands.add_content.not_allowed': 'It is not allowed to insert random content into this field.',
+
   'commands.widget_details.title': 'Widget properties',
   'commands.widget_details.no_details_view': 'This widget has no properties',
   'commands.widget_details.dialog.title': 'Properties of "$1"',
 
-  'commands.save_widget_to_clipboard.title': 'Mark widget for copying',
+  '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.title': 'Append copy of marked widget',
+  '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.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.title': 'Delete widget',
+  'commands.delete_widget.content_title': 'Delete content',
+  'commands.delete_widget.widget_title': 'Delete widget',
   'commands.delete_widget.dialog.title': 'Really delete this widget?',
   'commands.delete_widget.dialog.description': 'A deleted widget cannot be restored.',
   'commands.delete_widget.dialog.confirm': 'Delete',
@@ -24978,6 +25029,45 @@ var scrivito = {};
       return scrivito.obj_class_defaults.lookup(content_type);
     },
 
+    // @api public
+    configure_menu_order: function(order) {
+      scrivito.menu_order = order;
+    },
+
+    pattern_sort: function(items, patterns) {
+      if (patterns && patterns.length) {
+        var results = [];
+        _.each(patterns, function(pattern, index) {
+          if (!pattern.match(/(.*)\.\*$/)) {
+            var hit = _.find(items, function(item) { return item.id() === pattern; });
+            if (hit) {
+              results[index] = hit;
+              items = _.without(items, hit);
+            }
+          }
+        });
+        _.each(patterns, function(pattern, index) {
+          if (pattern.match(/(.*)\.\*$/)) {
+            var hits = _.select(items, function(item) {
+              return !item.id().indexOf(pattern.replace('.*', ''));
+            });
+            if (hits.length) {
+              results[index] = hits;
+              items = _.difference(items, hits);
+            }
+          }
+        });
+        return _.flatten(_.compact(results.concat(items)));
+      } else {
+        return items;
+      }
+    },
+
+    // @api beta
+    register_select_content: function(select_content) {
+      scrivito.select_content = select_content;
+    },
+
     init: function(config) {
       scrivito.config = config;
 
@@ -25007,6 +25097,7 @@ var scrivito = {};
 
       scrivito.widget_reloading.init();
       scrivito.widget_sorting.init();
+      scrivito.content_upload.init();
       scrivito.reloading.init();
 
       window.onbeforeunload = scrivito.warn_before_unloading;
@@ -25110,11 +25201,41 @@ var scrivito = {};
   var get_menu = function(dom_element) {
     assert_valid_dom_element(dom_element);
     var cms_element = build_cms_element(dom_element);
+    var fetch_menu = function() { return cms_element.menu(); };
+
     return {
-      add: function(command_options) {
-        var menu = cms_element.menu();
-        menu.push(scrivito.command.create_instance(command_options));
+      list: function() { return fetch_menu(); },
+
+      add: function(id, params) {
+        var menu = fetch_menu();
+        menu.push(scrivito.command.create_instance(_.extend(params, {id: id})));
+        cms_element.set_menu(menu);
+      },
+
+      update: function(id, params) {
+        var menu = fetch_menu();
+        _.find(menu, function(command, index) {
+          if (command.id() === id) {
+            return command.update_params(params);
+          }
+        });
+        cms_element.set_menu(menu);
+      },
+
+      replace: function(id, params) {
+        var menu = fetch_menu();
+        _.find(menu, function(command, index) {
+          if (command.id() === id) {
+            return menu[index] = scrivito.command.create_instance(_.extend(params, {id: id}));
+          }
+        });
         cms_element.set_menu(menu);
+      },
+
+      remove: function(id) {
+        var menu = fetch_menu();
+        var command = _.find(menu, function(command) { return command.id() === id; });
+        cms_element.set_menu(_.without(menu, command));
       }
     };
   };
@@ -25230,8 +25351,9 @@ var scrivito = {};
     gui: {
       start: function() {
         scrivito.gui.on('document', function(document) {
-          document.dom_element().find('body').attr('data-scrivito-display-mode',
-            scrivito.editing_context.display_mode);
+          var body = document.dom_element().find('body');
+          body.attr('data-scrivito-display-mode', scrivito.editing_context.display_mode);
+          _.each(['dragenter', 'dragover', 'drop'], function(e) { body.on(e, false); });
         });
 
         $('body').append('<div id="scrivito_editing"></div>');
@@ -25518,12 +25640,17 @@ var scrivito = {};
             return params.id;
           },
 
+          dom_id: function() {
+            return params.id.replace(/\./g, '_');
+          },
+
           title: function() {
-            return params.title;
+            var title = params.title;
+            return typeof title === 'function' ? title() : title;
           },
 
           icon: function() {
-            return params.icon;
+            return params.icon || '&#xf000;';
           },
 
           tooltip: function() {
@@ -25578,6 +25705,10 @@ var scrivito = {};
               return true;
             }
             return false;
+          },
+
+          update_params: function(new_params) {
+            return _.extend(params, new_params);
           }
         };
 
@@ -25590,8 +25721,13 @@ var scrivito = {};
   $.extend(scrivito, {
     menu_item: {
       create_instance: function(command) {
+        var icon = command.icon();
+        var icon_template = 'menu_item/' + (icon.indexOf('&') ? 'customer' : 'factory') + '_icon';
+
         var render_menu_item = function() {
-          return scrivito.template.render('menu_item', command);
+          return scrivito.template.render('menu_item', _.extend({}, command, {icon: function() {
+            return scrivito.template.render(icon_template, {icon: icon});
+          }}));
         };
 
         return {
@@ -25599,11 +25735,9 @@ var scrivito = {};
             if (command.is_present()) {
               var view;
               if (command.needs_update()) {
-                var id = _.uniqueId('scrivito_' + command.id());
+                var id = _.uniqueId(command.dom_id());
                 view = scrivito.template.render('menu_item/spinner', {id: id});
-                command.update().then(function() {
-                  $('#' + id).replaceWith(render_menu_item());
-                });
+                command.update().then(function() { $('#'+id).replaceWith(render_menu_item()); });
               } else {
                 view = render_menu_item();
               }
@@ -25889,7 +26023,7 @@ var scrivito = {};
           }));
 
           var bind_command = function(command) {
-            workspace_select.on('click', '#scrivito_' + command.id(), function() {
+            workspace_select.on('click', '#'+command.dom_id(), function() {
               return command.execute();
             });
           };
@@ -26030,7 +26164,7 @@ var scrivito = {};
         var query_params = {};
 
         if (!!is_binary) {
-          base_url += '__scrivito/details_page/';
+          base_url += '__scrivito/resource_details/';
           query_params.return_to = document.URL;
         }
 
@@ -26453,7 +26587,9 @@ var scrivito = {};
           is_current_page_restricted: scrivito.is_current_page_restricted,
           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
+          default_obj_class_for_content_type: scrivito.default_obj_class_for_content_type,
+          register_select_content: scrivito.register_select_content,
+          configure_menu_order: scrivito.configure_menu_order
         });
       },
 
@@ -27076,13 +27212,7 @@ var scrivito = {};
 
           details_src: function() {
             // TODO unify with ajax url generation
-            return '/__scrivito/objs/' +  that.id() + '/details';
-          },
-
-          fetch_details_markup: function() {
-            return scrivito.ajax('GET', 'objs/' +  that.id() + '/details').then(function(data) {
-              return data.markup;
-            });
+            return '/__scrivito/page_details/' +  that.id();
           },
 
           mark_resolved: function() {
@@ -27443,6 +27573,10 @@ var scrivito = {};
             return !!that.placement_modification();
           },
 
+          is_content_widget: function() {
+            return widget_class_name === 'Scrivito::ContentWidget';
+          },
+
           save: function(widget_attributes) {
             var obj_attributes = build_obj_attributes(widget_attributes);
             return that.obj().save(obj_attributes).then(function(obj_data) {
@@ -27454,10 +27588,6 @@ var scrivito = {};
             return that.obj().destroy_widget(that.id());
           },
 
-          fetch_details_markup: function() {
-            return that.fetch_markup('widget_details');
-          },
-
           details_src: function() {
             // TODO unify with ajax url generation
             return "/__scrivito/" + that.markup_url("widget_details");
@@ -27535,11 +27665,7 @@ var scrivito = {};
             },
 
             has_details_view: function() {
-              return that.dom_element().attr('data-scrivito-private-widget-has-details-view') ? true : false;
-            },
-
-            fetch_details_markup: function() {
-              return that.widget().fetch_details_markup();
+              return !!that.dom_element().attr('data-scrivito-private-widget-has-details-view');
             },
 
             fetch_show_markup: function() {
@@ -27602,13 +27728,16 @@ var scrivito = {};
             },
 
             create_widget: function(widget_class, widget_element) {
-              var widget_spec = {create: {_obj_class: widget_class}};
-              return add_widget(widget_spec, widget_element);
+              return add_widget({create: {_obj_class: widget_class}}, widget_element);
             },
 
-            copy_widget: function(src_obj_id, src_widget_id, widget_element) {
-              var widget_spec = {copy: {src_obj_id: src_obj_id, src_widget_id: src_widget_id}};
-              return add_widget(widget_spec, widget_element);
+            copy_widget: function(params, widget_element) {
+              return add_widget({copy: params}, widget_element);
+            },
+
+            create_content_widget: function(content, widget_element) {
+              return add_widget({create: {_obj_class: 'Scrivito::ContentWidget', content: content}},
+                widget_element);
             },
 
             fetch_widget_class_selection: function() {
@@ -27641,6 +27770,21 @@ var scrivito = {};
               }
             },
 
+            is_content_widget_allowed: function() {
+              return that.is_valid_child_class('Scrivito::ContentWidget');
+            },
+
+            prepend_widget_markup: function(widget_markup, widget_element) {
+              var dom_element = $($.trim(widget_markup));
+              if (widget_element) {
+                widget_element.dom_element().before(dom_element);
+              } else {
+                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) {
@@ -28543,7 +28687,7 @@ var scrivito = {};
         scrivito.close_all_menus();
 
         var menu = $(scrivito.template.render('menu', {
-          menu_items: _.map(commands, function(command) {
+          menu_items: _.map(scrivito.pattern_sort(commands, scrivito.menu_order), function(command) {
             return scrivito.menu_item.create_instance(command);
           })
         }));
@@ -28563,7 +28707,7 @@ var scrivito = {};
         });
 
         _.each(commands, function(command) {
-          menu.on('click', '.scrivito_' + command.id(), function() {
+          menu.on('click', '.'+command.dom_id(), function() {
             if (command.is_enabled()) {
               menu.data('scrivito-menu-close')();
             }
@@ -28627,7 +28771,7 @@ var scrivito = {};
     });
 
     _.each(commands, function(command) {
-      menu.on('click', '.scrivito_' + command.id(), function() {
+      menu.on('click', '.'+command.dom_id(), function() {
         if (command.is_enabled()) {
           menu.data('scrivito-menu-close')();
         }
@@ -28740,11 +28884,61 @@ var scrivito = {};
     }
   });
 }());
+(function() {
+  $.extend(scrivito, {
+    add_content_command: function(cms_element) {
+      var widget_field_element, widget_element;
+      if (cms_element.widget_field) {
+        widget_element = cms_element;
+      } else {
+        widget_field_element = cms_element;
+      }
+
+      return scrivito.command.create_instance({
+        id: 'scrivito.sdk.add_content',
+        title: scrivito.t('commands.add_content.title'),
+        icon: '&#xf082;',
+
+        present: function() {
+          return scrivito.select_content && scrivito.editing_context.is_editing_mode() &&
+            (widget_element || widget_field_element.is_empty());
+        },
+
+        disabled: function() {
+          if (!(widget_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();
+          }
+
+          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);
+                });
+              }));
+            }
+          });
+        }
+      });
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     add_subpage_command: function(child_list_element) {
       return scrivito.command.create_instance({
-        id: 'add_subpage',
+        id: 'scrivito.sdk.add_subpage',
         title: scrivito.t('commands.add_subpage.title'),
         icon: '&#xf022;',
         tooltip: scrivito.t('commands.add_subpage.tooltip',
@@ -28766,22 +28960,29 @@ var scrivito = {};
 }());
 (function() {
   $.extend(scrivito, {
-    add_widget_command: function(widget_field_element, widget_element) {
+    add_widget_command: function(cms_element) {
+      var widget_field_element, widget_element;
+      if (cms_element.widget_field) {
+        widget_element = cms_element;
+      } else {
+        widget_field_element = cms_element;
+      }
+
       return scrivito.command.create_instance({
-        id: 'add_widget',
+        id: 'scrivito.sdk.add_widget',
         title: scrivito.t('commands.add_widget.title'),
         icon: '&#xf022;',
 
         present: function() {
-          if (widget_element) {
-            return scrivito.editing_context.is_editing_mode();
-          } else {
-            return scrivito.editing_context.is_editing_mode() &&
-                widget_field_element.widget_elements().length === 0;
-          }
+          return scrivito.editing_context.is_editing_mode() &&
+            (widget_element || widget_field_element.is_empty());
         },
 
         execute: function() {
+          if (!widget_field_element) {
+            widget_field_element = widget_element.widget_field();
+          }
+
           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) {
@@ -28805,7 +29006,7 @@ var scrivito = {};
   $.extend(scrivito, {
     copy_page_from_clipboard_command: function(child_list_element) {
       return scrivito.command.create_instance({
-        id: 'copy_page_from_clipboard',
+        id: 'scrivito.sdk.copy_page_from_clipboard',
         title: scrivito.t('commands.copy_page_from_clipboard.title'),
         icon: '&#xf015;',
 
@@ -28833,24 +29034,33 @@ var scrivito = {};
 }());
 (function() {
   $.extend(scrivito, {
-    copy_widget_from_clipboard_command: function(widget_field_element, widget_element) {
+    copy_widget_from_clipboard_command: function(cms_element) {
+      var widget_field_element, widget_element;
+      if (cms_element.widget_field) {
+        widget_element = cms_element;
+      } else {
+        widget_field_element = cms_element;
+      }
+
       return scrivito.command.create_instance({
-        id: 'copy_widget_from_clipboard',
-        title: scrivito.t('commands.copy_widget_from_clipboard.title'),
+        id: 'scrivito.sdk.copy_widget_from_clipboard',
+        title: function() {
+          return scrivito.t('commands.copy_widget_from_clipboard.' +
+            (scrivito.widget_clipboard.widget().is_content_widget() ? 'content' : 'widget') +
+            '_title');
+        },
         icon: '&#xf015;',
 
         present: function() {
-          var is_editing_mode = scrivito.editing_context.is_editing_mode();
-          var is_clipboard_present = scrivito.widget_clipboard.is_present();
-          if (widget_element) {
-            return is_editing_mode && is_clipboard_present;
-          } else {
-            var is_empty_widget_field = widget_field_element.widget_elements().length === 0;
-            return is_editing_mode && is_clipboard_present && is_empty_widget_field;
-          }
+          return scrivito.editing_context.is_editing_mode() &&
+            scrivito.widget_clipboard.is_present() &&
+            (widget_element || widget_field_element.is_empty());
         },
 
         disabled: function() {
+          if (!widget_field_element) {
+            widget_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)) {
             return scrivito.t('commands.copy_widget_from_clipboard.paste_forbidden',
@@ -28859,11 +29069,15 @@ var scrivito = {};
         },
 
         execute: function() {
+          if (!widget_field_element) {
+            widget_field_element = widget_element.widget_field();
+          }
           var widget = scrivito.widget_clipboard.widget();
-          var widget_id = widget.id();
-          var obj_id = widget.obj().id();
-
-          var copy_widget = widget_field_element.copy_widget(obj_id, widget_id, widget_element);
+          var copy_widget = widget_field_element.copy_widget({
+            workspace_id: scrivito.editing_context.selected_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
@@ -28882,7 +29096,7 @@ var scrivito = {};
   $.extend(scrivito, {
     create_workspace_command: function() {
       return scrivito.command.create_instance({
-        id: 'create_workspace',
+        id: 'scrivito.sdk.create_workspace',
         title: scrivito.t('commands.create_workspace.title'),
         icon: '&#xf022;',
 
@@ -28917,7 +29131,7 @@ var scrivito = {};
       }
 
       return scrivito.command.create_instance({
-        id: 'delete_obj',
+        id: 'scrivito.sdk.delete_obj',
         title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf018;',
 
@@ -28958,15 +29172,14 @@ var scrivito = {};
 }());
 (function() {
   $.extend(scrivito, {
-    delete_widget_command: function(widget_field_element, widget_element) {
+    delete_widget_command: function(widget_element) {
       return scrivito.command.create_instance({
-        id: 'delete_widget',
-        title: scrivito.t('commands.delete_widget.title'),
+        id: 'scrivito.sdk.delete_widget',
+        title: scrivito.t('commands.delete_widget.' +
+          (widget_element.widget().is_content_widget() ? 'content' : 'widget') + '_title'),
         icon: '&#xf018;',
 
-        present: function() {
-          return scrivito.editing_context.is_editing_mode();
-        },
+        present: function() { return scrivito.editing_context.is_editing_mode(); },
 
         execute: function() {
           return scrivito.confirmation_dialog({
@@ -28977,13 +29190,12 @@ 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 widget = widget_element.widget();
             widget_element.dom_element().remove();
-
-            if (widget_field_element.widget_elements().length === 0) {
+            if (widget_field_element.is_empty()) {
               scrivito.inplace_marker.refresh();
             }
-
             scrivito.widget_sorting.update_placeholder(widget_field_element);
 
             return widget.destroy().then(function() {
@@ -29002,7 +29214,7 @@ var scrivito = {};
   $.extend(scrivito, {
     delete_workspace_command: function(workspace) {
       return scrivito.command.create_instance({
-        id: 'delete_workspace',
+        id: 'scrivito.sdk.delete_workspace',
         title: scrivito.t('commands.delete_workspace.title'),
         icon: '&#xf018;',
 
@@ -29028,7 +29240,7 @@ var scrivito = {};
   $.extend(scrivito, {
     duplicate_obj_command: function(obj) {
       return scrivito.command.create_instance({
-        id: 'duplicate_obj',
+        id: 'scrivito.sdk.duplicate_obj',
         title: scrivito.t('commands.duplicate_obj.title'),
         icon: '&#xf015;',
 
@@ -29062,7 +29274,7 @@ var scrivito = {};
       }
 
       return scrivito.command.create_instance({
-        id: 'mark_resolved_obj',
+        id: 'scrivito.sdk.mark_resolved_obj',
         title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf124;',
 
@@ -29092,7 +29304,7 @@ var scrivito = {};
   $.extend(scrivito, {
     move_page_from_clipboard_command: function(child_list_element) {
       return scrivito.command.create_instance({
-        id: 'move_page_from_clipboard',
+        id: 'scrivito.sdk.move_page_from_clipboard',
         title: scrivito.t('commands.move_page_from_clipboard.title'),
         icon: '&#xf016;',
 
@@ -29123,7 +29335,7 @@ var scrivito = {};
   $.extend(scrivito, {
     obj_details_command: function(obj) {
       return scrivito.command.create_instance({
-        id: 'obj_details',
+        id: 'scrivito.sdk.obj_details',
         title: scrivito.t('commands.obj_details.title'),
         icon: '&#xf030;',
 
@@ -29170,7 +29382,7 @@ var scrivito = {};
       };
 
       return scrivito.command.create_instance({
-        id: 'publish_workspace',
+        id: 'scrivito.sdk.publish_workspace',
         title: scrivito.t('commands.publish_workspace.title'),
         icon: '&#xf033;',
         tooltip: scrivito.t('commands.publish_workspace.title', workspace.title()),
@@ -29205,7 +29417,7 @@ var scrivito = {};
   $.extend(scrivito, {
     rebase_workspace_command: function(workspace) {
       return scrivito.command.create_instance({
-        id: 'rebase_workspace',
+        id: 'scrivito.sdk.rebase_workspace',
         title: scrivito.t('commands.rebase_workspace.title'),
         icon: '&#xf023;',
         tooltip: scrivito.t('commands.rebase_workspace.tooltip', workspace.title()),
@@ -29233,7 +29445,7 @@ var scrivito = {};
   $.extend(scrivito, {
     rename_workspace_command: function(workspace) {
       return scrivito.command.create_instance({
-        id: 'rename_workspace',
+        id: 'scrivito.sdk.rename_workspace',
         title: scrivito.t('commands.rename_workspace.title'),
         icon: '&#xf04f;',
 
@@ -29264,7 +29476,7 @@ var scrivito = {};
       }
 
       return scrivito.command.create_instance({
-        id: 'restore_obj',
+        id: 'scrivito.sdk.restore_obj',
         title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf032;',
 
@@ -29292,7 +29504,7 @@ var scrivito = {};
     restore_widget_command: function(widget_element) {
       var widget = widget_element.widget();
       return scrivito.command.create_instance({
-        id: 'restore_widget',
+        id: 'scrivito.sdk.restore_widget',
         title: scrivito.t('commands.restore_widget.title'),
         icon: '&#xf032;',
 
@@ -29323,7 +29535,7 @@ var scrivito = {};
       }
 
       return scrivito.command.create_instance({
-        id: 'revert_obj',
+        id: 'scrivito.sdk.revert_obj',
         title: scrivito.t(translations_namespace + '.title'),
         icon: '&#xf032;',
 
@@ -29371,8 +29583,9 @@ var scrivito = {};
     revert_widget_command: function(widget_element) {
       var widget = widget_element.widget();
       return scrivito.command.create_instance({
-        id: 'revert_widget',
-        title: scrivito.i18n.translate('commands.revert_widget.title'),
+        id: 'scrivito.sdk.revert_widget',
+        title: scrivito.t('commands.revert_widget.' +
+          (widget.is_content_widget() ? 'content' : 'widget') + '_title'),
         icon: '&#xf032;',
 
         present: function() {
@@ -29384,24 +29597,22 @@ var scrivito = {};
             return scrivito.t('commands.revert_widget.rtc_workspace');
           }
           if (widget.is_new()) {
-            return scrivito.i18n.translate('commands.revert_widget.is_new');
+            return scrivito.t('commands.revert_widget.is_new');
           }
           if (!widget.is_modified()) {
-            return scrivito.i18n.translate('commands.revert_widget.is_not_modified');
+            return scrivito.t('commands.revert_widget.is_not_modified');
           }
         },
 
-        update: function() {
-          return widget.update_modification();
-        },
+        update: function() { return widget.update_modification(); },
 
         execute: function() {
           return scrivito.confirmation_dialog({
-            title: scrivito.i18n.translate('commands.revert_widget.dialog.title'),
-            description: scrivito.i18n.translate('commands.revert_widget.dialog.description'),
+            title: scrivito.t('commands.revert_widget.dialog.title'),
+            description: scrivito.t('commands.revert_widget.dialog.description'),
             icon: '&#xf032;',
             color: 'red',
-            confirm_button_text: scrivito.i18n.translate('commands.revert_obj.dialog.confirm'),
+            confirm_button_text: scrivito.t('commands.revert_obj.dialog.confirm'),
             confirm_button_color: 'red'
           }).then(function() {
             var dom_element = widget_element.dom_element();
@@ -29418,7 +29629,7 @@ var scrivito = {};
   $.extend(scrivito, {
     save_obj_to_clipboard_command: function(obj) {
       return scrivito.command.create_instance({
-        id: 'save_obj_to_clipboard',
+        id: 'scrivito.sdk.save_obj_to_clipboard',
         title: scrivito.t('commands.save_obj_to_clipboard.title'),
         icon: '&#xf017;',
 
@@ -29443,17 +29654,12 @@ var scrivito = {};
   $.extend(scrivito, {
     save_widget_to_clipboard_command: function(widget_element) {
       return scrivito.command.create_instance({
-        id: 'save_widget_to_clipboard',
-        title: scrivito.t('commands.save_widget_to_clipboard.title'),
+        id: 'scrivito.sdk.save_widget_to_clipboard',
+        title: scrivito.t('commands.save_widget_to_clipboard.' +
+          (widget_element.widget().is_content_widget() ? 'content' : 'widget') + '_title'),
         icon: '&#xf017;',
-
-        present: function() {
-          return scrivito.editing_context.is_editing_mode();
-        },
-
-        execute: function() {
-          scrivito.widget_clipboard.save_widget(widget_element.widget());
-        }
+        present: function() { return scrivito.editing_context.is_editing_mode(); },
+        execute: function() { scrivito.widget_clipboard.save_widget(widget_element.widget()); }
       });
     }
   });
@@ -29462,13 +29668,13 @@ var scrivito = {};
   $.extend(scrivito, {
     select_workspace_command: function(workspace) {
       return scrivito.command.create_instance({
-        id: 'select_workspace_' + workspace.id(),
+        id: 'scrivito.sdk.select_workspace_'+workspace.id(),
         title: workspace.title(),
         icon: workspace.icon(),
 
         execute: function() {
           scrivito.with_saving_overlay(
-              scrivito.redirect_to('?_scrivito_workspace_id=' + workspace.id()));
+            scrivito.redirect_to('?_scrivito_workspace_id='+workspace.id()));
         }
       });
     }
@@ -29478,7 +29684,7 @@ var scrivito = {};
   $.extend(scrivito, {
     sort_items_command: function(child_list_element) {
       return scrivito.command.create_instance({
-        id: 'sort_items',
+        id: 'scrivito.sdk.sort_items',
         title: scrivito.t('commands.sort_items.title'),
         icon: '&#xf03c;',
         tooltip: scrivito.t('commands.sort_items.tooltip',
@@ -29566,14 +29772,13 @@ var scrivito = {};
       };
 
       return scrivito.command.create_instance({
-        id: 'widget_details',
+        id: 'scrivito.sdk.widget_details',
         title: scrivito.t('commands.widget_details.title'),
         icon: '&#xf030;',
 
         present: function() {
-          return scrivito.editing_context.is_editing_mode() ||
-            widget().is_modified() ||
-            widget().is_placement_modified();
+          return !widget().is_content_widget() && (scrivito.editing_context.is_editing_mode() ||
+            widget().is_modified() || widget().is_placement_modified());
         },
 
         disabled: function() {
@@ -29596,7 +29801,7 @@ var scrivito = {};
   $.extend(scrivito, {
     workspace_changes_command: function() {
       return scrivito.command.create_instance({
-        id: 'workspace_changes',
+        id: 'scrivito.sdk.workspace_changes',
         title: scrivito.t('commands.workspace_changes.title'),
         icon: '&#xf080;',
 
@@ -29611,7 +29816,7 @@ var scrivito = {};
   $.extend(scrivito, {
     workspace_settings_command: function(workspace) {
       return scrivito.command.create_instance({
-        id: 'workspace_settings',
+        id: 'scrivito.sdk.workspace_settings',
         title: scrivito.t('commands.workspace_settings.title'),
         icon: '&#xf030;',
 
@@ -29660,13 +29865,14 @@ var scrivito = {};
             _.each(scrivito.widget_element.all($(content)), function(widget_element) {
               var widget_field_element = widget_element.widget_field();
               widget_element.set_menu([
-                scrivito.add_widget_command(widget_field_element, widget_element),
+                scrivito.add_widget_command(widget_element),
+                scrivito.add_content_command(widget_element),
                 scrivito.widget_details_command(widget_element),
                 scrivito.save_widget_to_clipboard_command(widget_element),
-                scrivito.copy_widget_from_clipboard_command(widget_field_element, widget_element),
+                scrivito.copy_widget_from_clipboard_command(widget_element),
                 scrivito.revert_widget_command(widget_element),
                 scrivito.restore_widget_command(widget_element),
-                scrivito.delete_widget_command(widget_field_element, widget_element)
+                scrivito.delete_widget_command(widget_element)
               ].concat(widget_element.menu()));
             });
           });
@@ -29684,6 +29890,7 @@ var scrivito = {};
             _.each(scrivito.widget_field_element.all($(content)), function(widget_field_element) {
               widget_field_element.set_menu([
                 scrivito.add_widget_command(widget_field_element),
+                scrivito.add_content_command(widget_field_element),
                 scrivito.copy_widget_from_clipboard_command(widget_field_element)
               ].concat(widget_field_element.menu()));
             });
@@ -30003,6 +30210,76 @@ var scrivito = {};
     add_field_changes(changes._widget_pool[parent_widget_id], widget_field_element);
   };
 }());
+(function() {
+  $.extend(scrivito, {
+    content_upload: {
+      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.widget_element.all($(content)), function(widget_element) {
+              scrivito.content_upload.create(widget_element.widget_field(), widget_element);
+            });
+          }
+        });
+      },
+
+      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(); };
+
+        dropzone.on('dragenter', function() {
+          if (is_active()) {
+            dropzone.addClass('scrivito_content_upload');
+          }
+          return false;
+        });
+
+        dropzone.on('dragleave', function() {
+          if (is_active()) {
+            dropzone.removeClass('scrivito_content_upload');
+          }
+          return false;
+        });
+
+        dropzone.on('drop', function(event) {
+          if (is_active()) {
+            dropzone.removeClass('scrivito_content_upload');
+            var data_transfer = event.originalEvent.dataTransfer;
+            if (data_transfer) {
+              var files = data_transfer.files;
+              if (files.length === 1) {
+                scrivito.content_upload.upload(files[0], widget_field_element, widget_element);
+              }
+            }
+          }
+          return false;
+        });
+      },
+
+      upload: function(file, widget_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);
+            });
+          });
+        }));
+      }
+    }
+  });
+}());
 (function() {
   $.extend(scrivito, {
     hotkeys: {
@@ -30116,7 +30393,7 @@ var scrivito = {};
         var child_list = _.map(children, function(child) { return child.obj(); });
 
         var view = $(scrivito.template.render('obj_sorting_dialog', {
-          icon: '\uF03C',
+          icon: '&#xf03c;',
           child_list: child_list
         }));
 
@@ -30402,6 +30679,7 @@ var scrivito = {};
 
 
 
+
 //