scrivito_sdk 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ad8e5c737a6cade7f90311e8a3f5323a13d11c
-  data.tar.gz: 074728381d5ca7073756d0dd72453155515c8b88
+  metadata.gz: abac40ae69e81dc3a8ecf001f3a66513a901b015
+  data.tar.gz: 41b484f12f8c90c59f2a7a0c36c7926f2545a07b
 SHA512:
-  metadata.gz: 6ff44a2455faa3a26dc49635fa644908a2dca87a5923c020bb19f9ab51e49a402d6bbce7ce1cbf7d29023d06c46d4b72fa96a20b5cfa24fd6767dfa8d47e5de2
-  data.tar.gz: dc54d130bb0e71f93fa715eed4bc3913a40aa2ea3ac12bfd140b732d2a88b9d0232af7e1a0cc765cf20f33262c70916e3f313da60a92a9287d648e83cf0173c0
+  metadata.gz: aa5bf142baaf78af044daf72e8ee08f7787ca994ba6aed1ca9047cbe9790ea39c6240f3d3efe3f61b59921d830134630aeb0b55a98e6255b61c40bc1a3897c20
+  data.tar.gz: c5e24dae5899d8b36f4e2c761aac54ffd46cefea2518bf8263c5161e6a34ea36b37e78fc16a29be0546a4aeed22698c0109a7f93454d1b6767b3a98425f6cda3

data/app/controllers/scrivito/objs_controller.rb

@@ -92,33 +92,6 @@ module Scrivito
       render json: widgets_classes
     end
 
-    def create_widget
-      load_object
-      widget_pool_id = BasicObj.generate_widget_pool_id
-
-      task_unaware_request(:put, "workspaces/#{Workspace.current.id}/objs/#{params[:id]}",
-          {obj: {_widget_pool: {widget_pool_id => {_obj_class: params[:obj_class]}}}})
-
-      Workspace.reload
-      @obj.reload
-
-      @widget = @obj.widget_from_pool(widget_pool_id)
-
-      render json: {markup: render_to_string(layout: false)}
-    end
-
-    def copy_widget
-      load_object
-      new_widget_id = @obj.copy_widget_from(params[:src_obj_id], params[:src_widget_id])
-
-      Workspace.reload
-      @obj.reload
-
-      @widget = @obj.widget_from_pool(new_widget_id)
-
-      render json: {markup: render_to_string(layout: false)}
-    end
-
     def search
       in_selected_workspace do
         query = MultiJson.decode(params[:query]).with_indifferent_access

data/app/helpers/scrivito/cms_tag_helper.rb

@@ -188,11 +188,7 @@ module Scrivito
       content_tag(tag_name, inner_html, options)
     end
 
-    def render_widget(widget,
-                      container_modification = nil,
-                      obj = @obj,
-                      field_name = widget.container_field_name,
-                      container = widget.container)
+    def render_widget(widget, container_modification = nil)
       options = {}
 
       if inplace_editing_allowed?

data/app/views/scrivito/default_cms/show_widget.html.erb

@@ -1 +1 @@
-<%= render_widget(widget, @obj, widget.container_field_name, widget.container) %>
+<%= render_widget(widget) %>

data/app/views/scrivito/objs/copy_widget.html.erb

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

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

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

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## /mnt/dcc/Scrival_SDK__Kris__117/repos/scrivito/config/ca-bundle.crt -- Bundle of CA Root Certificates
 ##
-## Converted at: Fri May 23 10:03:45 2014 UTC
+## Converted at: Wed May 28 09:37:50 2014 UTC
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/assets/javascripts/scrivito_editing.js

@@ -9759,8 +9759,18 @@ function program7(depth0,data) {
   this.ScrivitoHandlebarsTemplates["inplace_menu_marker"] = Handlebars.template(function (Handlebars,depth0,helpers,partials,data) {
   this.compilerInfo = [3,'>= 1.0.0-rc.4'];
 helpers = helpers || Handlebars.helpers; data = data || {};
-  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
+  var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
 
+function program1(depth0,data) {
+  
+  var buffer = "", stack1;
+  buffer += "\n    <span class=\"scrivito_editing_marker_title\">";
+  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  buffer += escapeExpression(stack1)
+    + "</span>\n  ";
+  return buffer;
+  }
 
   buffer += "<span class=\"scrivito_editing_marker ";
   if (stack1 = helpers.css_classes) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
@@ -9771,14 +9781,17 @@ helpers = helpers || Handlebars.helpers; data = data || {};
   else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + "\" title=\"";
-  if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
-  else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
+  if (stack1 = helpers.tooltip) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
+  else { stack1 = depth0.tooltip; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
   buffer += escapeExpression(stack1)
     + "\">\n  <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; }
   buffer += escapeExpression(stack1)
-    + "</i>\n</span>\n";
+    + "</i>\n  ";
+  stack1 = helpers['if'].call(depth0, depth0.description, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
+  if(stack1 || stack1 === 0) { buffer += stack1; }
+  buffer += "\n</span>\n";
   return buffer;
   });
   return this.ScrivitoHandlebarsTemplates["inplace_menu_marker"];
@@ -10279,6 +10292,8 @@ $.i18n().load({
   'widget_menus.widget_is_dragged_here': 'Widget wurde hierher gezogen',
   'widget_menus.widget_is_dragged_away': 'Widget wurde von hier weggezogen',
 
+  'child_list_menu.description': 'Elemente von $1',
+
   'changes_list.menu_item': 'Änderungen von "$1"',
   'changes_list.title': 'Änderungen von "$1"',
   'changes_list.empty_result': 'In dieser Arbeitskopie wurde nichts geändert.',
@@ -10426,6 +10441,8 @@ $.i18n().load({
   'widget_menus.widget_is_dragged_here': 'Widget has been dragged here',
   'widget_menus.widget_is_dragged_away': 'Widget has been dragged away from here',
 
+  'child_list_menu.description': 'Items of $1',
+
   'changes_list.menu_item': 'Changes to "$1"',
   'changes_list.title': 'Changes to "$1"',
   'changes_list.empty_result': 'Nothing was changed in this working copy.',
@@ -10551,6 +10568,10 @@ var scrivito = {};
       });
     },
 
+    run_new_event: function(method) {
+      scrivito.wait(0).done(method);
+    },
+
     // For testing purpose only.
     reload_location: function() {
       window.location.reload();
@@ -11007,6 +11028,8 @@ var scrivito = {};
     ajax: function(type, path, options) {
       var is_write_request = type === 'PUT' || type === 'POST' || type === 'DELETE';
       if (is_write_request) {
+        options = options || {};
+        options.timeout = 15000; // miliseconds
         scrivito.write_monitor.start_write();
       }
 
@@ -11125,13 +11148,52 @@ var scrivito = {};
       },
 
       start_write: function() {
-        run_callbacks('start_write');
+        if (!scrivito.write_monitor.is_writing()) {
+          run_callbacks('start_write');
+        }
         counter += 1;
       },
 
       end_write: function() {
         counter -= 1;
-        run_callbacks('end_write');
+        if (!scrivito.write_monitor.is_writing()) {
+          scrivito.run_new_event(function() {
+            if (!scrivito.write_monitor.is_writing()) {
+              run_callbacks('end_write');
+            }
+          });
+        }
+      },
+
+      track_changes: function(fn, on_change_callback) {
+        var has_changes = false;
+        var changes_finished = false;
+
+        var start_token = scrivito.write_monitor.on('start_write', function() {
+          has_changes = true;
+          changes_finished = false;
+        });
+        var end_token = scrivito.write_monitor.on('end_write', function() {
+          changes_finished = true;
+        });
+
+        return fn().done(function() {
+          scrivito.write_monitor.off(start_token);
+          scrivito.write_monitor.off(end_token);
+          if (has_changes) {
+            if (changes_finished) {
+              on_change_callback();
+            } else {
+              var saving_promise = $.Deferred();
+              var final_end_token = scrivito.write_monitor.on('end_write', function() {
+                scrivito.write_monitor.off(final_end_token);
+                saving_promise.resolve();
+                on_change_callback();
+              });
+              scrivito.with_saving_overlay(saving_promise);
+            }
+          }
+        });
       },
 
       // For test purpose only.
@@ -11885,12 +11947,19 @@ $(function() {
               }
             }
 
-            var changes = {};
-            changes[that.field_name()] = content;
+            var request_promise = $.Deferred();
+
+            var to_be_saved = to_be_saved_data() || {};
+            to_be_saved.value = content;
+            to_be_saved.promises = to_be_saved.promises || [];
+            to_be_saved.promises.push(request_promise);
+            to_be_saved_data(to_be_saved);
 
-            var widget = that.widget();
-            var promise = widget ? widget.save(changes) : that.obj().save(changes);
-            return promise.then(function(model_data) {
+            if (!currently_saving()) {
+              next_save_request();
+            }
+
+            return request_promise.then(function(model_data) {
               return model_data[that.field_name()];
             });
           },
@@ -11920,6 +11989,63 @@ $(function() {
           }
         };
 
+        var next_save_request = function() {
+          currently_saving(true);
+          var to_be_saved = to_be_saved_data();
+          remove_to_be_saved();
+
+          var changes = {};
+          changes[that.field_name()] = to_be_saved.value;
+
+          var widget = that.widget();
+          var save_promise = widget ? widget.save(changes) : that.obj().save(changes);
+
+          save_promise.done(function(result) {
+            _.each(to_be_saved.promises, function(succeeding_promise) {
+              succeeding_promise.resolve(result);
+            });
+
+            if (to_be_saved_data()) {
+              next_save_request();
+            } else {
+              remove_currently_saving();
+            }
+          }).fail(function(error_message) {
+            var new_promises = (to_be_saved_data() || {}).promises;
+            var failing_promises = to_be_saved.promises.concat(new_promises || []);
+            _.each(failing_promises, function(failing_promise) {
+              failing_promise.reject(error_message);
+            });
+
+            remove_to_be_saved();
+            remove_currently_saving();
+          });
+        };
+
+        var to_be_saved_data = function(new_to_be_saved) {
+          if (new_to_be_saved) {
+            return that.dom_element().data('scrivito-to-be-saved', new_to_be_saved);
+          } else {
+            return that.dom_element().data('scrivito-to-be-saved');
+          }
+        };
+
+        var remove_to_be_saved = function() {
+          that.dom_element().removeData('scrivito-to-be-saved');
+        };
+
+        var currently_saving = function(new_currently_saving) {
+          if (new_currently_saving) {
+            return that.dom_element().data('scrivito-currently-saving', new_currently_saving);
+          } else {
+            return that.dom_element().data('scrivito-currently-saving');
+          }
+        };
+
+        var remove_currently_saving = function() {
+          that.dom_element().removeData('scrivito-currently-saving');
+        };
+
         return that;
       }
     }
@@ -12102,19 +12228,13 @@ $(function() {
             var url = 'objs/'+that.id()+'/copy';
 
             return scrivito.ajax('POST', url, post_attr).then(function(new_data) {
-              return scrivito.obj.create_instance({
-                id: new_data.id,
-                obj_class_name: new_data._obj_class
-              });
+              return scrivito.obj.create_instance_from_server_data(new_data);
             });
           },
 
           duplicate: function() {
             return scrivito.ajax('POST', 'objs/'+that.id()+'/duplicate').then(function(new_data) {
-              return scrivito.obj.create_instance({
-                id: new_data.id,
-                obj_class_name: new_data._obj_class
-              });
+              return scrivito.obj.create_instance_from_server_data(new_data);
             });
           }
         };
@@ -12140,13 +12260,17 @@ $(function() {
         return that;
       },
 
+      create_instance_from_server_data: function(create_params) {
+        return scrivito.obj.create_instance({
+          id: (create_params.id || create_params._id),
+          obj_class_name: create_params._obj_class
+        });
+      },
+
       create: function(data) {
         return prepare_attributes(data).then(function(attributes) {
           return scrivito.ajax('POST', 'objs', {data: {obj: attributes}}).then(function(new_data) {
-            return scrivito.obj.create_instance({
-              id: new_data.id,
-              obj_class_name: new_data._obj_class
-            });
+            return scrivito.obj.create_instance_from_server_data(new_data);
           });
         });
       }
@@ -13357,6 +13481,10 @@ $(function() {
         $(dom_element).attr('data-scrivito-private-menu-description', description);
       },
 
+      set_tooltip: function(dom_element, tooltip) {
+        $(dom_element).attr('data-scrivito-private-menu-tooltip', tooltip);
+      },
+
       set_css_classes: function(dom_element, css_classes) {
         $(dom_element).attr('data-scrivito-private-menu-css-classes', css_classes);
       }
@@ -13381,6 +13509,7 @@ $(function() {
 
         var icon = dom_element.attr('data-scrivito-private-menu-icon') || '\uf000';
         var description = dom_element.attr('data-scrivito-private-menu-description');
+        var tooltip = dom_element.attr('data-scrivito-private-menu-tooltip');
         var css_classes = dom_element.attr('data-scrivito-private-menu-css-classes');
         var commands = dom_element.data('scrivito-private-menu-commands');
 
@@ -13388,6 +13517,7 @@ $(function() {
           id: marker_id,
           icon: icon,
           description: description,
+          tooltip: tooltip,
           css_classes: css_classes
         }));
 
@@ -13776,20 +13906,15 @@ $(window).on('load', function() {
         },
 
         execute: function() {
-          var has_changes = false;
-          var token = scrivito.write_monitor.on('start_write', function() {
-            has_changes = true;
-          });
-
           var title = scrivito.i18n.translate('current_page');
           var fetch_markup = function() {
             return obj.fetch_details_markup();
           };
-          return scrivito.details_dialog.open(title, fetch_markup, '&#xf03d;').then(function() {
-            scrivito.write_monitor.off(token);
-            if (has_changes) {
-              return scrivito.with_saving_overlay(scrivito.reload());
-            }
+
+          return scrivito.write_monitor.track_changes(function() {
+            return scrivito.details_dialog.open(title, fetch_markup, '&#xf03d;');
+          }, function() {
+            return scrivito.with_saving_overlay(scrivito.reload());
           });
         }
       });
@@ -13961,21 +14086,15 @@ $(window).on('load', function() {
         },
 
         execute: function() {
-          var has_changes = false;
-          var token = scrivito.write_monitor.on('start_write', function() {
-            has_changes = true;
-          });
-
           var dialog_title = widget_element.widget().widget_class_name();
           var fetch_markup = function() {
             return widget_element.fetch_details_markup();
           };
 
-          return scrivito.details_dialog.open(dialog_title, fetch_markup).then(function() {
-            scrivito.write_monitor.off(token);
-            if (has_changes) {
-              widget_element.dom_element().trigger('scrivito_reload');
-            }
+          return scrivito.write_monitor.track_changes(function() {
+            return scrivito.details_dialog.open(dialog_title, fetch_markup);
+          }, function() {
+            widget_element.dom_element().trigger('scrivito_reload');
           });
         }
       });
@@ -14009,12 +14128,15 @@ $(window).on('load', function() {
                   menu.add_item(widget_dom_element, command);
                 });
 
+                var description = widget_element.widget().widget_class_name();
+                menu.set_description(widget_dom_element, description);
+
                 if (widget_element.has_details_view() &&
                     scrivito.editing_context.is_comparing_mode()) {
                   var options = menu_options(widget_element);
                   if (options) {
-                    var description = scrivito.i18n.translate('widget_menus.' + options.key);
-                    menu.set_description(widget_dom_element, description);
+                    var tooltip = scrivito.i18n.translate('widget_menus.' + options.key);
+                    menu.set_tooltip(widget_dom_element, tooltip);
                     menu.set_icon(widget_dom_element, options.icon);
                     menu.set_css_classes(widget_dom_element, options.css_class);
                   }
@@ -14235,6 +14357,9 @@ $(window).on('load', function() {
               scrivito.editing_context.is_editing_mode()) {
             _.each(scrivito.child_list_element.all(), function(child_list_element) {
               var dom_element = child_list_element.dom_element();
+              var description = child_list_element.obj().description_for_editor();
+              menu.set_description(dom_element,
+                  scrivito.i18n.translate('child_list_menu.description', description));
               _.each([
                 scrivito.add_subpage_command(child_list_element),
                 scrivito.copy_page_from_clipboard_command(child_list_element),
@@ -14319,12 +14444,12 @@ $(window).on('load', function() {
           return scrivito.create_obj({blob: file, _path: path, _obj_class: 'Image'});
         };
 
-        scrivito.with_saving_overlay(create_image(file).then(function(data) {
+        scrivito.with_saving_overlay(create_image(file).then(function(obj) {
           var field_value;
           if (field_type === 'reference') {
-            field_value = data.id;
+            field_value = obj.id;
           } else if (field_type === 'linklist') {
-            field_value = [{obj_id: data.id}];
+            field_value = [{obj_id: obj.id}];
           } else {
             $.error('Field type must be "reference" or "linklist".');
           }

data/lib/assets/stylesheets/scrivito.css

@@ -155,8 +155,14 @@ body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[dat
 .scrivito_editing_marker:hover,
 .scrivito_editing_marker:active { background: #439439; background: rgba(67, 148, 57, 1); }
 
+[data-scrivito-display-mode="editing"] [data-scrivito-private-child-list-path]:hover .scrivito_editing_marker,
+[data-scrivito-display-mode="editing"] [data-scrivito-widget-obj-class]:hover .scrivito_editing_marker {
+  background: #439439; background: rgba(67, 148, 57, 1);
+}
+
 /* scrivito_editing_marker edited/new/deleted colors */
 [data-scrivito-private-widget-modification="edited"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="edited"] .scrivito_editing_marker .scrivito_editing_marker_title,
 [data-scrivito-field-modification="edited"] .scrivito_editing_marker,
 [data-scrivito-private-widget-modification="edited"][data-scrivito-private-widget-container-modification="new"] .scrivito_editing_marker,
 [data-scrivito-private-widget-modification="edited"][data-scrivito-private-widget-container-modification="deleted"] .scrivito_editing_marker {
@@ -164,17 +170,20 @@ body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[dat
 }
 
 [data-scrivito-private-widget-modification="new"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="new"] .scrivito_editing_marker .scrivito_editing_marker_title,
 [data-scrivito-field-modification="new"] .scrivito_editing_marker,
 [data-scrivito-private-widget-modification="new"][data-scrivito-private-widget-container-modification="new"] .scrivito_editing_marker {
   background: #4c8c07;
 }
 [data-scrivito-private-widget-modification="deleted"] .scrivito_editing_marker,
+[data-scrivito-private-widget-modification="deleted"] .scrivito_editing_marker .scrivito_editing_marker_title,
 [data-scrivito-field-modification="deleted"] .scrivito_editing_marker,
 [data-scrivito-private-widget-modification="deleted"][data-scrivito-private-widget-container-modification="deleted"] .scrivito_editing_marker {
   background: #ff1f01;
 }
 
 /* scrivito_editing_marker colors for unmodified but moved widgets */
-[data-scrivito-private-widget-container-modification="deleted"] .scrivito_editing_marker {
+:not([data-scrivito-private-widget-modification])[data-scrivito-private-widget-container-modification="deleted"] .scrivito_editing_marker,
+:not([data-scrivito-private-widget-modification])[data-scrivito-private-widget-container-modification="deleted"] .scrivito_editing_marker .scrivito_editing_marker_title {
   background: #808080;
 }

data/lib/assets/stylesheets/scrivito_editing.css

@@ -462,6 +462,9 @@ html.scrivito_bottombar_on {
   color: #696969!important;
   cursor: help;
 }
+body.scrivito_editing_active {
+  padding-top: 45px;
+}
 .scrivito_topbar * {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -915,15 +918,12 @@ html.scrivito_bottombar_on {
   color: #fff;
   font-size: 13px;
   line-height: 14px;
+  height: 25px;
   text-align: center;
   padding: 5px 8px;
   margin: -2px 0 0 -2px;
   vertical-align: middle;
-  min-width: 20px;
-  min-height: 14px;
-  background: #111;
-  background: #ffa500;
-  background: rgba(255, 165, 0, 0.5);
+  background: rgba(67, 148, 57, 0.5);
   z-index: 11111;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -941,7 +941,7 @@ html.scrivito_bottombar_on {
 .scrivito_editing_marker:hover,
 .scrivito_editing_marker:active {
   cursor: pointer;
-  background: #ffa500;
+  background: #439439;
   -webkit-transition: background ease-in-out .2s;
   -moz-transition: background ease-in-out .2s;
   -o-transition: background ease-in-out .2s;
@@ -951,7 +951,6 @@ html.scrivito_bottombar_on {
   padding: 0;
   font-size: 12px;
   line-height: 8px;
-  padding-bottom: 2px;
   color: #fff;
 }
 .scrivito_editing_marker .scrivito_icon:hover {
@@ -976,6 +975,94 @@ html.scrivito_bottombar_on {
 .ui-sortable:not(.scrivito_empty_widget_field) .scrivito_editing_marker .scrivito_icon:hover {
   cursor: move;
 }
+.scrivito_editing_marker .scrivito_editing_marker_title {
+  display: block;
+  position: absolute;
+  top: 0;
+  right: 29px;
+  color: #fff;
+  font-size: 11px;
+  line-height: 14px;
+  height: 25px;
+  text-align: center;
+  padding: 5px 10px;
+  margin: 0;
+  white-space: nowrap;
+  background: #439439;
+  opacity: 0;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-transition: opacity ease-in-out .6s;
+  -moz-transition: opacity ease-in-out .6s;
+  -o-transition: opacity ease-in-out .6s;
+  transition: opacity ease-in-out .6s;
+}
+.scrivito_editing_marker:hover .scrivito_editing_marker_title,
+.scrivito_editing_marker:active .scrivito_editing_marker_title {
+  cursor: pointer;
+}
+[data-scrivito-display-mode="editing"] [data-scrivito-private-child-list-path]:hover .scrivito_editing_marker .scrivito_editing_marker_title,
+[data-scrivito-display-mode="editing"] [data-scrivito-widget-obj-class]:hover .scrivito_editing_marker .scrivito_editing_marker_title,
+[data-scrivito-display-mode="diff"] [data-scrivito-widget-obj-class]:hover .scrivito_editing_marker .scrivito_editing_marker_title,
+[data-scrivito-display-mode="added"] [data-scrivito-widget-obj-class]:hover .scrivito_editing_marker .scrivito_editing_marker_title,
+[data-scrivito-display-mode="deleted"] [data-scrivito-widget-obj-class]:hover .scrivito_editing_marker .scrivito_editing_marker_title {
+  opacity: 1;
+  -webkit-transition: opacity ease-in-out .5s;
+  -moz-transition: opacity ease-in-out .5s;
+  -o-transition: opacity ease-in-out .5s;
+  transition: opacity ease-in-out .5s;
+}
+.scrivito_structure_marker {
+  display: block;
+  position: absolute;
+  color: #fff;
+  font-size: 13px;
+  line-height: 14px;
+  text-align: center;
+  padding: 0 8px;
+  margin: -2px 0 0 0;
+  vertical-align: middle;
+  min-height: 10px;
+  background: #111;
+  background: #ffa500;
+  background: rgba(255, 165, 0, 0.4);
+  z-index: 11111;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+  -webkit-transition: background ease-in-out .6s;
+  -moz-transition: background ease-in-out .6s;
+  -o-transition: background ease-in-out .6s;
+  transition: background ease-in-out .6s;
+}
+.scrivito_structure_marker:hover,
+.scrivito_structure_marker:active {
+  cursor: pointer;
+  background: #ffa500;
+  -webkit-transition: background ease-in-out .2s;
+  -moz-transition: background ease-in-out .2s;
+  -o-transition: background ease-in-out .2s;
+  transition: background ease-in-out .2s;
+}
+.scrivito_structure_marker .scrivito_icon {
+  padding: 0;
+  font-size: 8px;
+  line-height: 8px;
+  color: #fff;
+}
+.scrivito_structure_marker .scrivito_icon:hover {
+  cursor: pointer;
+}
+.scrivito_empty_widget_field > .scrivito_structure_marker,
+*[data-scrivito-private-widget-id] > .scrivito_structure_marker {
+  left: 45%;
+}
 .scrivito_button {
   display: inline-block;
   color: #555;
@@ -1199,6 +1286,45 @@ a.scrivito_button:active {
   -o-animation: rotation 4s infinite linear;
   animation: rotation 4s infinite linear;
 }
+.scrivito_glowing {
+  -webkit-animation: glow 4s infinite linear;
+  -moz-animation: glow 4s infinite linear;
+  -o-animation: glow 4s infinite linear;
+  animation: glow 4s infinite linear;
+}
+@-webkit-keyframes glow {
+  0% {
+    box-shadow: 0 0 2px 2px rgba(255, 165, 0, 0.2);
+  }
+  50% {
+    box-shadow: 0 0 2px 4px #ffa500;
+  }
+  100% {
+    box-shadow: 0 0 2px 2px rgba(255, 165, 0, 0.2);
+  }
+}
+@-moz-keyframes glow {
+  0% {
+    box-shadow: 0 0 2px 2px rgba(255, 165, 0, 0.2);
+  }
+  50% {
+    box-shadow: 0 0 2px 4px #ffa500;
+  }
+  100% {
+    box-shadow: 0 0 2px 2px rgba(255, 165, 0, 0.2);
+  }
+}
+@keyframes glow {
+  0% {
+    box-shadow: 0 0 2px 2px rgba(255, 165, 0, 0.2);
+  }
+  50% {
+    box-shadow: 0 0 2px 4px #ffa500;
+  }
+  100% {
+    box-shadow: 0 0 2px 2px rgba(255, 165, 0, 0.2);
+  }
+}
 .scrivito_modal_prompt .scrivito_modal_body form {
   margin: 0;
 }

data/lib/generators/cms/widget/templates/details.html.erb

@@ -0,0 +1,2 @@
+This is the details view of the <%= class_name %>.
+Edit "app/views/<%= file_name %>/details.html.erb" to change its appearance.

data/lib/generators/cms/widget/templates/migration.erb

@@ -0,0 +1,15 @@
+class Create<%= class_name %> < ::Scrivito::Migration
+  def up
+    create_obj_class(
+      name: '<%= class_name %>',
+      type: 'publication',
+      title: '<%= class_name.underscore.humanize %>',
+      # attributes: [
+      #   {
+      #     name: 'example',
+      #     type: :string,
+      #   },
+      # ]
+    )
+  end
+end

data/lib/generators/cms/widget/templates/model.erb

@@ -0,0 +1,2 @@
+class <%= class_name %> < Widget
+end

data/lib/generators/cms/widget/templates/show.html.erb

@@ -0,0 +1,2 @@
+This is the show view of the <%= class_name %>.
+Edit "app/views/<%= file_name %>/show.html.erb" to change its appearance.

data/lib/generators/cms/widget/templates/thumbnail.html.erb

@@ -0,0 +1,2 @@
+This is the thumbnail view of the <%= class_name %>.
+Edit "app/views/<%= file_name %>/thumbnail.html.erb" to change its appearance.

data/lib/generators/cms/widget/widget_generator.rb

@@ -0,0 +1,30 @@
+module Cms
+  module Generators
+    class WidgetGenerator < ::Rails::Generators::NamedBase
+      include ::Rails::Generators::Migration
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def self.next_migration_number(dirname)
+        max = current_migration_number(dirname)
+        Scrivito::Migration.next_migration_number(max)
+      end
+
+      def generate_model
+        template('model.erb', "app/models/#{file_name}.rb")
+      end
+
+      def generate_views
+        path = "app/views/#{file_name}"
+
+        template('show.html.erb', "#{path}/show.html.erb")
+        template('details.html.erb', "#{path}/details.html.erb")
+        template('thumbnail.html.erb', "#{path}/thumbnail.html.erb")
+      end
+
+      def generate_migration
+        migration_template('migration.erb', "cms/migrate/create_#{file_name}.rb")
+      end
+    end
+  end
+end

data/lib/scrivito/basic_obj.rb

@@ -52,9 +52,12 @@ module Scrivito
     # @example Arrays of {String Strings} allow you to set multi enum fields
     #   Obj.create(:tags => ["ruby", "rails"])
     #
-    # @example Simply pass an Array of {BasicWidget Widgets} to change a widget field
+    # @example Simply pass an Array of {BasicWidget Widgets} to change a widget field. See {BasicWidget#clone Widget#clone} on how to clone a widget.
     #   # Add new widgets
-    #   Obj.create(:widgets => [Widget.new(_obj_class: 'TitleWidget', tite: 'My Title')])
+    #   Obj.create(:widgets => [Widget.new(_obj_class: 'TitleWidget', title: 'My Title')])
+    #
+    #   # Add a widget clone
+    #   Obj.create(:widgets => [another_obj.widgets.first.clone])
     #
     #   # Changing a widget field
     #   obj.update(:widgets => [obj.widgets.first])
@@ -660,25 +663,6 @@ module Scrivito
       instantiate_widget(widget_id, widget_data) if widget_data
     end
 
-    def copy_widget_from(src_obj_id, src_widget_id)
-      raise "cannot copy widget, since workspace is not modifiable" if Workspace.current.published?
-
-      src_obj_content = CmsRestApi.get(cms_rest_api_path(src_obj_id))
-      widget_content = src_obj_content["_widget_pool"]["#{src_widget_id}"]
-
-      raise "cannot copy widget, since widget does not exist" unless widget_content
-
-      src_widget = BasicObj.find(src_obj_id).widget_from_pool(src_widget_id)
-      widget_content.delete_if do |attribute_name, _|
-        src_widget.type_of_attribute(attribute_name) == "widget"
-      end
-      widget_pool_id = BasicObj.generate_widget_pool_id
-
-      CmsRestApi.put(cms_rest_api_path, obj: {_widget_pool: {widget_pool_id => widget_content}})
-
-      widget_pool_id
-    end
-
     # for internal testing purposes only
     def blob_id
       find_blob.try(:id)

data/lib/scrivito/basic_widget.rb

@@ -80,11 +80,32 @@ class BasicWidget
     container.update(container_field_name => new_widget_list)
   end
 
+  # Clones the {BasicWidget Widget}. The clone gets all
+  # attributes of the original widget except nested widget attributes.
+  # The clone is not attached to an {BasicObj Obj} initially.
+  # It only becomes usable by assigning it to a widget attribute of an Obj.
+  #
+  # @example
+  #   # From another_obj, take the first widget in my_widgets,
+  #   # and put a clone in obj's my_widgets.
+  #   obj.update(my_widgets: [another_obj.my_widgets.first.clone])
+  #
+  # @api public
+  def clone
+    attributes = {}
+    data_from_cms.all_custom_attributes.each do |attr_name|
+      if type_of_attribute(attr_name) != 'widget'
+        attributes[attr_name] = read_attribute(attr_name)
+      end
+    end
+    self.class.new(attributes)
+  end
+
   def id
     if @id
       @id
     else
-      raise_not_persisted_errror
+      raise_not_persisted_error
     end
   end
 
@@ -196,7 +217,7 @@ class BasicWidget
     if @obj
       @obj
     else
-      raise_not_persisted_errror
+      raise_not_persisted_error
     end
   end
 
@@ -218,11 +239,11 @@ class BasicWidget
     if persisted?
       super
     else
-      raise_not_persisted_errror
+      raise_not_persisted_error
     end
   end
 
-  def raise_not_persisted_errror
+  def raise_not_persisted_error
     raise ScrivitoError.new('Can not access a new widget before it has been saved')
   end
 

data/lib/scrivito/cms_accessible.rb

@@ -16,7 +16,7 @@ module Scrivito
       @obj = loaded_obj
     end
 
-    # Deliver a binary @obj by redirecting to it's `body_data_url`.
+    # Deliver a binary @obj by redirecting to its `body_data_url`.
     # Will respond with 404 if the @obj has no blob.
     # @api public
     def deliver_file

data/lib/scrivito/content_state_caching.rb

@@ -3,8 +3,8 @@ module Scrivito
 # This module provides advances auto-invalidating caching mechanism for storing obj data.
 #
 # To keep it up-to-date its caches and changes should be updated periodically
-# It's changes should be updated every time a new workspace data has been fetched.
-# It's caches should be updated every time a new obj data has been fetched.
+# Its changes should be updated every time a new workspace data has been fetched.
+# Its caches should be updated every time a new obj data has been fetched.
 module ContentStateCaching
   class << self
     # How deep should a content state chain be inspected. Default depth is 20.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -185,6 +185,12 @@ files:
 - lib/generators/cms/migration/USAGE
 - lib/generators/cms/migration/migration_generator.rb
 - lib/generators/cms/migration/templates/migration.erb
+- lib/generators/cms/widget/templates/details.html.erb
+- lib/generators/cms/widget/templates/migration.erb
+- lib/generators/cms/widget/templates/model.erb
+- lib/generators/cms/widget/templates/show.html.erb
+- lib/generators/cms/widget/templates/thumbnail.html.erb
+- lib/generators/cms/widget/widget_generator.rb
 - lib/obj.rb
 - lib/scrivito/access_denied.rb
 - lib/scrivito/attribute_content.rb