, allowing + # to index only the main text of the page. + main = soup.find(role='main') + if main: + soup = main text = ' '.join(get_text(soup)) return text From b3134c5f83d8f22f8bedf62859c82f5b84781b87 Mon Sep 17 00:00:00 2001 From: Justin Stollsteimer Date: Mon, 10 Jun 2013 13:33:42 -0600 Subject: [PATCH 0610/1061] minor improvements to inline table editor --- widgy/static/widgy/css/widgy.scss | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss index 6dbd1023a..f3e3b4c47 100644 --- a/widgy/static/widgy/css/widgy.scss +++ b/widgy/static/widgy/css/widgy.scss @@ -4,7 +4,7 @@ /* Mixins -----------------------------------------*/ -$table-cell-min-width: 250px; +$table-cell-min-width: 120px; @mixin button { @include rounded(3px); @@ -593,9 +593,9 @@ li.node_drop_target { } span.title { - font-size: 12px; - display: block; - padding: 0 0 0 15px; +// font-size: 12px; + display: none; +// padding: 0 0 0 15px; } button { @@ -689,9 +689,7 @@ li.node_drop_target { min-height: 20px; > p.drag-row { - background: white; - height: 0px; - padding: 0px; + display: none; } } } @@ -702,15 +700,15 @@ li.node_drop_target { p.drag-row { span.dragHandle { font-size: 13px; - left: 0px; + left: 2px; position: absolute; - top: 5px; + top: 3px; } span.title { - font-size: 12px; - display: block; - padding: 0 0 0 15px; +// font-size: 12px; + display: none; +// padding: 0 0 0 15px; } button { @@ -734,6 +732,10 @@ li.node_drop_target { } } } + + textarea { + height: 40px; + } } } } From feeff752ed6a4b4e68232f78502c4eb7fb4690b8 Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Mon, 10 Jun 2013 16:30:50 -0600 Subject: [PATCH 0611/1061] Unicode support for build_url --- widgy/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgy/utils.py b/widgy/utils.py index 01a42d672..9cdcdd7e0 100644 --- a/widgy/utils.py +++ b/widgy/utils.py @@ -1,7 +1,6 @@ """ Some utility functions used throughout the project. """ -import urllib from itertools import ifilterfalse import bs4 @@ -10,6 +9,7 @@ from django.utils.safestring import mark_safe from django.template import Context from django.db import models +from django.utils.http import urlencode try: from django.contrib.auth import get_user_model @@ -94,7 +94,7 @@ def update_context(context, dict): def build_url(path, **kwargs): if kwargs: - path += '?' + urllib.urlencode(kwargs) + path += '?' + urlencode(kwargs) return path From ce9b46574f01781bd8b505f556d15142302f631d Mon Sep 17 00:00:00 2001 From: Justin Stollsteimer Date: Tue, 11 Jun 2013 12:08:57 -0600 Subject: [PATCH 0612/1061] form field position and style updates --- widgy/static/widgy/css/widgy.scss | 100 ++++++++++++++++-------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss index f3e3b4c47..2bc623165 100644 --- a/widgy/static/widgy/css/widgy.scss +++ b/widgy/static/widgy/css/widgy.scss @@ -296,6 +296,50 @@ li.node_drop_target { } } + &.image { + div.widget { + div { + + div { + + &.formField { + position: relative; + + label { + display: none; + } + + a { + img { + float: left; + margin-right: 10px; + } + } + + span { + float: left; + + } + + a.related-lookup { + position: absolute; + height: 10px; + left: 53px; + top: 25px; + } + + input { + float: left; + margin-top: 6px; + width: 86%; + } + + } + } + } + } + } + div.widget { background: white; padding: 0px; @@ -352,42 +396,9 @@ li.node_drop_target { &.formField { margin-bottom: 10px; - - &.image { - padding-left: 80px; - position: relative; - - label { - display: none; - } - - img { - left: 5px; - position: relative; - - &.quiet { - left: 10px; - position: absolute; - top: 10px; - } - } - - a.related-lookup { - float: right; - height: 10px; - top: 21px; - } - - input { - float: left; - margin-top: 6px; - width: 86%; - } - - } .cke { - float: right; + float: left; } &.required { @@ -424,6 +435,13 @@ li.node_drop_target { } } } + + input { + &[type='checkbox'], + &[type='radio'] { + margin-left: 0px; + } + } label { clear: left; @@ -985,20 +1003,6 @@ li.shelfItem { -/* Mezzanine Override */ - -input[type="text"], -input[type="password"], -input.vDateField, -input.vTimeField, -.change-list form table .vAutocompleteSearchField, -.change-list form table .vM2MAutocompleteSearchField, -.inline-tabular .vAutocompleteSearchField, -.inline-tabular .vM2MAutocompleteSearchField { - width: 200px; -} - - /*| HTML and Markdown Preview Pane -----------------------------------------*/ From a48a1fe7475c4b4f553719ecffba7ce27a8c45f3 Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Tue, 11 Jun 2013 13:33:17 -0600 Subject: [PATCH 0613/1061] Lazily populate changed_anything in the template context This isn't always used by the template, and is expensive to calculate. --- widgy/views/versioning.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/widgy/views/versioning.py b/widgy/views/versioning.py index c4910fe47..4041e06d9 100644 --- a/widgy/views/versioning.py +++ b/widgy/views/versioning.py @@ -62,7 +62,9 @@ def get_context_data(self, **kwargs): kwargs['diff_url'] = diff_url(self.site, self.object.working_copy, self.object.head.root_node) - kwargs['changed_anything'] = self.object.has_changes() + + # lazy because the template doesn't always use it + kwargs['changed_anything'] = lambda: self.object.has_changes() return kwargs From 4ff34d771be29bce24e628b64ca47fb7e301403e Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Tue, 21 May 2013 14:09:27 -0600 Subject: [PATCH 0614/1061] Static drop targets --- widgy/static/widgy/css/widgy.scss | 30 ++++++++++++++++------ widgy/static/widgy/js/nodes/nodes.js | 38 +++++++++++++++++++--------- 2 files changed, 48 insertions(+), 20 deletions(-) diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss index 2bc623165..ae6763b0c 100644 --- a/widgy/static/widgy/css/widgy.scss +++ b/widgy/static/widgy/css/widgy.scss @@ -166,29 +166,44 @@ textarea { li.node_drop_target { @include rounded(3px); @include transition; - border: 1px dashed lighten($green,10%) !important; + + border: none !important; background: lighten($green,25%) !important; font-size: 1.0em !important; font-style: italic !important; - height: auto !important; - margin: 0.75em 1em !important; - padding: 0.25em !important; + height: 1em !important; + margin: -1em 1em !important; + padding: 0em !important; text-align: center; - + span { display: none; } + &:first-child { + margin-top: 0 !important; + } + + &:last-child, + &.previous.nm { + margin-bottom: 0 !important; + } + &.active { border: 1px dashed $green !important; background: lighten($green,40%) !important; color: darken($green,10%) !important; - margin: 0.25em 1em !important; - + height: 3em !important; + padding: 1em !important; + span { display: block; } } + + &.previous { + background: #FF9900 !important; + } } @mixin widgetNodeChildren { @@ -235,7 +250,6 @@ li.node_drop_target { // drag & drop styles &.being_dragged { @include shadow(#999999, 2px, 2px, 5px); - background-color: blue; margin: 0 !important; position: fixed; } diff --git a/widgy/static/widgy/js/nodes/nodes.js b/widgy/static/widgy/js/nodes/nodes.js index 4ff6d6879..29c4cd36a 100644 --- a/widgy/static/widgy/js/nodes/nodes.js +++ b/widgy/static/widgy/js/nodes/nodes.js @@ -298,23 +298,33 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ }); } - if (this.canAcceptChild(view)) - { - $children.prepend(this.createDropTarget().el); + if (this.canAcceptChild(view)) { + $children.prepend(this.createDropTarget(view).el); this.list.each(function(node_view) { - var drop_target = that.createDropTarget().$el.insertAfter(node_view.el); - - if ( mine && view == node_view ) - drop_target.hide(); - }); + var drop_target = that.createDropTarget(view).$el.insertAfter(node_view.el); + }, this); } }, - createDropTarget: function() { + createDropTarget: function(view) { var drop_target = new DropTargetView(); drop_target.on('dropped', this.dropChildView); this.drop_targets_list.push(drop_target); + if ( this.list.contains(view) ) { + var view_index = this.list.list.indexOf(view), + target_index = this.drop_targets_list.list.length - 1; + if ( view_index == target_index ) { + drop_target.activate().$el + .addClass('previous') + .attr('style', function(i, s) { return (s||'') + ' height: '+ view.$el.height() +'px !important;'; }); + if ( view_index == this.list.list.length - 1 ) + drop_target.$el.addClass('nm'); + } else if ( view_index == target_index - 1 ) { + drop_target.$el.hide(); + } + } + return drop_target.render(); }, @@ -549,9 +559,10 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ 'opacity': 0, 'width': '100%', 'height': '100%', + 'padding': '20px 40px', 'position': 'absolute', - 'top': 0, - 'left': 0 + 'top': '-20px', + 'left': '-40px' }); this.$el.prepend($pointerEventsCatcher); @@ -560,10 +571,13 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ activate: function(event) { this.$el.addClass('active'); + return this; }, deactivate: function(event) { - this.$el.removeClass('active'); + this.$el.removeClass('active') + .css('height', ''); + return this; } }); From 7c29da869d089f6c4cf2c7cb2ed0127a499a2177 Mon Sep 17 00:00:00 2001 From: Antoine Catton Date: Mon, 10 Jun 2013 16:51:10 -0600 Subject: [PATCH 0615/1061] Move History Link from the page to the Widgy field --- .../templates/widgy/page_builder/widgypage_change_form.html | 3 --- widgy/contrib/widgy_mezzanine/admin.py | 2 -- widgy/forms.py | 1 + widgy/templates/widgy/versioned_widgy_field_base.html | 1 + 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/widgy/contrib/page_builder/templates/widgy/page_builder/widgypage_change_form.html b/widgy/contrib/page_builder/templates/widgy/page_builder/widgypage_change_form.html index 9c9ec0cd5..34e9f4bdf 100644 --- a/widgy/contrib/page_builder/templates/widgy/page_builder/widgypage_change_form.html +++ b/widgy/contrib/page_builder/templates/widgy/page_builder/widgypage_change_form.html @@ -2,9 +2,6 @@ {% load i18n %} {% block object-tools %}
    - {% if history_url %} -
  • {% trans "History" %}
    • - {% endif %} {% if has_absolute_url %}
  • {% trans "View on site" %}
    • {% endif%} diff --git a/widgy/contrib/widgy_mezzanine/admin.py b/widgy/contrib/widgy_mezzanine/admin.py index bae918f48..16f1f4931 100644 --- a/widgy/contrib/widgy_mezzanine/admin.py +++ b/widgy/contrib/widgy_mezzanine/admin.py @@ -52,8 +52,6 @@ def render_change_form(self, request, context, *args, **kwargs): # we are rendering a change form obj = context['original'] site = self.get_site() - context['history_url'] = site.reverse(site.history_view, - kwargs={'pk': obj.root_node.pk}) return super(WidgyPageAdmin, self).render_change_form(request, context, *args, **kwargs) diff --git a/widgy/forms.py b/widgy/forms.py index fc498f791..50b3cc363 100644 --- a/widgy/forms.py +++ b/widgy/forms.py @@ -142,6 +142,7 @@ def render(self, name, value, attrs=None): context = { 'commit_url': self.site.reverse(self.site.commit_view, kwargs={'pk': value}), 'reset_url': self.site.reverse(self.site.reset_view, kwargs={'pk': value}), + 'history_url': self.site.reverse(self.site.history_view, kwargs={'pk': value}), } return super(VersionedWidgyWidget, self).render(name, value, attrs, context) diff --git a/widgy/templates/widgy/versioned_widgy_field_base.html b/widgy/templates/widgy/versioned_widgy_field_base.html index 229bc8590..d2a757190 100644 --- a/widgy/templates/widgy/versioned_widgy_field_base.html +++ b/widgy/templates/widgy/versioned_widgy_field_base.html @@ -9,6 +9,7 @@ {% block widgy_tools %}
  • {% trans "Commit" %}
  • {% trans "Reset" %}
    • +
  • {% trans "History" %}
    • {% endblock %}
{% compress js %} From 72f78fb7932a9c120b61532ec9a5b2fed04c600e Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Fri, 17 May 2013 16:49:53 -0600 Subject: [PATCH 0616/1061] Made TabbedContainer children editable. --- widgy/contrib/page_builder/models.py | 5 +- widgy/static/widgy/css/widgy.scss | 9 +- widgy/static/widgy/css/widgy_common.scss | 5 + .../widgy/js/components/tabbed/component.js | 52 ++++++--- widgy/static/widgy/js/nodes/nodes.js | 31 +++-- widgy/static/widgy/mixins/tabbed.admin.scss | 107 +++++++++++------- widgy/templates/widgy/preview.html | 6 +- 7 files changed, 142 insertions(+), 73 deletions(-) diff --git a/widgy/contrib/page_builder/models.py b/widgy/contrib/page_builder/models.py index b66484cbe..57f5debf2 100644 --- a/widgy/contrib/page_builder/models.py +++ b/widgy/contrib/page_builder/models.py @@ -13,7 +13,7 @@ from widgy.models import Content from widgy.models.mixins import ( StrictDefaultChildrenMixin, InvisibleMixin, TitleDisplayNameMixin, - DisplayNameMixin, + DisplayNameMixin, TabbedContainer ) from widgy.models.links import LinkField, LinkFormField, LinkFormMixin from widgy.db.fields import WidgyField @@ -191,7 +191,8 @@ class Meta: @widgy.register -class Tabs(Accordion): +class Tabs(TabbedContainer, Accordion): + class Meta: proxy = True verbose_name = _('tabs') diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss index ae6763b0c..d0c4b5a7a 100644 --- a/widgy/static/widgy/css/widgy.scss +++ b/widgy/static/widgy/css/widgy.scss @@ -385,10 +385,11 @@ li.node_drop_target { top: 3px; right: 3px; z-index: 10; - - &.edit { - right: 74px; - } + } + + // If you nest this in the previous statement the selector becomes .edit.edit, which is too specific. + button.edit { + right: 74px; } .dragHandle { diff --git a/widgy/static/widgy/css/widgy_common.scss b/widgy/static/widgy/css/widgy_common.scss index 65c836791..6455e187f 100644 --- a/widgy/static/widgy/css/widgy_common.scss +++ b/widgy/static/widgy/css/widgy_common.scss @@ -122,6 +122,11 @@ table { display: table; width: 100% !important; } } +@mixin box-sizing($box-sizing) { + box-sizing: $box-sizing; + -moz-box-sizing: $box-sizing; +} + /* Variables -----------------------------------------------*/ diff --git a/widgy/static/widgy/js/components/tabbed/component.js b/widgy/static/widgy/js/components/tabbed/component.js index 2efa2576f..182c37497 100644 --- a/widgy/static/widgy/js/components/tabbed/component.js +++ b/widgy/static/widgy/js/components/tabbed/component.js @@ -5,6 +5,14 @@ define([ 'underscore', 'widgy.backbone', 'components/widget/component' ], functi 'click .tabbed > .widget > .node_children .drag-row': 'showTabClick' }), + initialize: function() { + widget.View.prototype.initialize.apply(this, arguments); + + _.bindAll(this, + 'stealThingsFromChild' + ); + }, + showTabClick: function(event) { if ( $(event.target).is('.preview') ) return; @@ -42,28 +50,40 @@ define([ 'underscore', 'widgy.backbone', 'components/widget/component' ], functi }); }, - renderPromise: function() { - return widget.View.prototype.renderPromise.apply(this, arguments).then(function(view) { + renderChildren: function() { + var parent = this; + return widget.View.prototype.renderChildren.apply(this, arguments).then(function() { // Show the first tab on first render. // Does this always work? - view.showTab(view.list.list[0]); + if ( parent.list.list.length ) + parent.showTab(parent.list.list[0]); - return view; + return parent; }); }, - addChildPromise: function() { - var parent = this; - return widget.View.prototype.addChildPromise.apply(this, arguments).then(function(child_view) { - if ( child_view.hasShelf() ) { - console.log('addChildPromise'); - child_view.shelf.$el.hide().appendTo(parent.$current); - } - child_view.$preview.hide().appendTo(parent.$current); - child_view.$children.hide().appendTo(parent.$current); - - return child_view; - }); + stealThingsFromChild: function(child_view) { + if ( child_view.hasShelf() ) { + child_view.shelf.$el.hide().appendTo(this.$current); + } + child_view.$preview.hide().appendTo(this.$current); + child_view.$children.hide().appendTo(this.$current); + + this.showTab(child_view); + + return child_view; + }, + + listenToChildEvents: function(child_view) { + widget.View.prototype.listenToChildEvents.apply(this, arguments); + this.listenTo(child_view, 'rendered', this.stealThingsFromChild); + return child_view; + }, + + createDropTarget: function(view) { + var drop_target = widget.View.prototype.createDropTarget.apply(this, arguments); + drop_target.$el.css('height', ''); + return drop_target; } }); diff --git a/widgy/static/widgy/js/nodes/nodes.js b/widgy/static/widgy/js/nodes/nodes.js index 29c4cd36a..8f4e3a7bf 100644 --- a/widgy/static/widgy/js/nodes/nodes.js +++ b/widgy/static/widgy/js/nodes/nodes.js @@ -55,6 +55,7 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ 'rerender', 'popOut', 'popIn', + 'listenToChildEvents', 'closeSubwindow' ); @@ -112,6 +113,14 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ }); }, + listenToChildEvents: function(child_view) { + this + .listenTo(child_view, 'startDrag', this.startDrag) + .listenTo(child_view, 'stopDrag', this.stopDrag); + + return child_view; + }, + addChildPromise: function(node, collection, options) { var parent = this; @@ -121,16 +130,14 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ }); return node.ready(function(model) { - var node_view = new model.component.View({ + return new model.component.View({ model: node, parent: parent, app: parent.app }); - - parent - .listenTo(node_view, 'startDrag', parent.startDrag) - .listenTo(node_view, 'stopDrag', parent.stopDrag); - + }) + .then(this.listenToChildEvents) + .then(function(node_view) { parent.app.node_view_list.push(node_view); if ( options && options.index ) { parent.list.list.splice(options.index, 0, node_view); @@ -388,9 +395,17 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ }, rerender: function() { + this.cleanUp(); this.renderPromise().done(); }, + cleanUp: function() { + this.$children.remove(); + this.$preview.remove(); + if (this.shelf) + this.shelf.close(); + }, + renderNode: function() { return DraggableView.prototype.renderPromise.apply(this, arguments).then(function(view) { view.$children = view.$(' > .widget > .node_children'); @@ -410,6 +425,8 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ if ( view.app.compatibility_data ) view.app.updateCompatibility(view.app.compatibility_data); + view.trigger('rendered', view); + return view; }); }); @@ -433,8 +450,6 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ renderShelf: function() { console.log('renderShelf'); - if (this.shelf) - this.shelf.remove(); var shelf = this.shelf = new shelves.ShelfView({ collection: new shelves.ShelfCollection({ diff --git a/widgy/static/widgy/mixins/tabbed.admin.scss b/widgy/static/widgy/mixins/tabbed.admin.scss index 16fe24b48..1a8be20b5 100644 --- a/widgy/static/widgy/mixins/tabbed.admin.scss +++ b/widgy/static/widgy/mixins/tabbed.admin.scss @@ -1,10 +1,4 @@ -@mixin rounded($radius) { - border-radius: $radius !important; - -o-border-radius: $radius !important; - -ms-border-radius: $radius !important; - -moz-border-radius: $radius !important; - -webkit-border-radius: $radius !important; -} +@import "widgy_common"; /* div.widgy div.editor section.node div.widget > ul.nodeChildren { @@ -12,60 +6,93 @@ div.widgy div.editor section.node div.widget > ul.nodeChildren { } */ -div.widgy div.editor section.tabbed > div.widget > ul.nodeChildren { - float: left !important; - width: 63% !important; +div.widgy div.editor .tabbed { + > .widget { + @include clearfix; + } +} + +div.widgy div.editor .tabbed > div.widget > ul.nodeChildren { + @include box-sizing(border-box); > li { @include rounded(4px 4px 0px 0px); - background: #eeeeee !important; - border-color: #cccccc; - border-width: 1px 1px 0px 1px; - color: #999999; display: inline-block; float: left; margin: 0 0 0 .5em !important; padding: 0px 5px !important; position: relative; top: 2px; - z-index: 10; - .widget { - background: transparent !important; + &.node { + background: #eeeeee !important; + border-color: #cccccc; + border-width: 1px 1px 0px 1px; + color: #999999; - .drag-row { - @include rounded(0px); - background: transparent !important; + &.active { + background-color: #fafafa !important; + border-bottom: 2px solid #fafafa; + color: #555555; - span.title { - color: inherit; + .edit, .delete { + display: inline; } + } - .edit, // functionality for editing the tab doesn't exist yet. - .delete span { - display: none; - } + .widget { + background: transparent !important; - .preview { - background: transparent; - display: inline; + .drag-row { + @include rounded(0px); + background: transparent !important; + + span.title { + color: inherit; + } + + .edit span, // functionality for editing the tab doesn't exist yet. + .delete span { + display: none; + } + + button.edit, + button.delete { + position: static !important; + } + + .preview { + background: transparent; + display: inline; + } } } - } - .preview, - .nodeChildren { - display: none; - } + .preview, + .nodeChildren { + display: none; + } + + &:hover { + background-color: white !important; + } - &:hover { - background-color: white !important; + .edit, .delete { + display: none; + } } - &.active { - background-color: #fafafa !important; - border-bottom: 2px solid #fafafa; - color: #555555; + &.node_drop_target { + height: 24px !important; + width: 50px; + + &.active { + width: 100px; + + span { + display: none; + } + } } } } diff --git a/widgy/templates/widgy/preview.html b/widgy/templates/widgy/preview.html index 2be6fe3af..b16546407 100644 --- a/widgy/templates/widgy/preview.html +++ b/widgy/templates/widgy/preview.html @@ -10,12 +10,12 @@ {{ self.display_name|capfirst }} {% endblock %} - {% if self.deletable %} - - {% endif %} {% if self.editable %} {% endif %} + {% if self.deletable %} + + {% endif %} {% if self.pop_out %} {% trans "pop out" %} {% endif %} From 7bd3d94c87a9ebb5362fe8d7a04890221bc046ba Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Mon, 20 May 2013 11:38:33 -0600 Subject: [PATCH 0617/1061] Optional dragTimeout for DraggableView. This allows us to delay dragging for TabbedContainer children. --- .../widgy/js/components/tabbed/component.js | 5 +++-- widgy/static/widgy/js/nodes/base.js | 19 +++++++++++++++++-- widgy/static/widgy/js/nodes/nodes.js | 6 +++--- widgy/static/widgy/js/shelves/shelves.js | 6 +----- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/widgy/static/widgy/js/components/tabbed/component.js b/widgy/static/widgy/js/components/tabbed/component.js index 182c37497..56891343f 100644 --- a/widgy/static/widgy/js/components/tabbed/component.js +++ b/widgy/static/widgy/js/components/tabbed/component.js @@ -74,9 +74,10 @@ define([ 'underscore', 'widgy.backbone', 'components/widget/component' ], functi return child_view; }, - listenToChildEvents: function(child_view) { - widget.View.prototype.listenToChildEvents.apply(this, arguments); + prepareChild: function(child_view) { + widget.View.prototype.prepareChild.apply(this, arguments); this.listenTo(child_view, 'rendered', this.stealThingsFromChild); + child_view.dragTimeout = 100; return child_view; }, diff --git a/widgy/static/widgy/js/nodes/base.js b/widgy/static/widgy/js/nodes/base.js index f7548cfcc..6c8d7848d 100644 --- a/widgy/static/widgy/js/nodes/base.js +++ b/widgy/static/widgy/js/nodes/base.js @@ -15,9 +15,10 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( var DraggablewView = Backbone.View.extend({ tagName: 'li', className: 'node', + dragTimeout: 0, events: Backbone.extendEvents(Backbone.View, { - 'mousedown .drag-row': 'startBeingDragged' + 'mousedown .drag-row': 'onMouseDown' }), initialize: function(options) { @@ -53,7 +54,7 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( }); }, - startBeingDragged: function(event) { + onMouseDown: function(event) { event.preventDefault(); event.stopPropagation(); @@ -64,6 +65,20 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( if ( ! this.app.ready() ) return; + var _continue = true; + + this.$el.on('mouseup.draggable-timeout', function() { + _continue = false; + }); + + setTimeout(_.bind(function() { + this.$el.off('.draggable-timeout'); + if ( _continue ) + this.startBeingDragged(event); + }, this), this.dragTimeout); + }, + + startBeingDragged: function(event) { // Store the mouse offset in this container for followMouse to use. We // need to get this before `this.app.startDrag`, otherwise the drop // targets screw everything up. diff --git a/widgy/static/widgy/js/nodes/nodes.js b/widgy/static/widgy/js/nodes/nodes.js index 8f4e3a7bf..ad44bc8b5 100644 --- a/widgy/static/widgy/js/nodes/nodes.js +++ b/widgy/static/widgy/js/nodes/nodes.js @@ -55,7 +55,7 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ 'rerender', 'popOut', 'popIn', - 'listenToChildEvents', + 'prepareChild', 'closeSubwindow' ); @@ -113,7 +113,7 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ }); }, - listenToChildEvents: function(child_view) { + prepareChild: function(child_view) { this .listenTo(child_view, 'startDrag', this.startDrag) .listenTo(child_view, 'stopDrag', this.stopDrag); @@ -136,7 +136,7 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ app: parent.app }); }) - .then(this.listenToChildEvents) + .then(this.prepareChild) .then(function(node_view) { parent.app.node_view_list.push(node_view); if ( options && options.index ) { diff --git a/widgy/static/widgy/js/shelves/shelves.js b/widgy/static/widgy/js/shelves/shelves.js index 8fc05a942..fb9c39ef4 100644 --- a/widgy/static/widgy/js/shelves/shelves.js +++ b/widgy/static/widgy/js/shelves/shelves.js @@ -141,7 +141,7 @@ define([ 'exports', 'underscore', 'widgy.backbone', 'nodes/base', // Override the DraggableView events, I want the whole thing draggable, not // just the drag handle. events: Backbone.extendEvents(DraggableView, { - 'mousedown': 'startBeingDragged' + 'mousedown': 'onMouseDown' }), canAcceptParent: function(parent) { @@ -151,10 +151,6 @@ define([ 'exports', 'underscore', 'widgy.backbone', 'nodes/base', startBeingDragged: function(event) { DraggableView.prototype.startBeingDragged.apply(this, arguments); - // only on a left click. - if ( event.which !== 1 ) - return; - var placeholder = this.placeholder = $('
  •  
    • ').css({ width: this.$el.width() }); From 497dbf381cd181d2c5d2d8bb58bebde48e83b22e Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Mon, 10 Jun 2013 11:00:47 -0600 Subject: [PATCH 0618/1061] Got JS tests running again. - remove depedencies on node versions of modules - switched to amdjs/backbone and underscore - upgraded to backbone 1.0 --- js_tests/package.json | 4 - js_tests/tests/setup.js | 7 +- js_tests/tests/test_node.js | 2 +- widgy/static/widgy/js/lib/backbone.js | 1371 +++++++++++----------- widgy/static/widgy/js/lib/underscore.js | 71 +- widgy/static/widgy/js/main.js | 19 +- widgy/static/widgy/js/nodes/models.js | 6 +- widgy/static/widgy/js/shelves/shelves.js | 2 +- widgy/static/widgy/js/widgy.backbone.js | 2 +- 9 files changed, 761 insertions(+), 723 deletions(-) diff --git a/js_tests/package.json b/js_tests/package.json index d0b64a816..18711126f 100644 --- a/js_tests/package.json +++ b/js_tests/package.json @@ -7,10 +7,6 @@ "test": "tests" }, "dependencies": { - "jquery": ">=1.8.3", - "mustache": ">=0.7.2", - "underscore": "1.4.4", - "backbone": ">=0.9.10", "jsdom": "~0.3.4", "requirejs": "~2.1.4", "chai": "~1.4.2" diff --git a/js_tests/tests/setup.js b/js_tests/tests/setup.js index 2b59180f1..6ebf1cc81 100644 --- a/js_tests/tests/setup.js +++ b/js_tests/tests/setup.js @@ -10,13 +10,16 @@ global.window = global.window = global.document.createWindow(); requirejs.config({ baseUrl: path.join(__dirname, "../../widgy/static/widgy/js/"), paths: { + 'jquery': './lib/jquery', + 'underscore': './lib/underscore', + 'backbone': './lib/backbone', 'text': 'require/text' } }); // Backbone expects window.jQuery to be set. -var Backbone = requirejs('backbone'), - jQuery = requirejs('jquery'); +var Backbone = requirejs('lib/backbone'), + jQuery = requirejs('lib/jquery'); Backbone.$ = jQuery; diff --git a/js_tests/tests/test_node.js b/js_tests/tests/test_node.js index 1587a15a6..f67321430 100644 --- a/js_tests/tests/test_node.js +++ b/js_tests/tests/test_node.js @@ -177,7 +177,7 @@ describe('NodeCollection', function() { assert.equal(node1.children.length, 1); return Q.all([node1.ready(), node2.ready()]).then(function() { - x.update2([ + x.set2([ { url: 1, children: [ diff --git a/widgy/static/widgy/js/lib/backbone.js b/widgy/static/widgy/js/lib/backbone.js index 7391faac3..8b4f60c45 100644 --- a/widgy/static/widgy/js/lib/backbone.js +++ b/widgy/static/widgy/js/lib/backbone.js @@ -1,47 +1,46 @@ -// Backbone.js 0.9.9 +// Backbone.js 1.0.0 -// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc. +// (c) 2010-2013 Jeremy Ashkenas, DocumentCloud Inc. // Backbone may be freely distributed under the MIT license. // For all details and documentation: // http://backbonejs.org -(function(){ +(function(root, factory) { + // Set up Backbone appropriately for the environment. + if (typeof exports !== 'undefined') { + // Node/CommonJS, no need for jQuery in that case. + factory(root, exports, require('underscore')); + } else if (typeof define === 'function' && define.amd) { + // AMD + define(['underscore', 'jquery', 'exports'], function(_, $, exports) { + // Export global even in AMD case in case this script is loaded with + // others that may still expect a global Backbone. + root.Backbone = factory(root, exports, _, $); + }); + } else { + // Browser globals + root.Backbone = factory(root, {}, root._, (root.jQuery || root.Zepto || root.ender || root.$)); + } +}(this, function(root, Backbone, _, $) { // Initial Setup // ------------- - // Save a reference to the global object (`window` in the browser, `exports` - // on the server). - var root = this; - // Save the previous value of the `Backbone` variable, so that it can be // restored later on, if `noConflict` is used. var previousBackbone = root.Backbone; - // Create a local reference to array methods. + // Create local references to array methods we'll want to use later. var array = []; var push = array.push; var slice = array.slice; var splice = array.splice; - // The top-level namespace. All public Backbone classes and modules will - // be attached to this. Exported for both CommonJS and the browser. - var Backbone; - if (typeof exports !== 'undefined') { - Backbone = exports; - } else { - Backbone = root.Backbone = {}; - } - // Current version of the library. Keep in sync with `package.json`. - Backbone.VERSION = '0.9.9'; - - // Require Underscore, if we're on the server, and it's not already present. - var _ = root._; - if (!_ && (typeof require !== 'undefined')) _ = require('underscore'); + Backbone.VERSION = '1.0.0'; // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable. - Backbone.$ = root.jQuery || root.Zepto || root.ender; + Backbone.$ = $; // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable // to its previous owner. Returns a reference to this Backbone object. @@ -64,45 +63,6 @@ // Backbone.Events // --------------- - // Regular expression used to split event strings. - var eventSplitter = /\s+/; - - // Implement fancy features of the Events API such as multiple event - // names `"change blur"` and jQuery-style event maps `{change: action}` - // in terms of the existing API. - var eventsApi = function(obj, action, name, rest) { - if (!name) return true; - if (typeof name === 'object') { - for (var key in name) { - obj[action].apply(obj, [key, name[key]].concat(rest)); - } - } else if (eventSplitter.test(name)) { - var names = name.split(eventSplitter); - for (var i = 0, l = names.length; i < l; i++) { - obj[action].apply(obj, [names[i]].concat(rest)); - } - } else { - return true; - } - }; - - // Optimized internal dispatch function for triggering events. Tries to - // keep the usual cases speedy (most Backbone events have 3 arguments). - var triggerEvents = function(obj, events, args) { - var ev, i = -1, l = events.length; - switch (args.length) { - case 0: while (++i < l) (ev = events[i]).callback.call(ev.ctx); - return; - case 1: while (++i < l) (ev = events[i]).callback.call(ev.ctx, args[0]); - return; - case 2: while (++i < l) (ev = events[i]).callback.call(ev.ctx, args[0], args[1]); - return; - case 3: while (++i < l) (ev = events[i]).callback.call(ev.ctx, args[0], args[1], args[2]); - return; - default: while (++i < l) (ev = events[i]).callback.apply(ev.ctx, args); - } - }; - // A module that can be mixed in to *any object* in order to provide it with // custom events. You may bind with `on` or remove with `off` callback // functions to an event; `trigger`-ing an event fires all callbacks in @@ -115,37 +75,35 @@ // var Events = Backbone.Events = { - // Bind one or more space separated events, or an events map, - // to a `callback` function. Passing `"all"` will bind the callback to - // all events fired. + // Bind an event to a `callback` function. Passing `"all"` will bind + // the callback to all events fired. on: function(name, callback, context) { - if (!(eventsApi(this, 'on', name, [callback, context]) && callback)) return this; + if (!eventsApi(this, 'on', name, [callback, context]) || !callback) return this; this._events || (this._events = {}); - var list = this._events[name] || (this._events[name] = []); - list.push({callback: callback, context: context, ctx: context || this}); + var events = this._events[name] || (this._events[name] = []); + events.push({callback: callback, context: context, ctx: context || this}); return this; }, - // Bind events to only be triggered a single time. After the first time + // Bind an event to only be triggered a single time. After the first time // the callback is invoked, it will be removed. once: function(name, callback, context) { - if (!(eventsApi(this, 'once', name, [callback, context]) && callback)) return this; + if (!eventsApi(this, 'once', name, [callback, context]) || !callback) return this; var self = this; var once = _.once(function() { self.off(name, once); callback.apply(this, arguments); }); once._callback = callback; - this.on(name, once, context); - return this; + return this.on(name, once, context); }, // Remove one or many callbacks. If `context` is null, removes all // callbacks with that function. If `callback` is null, removes all - // callbacks for the event. If `events` is null, removes all bound + // callbacks for the event. If `name` is null, removes all bound // callbacks for all events. off: function(name, callback, context) { - var list, ev, events, names, i, l, j, k; + var retain, ev, events, names, i, l, j, k; if (!this._events || !eventsApi(this, 'off', name, [callback, context])) return this; if (!name && !callback && !context) { this._events = {}; @@ -155,18 +113,18 @@ names = name ? [name] : _.keys(this._events); for (i = 0, l = names.length; i < l; i++) { name = names[i]; - if (list = this._events[name]) { - events = []; + if (events = this._events[name]) { + this._events[name] = retain = []; if (callback || context) { - for (j = 0, k = list.length; j < k; j++) { - ev = list[j]; - if ((callback && callback !== (ev.callback._callback || ev.callback)) || + for (j = 0, k = events.length; j < k; j++) { + ev = events[j]; + if ((callback && callback !== ev.callback && callback !== ev.callback._callback) || (context && context !== ev.context)) { - events.push(ev); + retain.push(ev); } } } - this._events[name] = events; + if (!retain.length) delete this._events[name]; } } @@ -183,39 +141,87 @@ if (!eventsApi(this, 'trigger', name, args)) return this; var events = this._events[name]; var allEvents = this._events.all; - if (events) triggerEvents(this, events, args); - if (allEvents) triggerEvents(this, allEvents, arguments); - return this; - }, - - // An inversion-of-control version of `on`. Tell *this* object to listen to - // an event in another object ... keeping track of what it's listening to. - listenTo: function(object, events, callback) { - var listeners = this._listeners || (this._listeners = {}); - var id = object._listenerId || (object._listenerId = _.uniqueId('l')); - listeners[id] = object; - object.on(events, callback || this, this); + if (events) triggerEvents(events, args); + if (allEvents) triggerEvents(allEvents, arguments); return this; }, // Tell this object to stop listening to either specific events ... or // to every object it's currently listening to. - stopListening: function(object, events, callback) { + stopListening: function(obj, name, callback) { var listeners = this._listeners; - if (!listeners) return; - if (object) { - object.off(events, callback, this); - if (!events && !callback) delete listeners[object._listenerId]; - } else { - for (var id in listeners) { - listeners[id].off(null, null, this); - } - this._listeners = {}; + if (!listeners) return this; + var deleteListener = !name && !callback; + if (typeof name === 'object') callback = this; + if (obj) (listeners = {})[obj._listenerId] = obj; + for (var id in listeners) { + listeners[id].off(name, callback, this); + if (deleteListener) delete this._listeners[id]; } return this; } + + }; + + // Regular expression used to split event strings. + var eventSplitter = /\s+/; + + // Implement fancy features of the Events API such as multiple event + // names `"change blur"` and jQuery-style event maps `{change: action}` + // in terms of the existing API. + var eventsApi = function(obj, action, name, rest) { + if (!name) return true; + + // Handle event maps. + if (typeof name === 'object') { + for (var key in name) { + obj[action].apply(obj, [key, name[key]].concat(rest)); + } + return false; + } + + // Handle space separated event names. + if (eventSplitter.test(name)) { + var names = name.split(eventSplitter); + for (var i = 0, l = names.length; i < l; i++) { + obj[action].apply(obj, [names[i]].concat(rest)); + } + return false; + } + + return true; + }; + + // A difficult-to-believe, but optimized internal dispatch function for + // triggering events. Tries to keep the usual cases speedy (most internal + // Backbone events have 3 arguments). + var triggerEvents = function(events, args) { + var ev, i = -1, l = events.length, a1 = args[0], a2 = args[1], a3 = args[2]; + switch (args.length) { + case 0: while (++i < l) (ev = events[i]).callback.call(ev.ctx); return; + case 1: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1); return; + case 2: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2); return; + case 3: while (++i < l) (ev = events[i]).callback.call(ev.ctx, a1, a2, a3); return; + default: while (++i < l) (ev = events[i]).callback.apply(ev.ctx, args); + } }; + var listenMethods = {listenTo: 'on', listenToOnce: 'once'}; + + // Inversion-of-control versions of `on` and `once`. Tell *this* object to + // listen to an event in another object ... keeping track of what it's + // listening to. + _.each(listenMethods, function(implementation, method) { + Events[method] = function(obj, name, callback) { + var listeners = this._listeners || (this._listeners = {}); + var id = obj._listenerId || (obj._listenerId = _.uniqueId('l')); + listeners[id] = obj; + if (typeof name === 'object') callback = this; + obj[implementation](name, callback, this); + return this; + }; + }); + // Aliases for backwards compatibility. Events.bind = Events.on; Events.unbind = Events.off; @@ -227,30 +233,41 @@ // Backbone.Model // -------------- - // Create a new model, with defined attributes. A client id (`cid`) + // Backbone **Models** are the basic data object in the framework -- + // frequently representing a row in a table in a database on your server. + // A discrete chunk of data and a bunch of useful, related methods for + // performing computations and transformations on that data. + + // Create a new model with the specified attributes. A client id (`cid`) // is automatically generated and assigned for you. var Model = Backbone.Model = function(attributes, options) { var defaults; var attrs = attributes || {}; + options || (options = {}); this.cid = _.uniqueId('c'); - this.changed = {}; this.attributes = {}; - this._changes = []; - if (options && options.collection) this.collection = options.collection; - if (options && options.parse) attrs = this.parse(attrs); - if (defaults = _.result(this, 'defaults')) _.defaults(attrs, defaults); - this.set(attrs, {silent: true}); - this._currentAttributes = _.clone(this.attributes); - this._previousAttributes = _.clone(this.attributes); + _.extend(this, _.pick(options, modelOptions)); + if (options.parse) attrs = this.parse(attrs, options) || {}; + if (defaults = _.result(this, 'defaults')) { + attrs = _.defaults({}, attrs, defaults); + } + this.set(attrs, options); + this.changed = {}; this.initialize.apply(this, arguments); }; + // A list of options to be attached directly to the model, if provided. + var modelOptions = ['url', 'urlRoot', 'collection']; + // Attach all inheritable methods to the Model prototype. _.extend(Model.prototype, Events, { // A hash of attributes whose current and previous value differ. changed: null, + // The value returned during the last failed validation. + validationError: null, + // The default name for the JSON `id` attribute is `"id"`. MongoDB and // CouchDB users may want to set this to `"_id"`. idAttribute: 'id', @@ -264,7 +281,8 @@ return _.clone(this.attributes); }, - // Proxy `Backbone.sync` by default. + // Proxy `Backbone.sync` by default -- but override this if you need + // custom syncing semantics for *this* particular model. sync: function() { return Backbone.sync.apply(this, arguments); }, @@ -285,76 +303,140 @@ return this.get(attr) != null; }, - // Set a hash of model attributes on the object, firing `"change"` unless - // you choose to silence it. + // Set a hash of model attributes on the object, firing `"change"`. This is + // the core primitive operation of a model, updating the data and notifying + // anyone who needs to know about the change in state. The heart of the beast. set: function(key, val, options) { - var attr, attrs; + var attr, attrs, unset, changes, silent, changing, prev, current; if (key == null) return this; // Handle both `"key", value` and `{key: value}` -style arguments. - if (_.isObject(key)) { + if (typeof key === 'object') { attrs = key; options = val; } else { (attrs = {})[key] = val; } - // Extract attributes and options. - var silent = options && options.silent; - var unset = options && options.unset; + options || (options = {}); // Run validation. if (!this._validate(attrs, options)) return false; + // Extract attributes and options. + unset = options.unset; + silent = options.silent; + changes = []; + changing = this._changing; + this._changing = true; + + if (!changing) { + this._previousAttributes = _.clone(this.attributes); + this.changed = {}; + } + current = this.attributes, prev = this._previousAttributes; + // Check for changes of `id`. if (this.idAttribute in attrs) this.id = attrs[this.idAttribute]; - var now = this.attributes; - - // For each `set` attribute... + // For each `set` attribute, update or delete the current value. for (attr in attrs) { val = attrs[attr]; - - // Update or delete the current value, and track the change. - unset ? delete now[attr] : now[attr] = val; - this._changes.push(attr, val); + if (!_.isEqual(current[attr], val)) changes.push(attr); + if (!_.isEqual(prev[attr], val)) { + this.changed[attr] = val; + } else { + delete this.changed[attr]; + } + unset ? delete current[attr] : current[attr] = val; } - // Signal that the model's state has potentially changed, and we need - // to recompute the actual changes. - this._hasComputed = false; + // Trigger all relevant attribute changes. + if (!silent) { + if (changes.length) this._pending = true; + for (var i = 0, l = changes.length; i < l; i++) { + this.trigger('change:' + changes[i], this, current[changes[i]], options); + } + } - // Fire the `"change"` events. - if (!silent) this.change(options); + // You might be wondering why there's a `while` loop here. Changes can + // be recursively nested within `"change"` events. + if (changing) return this; + if (!silent) { + while (this._pending) { + this._pending = false; + this.trigger('change', this, options); + } + } + this._pending = false; + this._changing = false; return this; }, - // Remove an attribute from the model, firing `"change"` unless you choose - // to silence it. `unset` is a noop if the attribute doesn't exist. + // Remove an attribute from the model, firing `"change"`. `unset` is a noop + // if the attribute doesn't exist. unset: function(attr, options) { return this.set(attr, void 0, _.extend({}, options, {unset: true})); }, - // Clear all attributes on the model, firing `"change"` unless you choose - // to silence it. + // Clear all attributes on the model, firing `"change"`. clear: function(options) { var attrs = {}; for (var key in this.attributes) attrs[key] = void 0; return this.set(attrs, _.extend({}, options, {unset: true})); }, + // Determine if the model has changed since the last `"change"` event. + // If you specify an attribute name, determine if that attribute has changed. + hasChanged: function(attr) { + if (attr == null) return !_.isEmpty(this.changed); + return _.has(this.changed, attr); + }, + + // Return an object containing all the attributes that have changed, or + // false if there are no changed attributes. Useful for determining what + // parts of a view need to be updated and/or what attributes need to be + // persisted to the server. Unset attributes will be set to undefined. + // You can also pass an attributes object to diff against the model, + // determining if there *would be* a change. + changedAttributes: function(diff) { + if (!diff) return this.hasChanged() ? _.clone(this.changed) : false; + var val, changed = false; + var old = this._changing ? this._previousAttributes : this.attributes; + for (var attr in diff) { + if (_.isEqual(old[attr], (val = diff[attr]))) continue; + (changed || (changed = {}))[attr] = val; + } + return changed; + }, + + // Get the previous value of an attribute, recorded at the time the last + // `"change"` event was fired. + previous: function(attr) { + if (attr == null || !this._previousAttributes) return null; + return this._previousAttributes[attr]; + }, + + // Get all of the attributes of the model at the time of the previous + // `"change"` event. + previousAttributes: function() { + return _.clone(this._previousAttributes); + }, + // Fetch the model from the server. If the server's representation of the - // model differs from its current attributes, they will be overriden, + // model differs from its current attributes, they will be overridden, // triggering a `"change"` event. fetch: function(options) { options = options ? _.clone(options) : {}; if (options.parse === void 0) options.parse = true; var model = this; var success = options.success; - options.success = function(resp, status, xhr) { - if (!model.set(model.parse(resp), options)) return false; + options.success = function(resp) { + if (!model.set(model.parse(resp, options), options)) return false; if (success) success(model, resp, options); + model.trigger('sync', model, resp, options); }; + wrapError(this, options); return this.sync('read', this, options); }, @@ -362,55 +444,53 @@ // If the server returns an attributes hash that differs, the model's // state will be `set` again. save: function(key, val, options) { - var attrs, current, done; + var attrs, method, xhr, attributes = this.attributes; // Handle both `"key", value` and `{key: value}` -style arguments. - if (key == null || _.isObject(key)) { + if (key == null || typeof key === 'object') { attrs = key; options = val; - } else if (key != null) { + } else { (attrs = {})[key] = val; } - options = options ? _.clone(options) : {}; - // If we're "wait"-ing to set changed attributes, validate early. - if (options.wait) { - if (attrs && !this._validate(attrs, options)) return false; - current = _.clone(this.attributes); - } + // If we're not waiting and attributes exist, save acts as `set(attr).save(null, opts)`. + if (attrs && (!options || !options.wait) && !this.set(attrs, options)) return false; - // Regular saves `set` attributes before persisting to the server. - var silentOptions = _.extend({}, options, {silent: true}); - if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) { - return false; - } + options = _.extend({validate: true}, options); // Do not persist invalid models. - if (!attrs && !this._validate(null, options)) return false; + if (!this._validate(attrs, options)) return false; + + // Set temporary attributes if `{wait: true}`. + if (attrs && options.wait) { + this.attributes = _.extend({}, attributes, attrs); + } // After a successful server-side save, the client is (optionally) // updated with the server-side state. + if (options.parse === void 0) options.parse = true; var model = this; var success = options.success; - options.success = function(resp, status, xhr) { - done = true; - var serverAttrs = model.parse(resp); + options.success = function(resp) { + // Ensure attributes are restored during synchronous saves. + model.attributes = attributes; + var serverAttrs = model.parse(resp, options); if (options.wait) serverAttrs = _.extend(attrs || {}, serverAttrs); - if (!model.set(serverAttrs, options)) return false; + if (_.isObject(serverAttrs) && !model.set(serverAttrs, options)) { + return false; + } if (success) success(model, resp, options); + model.trigger('sync', model, resp, options); }; + wrapError(this, options); - // Finish configuring and sending the Ajax request. - var method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update'); - if (method == 'patch') options.attrs = attrs; - var xhr = this.sync(method, this, options); + method = this.isNew() ? 'create' : (options.patch ? 'patch' : 'update'); + if (method === 'patch') options.attrs = attrs; + xhr = this.sync(method, this, options); - // When using `wait`, reset attributes to original values unless - // `success` has been called already. - if (!done && options.wait) { - this.clear(silentOptions); - this.set(current, silentOptions); - } + // Restore attributes. + if (attrs && options.wait) this.attributes = attributes; return xhr; }, @@ -430,12 +510,14 @@ options.success = function(resp) { if (options.wait || model.isNew()) destroy(); if (success) success(model, resp, options); + if (!model.isNew()) model.trigger('sync', model, resp, options); }; if (this.isNew()) { options.success(); return false; } + wrapError(this, options); var xhr = this.sync('delete', this, options); if (!options.wait) destroy(); @@ -453,7 +535,7 @@ // **parse** converts a response into the hash of attributes to be `set` on // the model. The default implementation is just to pass the response along. - parse: function(resp) { + parse: function(resp, options) { return resp; }, @@ -467,128 +549,52 @@ return this.id == null; }, - // Call this method to manually fire a `"change"` event for this model and - // a `"change:attribute"` event for each changed attribute. - // Calling this will cause all objects observing the model to update. - change: function(options) { - var changing = this._changing; - this._changing = true; - - // Generate the changes to be triggered on the model. - var triggers = this._computeChanges(true); - - this._pending = !!triggers.length; - - for (var i = triggers.length - 2; i >= 0; i -= 2) { - this.trigger('change:' + triggers[i], this, triggers[i + 1], options); - } - - if (changing) return this; - - // Trigger a `change` while there have been changes. - while (this._pending) { - this._pending = false; - this.trigger('change', this, options); - this._previousAttributes = _.clone(this.attributes); - } - - this._changing = false; - return this; - }, - - // Determine if the model has changed since the last `"change"` event. - // If you specify an attribute name, determine if that attribute has changed. - hasChanged: function(attr) { - if (!this._hasComputed) this._computeChanges(); - if (attr == null) return !_.isEmpty(this.changed); - return _.has(this.changed, attr); - }, - - // Return an object containing all the attributes that have changed, or - // false if there are no changed attributes. Useful for determining what - // parts of a view need to be updated and/or what attributes need to be - // persisted to the server. Unset attributes will be set to undefined. - // You can also pass an attributes object to diff against the model, - // determining if there *would be* a change. - changedAttributes: function(diff) { - if (!diff) return this.hasChanged() ? _.clone(this.changed) : false; - var val, changed = false, old = this._previousAttributes; - for (var attr in diff) { - if (_.isEqual(old[attr], (val = diff[attr]))) continue; - (changed || (changed = {}))[attr] = val; - } - return changed; - }, - - // Looking at the built up list of `set` attribute changes, compute how - // many of the attributes have actually changed. If `loud`, return a - // boiled-down list of only the real changes. - _computeChanges: function(loud) { - this.changed = {}; - var already = {}; - var triggers = []; - var current = this._currentAttributes; - var changes = this._changes; - - // Loop through the current queue of potential model changes. - for (var i = changes.length - 2; i >= 0; i -= 2) { - var key = changes[i], val = changes[i + 1]; - if (already[key]) continue; - already[key] = true; - - // Check if the attribute has been modified since the last change, - // and update `this.changed` accordingly. If we're inside of a `change` - // call, also add a trigger to the list. - if (current[key] !== val) { - this.changed[key] = val; - if (!loud) continue; - triggers.push(key, val); - current[key] = val; - } - } - if (loud) this._changes = []; - - // Signals `this.changed` is current to prevent duplicate calls from `this.hasChanged`. - this._hasComputed = true; - return triggers; - }, - - // Get the previous value of an attribute, recorded at the time the last - // `"change"` event was fired. - previous: function(attr) { - if (attr == null || !this._previousAttributes) return null; - return this._previousAttributes[attr]; - }, - - // Get all of the attributes of the model at the time of the previous - // `"change"` event. - previousAttributes: function() { - return _.clone(this._previousAttributes); + // Check if the model is currently in a valid state. + isValid: function(options) { + return this._validate({}, _.extend(options || {}, { validate: true })); }, // Run validation against the next complete set of model attributes, - // returning `true` if all is well. If a specific `error` callback has - // been passed, call that instead of firing the general `"error"` event. + // returning `true` if all is well. Otherwise, fire an `"invalid"` event. _validate: function(attrs, options) { - if (!this.validate) return true; + if (!options.validate || !this.validate) return true; attrs = _.extend({}, this.attributes, attrs); - var error = this.validate(attrs, options); + var error = this.validationError = this.validate(attrs, options) || null; if (!error) return true; - if (options && options.error) options.error(this, error, options); - this.trigger('error', this, error, options); + this.trigger('invalid', this, error, _.extend(options || {}, {validationError: error})); return false; } }); + // Underscore methods that we want to implement on the Model. + var modelMethods = ['keys', 'values', 'pairs', 'invert', 'pick', 'omit']; + + // Mix in each Underscore method as a proxy to `Model#attributes`. + _.each(modelMethods, function(method) { + Model.prototype[method] = function() { + var args = slice.call(arguments); + args.unshift(this.attributes); + return _[method].apply(_, args); + }; + }); + // Backbone.Collection // ------------------- - // Provides a standard collection class for our sets of models, ordered - // or unordered. If a `comparator` is specified, the Collection will maintain + // If models tend to represent a single row of data, a Backbone Collection is + // more analagous to a table full of data ... or a small slice or page of that + // table, or a collection of rows that belong together for a particular reason + // -- all of the messages in this particular folder, all of the documents + // belonging to this particular author, and so on. Collections maintain + // indexes of their models, both in order, and for lookup by `id`. + + // Create a new **Collection**, perhaps to contain a specific type of `model`. + // If a `comparator` is specified, the Collection will maintain // its models in sort order, as they're added and removed. var Collection = Backbone.Collection = function(models, options) { options || (options = {}); + if (options.url) this.url = options.url; if (options.model) this.model = options.model; if (options.comparator !== void 0) this.comparator = options.comparator; this._reset(); @@ -596,6 +602,10 @@ if (models) this.reset(models, _.extend({silent: true}, options)); }; + // Default options for `Collection#set`. + var setOptions = {add: true, remove: true, merge: true}; + var addOptions = {add: true, merge: false, remove: false}; + // Define the Collection's inheritable methods. _.extend(Collection.prototype, Events, { @@ -618,83 +628,120 @@ return Backbone.sync.apply(this, arguments); }, - // Add a model, or list of models to the set. Pass **silent** to avoid - // firing the `add` event for every new model. + // Add a model, or list of models to the set. add: function(models, options) { - var i, args, length, model, existing, needsSort; - var at = options && options.at; - var sort = ((options && options.sort) == null ? true : options.sort); + return this.set(models, _.defaults(options || {}, addOptions)); + }, + + // Remove a model, or a list of models from the set. + remove: function(models, options) { models = _.isArray(models) ? models.slice() : [models]; + options || (options = {}); + var i, l, index, model; + for (i = 0, l = models.length; i < l; i++) { + model = this.get(models[i]); + if (!model) continue; + delete this._byId[model.id]; + delete this._byId[model.cid]; + index = this.indexOf(model); + this.models.splice(index, 1); + this.length--; + if (!options.silent) { + options.index = index; + model.trigger('remove', model, this, options); + } + this._removeReference(model); + } + return this; + }, + + // Update a collection by `set`-ing a new list of models, adding new ones, + // removing models that are no longer present, and merging models that + // already exist in the collection, as necessary. Similar to **Model#set**, + // the core operation for updating the data contained by the collection. + set: function(models, options) { + options = _.defaults(options || {}, setOptions); + if (options.parse) models = this.parse(models, options); + if (!_.isArray(models)) models = models ? [models] : []; + var i, l, model, attrs, existing, sort; + var at = options.at; + var sortable = this.comparator && (at == null) && options.sort !== false; + var sortAttr = _.isString(this.comparator) ? this.comparator : null; + var toAdd = [], toRemove = [], modelMap = {}; // Turn bare objects into model references, and prevent invalid models // from being added. - for (i = models.length - 1; i >= 0; i--) { - if(!(model = this._prepareModel(models[i], options))) { - this.trigger("error", this, models[i], options); - models.splice(i, 1); - continue; - } - models[i] = model; + for (i = 0, l = models.length; i < l; i++) { + if (!(model = this._prepareModel(models[i], options))) continue; - existing = model.id != null && this._byId[model.id]; // If a duplicate is found, prevent it from being added and // optionally merge it into the existing model. - if (existing || this._byCid[model.cid]) { - if (options && options.merge && existing) { + if (existing = this.get(model)) { + if (options.remove) modelMap[existing.cid] = true; + if (options.merge) { existing.set(model.attributes, options); - needsSort = sort; + if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true; } - models.splice(i, 1); - continue; + + // This is a new model, push it to the `toAdd` list. + } else if (options.add) { + toAdd.push(model); + + // Listen to added models' events, and index models for lookup by + // `id` and by `cid`. + model.on('all', this._onModelEvent, this); + this._byId[model.cid] = model; + if (model.id != null) this._byId[model.id] = model; } + } - // Listen to added models' events, and index models for lookup by - // `id` and by `cid`. - model.on('all', this._onModelEvent, this); - this._byCid[model.cid] = model; - if (model.id != null) this._byId[model.id] = model; + // Remove nonexistent models if appropriate. + if (options.remove) { + for (i = 0, l = this.length; i < l; ++i) { + if (!modelMap[(model = this.models[i]).cid]) toRemove.push(model); + } + if (toRemove.length) this.remove(toRemove, options); } // See if sorting is needed, update `length` and splice in new models. - if (models.length) needsSort = sort; - this.length += models.length; - args = [at != null ? at : this.models.length, 0]; - push.apply(args, models); - splice.apply(this.models, args); + if (toAdd.length) { + if (sortable) sort = true; + this.length += toAdd.length; + if (at != null) { + splice.apply(this.models, [at, 0].concat(toAdd)); + } else { + push.apply(this.models, toAdd); + } + } - // Sort the collection if appropriate. - if (needsSort && this.comparator && at == null) this.sort({silent: true}); + // Silently sort the collection if appropriate. + if (sort) this.sort({silent: true}); - if (options && options.silent) return this; + if (options.silent) return this; // Trigger `add` events. - while (model = models.shift()) { - model.trigger('add', model, this, options); + for (i = 0, l = toAdd.length; i < l; i++) { + (model = toAdd[i]).trigger('add', model, this, options); } + // Trigger `sort` if the collection was sorted. + if (sort) this.trigger('sort', this, options); return this; }, - // Remove a model, or a list of models from the set. Pass silent to avoid - // firing the `remove` event for every model removed. - remove: function(models, options) { - var i, l, index, model; + // When you have more items than you want to add or remove individually, + // you can reset the entire set with a new list of models, without firing + // any granular `add` or `remove` events. Fires `reset` when finished. + // Useful for bulk operations and optimizations. + reset: function(models, options) { options || (options = {}); - models = _.isArray(models) ? models.slice() : [models]; - for (i = 0, l = models.length; i < l; i++) { - model = this.get(models[i]); - if (!model) continue; - delete this._byId[model.id]; - delete this._byCid[model.cid]; - index = this.indexOf(model); - this.models.splice(index, 1); - this.length--; - if (!options.silent) { - options.index = index; - model.trigger('remove', model, this, options); - } - this._removeReference(model); + for (var i = 0, l = this.models.length; i < l; i++) { + this._removeReference(this.models[i]); } + options.previousModels = this.models; + this._reset(); + this.add(models, _.extend({silent: true}, options)); + if (!options.silent) this.trigger('reset', this, options); return this; }, @@ -734,7 +781,7 @@ // Get a model from the set by id. get: function(obj) { if (obj == null) return void 0; - return this._byId[obj.id != null ? obj.id : obj] || this._byCid[obj.cid || obj]; + return this._byId[obj.id != null ? obj.id : obj.cid || obj]; }, // Get the model at the given index. @@ -742,10 +789,11 @@ return this.models[index]; }, - // Return models with matching attributes. Useful for simple cases of `filter`. - where: function(attrs) { - if (_.isEmpty(attrs)) return []; - return this.filter(function(model) { + // Return models with matching attributes. Useful for simple cases of + // `filter`. + where: function(attrs, first) { + if (_.isEmpty(attrs)) return first ? void 0 : []; + return this[first ? 'find' : 'filter'](function(model) { for (var key in attrs) { if (attrs[key] !== model.get(key)) return false; } @@ -753,95 +801,60 @@ }); }, + // Return the first model with matching attributes. Useful for simple cases + // of `find`. + findWhere: function(attrs) { + return this.where(attrs, true); + }, + // Force the collection to re-sort itself. You don't need to call this under // normal circumstances, as the set will maintain sort order as each item // is added. sort: function(options) { - if (!this.comparator) { - throw new Error('Cannot sort a set without a comparator'); - } + if (!this.comparator) throw new Error('Cannot sort a set without a comparator'); + options || (options = {}); + // Run sort based on type of `comparator`. if (_.isString(this.comparator) || this.comparator.length === 1) { this.models = this.sortBy(this.comparator, this); } else { this.models.sort(_.bind(this.comparator, this)); } - if (!options || !options.silent) this.trigger('sort', this, options); + if (!options.silent) this.trigger('sort', this, options); return this; }, + // Figure out the smallest index at which a model should be inserted so as + // to maintain order. + sortedIndex: function(model, value, context) { + value || (value = this.comparator); + var iterator = _.isFunction(value) ? value : function(model) { + return model.get(value); + }; + return _.sortedIndex(this.models, model, iterator, context); + }, + // Pluck an attribute from each model in the collection. pluck: function(attr) { return _.invoke(this.models, 'get', attr); }, - // Smartly update a collection with a change set of models, adding, - // removing, and merging as necessary. - update: function(models, options) { - var model, i, l, existing; - var add = [], remove = [], modelMap = {}; - var idAttr = this.model.prototype.idAttribute; - options = _.extend({add: true, merge: true, remove: true}, options); - if (options.parse) models = this.parse(models); - - // Allow a single model (or no argument) to be passed. - if (!_.isArray(models)) models = models ? [models] : []; - - // Proxy to `add` for this case, no need to iterate... - if (options.add && !options.remove) return this.add(models, options); - - // Determine which models to add and merge, and which to remove. - for (i = 0, l = models.length; i < l; i++) { - model = models[i]; - existing = this.get(model.id || model.cid || model[idAttr]); - if (options.remove && existing) modelMap[existing.cid] = true; - if ((options.add && !existing) || (options.merge && existing)) { - add.push(model); - } - } - if (options.remove) { - for (i = 0, l = this.models.length; i < l; i++) { - model = this.models[i]; - if (!modelMap[model.cid]) remove.push(model); - } - } - - // Remove models (if applicable) before we add and merge the rest. - if (remove.length) this.remove(remove, options); - if (add.length) this.add(add, options); - return this; - }, - - // When you have more items than you want to add or remove individually, - // you can reset the entire set with a new list of models, without firing - // any `add` or `remove` events. Fires `reset` when finished. - reset: function(models, options) { - options || (options = {}); - if (options.parse) models = this.parse(models); - for (var i = 0, l = this.models.length; i < l; i++) { - this._removeReference(this.models[i]); - } - options.previousModels = this.models; - this._reset(); - if (models) this.add(models, _.extend({silent: true}, options)); - if (!options.silent) this.trigger('reset', this, options); - return this; - }, - // Fetch the default set of models for this collection, resetting the - // collection when they arrive. If `add: true` is passed, appends the - // models to the collection instead of resetting. + // collection when they arrive. If `reset: true` is passed, the response + // data will be passed through the `reset` method instead of `set`. fetch: function(options) { options = options ? _.clone(options) : {}; if (options.parse === void 0) options.parse = true; - var collection = this; var success = options.success; - options.success = function(resp, status, xhr) { - var method = options.update ? 'update' : 'reset'; + var collection = this; + options.success = function(resp) { + var method = options.reset ? 'reset' : 'set'; collection[method](resp, options); if (success) success(collection, resp, options); + collection.trigger('sync', collection, resp, options); }; + wrapError(this, options); return this.sync('read', this, options); }, @@ -849,13 +862,12 @@ // collection immediately, unless `wait: true` is passed, in which case we // wait for the server to agree. create: function(model, options) { - var collection = this; options = options ? _.clone(options) : {}; - model = this._prepareModel(model, options); - if (!model) return false; - if (!options.wait) collection.add(model, options); + if (!(model = this._prepareModel(model, options))) return false; + if (!options.wait) this.add(model, options); + var collection = this; var success = options.success; - options.success = function(model, resp, options) { + options.success = function(resp) { if (options.wait) collection.add(model, options); if (success) success(model, resp, options); }; @@ -865,7 +877,7 @@ // **parse** converts a response into a list of models to be added to the // collection. The default implementation is just to pass it through. - parse: function(resp) { + parse: function(resp, options) { return resp; }, @@ -874,22 +886,16 @@ return new this.constructor(this.models); }, - // Proxy to _'s chain. Can't be proxied the same way the rest of the - // underscore methods are proxied because it relies on the underscore - // constructor. - chain: function() { - return _(this.models).chain(); - }, - - // Reset all internal state. Called when the collection is reset. + // Private method to reset all internal state. Called when the collection + // is first initialized or reset. _reset: function() { this.length = 0; this.models = []; this._byId = {}; - this._byCid = {}; }, - // Prepare a model or hash of attributes to be added to this collection. + // Prepare a hash of attributes (or other model) to be added to this + // collection. _prepareModel: function(attrs, options) { if (attrs instanceof Model) { if (!attrs.collection) attrs.collection = this; @@ -898,11 +904,14 @@ options || (options = {}); options.collection = this; var model = new this.model(attrs, options); - if (!model._validate(attrs, options)) return false; + if (!model._validate(attrs, options)) { + this.trigger('invalid', this, attrs, options); + return false; + } return model; }, - // Internal method to remove a model's ties to a collection. + // Internal method to sever a model's ties to a collection. _removeReference: function(model) { if (this === model.collection) delete model.collection; model.off('all', this._onModelEvent, this); @@ -925,12 +934,14 @@ }); // Underscore methods that we want to implement on the Collection. + // 90% of the core usefulness of Backbone Collections is actually implemented + // right here: var methods = ['forEach', 'each', 'map', 'collect', 'reduce', 'foldl', 'inject', 'reduceRight', 'foldr', 'find', 'detect', 'filter', 'select', 'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke', - 'max', 'min', 'sortedIndex', 'toArray', 'size', 'first', 'head', 'take', - 'initial', 'rest', 'tail', 'last', 'without', 'indexOf', 'shuffle', - 'lastIndexOf', 'isEmpty']; + 'max', 'min', 'toArray', 'size', 'first', 'head', 'take', 'initial', 'rest', + 'tail', 'drop', 'last', 'without', 'indexOf', 'shuffle', 'lastIndexOf', + 'isEmpty', 'chain']; // Mix in each Underscore method as a proxy to `Collection#models`. _.each(methods, function(method) { @@ -954,6 +965,241 @@ }; }); + // Backbone.View + // ------------- + + // Backbone Views are almost more convention than they are actual code. A View + // is simply a JavaScript object that represents a logical chunk of UI in the + // DOM. This might be a single item, an entire list, a sidebar or panel, or + // even the surrounding frame which wraps your whole app. Defining a chunk of + // UI as a **View** allows you to define your DOM events declaratively, without + // having to worry about render order ... and makes it easy for the view to + // react to specific changes in the state of your models. + + // Creating a Backbone.View creates its initial element outside of the DOM, + // if an existing element is not provided... + var View = Backbone.View = function(options) { + this.cid = _.uniqueId('view'); + this._configure(options || {}); + this._ensureElement(); + this.initialize.apply(this, arguments); + this.delegateEvents(); + }; + + // Cached regex to split keys for `delegate`. + var delegateEventSplitter = /^(\S+)\s*(.*)$/; + + // List of view options to be merged as properties. + var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName', 'events']; + + // Set up all inheritable **Backbone.View** properties and methods. + _.extend(View.prototype, Events, { + + // The default `tagName` of a View's element is `"div"`. + tagName: 'div', + + // jQuery delegate for element lookup, scoped to DOM elements within the + // current view. This should be prefered to global lookups where possible. + $: function(selector) { + return this.$el.find(selector); + }, + + // Initialize is an empty function by default. Override it with your own + // initialization logic. + initialize: function(){}, + + // **render** is the core function that your view should override, in order + // to populate its element (`this.el`), with the appropriate HTML. The + // convention is for **render** to always return `this`. + render: function() { + return this; + }, + + // Remove this view by taking the element out of the DOM, and removing any + // applicable Backbone.Events listeners. + remove: function() { + this.$el.remove(); + this.stopListening(); + return this; + }, + + // Change the view's element (`this.el` property), including event + // re-delegation. + setElement: function(element, delegate) { + if (this.$el) this.undelegateEvents(); + this.$el = element instanceof Backbone.$ ? element : Backbone.$(element); + this.el = this.$el[0]; + if (delegate !== false) this.delegateEvents(); + return this; + }, + + // Set callbacks, where `this.events` is a hash of + // + // *{"event selector": "callback"}* + // + // { + // 'mousedown .title': 'edit', + // 'click .button': 'save' + // 'click .open': function(e) { ... } + // } + // + // pairs. Callbacks will be bound to the view, with `this` set properly. + // Uses event delegation for efficiency. + // Omitting the selector binds the event to `this.el`. + // This only works for delegate-able events: not `focus`, `blur`, and + // not `change`, `submit`, and `reset` in Internet Explorer. + delegateEvents: function(events) { + if (!(events || (events = _.result(this, 'events')))) return this; + this.undelegateEvents(); + for (var key in events) { + var method = events[key]; + if (!_.isFunction(method)) method = this[events[key]]; + if (!method) continue; + + var match = key.match(delegateEventSplitter); + var eventName = match[1], selector = match[2]; + method = _.bind(method, this); + eventName += '.delegateEvents' + this.cid; + if (selector === '') { + this.$el.on(eventName, method); + } else { + this.$el.on(eventName, selector, method); + } + } + return this; + }, + + // Clears all callbacks previously bound to the view with `delegateEvents`. + // You usually don't need to use this, but may wish to if you have multiple + // Backbone views attached to the same DOM element. + undelegateEvents: function() { + this.$el.off('.delegateEvents' + this.cid); + return this; + }, + + // Performs the initial configuration of a View with a set of options. + // Keys with special meaning *(e.g. model, collection, id, className)* are + // attached directly to the view. See `viewOptions` for an exhaustive + // list. + _configure: function(options) { + if (this.options) options = _.extend({}, _.result(this, 'options'), options); + _.extend(this, _.pick(options, viewOptions)); + this.options = options; + }, + + // Ensure that the View has a DOM element to render into. + // If `this.el` is a string, pass it through `$()`, take the first + // matching element, and re-assign it to `el`. Otherwise, create + // an element from the `id`, `className` and `tagName` properties. + _ensureElement: function() { + if (!this.el) { + var attrs = _.extend({}, _.result(this, 'attributes')); + if (this.id) attrs.id = _.result(this, 'id'); + if (this.className) attrs['class'] = _.result(this, 'className'); + var $el = Backbone.$('<' + _.result(this, 'tagName') + '>').attr(attrs); + this.setElement($el, false); + } else { + this.setElement(_.result(this, 'el'), false); + } + } + + }); + + // Backbone.sync + // ------------- + + // Override this function to change the manner in which Backbone persists + // models to the server. You will be passed the type of request, and the + // model in question. By default, makes a RESTful Ajax request + // to the model's `url()`. Some possible customizations could be: + // + // * Use `setTimeout` to batch rapid-fire updates into a single request. + // * Send up the models as XML instead of JSON. + // * Persist models via WebSockets instead of Ajax. + // + // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests + // as `POST`, with a `_method` parameter containing the true HTTP method, + // as well as all requests with the body as `application/x-www-form-urlencoded` + // instead of `application/json` with the model in a param named `model`. + // Useful when interfacing with server-side languages like **PHP** that make + // it difficult to read the body of `PUT` requests. + Backbone.sync = function(method, model, options) { + var type = methodMap[method]; + + // Default options, unless specified. + _.defaults(options || (options = {}), { + emulateHTTP: Backbone.emulateHTTP, + emulateJSON: Backbone.emulateJSON + }); + + // Default JSON-request options. + var params = {type: type, dataType: 'json'}; + + // Ensure that we have a URL. + if (!options.url) { + params.url = _.result(model, 'url') || urlError(); + } + + // Ensure that we have the appropriate request data. + if (options.data == null && model && (method === 'create' || method === 'update' || method === 'patch')) { + params.contentType = 'application/json'; + params.data = JSON.stringify(options.attrs || model.toJSON(options)); + } + + // For older servers, emulate JSON by encoding the request into an HTML-form. + if (options.emulateJSON) { + params.contentType = 'application/x-www-form-urlencoded'; + params.data = params.data ? {model: params.data} : {}; + } + + // For older servers, emulate HTTP by mimicking the HTTP method with `_method` + // And an `X-HTTP-Method-Override` header. + if (options.emulateHTTP && (type === 'PUT' || type === 'DELETE' || type === 'PATCH')) { + params.type = 'POST'; + if (options.emulateJSON) params.data._method = type; + var beforeSend = options.beforeSend; + options.beforeSend = function(xhr) { + xhr.setRequestHeader('X-HTTP-Method-Override', type); + if (beforeSend) return beforeSend.apply(this, arguments); + }; + } + + // Don't process data on a non-GET request. + if (params.type !== 'GET' && !options.emulateJSON) { + params.processData = false; + } + + // If we're sending a `PATCH` request, and we're in an old Internet Explorer + // that still has ActiveX enabled by default, override jQuery to use that + // for XHR instead. Remove this line when jQuery supports `PATCH` on IE8. + if (params.type === 'PATCH' && window.ActiveXObject && + !(window.external && window.external.msActiveXFilteringEnabled)) { + params.xhr = function() { + return new ActiveXObject("Microsoft.XMLHTTP"); + }; + } + + // Make the request, allowing the user to override any Ajax options. + var xhr = options.xhr = Backbone.ajax(_.extend(params, options)); + model.trigger('request', model, xhr, options); + return xhr; + }; + + // Map from CRUD to HTTP for our default `Backbone.sync` implementation. + var methodMap = { + 'create': 'POST', + 'update': 'PUT', + 'patch': 'PATCH', + 'delete': 'DELETE', + 'read': 'GET' + }; + + // Set the default implementation of `Backbone.ajax` to proxy through to `$`. + // Override this if you'd like to use a different library. + Backbone.ajax = function() { + return Backbone.$.ajax.apply(Backbone.$, arguments); + }; + // Backbone.Router // --------------- @@ -969,7 +1215,7 @@ // Cached regular expressions for matching named param parts and splatted // parts of route strings. var optionalParam = /\((.*?)\)/g; - var namedParam = /:\w+/g; + var namedParam = /(\(\?)?:\w+/g; var splatParam = /\*\w+/g; var escapeRegExp = /[\-{}\[\]+?.,\\\^$|#\s]/g; @@ -988,13 +1234,19 @@ // route: function(route, name, callback) { if (!_.isRegExp(route)) route = this._routeToRegExp(route); + if (_.isFunction(name)) { + callback = name; + name = ''; + } if (!callback) callback = this[name]; - Backbone.history.route(route, _.bind(function(fragment) { - var args = this._extractParameters(route, fragment); - callback && callback.apply(this, args); - this.trigger.apply(this, ['route:' + name].concat(args)); - Backbone.history.trigger('route', this, name, args); - }, this)); + var router = this; + Backbone.history.route(route, function(fragment) { + var args = router._extractParameters(route, fragment); + callback && callback.apply(router, args); + router.trigger.apply(router, ['route:' + name].concat(args)); + router.trigger('route', name, args); + Backbone.history.trigger('route', router, name, args); + }); return this; }, @@ -1009,6 +1261,7 @@ // routes can be defined at the bottom of the route map. _bindRoutes: function() { if (!this.routes) return; + this.routes = _.result(this, 'routes'); var route, routes = _.keys(this.routes); while ((route = routes.pop()) != null) { this.route(route, this.routes[route]); @@ -1020,15 +1273,21 @@ _routeToRegExp: function(route) { route = route.replace(escapeRegExp, '\\$&') .replace(optionalParam, '(?:$1)?') - .replace(namedParam, '([^\/]+)') + .replace(namedParam, function(match, optional){ + return optional ? match : '([^\/]+)'; + }) .replace(splatParam, '(.*?)'); return new RegExp('^' + route + '$'); }, // Given a route, and a URL fragment that it matches, return the array of - // extracted parameters. + // extracted decoded parameters. Empty or unmatched parameters will be + // treated as `null` to normalize cross-browser behavior. _extractParameters: function(route, fragment) { - return route.exec(fragment).slice(1); + var params = route.exec(fragment).slice(1); + return _.map(params, function(param) { + return param ? decodeURIComponent(param) : null; + }); } }); @@ -1036,13 +1295,16 @@ // Backbone.History // ---------------- - // Handles cross-browser history management, based on URL fragments. If the - // browser does not support `onhashchange`, falls back to polling. + // Handles cross-browser history management, based on either + // [pushState](http://diveintohtml5.info/history.html) and real URLs, or + // [onhashchange](https://developer.mozilla.org/en-US/docs/DOM/window.onhashchange) + // and URL fragments. If the browser supports neither (old IE, natch), + // falls back to polling. var History = Backbone.History = function() { this.handlers = []; _.bindAll(this, 'checkUrl'); - // #1653 - Ensure that `History` can be used outside of the browser. + // Ensure that `History` can be used outside of the browser. if (typeof window !== 'undefined') { this.location = window.location; this.history = window.history; @@ -1121,9 +1383,9 @@ // Depending on whether we're using pushState or hashes, and whether // 'onhashchange' is supported, determine how we check the URL state. if (this._hasPushState) { - Backbone.$(window).bind('popstate', this.checkUrl); + Backbone.$(window).on('popstate', this.checkUrl); } else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) { - Backbone.$(window).bind('hashchange', this.checkUrl); + Backbone.$(window).on('hashchange', this.checkUrl); } else if (this._wantsHashChange) { this._checkUrlInterval = setInterval(this.checkUrl, this.interval); } @@ -1155,7 +1417,7 @@ // Disable Backbone.history, perhaps temporarily. Not useful in a real app, // but possibly useful for unit testing Routers. stop: function() { - Backbone.$(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl); + Backbone.$(window).off('popstate', this.checkUrl).off('hashchange', this.checkUrl); clearInterval(this._checkUrlInterval); History.started = false; }, @@ -1238,7 +1500,7 @@ var href = location.href.replace(/(javascript:|#).*$/, ''); location.replace(href + '#' + fragment); } else { - // #1649 - Some browsers require that `hash` contains a leading #. + // Some browsers require that `hash` contains a leading #. location.hash = '#' + fragment; } } @@ -1248,241 +1510,6 @@ // Create the default Backbone.history. Backbone.history = new History; - // Backbone.View - // ------------- - - // Creating a Backbone.View creates its initial element outside of the DOM, - // if an existing element is not provided... - var View = Backbone.View = function(options) { - this.cid = _.uniqueId('view'); - this._configure(options || {}); - this._ensureElement(); - this.initialize.apply(this, arguments); - this.delegateEvents(); - }; - - // Cached regex to split keys for `delegate`. - var delegateEventSplitter = /^(\S+)\s*(.*)$/; - - // List of view options to be merged as properties. - var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName', 'events']; - - // Set up all inheritable **Backbone.View** properties and methods. - _.extend(View.prototype, Events, { - - // The default `tagName` of a View's element is `"div"`. - tagName: 'div', - - // jQuery delegate for element lookup, scoped to DOM elements within the - // current view. This should be prefered to global lookups where possible. - $: function(selector) { - return this.$el.find(selector); - }, - - // Initialize is an empty function by default. Override it with your own - // initialization logic. - initialize: function(){}, - - // **render** is the core function that your view should override, in order - // to populate its element (`this.el`), with the appropriate HTML. The - // convention is for **render** to always return `this`. - render: function() { - return this; - }, - - // Remove this view by taking the element out of the DOM, and removing any - // applicable Backbone.Events listeners. - remove: function() { - this.$el.remove(); - this.stopListening(); - return this; - }, - - // For small amounts of DOM Elements, where a full-blown template isn't - // needed, use **make** to manufacture elements, one at a time. - // - // var el = this.make('li', {'class': 'row'}, this.model.escape('title')); - // - make: function(tagName, attributes, content) { - var el = document.createElement(tagName); - if (attributes) Backbone.$(el).attr(attributes); - if (content != null) Backbone.$(el).html(content); - return el; - }, - - // Change the view's element (`this.el` property), including event - // re-delegation. - setElement: function(element, delegate) { - if (this.$el) this.undelegateEvents(); - this.$el = element instanceof Backbone.$ ? element : Backbone.$(element); - this.el = this.$el[0]; - if (delegate !== false) this.delegateEvents(); - return this; - }, - - // Set callbacks, where `this.events` is a hash of - // - // *{"event selector": "callback"}* - // - // { - // 'mousedown .title': 'edit', - // 'click .button': 'save' - // 'click .open': function(e) { ... } - // } - // - // pairs. Callbacks will be bound to the view, with `this` set properly. - // Uses event delegation for efficiency. - // Omitting the selector binds the event to `this.el`. - // This only works for delegate-able events: not `focus`, `blur`, and - // not `change`, `submit`, and `reset` in Internet Explorer. - delegateEvents: function(events) { - if (!(events || (events = _.result(this, 'events')))) return; - this.undelegateEvents(); - for (var key in events) { - var method = events[key]; - if (!_.isFunction(method)) method = this[events[key]]; - if (!method) throw new Error('Method "' + events[key] + '" does not exist'); - var match = key.match(delegateEventSplitter); - var eventName = match[1], selector = match[2]; - method = _.bind(method, this); - eventName += '.delegateEvents' + this.cid; - if (selector === '') { - this.$el.bind(eventName, method); - } else { - this.$el.delegate(selector, eventName, method); - } - } - }, - - // Clears all callbacks previously bound to the view with `delegateEvents`. - // You usually don't need to use this, but may wish to if you have multiple - // Backbone views attached to the same DOM element. - undelegateEvents: function() { - this.$el.unbind('.delegateEvents' + this.cid); - }, - - // Performs the initial configuration of a View with a set of options. - // Keys with special meaning *(model, collection, id, className)*, are - // attached directly to the view. - _configure: function(options) { - if (this.options) options = _.extend({}, _.result(this, 'options'), options); - _.extend(this, _.pick(options, viewOptions)); - this.options = options; - }, - - // Ensure that the View has a DOM element to render into. - // If `this.el` is a string, pass it through `$()`, take the first - // matching element, and re-assign it to `el`. Otherwise, create - // an element from the `id`, `className` and `tagName` properties. - _ensureElement: function() { - if (!this.el) { - var attrs = _.extend({}, _.result(this, 'attributes')); - if (this.id) attrs.id = _.result(this, 'id'); - if (this.className) attrs['class'] = _.result(this, 'className'); - this.setElement(this.make(_.result(this, 'tagName'), attrs), false); - } else { - this.setElement(_.result(this, 'el'), false); - } - } - - }); - - // Backbone.sync - // ------------- - - // Map from CRUD to HTTP for our default `Backbone.sync` implementation. - var methodMap = { - 'create': 'POST', - 'update': 'PUT', - 'patch': 'PATCH', - 'delete': 'DELETE', - 'read': 'GET' - }; - - // Override this function to change the manner in which Backbone persists - // models to the server. You will be passed the type of request, and the - // model in question. By default, makes a RESTful Ajax request - // to the model's `url()`. Some possible customizations could be: - // - // * Use `setTimeout` to batch rapid-fire updates into a single request. - // * Send up the models as XML instead of JSON. - // * Persist models via WebSockets instead of Ajax. - // - // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests - // as `POST`, with a `_method` parameter containing the true HTTP method, - // as well as all requests with the body as `application/x-www-form-urlencoded` - // instead of `application/json` with the model in a param named `model`. - // Useful when interfacing with server-side languages like **PHP** that make - // it difficult to read the body of `PUT` requests. - Backbone.sync = function(method, model, options) { - var type = methodMap[method]; - - // Default options, unless specified. - _.defaults(options || (options = {}), { - emulateHTTP: Backbone.emulateHTTP, - emulateJSON: Backbone.emulateJSON - }); - - // Default JSON-request options. - var params = {type: type, dataType: 'json'}; - - // Ensure that we have a URL. - if (!options.url) { - params.url = _.result(model, 'url') || urlError(); - } - - // Ensure that we have the appropriate request data. - if (options.data == null && model && (method === 'create' || method === 'update' || method === 'patch')) { - params.contentType = 'application/json'; - params.data = JSON.stringify(options.attrs || model.toJSON(options)); - } - - // For older servers, emulate JSON by encoding the request into an HTML-form. - if (options.emulateJSON) { - params.contentType = 'application/x-www-form-urlencoded'; - params.data = params.data ? {model: params.data} : {}; - } - - // For older servers, emulate HTTP by mimicking the HTTP method with `_method` - // And an `X-HTTP-Method-Override` header. - if (options.emulateHTTP && (type === 'PUT' || type === 'DELETE' || type === 'PATCH')) { - params.type = 'POST'; - if (options.emulateJSON) params.data._method = type; - var beforeSend = options.beforeSend; - options.beforeSend = function(xhr) { - xhr.setRequestHeader('X-HTTP-Method-Override', type); - if (beforeSend) return beforeSend.apply(this, arguments); - }; - } - - // Don't process data on a non-GET request. - if (params.type !== 'GET' && !options.emulateJSON) { - params.processData = false; - } - - var success = options.success; - options.success = function(resp, status, xhr) { - if (success) success(resp, status, xhr); - model.trigger('sync', model, resp, options); - }; - - var error = options.error; - options.error = function(xhr, status, thrown) { - if (error) error(model, xhr, options); - model.trigger('error', model, xhr, options); - }; - - // Make the request, allowing the user to override any Ajax options. - var xhr = Backbone.ajax(_.extend(params, options)); - model.trigger('request', model, xhr, options); - return xhr; - }; - - // Set the default implementation of `Backbone.ajax` to proxy through to `$`. - Backbone.ajax = function() { - return Backbone.$.ajax.apply(Backbone.$, arguments); - }; - // Helpers // ------- @@ -1499,7 +1526,7 @@ if (protoProps && _.has(protoProps, 'constructor')) { child = protoProps.constructor; } else { - child = function(){ parent.apply(this, arguments); }; + child = function(){ return parent.apply(this, arguments); }; } // Add static properties to the constructor function, if supplied. @@ -1530,4 +1557,14 @@ throw new Error('A "url" property or function must be specified'); }; -}).call(this); + // Wrap an optional error callback with a fallback error event. + var wrapError = function (model, options) { + var error = options.error; + options.error = function(resp) { + if (error) error(model, resp, options); + model.trigger('error', model, resp, options); + }; + }; + + return Backbone; +})); diff --git a/widgy/static/widgy/js/lib/underscore.js b/widgy/static/widgy/js/lib/underscore.js index 4d83099fd..5574d1495 100644 --- a/widgy/static/widgy/js/lib/underscore.js +++ b/widgy/static/widgy/js/lib/underscore.js @@ -1,6 +1,6 @@ -// Underscore.js 1.4.3 +// Underscore.js 1.4.4 // http://underscorejs.org -// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. +// (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc. // Underscore may be freely distributed under the MIT license. (function() { @@ -64,7 +64,7 @@ } // Current version. - _.VERSION = '1.4.3'; + _.VERSION = '1.4.4'; // Collection Functions // -------------------- @@ -224,8 +224,9 @@ // Invoke a method (with arguments) on every item in a collection. _.invoke = function(obj, method) { var args = slice.call(arguments, 2); + var isFunc = _.isFunction(method); return _.map(obj, function(value) { - return (_.isFunction(method) ? method : value[method]).apply(value, args); + return (isFunc ? method : value[method]).apply(value, args); }); }; @@ -235,10 +236,10 @@ }; // Convenience version of a common use case of `filter`: selecting only objects - // with specific `key:value` pairs. - _.where = function(obj, attrs) { - if (_.isEmpty(attrs)) return []; - return _.filter(obj, function(value) { + // containing specific `key:value` pairs. + _.where = function(obj, attrs, first) { + if (_.isEmpty(attrs)) return first ? null : []; + return _[first ? 'find' : 'filter'](obj, function(value) { for (var key in attrs) { if (attrs[key] !== value[key]) return false; } @@ -246,6 +247,12 @@ }); }; + // Convenience version of a common use case of `find`: getting the first object + // containing specific `key:value` pairs. + _.findWhere = function(obj, attrs) { + return _.where(obj, attrs, true); + }; + // Return the maximum element or (element-based computation). // Can't optimize arrays of integers longer than 65,535 elements. // See: https://bugs.webkit.org/show_bug.cgi?id=80797 @@ -567,26 +574,23 @@ // Function (ahem) Functions // ------------------ - // Reusable constructor function for prototype setting. - var ctor = function(){}; - // Create a function bound to a given object (assigning `this`, and arguments, - // optionally). Binding with arguments is also known as `curry`. - // Delegates to **ECMAScript 5**'s native `Function.bind` if available. - // We check for `func.bind` first, to fail fast when `func` is undefined. + // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if + // available. _.bind = function(func, context) { - var args, bound; if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1)); - if (!_.isFunction(func)) throw new TypeError; - args = slice.call(arguments, 2); - return bound = function() { - if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments))); - ctor.prototype = func.prototype; - var self = new ctor; - ctor.prototype = null; - var result = func.apply(self, args.concat(slice.call(arguments))); - if (Object(result) === result) return result; - return self; + var args = slice.call(arguments, 2); + return function() { + return func.apply(context, args.concat(slice.call(arguments))); + }; + }; + + // Partially apply a function by creating a version that has had some of its + // arguments pre-filled, without changing its dynamic `this` context. + _.partial = function(func) { + var args = slice.call(arguments, 1); + return function() { + return func.apply(this, args.concat(slice.call(arguments))); }; }; @@ -594,7 +598,7 @@ // all callbacks defined on an object belong to it. _.bindAll = function(obj) { var funcs = slice.call(arguments, 1); - if (funcs.length == 0) funcs = _.functions(obj); + if (funcs.length === 0) funcs = _.functions(obj); each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); }); return obj; }; @@ -1019,7 +1023,7 @@ max = min; min = 0; } - return min + (0 | Math.random() * (max - min + 1)); + return min + Math.floor(Math.random() * (max - min + 1)); }; // List of HTML entities for escaping. @@ -1075,7 +1079,7 @@ // Useful for temporary DOM ids. var idCounter = 0; _.uniqueId = function(prefix) { - var id = '' + ++idCounter; + var id = ++idCounter + ''; return prefix ? prefix + id : id; }; @@ -1110,6 +1114,7 @@ // Underscore templating handles arbitrary delimiters, preserves whitespace, // and correctly escapes quotes within interpolated code. _.template = function(text, data, settings) { + var render; settings = _.defaults({}, settings, _.templateSettings); // Combine delimiters into one regular expression via alternation. @@ -1148,7 +1153,7 @@ source + "return __p;\n"; try { - var render = new Function(settings.variable || 'obj', '_', source); + render = new Function(settings.variable || 'obj', '_', source); } catch (e) { e.source = source; throw e; @@ -1218,4 +1223,12 @@ }); + // AMD define happens at the end for compatibility with AMD loaders + // that don't enforce next-turn semantics on modules. + if (typeof define === 'function' && define.amd) { + define('underscore', function() { + return _; + }); + } + }).call(this); diff --git a/widgy/static/widgy/js/main.js b/widgy/static/widgy/js/main.js index 1043e4e51..0e7d39b0e 100644 --- a/widgy/static/widgy/js/main.js +++ b/widgy/static/widgy/js/main.js @@ -10,21 +10,10 @@ if ( typeof window.console == 'undefined' ) } require.config({ - // ordered dependencies (example: jquery plugins) - shim: { - 'underscore': { - exports: '_' - }, - 'backbone': { - deps: ['underscore', 'jquery'], - exports: 'Backbone' - } - }, paths: { - 'jquery': './lib/jquery', - 'underscore': './lib/underscore', - 'backbone': './lib/backbone', - 'mustache': './lib/mustache', - 'text': 'require/text' + 'jquery': './lib/jquery', + 'underscore': './lib/underscore', + 'backbone': './lib/backbone', + 'text': 'require/text' } }); diff --git a/widgy/static/widgy/js/nodes/models.js b/widgy/static/widgy/js/nodes/models.js index 0526b5b87..c68ee33fa 100644 --- a/widgy/static/widgy/js/nodes/models.js +++ b/widgy/static/widgy/js/nodes/models.js @@ -105,7 +105,7 @@ define([ 'underscore', 'widgy.backbone', 'lib/q' if (ret) { if (children) { - this.children.update2(children, options); + this.children.set2(children, options); if ( options && (options.resort || options.sort_silently) ) { this.children.sortByRight(options); } @@ -185,7 +185,7 @@ define([ 'underscore', 'widgy.backbone', 'lib/q' * collection. * - else, remove the old model from the collection. */ - update2: function(data, options) { + set2: function(data, options) { var models = []; _.each(data, function(child) { @@ -199,7 +199,7 @@ define([ 'underscore', 'widgy.backbone', 'lib/q' } }, this); - this.update(models, options); + this.set(models, options); }, /** diff --git a/widgy/static/widgy/js/shelves/shelves.js b/widgy/static/widgy/js/shelves/shelves.js index fb9c39ef4..a9fadcdda 100644 --- a/widgy/static/widgy/js/shelves/shelves.js +++ b/widgy/static/widgy/js/shelves/shelves.js @@ -121,7 +121,7 @@ define([ 'exports', 'underscore', 'widgy.backbone', 'nodes/base', else return this.collection._prepareModel(value); }, this); - this.collection.update(instances); + this.collection.set(instances); this.collection.sort(); this.content_classes = null; }, diff --git a/widgy/static/widgy/js/widgy.backbone.js b/widgy/static/widgy/js/widgy.backbone.js index abd363e52..4bd38b586 100644 --- a/widgy/static/widgy/js/widgy.backbone.js +++ b/widgy/static/widgy/js/widgy.backbone.js @@ -1,4 +1,4 @@ -define([ 'jquery', 'underscore', 'backbone', 'mustache', 'lib/q' ], function($, _, Backbone, Mustache, Q) { +define([ 'jquery', 'underscore', 'backbone', 'lib/mustache', 'lib/q' ], function($, _, Backbone, Mustache, Q) { Mustache.tags = ['<%', '%>']; From b238945b79f9963fbc79adfa3c098b4a61028504 Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Tue, 11 Jun 2013 15:22:35 -0600 Subject: [PATCH 0619/1061] test ShelfItem event bubbling --- js_tests/package.json | 3 +- js_tests/tests/setup.js | 14 +++++++++ js_tests/tests/test_node.js | 9 ------ js_tests/tests/test_nodeview.js | 38 ++++++++++++++++++++++++ js_tests/tests/test_widget_component.js | 14 --------- widgy/static/widgy/js/nodes/nodes.js | 18 +++++++---- widgy/static/widgy/js/shelves/shelves.js | 19 +++++++----- widgy/static/widgy/js/widgy.backbone.js | 3 +- 8 files changed, 79 insertions(+), 39 deletions(-) create mode 100644 js_tests/tests/test_nodeview.js diff --git a/js_tests/package.json b/js_tests/package.json index 18711126f..5622efc41 100644 --- a/js_tests/package.json +++ b/js_tests/package.json @@ -9,7 +9,8 @@ "dependencies": { "jsdom": "~0.3.4", "requirejs": "~2.1.4", - "chai": "~1.4.2" + "chai": "~1.4.2", + "sinon": "~1.7.1" }, "devDependencies": { "mocha": "~1.8.1", diff --git a/js_tests/tests/setup.js b/js_tests/tests/setup.js index 6ebf1cc81..40d7b5b59 100644 --- a/js_tests/tests/setup.js +++ b/js_tests/tests/setup.js @@ -38,6 +38,20 @@ test = { } }; +requirejs.define('components/testcomponent/component', ['widgy.contents'], function(contents) { + var TestContent = contents.Model.extend(); + var EditorView = contents.EditorView.extend(); + + var WidgetView = contents.View.extend({ + editorClass: EditorView + }); + + return _.extend({}, contents, { + Model: TestContent, + View: WidgetView + }); +}); + module.exports = { test: test }; diff --git a/js_tests/tests/test_node.js b/js_tests/tests/test_node.js index f67321430..089fde9ad 100644 --- a/js_tests/tests/test_node.js +++ b/js_tests/tests/test_node.js @@ -17,15 +17,6 @@ var assertListsEqual = function(a, b, message) { } }; -// define a TestComponent -requirejs.define('components/testcomponent/component', ['widgy.contents'], function(contents) { - var TestContent = contents.Model.extend(); - - return _.extend({}, contents, { - Model: TestContent - }); -}); - var TestComponent = requirejs('components/testcomponent/component'); diff --git a/js_tests/tests/test_nodeview.js b/js_tests/tests/test_nodeview.js new file mode 100644 index 000000000..e88356360 --- /dev/null +++ b/js_tests/tests/test_nodeview.js @@ -0,0 +1,38 @@ +var test = require('./setup').test, + requirejs = require('requirejs'), + assert = require('chai').assert, + sinon = require('sinon'); + +var nodes = requirejs('nodes/nodes'), + shelves = requirejs('shelves/shelves'), + _ = requirejs('underscore'), + Q = requirejs('lib/q'); + + +describe('ShelfView', function() { + beforeEach(function() { + this.node = new nodes.Node({ + content: { + component: 'testcomponent', + shelf: true + } + }); + }); + + it('bubbles ShelfItemView events', function() { + return this.node.ready(function(node) { + var node_view = new nodes.NodeView({model: node}), + callback = sinon.spy(), + // this would happen in renderShelf + shelf = node_view.makeShelf(); + + shelf.collection.add({}); + var shelf_item = shelf.list.list[0]; + + shelf.on('foo', callback); + assert.isFalse(callback.called); + shelf_item.trigger('foo'); + assert.isTrue(callback.called); + }); + }); +}); diff --git a/js_tests/tests/test_widget_component.js b/js_tests/tests/test_widget_component.js index 6d771a40c..1cf4806cd 100644 --- a/js_tests/tests/test_widget_component.js +++ b/js_tests/tests/test_widget_component.js @@ -8,20 +8,6 @@ var _ = requirejs('underscore'), contents = requirejs('widgy.contents'), nodes = requirejs('nodes/nodes'); -// define a TestComponent -requirejs.define('components/testcomponent/component', ['widgy.contents'], function(contents) { - var EditorView = contents.EditorView.extend({ - }); - - var WidgetView = contents.View.extend({ - editorClass: EditorView - }); - - return _.extend({}, contents, { - View: WidgetView - }); -}); - var TestComponent = requirejs('components/testcomponent/component'); diff --git a/widgy/static/widgy/js/nodes/nodes.js b/widgy/static/widgy/js/nodes/nodes.js index ad44bc8b5..86ffb9316 100644 --- a/widgy/static/widgy/js/nodes/nodes.js +++ b/widgy/static/widgy/js/nodes/nodes.js @@ -451,12 +451,7 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ renderShelf: function() { console.log('renderShelf'); - var shelf = this.shelf = new shelves.ShelfView({ - collection: new shelves.ShelfCollection({ - node: this.node - }), - app: this.app - }); + var shelf = this.shelf = this.makeShelf(); this.listenTo(shelf, 'startDrag', this.startDrag) .listenTo(shelf, 'stopDrag', this.stopDrag); @@ -479,6 +474,17 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ shelf.el.style.marginTop = margin_top + 'px'; }); } + + return shelf; + }, + + makeShelf: function() { + return new shelves.ShelfView({ + collection: new shelves.ShelfCollection({ + node: this.node + }), + app: this.app + }); }, toJSON: function() { diff --git a/widgy/static/widgy/js/shelves/shelves.js b/widgy/static/widgy/js/shelves/shelves.js index a9fadcdda..24db6d896 100644 --- a/widgy/static/widgy/js/shelves/shelves.js +++ b/widgy/static/widgy/js/shelves/shelves.js @@ -1,8 +1,8 @@ -define([ 'exports', 'underscore', 'widgy.backbone', 'nodes/base', +define([ 'jquery', 'underscore', 'widgy.backbone', 'nodes/base', 'nodes/models', 'text!nodes/preview.html', 'text!./shelf.html' - ], function(exports, _, Backbone, DraggableView, + ], function($, _, Backbone, DraggableView, node_models, shelf_item_view_template, shelf_view_template @@ -32,14 +32,11 @@ define([ 'exports', 'underscore', 'widgy.backbone', 'nodes/base', 'resizeShelf' ); - this.collection.on('add', this.addOne) - .on('sort', this.resort); + this.collection.on('add', this.addOne); this.app = options.app; this.list = new Backbone.ViewList(); - - $(window).resize(this.resizeShelf); }, addOne: function(model) { @@ -51,7 +48,6 @@ define([ 'exports', 'underscore', 'widgy.backbone', 'nodes/base', view.on('all', this.bubble); this.list.push(view); - this.$list.append(view.render().el); }, resort: function(collection) { @@ -69,8 +65,15 @@ define([ 'exports', 'underscore', 'widgy.backbone', 'nodes/base', render: function() { Backbone.View.prototype.render.apply(this, arguments); - this.$list = this.$el.children('.list'); + var $list = this.$list = this.$el.children('.list'); + this.collection.on('sort', this.resort); + + this.list.on('push', function(view) { + $list.append(view.render().el); + }); + this.resizeShelf(); + $(window).resize(this.resizeShelf); return this; }, diff --git a/widgy/static/widgy/js/widgy.backbone.js b/widgy/static/widgy/js/widgy.backbone.js index 4bd38b586..874f0bd3a 100644 --- a/widgy/static/widgy/js/widgy.backbone.js +++ b/widgy/static/widgy/js/widgy.backbone.js @@ -171,10 +171,11 @@ define([ 'jquery', 'underscore', 'backbone', 'lib/mustache', 'lib/q' ], function ); } - _.extend(ViewList.prototype, { + _.extend(ViewList.prototype, Backbone.Events, { push: function(view) { view.on('close', this.remove); this.list.push(view); + this.trigger('push', view); }, remove: function(view) { From d810b1851d0c6e4e8fb376648c36b6e2fe6cf407 Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Tue, 11 Jun 2013 17:46:42 -0600 Subject: [PATCH 0620/1061] Replaced dragTimeout with distanceTrigger Now, dragging a widget doesn't begin until you have moved at least 5 pixels. --- .../widgy/js/components/tabbed/component.js | 1 - widgy/static/widgy/js/nodes/base.js | 99 ++++++++++++++----- widgy/static/widgy/js/nodes/nodes.js | 34 +------ widgy/static/widgy/js/shelves/shelves.js | 12 +++ 4 files changed, 93 insertions(+), 53 deletions(-) diff --git a/widgy/static/widgy/js/components/tabbed/component.js b/widgy/static/widgy/js/components/tabbed/component.js index 56891343f..9720495b0 100644 --- a/widgy/static/widgy/js/components/tabbed/component.js +++ b/widgy/static/widgy/js/components/tabbed/component.js @@ -77,7 +77,6 @@ define([ 'underscore', 'widgy.backbone', 'components/widget/component' ], functi prepareChild: function(child_view) { widget.View.prototype.prepareChild.apply(this, arguments); this.listenTo(child_view, 'rendered', this.stealThingsFromChild); - child_view.dragTimeout = 100; return child_view; }, diff --git a/widgy/static/widgy/js/nodes/base.js b/widgy/static/widgy/js/nodes/base.js index 6c8d7848d..48302172a 100644 --- a/widgy/static/widgy/js/nodes/base.js +++ b/widgy/static/widgy/js/nodes/base.js @@ -6,6 +6,8 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( document.body.scrollTop += amount; }, 100); + var BACKTICK = 96; + /** * Provides an interface for a draggable NodeView. See NodeView for more @@ -15,7 +17,7 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( var DraggablewView = Backbone.View.extend({ tagName: 'li', className: 'node', - dragTimeout: 0, + distanceTrigger: 5, events: Backbone.extendEvents(Backbone.View, { 'mousedown .drag-row': 'onMouseDown' @@ -28,7 +30,11 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( 'startBeingDragged', 'followMouse', 'stopBeingDragged', - 'canAcceptParent' + 'canAcceptParent', + 'bindDragEvents', + 'unbindDocument', + 'checkDistance', + 'debugMode' ); this @@ -59,26 +65,13 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( event.stopPropagation(); // only on a left click. - if ( event.which !== 1 ) - return; - - if ( ! this.app.ready() ) - return; - - var _continue = true; - - this.$el.on('mouseup.draggable-timeout', function() { - _continue = false; - }); + if ( event.which !== 1 || ! this.app.ready() ) + return false; - setTimeout(_.bind(function() { - this.$el.off('.draggable-timeout'); - if ( _continue ) - this.startBeingDragged(event); - }, this), this.dragTimeout); - }, + // this is for checkDistance + this.originalX = event.clientX; + this.originalY = event.clientY; - startBeingDragged: function(event) { // Store the mouse offset in this container for followMouse to use. We // need to get this before `this.app.startDrag`, otherwise the drop // targets screw everything up. @@ -86,8 +79,39 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( this.cursorOffsetX = event.clientX - offset.left + (event.pageX - event.clientX); this.cursorOffsetY = event.clientY - offset.top + (event.pageY - event.clientY); - // follow mouse really quick, just in case they haven't moved their mouse - // yet. + $(document) + .on('mouseup.' + this.cid, this.unbindDocument) + .on('mousemove.' + this.cid, this.checkDistance); + + $(window).on('scroll.' + this.cid, _.bind(function() { + // pass in a fake mouse event. + this.startBeingDragged({ + clientY: this.originalY, + clientX: this.originalX + }); + }, this)); + + return true; + }, + + unbindDocument: function(event) { + $(document).off('.' + this.cid); + $(window).off('.' + this.cid); + }, + + checkDistance: function(event) { + var distance = Math.sqrt(Math.pow(event.clientY - this.originalY, 2) + Math.pow(event.clientX - this.originalX, 2)); + + if ( distance > this.distanceTrigger ) { + this.startBeingDragged(event); + } + }, + + startBeingDragged: function(event) { + this.unbindDocument(); + + // follow mouse really quick, just in case they haven't moved their + // mouse yet. this.followMouse(event); this.$el.css({ @@ -96,9 +120,36 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( }); this.$el.addClass('being_dragged'); + this.bindDragEvents(); this.trigger('startDrag', this); }, + bindDragEvents: function() { + var view = this; + + $(document) + .on('mouseup.' + this.cid, this.stopBeingDragged) + .on('mousemove.' + this.cid, this.followMouse) + .on('selectstart.' + this.cid, function(){ return false; }) + // debugging helper + .one('keypress.' + this.cid, function(event) { + if ( event.which === BACKTICK ) + view.debugMode(); + }); + }, + + debugMode: function(event) { + var view = this; + view.unbindDocument(); + + $(document) + // resume dragging + .one('keypress.' + this.cid, function(event) { + if ( event.which === BACKTICK ) + view.bindDragEvents(); + }); + }, + stopBeingDragged: function() { this.$el.css({ top: '', @@ -107,9 +158,11 @@ define(['jquery', 'underscore', 'widgy.backbone'], function( 'z-index': '' }); + this.unbindDocument(); this.$el.removeClass('being_dragged'); - clearInterval(this.bumpInterval); + + this.trigger('stopDrag'); }, bumpAmount: function(clientY) { diff --git a/widgy/static/widgy/js/nodes/nodes.js b/widgy/static/widgy/js/nodes/nodes.js index 86ffb9316..b2607a2c0 100644 --- a/widgy/static/widgy/js/nodes/nodes.js +++ b/widgy/static/widgy/js/nodes/nodes.js @@ -94,9 +94,9 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ return this.content.get('pop_out') === 2 && ! this.isRootNode(); }, - startBeingDragged: function(event) { + onMouseDown: function(event) { if ( $(event.target).is('.title, .drag-row, .drag_handle') && this.content.get('draggable') ) { - return DraggableView.prototype.startBeingDragged.apply(this, arguments); + return DraggableView.prototype.onMouseDown.apply(this, arguments); } else { return false; } @@ -207,27 +207,6 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ startDrag: function(dragged_view) { if ( ( this.hasShelf() && ! dragged_view.model.id || this.isRootNode() )) { this.dragged_view = dragged_view; - - var bindToDocument = _.bind(function() { - $(document) - .on('mouseup.' + dragged_view.cid, this.stopDragging) - .on('mousemove.' + dragged_view.cid, dragged_view.followMouse) - .on('selectstart.' + dragged_view.cid, function(){ return false; }) - // debugging helper - .one('keypress.' + dragged_view.cid, function(event) { - if ( event.which === 96 ) { - $(document) - .off('.' + dragged_view.cid) - // resume dragging - .one('keypress.' + dragged_view.cid, function(event) { - if ( event.which === 96 ) bindToDocument(); - }); - } - }); - }, this); - - bindToDocument(); - this.addDropTargets(dragged_view); } else { // propagate event @@ -239,11 +218,6 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ var dragged_view = this.dragged_view; delete this.dragged_view; - $(document).off('.' + dragged_view.cid); - - if ( dragged_view.placeholder ) - dragged_view.placeholder.remove(); - this.clearDropTargets(); dragged_view.stopBeingDragged(); @@ -253,7 +227,9 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/ stopDrag: function(callback) { if ( this.hasShelf() && this.dragged_view ) { - callback(this.stopDragging()); + var dragged_view = this.stopDragging(); + if ( callback ) + callback(dragged_view); } else { // propagate event this.trigger('stopDrag', callback); diff --git a/widgy/static/widgy/js/shelves/shelves.js b/widgy/static/widgy/js/shelves/shelves.js index 24db6d896..bf2674af4 100644 --- a/widgy/static/widgy/js/shelves/shelves.js +++ b/widgy/static/widgy/js/shelves/shelves.js @@ -151,6 +151,13 @@ define([ 'jquery', 'underscore', 'widgy.backbone', 'nodes/base', return this.app.validateRelationship(parent, this.model); }, + onMouseDown: function(event) { + var ret = DraggableView.prototype.onMouseDown.apply(this, arguments); + + if (ret) + this.startBeingDragged(event); + }, + startBeingDragged: function(event) { DraggableView.prototype.startBeingDragged.apply(this, arguments); @@ -161,6 +168,11 @@ define([ 'jquery', 'underscore', 'widgy.backbone', 'nodes/base', this.$el.after(placeholder); }, + stopBeingDragged: function() { + DraggableView.prototype.stopBeingDragged.apply(this, arguments); + this.placeholder.remove(); + }, + cssClasses: function() { return this.model.get('css_classes'); } From 7739178479aa616743b0e27dd1e716ba7f3c5b7f Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Wed, 12 Jun 2013 14:15:33 -0600 Subject: [PATCH 0621/1061] Use 'here' classes in the top nav menu The li and the anchor for current_or_ascendant pages should have a 'here' class. The anchor doesn't strictly need it, but it's more convenient for the designers that way. --- .../widgy_mezzanine/templates/pages/menus/dropdown.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/widgy/contrib/widgy_mezzanine/templates/pages/menus/dropdown.html b/widgy/contrib/widgy_mezzanine/templates/pages/menus/dropdown.html index 0677e244f..ba4a37ac5 100644 --- a/widgy/contrib/widgy_mezzanine/templates/pages/menus/dropdown.html +++ b/widgy/contrib/widgy_mezzanine/templates/pages/menus/dropdown.html @@ -4,8 +4,9 @@
      {% for page in page_branch %} {% if page.in_menu %} -
    • - {{ page.title }} + + {{ page.title }} {% if page.branch_level == 0 and page.has_children_in_menu %} {% page_menu page %} {% endif %} From 305803966504baeb5b5dff44c85b36dc081b2b54 Mon Sep 17 00:00:00 2001 From: Antoine Catton Date: Wed, 12 Jun 2013 09:44:52 -0600 Subject: [PATCH 0622/1061] Make Mezzanine links linkable --- tests/modeltests/core_tests/models.py | 10 ++-- tests/modeltests/core_tests/tests/links.py | 25 +++++----- widgy/contrib/widgy_mezzanine/admin.py | 4 ++ widgy/contrib/widgy_mezzanine/models.py | 6 +-- widgy/models/links.py | 58 ++++++++++++++-------- 5 files changed, 61 insertions(+), 42 deletions(-) diff --git a/tests/modeltests/core_tests/models.py b/tests/modeltests/core_tests/models.py index a13d59f5f..c99ffa75d 100644 --- a/tests/modeltests/core_tests/models.py +++ b/tests/modeltests/core_tests/models.py @@ -4,7 +4,7 @@ from widgy.db.fields import WidgyField, VersionedWidgyField from widgy import registry -from widgy.models.links import LinkableMixin, LinkField +from widgy.models import links from widgy.models.mixins import InvisibleMixin @@ -156,19 +156,21 @@ class ForeignKeyWidget(Content): registry.register(ForeignKeyWidget) -class LinkableThing(LinkableMixin, models.Model): +@links.register +class LinkableThing(models.Model): name = models.CharField(max_length=255, default='') def __unicode__(self): return self.name -class AnotherLinkableThing(LinkableMixin, models.Model): +@links.register +class AnotherLinkableThing(models.Model): pass class ThingWithLink(models.Model): - link = LinkField('linkable_content_type', 'linkable_object_id') + link = links.LinkField('linkable_content_type', 'linkable_object_id') class MyInvisibleBucket(InvisibleMixin, Content): diff --git a/tests/modeltests/core_tests/tests/links.py b/tests/modeltests/core_tests/tests/links.py index 4b01c0236..93c5a8f40 100644 --- a/tests/modeltests/core_tests/tests/links.py +++ b/tests/modeltests/core_tests/tests/links.py @@ -2,8 +2,7 @@ from django.test import TestCase from widgy.models.links import ( - get_all_linkable_classes, get_all_linker_classes, - get_link_field_from_model, LinkFormMixin, LinkFormField, + link_registry, get_link_field_from_model, LinkFormMixin, LinkFormField, get_composite_key, convert_linkable_to_choice, ) @@ -15,24 +14,24 @@ class TestLinkRelations(TestCase): def test_get_all_linkable_classes(self): - self.assertIn(LinkableThing, get_all_linkable_classes()) - self.assertIn(AnotherLinkableThing, get_all_linkable_classes()) + self.assertIn(LinkableThing, link_registry) + self.assertIn(AnotherLinkableThing, link_registry) def test_get_all_linker_classes(self): - self.assertIn(ThingWithLink, get_all_linker_classes()) - self.assertNotIn(Bucket, get_all_linker_classes()) - self.assertNotIn(VersionPageThrough, get_all_linker_classes()) + self.assertIn(ThingWithLink, link_registry.get_all_linker_classes()) + self.assertNotIn(Bucket, link_registry.get_all_linker_classes()) + self.assertNotIn(VersionPageThrough, link_registry.get_all_linker_classes()) def test_get_all_links_for_obj(self): linkable = LinkableThing.objects.create() - self.assertEqual(len(list(linkable.get_links())), 0) + self.assertEqual(len(list(link_registry.get_links(linkable))), 0) thing = ThingWithLink.objects.create( link=linkable, ) - self.assertEqual(list(linkable.get_links()), [thing]) + self.assertEqual(list(link_registry.get_links(linkable)), [thing]) linkable2 = AnotherLinkableThing.objects.create() @@ -40,7 +39,7 @@ def test_get_all_links_for_obj(self): link=linkable2, ) - self.assertEqual(list(linkable2.get_links()), [thing2]) + self.assertEqual(list(link_registry.get_links(linkable2)), [thing2]) def test_get_all_possible_linkables(self): l1 = LinkableThing.objects.create() @@ -87,11 +86,11 @@ def test_choices(self): # TODO: this has an implicit ordering check, that might be brittle. self.assertEqual(form.fields['link'].choices, [ + (AnotherLinkableThing._meta.verbose_name_plural, [ + convert_linkable_to_choice(page3), + ]), (LinkableThing._meta.verbose_name_plural, [ convert_linkable_to_choice(page2), convert_linkable_to_choice(page1), ]), - (AnotherLinkableThing._meta.verbose_name_plural, [ - convert_linkable_to_choice(page3), - ]), ]) diff --git a/widgy/contrib/widgy_mezzanine/admin.py b/widgy/contrib/widgy_mezzanine/admin.py index 16f1f4931..f278dabe8 100644 --- a/widgy/contrib/widgy_mezzanine/admin.py +++ b/widgy/contrib/widgy_mezzanine/admin.py @@ -14,10 +14,12 @@ from mezzanine.core.models import (CONTENT_STATUS_PUBLISHED, CONTENT_STATUS_DRAFT) +from mezzanine.pages.models import Link from widgy.forms import WidgyFormMixin from widgy.contrib.widgy_mezzanine import get_widgypage_model from widgy.utils import fancy_import, format_html +from widgy.models import links WidgyPage = get_widgypage_model() @@ -133,3 +135,5 @@ def __init__(self, *args, **kwargs): admin.site.register(WidgyPage, WidgyPageAdmin) admin.site.register(UndeletePage, UndeletePageAdmin) + +links.register(Link) diff --git a/widgy/contrib/widgy_mezzanine/models.py b/widgy/contrib/widgy_mezzanine/models.py index 6d3301a7f..dc511f39a 100644 --- a/widgy/contrib/widgy_mezzanine/models.py +++ b/widgy/contrib/widgy_mezzanine/models.py @@ -2,10 +2,8 @@ from django.conf import settings from django.core import urlresolvers -from widgy.models.links import LinkableMixin - -class WidgyPageMixin(LinkableMixin): +class WidgyPageMixin(object): base_template = 'widgy/mezzanine_base.html' @property @@ -42,7 +40,9 @@ def get_content_model(self): if getattr(settings, 'WIDGY_MEZZANINE_PAGE_MODEL', None) is None: from mezzanine.pages.models import Page from widgy.db.fields import VersionedWidgyField + from widgy.models import links + @links.register class WidgyPage(WidgyPageMixin, Page): root_node = VersionedWidgyField( site=settings.WIDGY_MEZZANINE_SITE, diff --git a/widgy/models/links.py b/widgy/models/links.py index 7428cd639..74af59692 100644 --- a/widgy/models/links.py +++ b/widgy/models/links.py @@ -3,26 +3,51 @@ from django.db import models from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ImproperlyConfigured from django import forms from widgy.generic import WidgyGenericForeignKey -def is_linkable(model): - return issubclass(model, LinkableMixin) and not model._meta.proxy +class LinkRegistry(set): + def register(self, model): + if model in self: + raise ImproperlyConfigured(("You cannot register the same " + "content ('{0}') twice.").format(model)) + if not issubclass(model, models.Model): + raise ImproperlyConfigured(("{0} is not a subclass of django.db.models.Model, " + "so it cannot be registered").format(model)) + self.add(model) -def has_link(model): - return any(isinstance(field, LinkField) - for field in model._meta.virtual_fields) + # This allow LinkRegistry.register to be used as a decorator + return model + def unregister(self, model): + self.remove(model) + + def get_links(self, obj): + if not isinstance(obj, tuple(self)): + raise ValueError("The object class is not registered linkable") + all_qs = (linker._default_manager.filter(points_to_links(linker, obj)) + for linker in self.get_all_linker_classes()) + + return itertools.chain.from_iterable(all_qs) + + @classmethod + def get_all_linker_classes(cls): + return filter(cls.has_link, models.get_models()) + + @classmethod + def has_link(cls, model): + return any(isinstance(field, LinkField) + for field in model._meta.virtual_fields) -def get_all_linkable_classes(): - return filter(is_linkable, models.get_models()) -def get_all_linker_classes(): - return filter(has_link, models.get_models()) +link_registry = LinkRegistry() +register = link_registry.register +unregister = link_registry.register def points_to_links(linker, linkable): @@ -37,18 +62,6 @@ def points_to_links(linker, linkable): if isinstance(field, LinkField))) -class LinkableMixin(object): - def get_links(self): - """ - Returns a heterogenous list of all things that have a LinkField that - points to self. - """ - all_qs = (linker._default_manager.filter(points_to_links(linker, self)) - for linker in get_all_linker_classes()) - - return itertools.chain.from_iterable(all_qs) - - class LinkField(WidgyGenericForeignKey): """ TODO: Explore the consequences of using add_field in contribute_to_class to @@ -56,6 +69,7 @@ class LinkField(WidgyGenericForeignKey): """ def __init__(self, ct_field=None, fk_field=None, *args, **kwargs): self.null = kwargs.pop('null', False) + self._link_registry = kwargs.pop('link_registry', link_registry) super(LinkField, self).__init__(ct_field, fk_field, *args, **kwargs) def get_choices(self): @@ -63,7 +77,7 @@ def get_choices(self): def get_choices_by_class(self): return ((Model, Model._default_manager.all()) - for Model in get_all_linkable_classes()) + for Model in self._link_registry) def contribute_to_class(self, cls, name): if self.ct_field is None: From 6a5a7f40107a92a63de6f7fd04d9b0a944417ca8 Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Thu, 13 Jun 2013 10:14:18 -0600 Subject: [PATCH 0623/1061] Set section_behavior when rendering accordion This needs to be set when render accordions in addition to tabs. Otherwise, an accordion inside a tab will still have section_behavior=tabs. --- .../templates/widgy/page_builder/accordion/render.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/widgy/contrib/page_builder/templates/widgy/page_builder/accordion/render.html b/widgy/contrib/page_builder/templates/widgy/page_builder/accordion/render.html index f95fd2b70..33a0ffb8e 100644 --- a/widgy/contrib/page_builder/templates/widgy/page_builder/accordion/render.html +++ b/widgy/contrib/page_builder/templates/widgy/page_builder/accordion/render.html @@ -1,7 +1,9 @@ {% load widgy_tags %}
      - {% for child in self.get_children %} - {% render child %} - {% endfor %} + {% with section_behavior='accordion' %} + {% for child in self.get_children %} + {% render child %} + {% endfor %} + {% endwith %}
      From e791e48d7da3da2b44d3c4723210f4c67101c6ac Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Thu, 13 Jun 2013 11:15:25 -0600 Subject: [PATCH 0624/1061] Use a relative protocol link for the font file. --- widgy/templates/widgy/widgy_field.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgy/templates/widgy/widgy_field.html b/widgy/templates/widgy/widgy_field.html index 6f0f86796..945c539d6 100644 --- a/widgy/templates/widgy/widgy_field.html +++ b/widgy/templates/widgy/widgy_field.html @@ -11,7 +11,7 @@ {% endcomment %} - + {% compress css %} From 2281f04152ef74c157e0d74fc0a9f1dddf3ab03f Mon Sep 17 00:00:00 2001 From: Antoine Catton Date: Thu, 13 Jun 2013 11:42:53 -0600 Subject: [PATCH 0625/1061] Fix uncaptcha template (Localization and HTML validation) --- .../templates/widgy/form_builder/uncaptcha/render.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/widgy/contrib/form_builder/templates/widgy/form_builder/uncaptcha/render.html b/widgy/contrib/form_builder/templates/widgy/form_builder/uncaptcha/render.html index 9392f385b..1c465e9ce 100644 --- a/widgy/contrib/form_builder/templates/widgy/form_builder/uncaptcha/render.html +++ b/widgy/contrib/form_builder/templates/widgy/form_builder/uncaptcha/render.html @@ -1,8 +1,8 @@ -{% load fusionbox_tags %}{{ field.errors }} +{% load fusionbox_tags i18n %}{{ field.errors }}
      - + -

      Please copy "{{ csrf_token }}" into the field labeled "Uncaptcha" +

      {% blocktrans %}Please copy "{{ csrf_token }}" into the field labeled "Uncaptcha".{% endblocktrans %}
      diff --git a/widgy/templates/widgy/revert.html b/widgy/templates/widgy/revert.html index 2baa2a941..9d18aa7f7 100644 --- a/widgy/templates/widgy/revert.html +++ b/widgy/templates/widgy/revert.html @@ -3,15 +3,7 @@
      -
      - {% csrf_token %} - {% for field in form %} - {% include "widgy/field_as_div.html" %} - {% endfor %} -

      - {% include submitrow_template with commit=object.root_node %} -

      -
      + {% include "widgy/_commit_form.html" with commit=object.root_node action_url=revert_url %} diff --git a/widgy/templatetags/widgy_tags.py b/widgy/templatetags/widgy_tags.py index bb7221e05..a5ed2f16e 100644 --- a/widgy/templatetags/widgy_tags.py +++ b/widgy/templatetags/widgy_tags.py @@ -68,18 +68,18 @@ def render_root(context, owner, field_name): @register.simple_tag def reverse_site_url(site, view_string, *args, **kwargs): - """We would be tempted to put + """ + We would be tempted to use {% url site.view kwarg=value kwarg2=value2 %} - but site.view actually return a callable (the view itself). - And Django template variable tries solver call it, fails - and resolve `site.view' as an empty string. + but site.view actually returns a callable (the view itself). The Django + template variable resolver tries to call it, which fails and resolves + `site.view' as an empty string. """ view = getattr(site, view_string) return site.reverse(view, args=args, kwargs=kwargs) class SitepermsWrapper(object): - def __init__(self, request, site): self._request = request self._site = site @@ -99,20 +99,17 @@ def __getitem__(self, item): class SitepermsNode(Node): - def __init__(self, site, siteperms): - self.site = site + self.site = template.Variable(site) self.siteperms = siteperms def render(self, context): - if self.site not in context: + try: + site = self.site.resolve(context) + except template.VariableDoesNotExist: raise TemplateSyntaxError(("'siteperms' variable %s " "not in context") % self.site) - if self.siteperms in context: - raise TemplateSyntaxError(("'siteperms' overriding variable " - "%s") % self.site) - context[self.siteperms] = SitepermsWrapper(context['request'], - context[self.site]) + context[self.siteperms] = SitepermsWrapper(context['request'], site) return '' diff --git a/widgy/views/versioning.py b/widgy/views/versioning.py index f5055b7ae..567907a30 100644 --- a/widgy/views/versioning.py +++ b/widgy/views/versioning.py @@ -7,18 +7,15 @@ FormView, DetailView, TemplateView, - RedirectView, ) from django.views.generic.detail import SingleObjectMixin -from django.shortcuts import get_object_or_404, redirect +from django.shortcuts import get_object_or_404 from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.utils import timezone -from django.contrib import messages from BeautifulSoup import BeautifulSoup -from widgy.utils import format_html from widgy.views.base import AuthorizedMixin from widgy.models import Node @@ -46,18 +43,6 @@ def commit(self, obj, user): obj.commit(user, **self.cleaned_data) -class ReviewedCommitForm(CommitForm): - - def commit(self, obj, user): - cleaned_data = self.cleaned_data.copy() - approve_it = 'approve_it' in self.data - - commit = obj.commit(user, **cleaned_data) - - if approve_it: - commit.approve(user) - - class VersionTrackerMixin(SingleObjectMixin): def get_queryset(self): return self.site.get_version_tracker_model().objects.all().select_related( @@ -68,6 +53,7 @@ def get_queryset(self): class CommitView(AuthorizedMixin, VersionTrackerMixin, FormView): template_name = 'widgy/commit.html' + form_class = CommitForm def get_context_data(self, **kwargs): self.object = self.get_object() @@ -83,7 +69,6 @@ def get_context_data(self, **kwargs): # lazy because the template doesn't always use it kwargs['changed_anything'] = lambda: self.object.has_changes() - kwargs['submitrow_template'] = self.site.get_version_tracker_model().commit_submitrow return kwargs @@ -96,9 +81,6 @@ def form_valid(self, form): context=self.get_context_data(), ) - def get_form_class(self): - return self.site.get_commit_form(self.request.user) - class ResetView(AuthorizedMixin, VersionTrackerMixin, TemplateView): template_name = 'widgy/reset.html' @@ -129,7 +111,6 @@ def get_context_data(self, **kwargs): kwargs = super(HistoryView, self).get_context_data(**kwargs) kwargs['site'] = self.site kwargs['commits'] = self.object.get_history_list() - kwargs['history_item_template'] = self.site.get_version_tracker_model().history_item_partial_template for commit in kwargs['commits']: if commit.parent_id: commit.diff_url = diff_url(self.site, @@ -138,73 +119,10 @@ def get_context_data(self, **kwargs): return kwargs -class ApprovalChangeBaseView(AuthorizedMixin, VersionTrackerMixin, RedirectView): - """ - Abstract class for approving or unapproving commits - """ - http_method_names = ['post'] - - def get_redirect_url(self, pk, commit_pk): - vt = get_object_or_404(self.get_queryset(), pk=pk) - commit = get_object_or_404(vt.commits.select_related('root_node'), - pk=commit_pk) - commit.tracker = vt - - self.action(commit) - - history_url = self.site.reverse(self.site.history_view, kwargs={ - 'pk': vt.pk - }) - - messages.success(self.request, self.get_message(commit, history_url)) - - return history_url - - def action(self, commit): - raise NotImplementedError("action should be implemented in subclass") - - def get_message(self, commit, history_url): - raise NotImplementedError("get_message should be implemented in subclass") - - -class ApproveView(ApprovalChangeBaseView): - - def action(self, commit): - commit.approve(self.request.user) - commit.save() - - def get_message(self, commit, history_url): - # XXX: Avoid circular import - from widgy.forms import UndoApprovalsForm - from widgy.admin import HTML_IN_MESSAGES - - message = _('Commit %s has been approved') % commit - if HTML_IN_MESSAGES: - message = format_html('{0} {1}', - message, - UndoApprovalsForm( - initial={ - 'actions': [commit.pk], - 'referer': history_url, - } - ).render(self.request, self.site) - ) - return message - - -class UnapproveView(ApprovalChangeBaseView): - - def action(self, commit): - commit.unapprove(self.request.user) - commit.save() - - def get_message(self, commit, history_url): - return _('Commit %s has been unapproved') % commit - - class RevertView(AuthorizedMixin, VersionTrackerMixin, FormView): template_name = 'widgy/revert.html' pk_url_kwarg = 'commit_pk' + form_class = CommitForm def get_context_data(self, **kwargs): kwargs['object'] = self.object @@ -212,7 +130,6 @@ def get_context_data(self, **kwargs): kwargs['revert_url'] = self.site.reverse( self.site.revert_view, kwargs={'pk': self.object.tracker.pk, 'commit_pk': self.object.pk}) - kwargs['submitrow_template'] = self.site.get_version_tracker_model().commit_submitrow return kwargs def get_object(self, queryset=None): @@ -242,9 +159,6 @@ def form_valid(self, form): context=self.get_context_data(), ) - def get_form_class(self): - return self.site.get_commit_form(self.request.user) - class DiffView(AuthorizedMixin, TemplateView): template_name = 'widgy/diff.html' @@ -265,31 +179,6 @@ def get_context_data(self, **kwargs): return kwargs -class UndoApprovalsView(AuthorizedMixin, FormView): - http_method_names = ['post'] - - def get_form_class(self): - # XXX: Avoid circular import - from widgy.forms import UndoApprovalsForm - return UndoApprovalsForm - - def form_valid(self, form): - # XXX: Avoid circular import - from widgy.models import VersionCommit - approved_commits = form.cleaned_data['actions'] - if not isinstance(approved_commits, list) or \ - not all([isinstance(i, int) for i in approved_commits]): - return self.form_invalid() - - commits = VersionCommit.objects.filter(pk__in=approved_commits) - for c in commits: - c.unapprove(self.request.user) - return redirect(form.cleaned_data['referer']) - - def form_invalid(self, form): - return redirect('/') - - def daisydiff(before, after): """ Given two strings of html documents in a and b, return a string containing From 0eb8c0c35bc9d7b69b96c954b6e3e91aa4bc07ed Mon Sep 17 00:00:00 2001 From: Antoine Catton Date: Tue, 25 Jun 2013 13:03:34 -0600 Subject: [PATCH 0656/1061] Remove useless method overriding --- widgy/contrib/review_queue/forms.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/widgy/contrib/review_queue/forms.py b/widgy/contrib/review_queue/forms.py index f5800e1aa..3ea968a6a 100644 --- a/widgy/contrib/review_queue/forms.py +++ b/widgy/contrib/review_queue/forms.py @@ -45,11 +45,6 @@ class Meta: model = VersionCommit fields = ('publish_at', ) - def __init__(self, *args, **kwargs): - super(ApproveForm, self).__init__(*args, **kwargs) - if hasattr(self, 'instance'): - self.initial.update(approve=self.instance.is_approved) - def save(self, request, commit=True): if self.cleaned_data['approve']: self.instance.approve(request.user, commit=commit) From 9b08e98fe0b953190e975e75cb0cc981847ee484 Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Wed, 26 Jun 2013 14:49:18 -0600 Subject: [PATCH 0657/1061] Remove WidgySiteTestMixin We only need it in a single test -- just do it there. --- tests/modeltests/core_tests/tests/api.py | 19 ++- tests/modeltests/core_tests/tests/base.py | 47 +----- tests/modeltests/core_tests/tests/core.py | 192 +++++++++++----------- 3 files changed, 122 insertions(+), 136 deletions(-) diff --git a/tests/modeltests/core_tests/tests/api.py b/tests/modeltests/core_tests/tests/api.py index b99bfab7e..422bc41d1 100644 --- a/tests/modeltests/core_tests/tests/api.py +++ b/tests/modeltests/core_tests/tests/api.py @@ -1,6 +1,9 @@ import json +import imp from django.core import urlresolvers +from django.core.exceptions import PermissionDenied +from django.utils.functional import cached_property from widgy.views import extract_id from widgy.models import Node @@ -8,9 +11,18 @@ from modeltests.core_tests.models import ImmovableBucket, UndeletableRawTextWidget, RawTextWidget from modeltests.core_tests.tests.base import RootNodeTestCase, HttpTestCase, make_a_nice_tree +from modeltests.core_tests.widgy_config import widgy_site class TestApi(RootNodeTestCase, HttpTestCase): + widgy_site = widgy_site + + @cached_property + def urls(self): + urls = imp.new_module('urls') + urls.urlpatterns = self.widgy_site.get_urls() + return urls + def setUp(self): super(TestApi, self).setUp() self.node_url = self.widgy_site.reverse(self.widgy_site.node_view) @@ -279,4 +291,9 @@ def test_add_with_right_id(self): class TestApiReviewed(TestApi): - widgy_site_class = ReviewedWidgySite + class Site(ReviewedWidgySite): + def authorize(self, request, *args, **kwargs): + if request.COOKIES.get('unauthorized_access'): + raise PermissionDenied + + widgy_site = Site() diff --git a/tests/modeltests/core_tests/tests/base.py b/tests/modeltests/core_tests/tests/base.py index ab692f3b7..8d36d2c6f 100644 --- a/tests/modeltests/core_tests/tests/base.py +++ b/tests/modeltests/core_tests/tests/base.py @@ -2,53 +2,22 @@ from django.test import TestCase from django.contrib.auth.models import User -from django.core.exceptions import PermissionDenied - -from widgy.site import WidgySite from modeltests.core_tests.models import Layout, RawTextWidget, Bucket +from modeltests.core_tests.widgy_config import widgy_site -class UnauthenticatedWidgySiteMixin(object): - def authorize(self, request, *args, **kwargs): - if request.COOKIES.get('unauthorized_access'): - raise PermissionDenied - - -class FakeUrlsModule(object): - def __init__(self, urlpatterns): - self.urlpatterns = urlpatterns - - -class WidgySiteTestMixin(object): - widgy_site_class = WidgySite - widgy_site_kwargs = {} - - @property - def widgy_site(self): - if not hasattr(self, '_widgy_site'): - WidgySiteClass = type('WidgySiteClass', - (UnauthenticatedWidgySiteMixin, - self.widgy_site_class), - {}) - self._widgy_site = WidgySiteClass(**self.widgy_site_kwargs) - return self._widgy_site - - @property - def urls(self): - if not hasattr(self, '_urls'): - self._urls = FakeUrlsModule(self.widgy_site.get_urls()) - return self._urls - - - -class RootNodeTestCase(WidgySiteTestMixin, TestCase): +class RootNodeTestCase(TestCase): def setUp(self): - self.root_node = Layout.add_root(self.widgy_site).node + super(RootNodeTestCase, self).setUp() + + self.root_node = Layout.add_root(widgy_site).node class HttpTestCase(TestCase): def setUp(self): + super(HttpTestCase, self).setUp() + u = User.objects.create_user( username='testuser', email='asdf@example.com', @@ -98,7 +67,7 @@ def display_node(node): proc.communicate(tree_to_dot(node)) -def make_a_nice_tree(root_node, widgy_site): +def make_a_nice_tree(root_node, widgy_site=widgy_site): left, right = root_node.content.get_children() left.add_child(widgy_site, RawTextWidget, diff --git a/tests/modeltests/core_tests/tests/core.py b/tests/modeltests/core_tests/tests/core.py index f06323168..95b032d8b 100644 --- a/tests/modeltests/core_tests/tests/core.py +++ b/tests/modeltests/core_tests/tests/core.py @@ -11,24 +11,21 @@ from django.db.models.deletion import ProtectedError from django.contrib.auth.models import Permission -from widgy.models import (Node, UnknownWidget, VersionTracker, Content) +from widgy.models import Node, UnknownWidget, VersionTracker, Content from widgy.contrib.review_queue.models import ReviewedVersionTracker from widgy.exceptions import ( ParentWasRejected, ChildWasRejected, MutualRejection, InvalidTreeMovement, InvalidOperation) from widgy.views.versioning import daisydiff +from modeltests.core_tests.widgy_config import widgy_site from modeltests.core_tests.models import ( Layout, Bucket, RawTextWidget, CantGoAnywhereWidget, PickyBucket, ImmovableBucket, AnotherLayout, VowelBucket, VersionedPage, VersionedPage2, VersionedPage3, VersionedPage4, VersionPageThrough, Related, ForeignKeyWidget, WeirdPkBucket, ReviewedVersionedPage ) - - -from modeltests.core_tests.tests.base import ( - RootNodeTestCase, WidgySiteTestMixin, make_a_nice_tree -) +from modeltests.core_tests.tests.base import RootNodeTestCase, make_a_nice_tree class TestCore(RootNodeTestCase): @@ -44,7 +41,7 @@ def test_deep(self): """ content = self.root_node.content for i in range(50): - content = content.add_child(self.widgy_site, + content = content.add_child(widgy_site, Bucket) # + 2 -- original buckets @@ -52,48 +49,48 @@ def test_deep(self): def test_validate_relationship_cls(self): with self.assertRaises(ChildWasRejected): - self.widgy_site.validate_relationship(self.root_node.content, RawTextWidget) + widgy_site.validate_relationship(self.root_node.content, RawTextWidget) bucket = list(self.root_node.content.get_children())[0] with self.assertRaises(ParentWasRejected): - self.widgy_site.validate_relationship(bucket, CantGoAnywhereWidget) + widgy_site.validate_relationship(bucket, CantGoAnywhereWidget) with self.assertRaises(MutualRejection): - self.widgy_site.validate_relationship(self.root_node.content, CantGoAnywhereWidget) + widgy_site.validate_relationship(self.root_node.content, CantGoAnywhereWidget) def test_validate_relationship_instance(self): - picky_bucket = self.root_node.content.add_child(self.widgy_site, + picky_bucket = self.root_node.content.add_child(widgy_site, PickyBucket) with self.assertRaises(ChildWasRejected): - picky_bucket.add_child(self.widgy_site, + picky_bucket.add_child(widgy_site, RawTextWidget, text='aasdf') - picky_bucket.add_child(self.widgy_site, + picky_bucket.add_child(widgy_site, RawTextWidget, text='hello') with self.assertRaises(ChildWasRejected): - picky_bucket.add_child(self.widgy_site, + picky_bucket.add_child(widgy_site, Layout) def test_to_json_works_for_multi_table_inheritance(self): - picky_bucket = self.root_node.content.add_child(self.widgy_site, + picky_bucket = self.root_node.content.add_child(widgy_site, PickyBucket) - picky_bucket.to_json(self.widgy_site) + picky_bucket.to_json(widgy_site) def test_reposition(self): - left, right = make_a_nice_tree(self.root_node, self.widgy_site) + left, right = make_a_nice_tree(self.root_node) with self.assertRaises(InvalidTreeMovement): - self.root_node.content.reposition(self.widgy_site, parent=left.content) + self.root_node.content.reposition(widgy_site, parent=left.content) with self.assertRaises(InvalidTreeMovement): - left.content.reposition(self.widgy_site, right=self.root_node.content) + left.content.reposition(widgy_site, right=self.root_node.content) # swap left and right - right.content.reposition(self.widgy_site, right=left.content) + right.content.reposition(widgy_site, right=left.content) new_left, new_right = self.root_node.get_children() self.assertEqual(right, new_left) @@ -101,28 +98,28 @@ def test_reposition(self): raw_text = new_right.get_first_child() with self.assertRaises(ChildWasRejected): - raw_text.content.reposition(self.widgy_site, + raw_text.content.reposition(widgy_site, parent=self.root_node.content, right=new_left.content) subbucket = list(new_right.get_children())[-1] - subbucket.content.reposition(self.widgy_site, + subbucket.content.reposition(widgy_site, parent=self.root_node.content, right=new_left.content) new_subbucket, new_left, new_right = self.root_node.get_children() self.assertEqual(new_subbucket, subbucket) def test_proxy_model(self): - bucket = VowelBucket.add_root(self.widgy_site) + bucket = VowelBucket.add_root(widgy_site) bucket = Node.objects.get(pk=bucket.node.pk).content - bucket.add_child(self.widgy_site, ImmovableBucket) + bucket.add_child(widgy_site, ImmovableBucket) with self.assertRaises(ChildWasRejected): - bucket.add_child(self.widgy_site, Bucket) + bucket.add_child(widgy_site, Bucket) - bucket.add_child(self.widgy_site, ImmovableBucket) + bucket.add_child(widgy_site, ImmovableBucket) with self.assertRaises(ChildWasRejected): - bucket.add_child(self.widgy_site, Bucket) + bucket.add_child(widgy_site, Bucket) def test_unkown_content_type(self): """ @@ -150,7 +147,7 @@ def test_unkown_content_type_prefetch(self): app_label='faaaaake', ) - left, right = make_a_nice_tree(self.root_node, self.widgy_site) + left, right = make_a_nice_tree(self.root_node) left.content_type = fake_ct left.save() @@ -171,7 +168,7 @@ def test_get_attributes(self): ] for cls, kwargs, attributes in tests: - widget = cls.add_root(self.widgy_site, **kwargs) + widget = cls.add_root(widgy_site, **kwargs) self.assertEqual(widget.get_attributes(), attributes) @@ -206,57 +203,57 @@ def test_unregister_not_registered(self): class TestTreesEqual(RootNodeTestCase): def test_trees_equal_after_clone(self): - left, right = make_a_nice_tree(self.root_node, self.widgy_site) + left, right = make_a_nice_tree(self.root_node) new_root = self.root_node.clone_tree(freeze=False) self.assertTrue(self.root_node.trees_equal(new_root)) new_root.content.get_children()[0].delete() self.assertFalse(self.root_node.trees_equal(new_root)) def test_trees_unequal_content_type(self): - a = CantGoAnywhereWidget.add_root(self.widgy_site) - b = RawTextWidget.add_root(self.widgy_site, text='a') + a = CantGoAnywhereWidget.add_root(widgy_site) + b = RawTextWidget.add_root(widgy_site, text='a') self.assertFalse(a.node.trees_equal(b.node)) def test_trees_unequal_children(self): - a = Bucket.add_root(self.widgy_site) - a.add_child(self.widgy_site, RawTextWidget, text='a') - a.add_child(self.widgy_site, RawTextWidget, text='b') + a = Bucket.add_root(widgy_site) + a.add_child(widgy_site, RawTextWidget, text='a') + a.add_child(widgy_site, RawTextWidget, text='b') - b = Bucket.add_root(self.widgy_site) - b.add_child(self.widgy_site, RawTextWidget, text='a') + b = Bucket.add_root(widgy_site) + b.add_child(widgy_site, RawTextWidget, text='a') self.assertFalse(a.node.trees_equal(b.node)) def test_trees_unequal_depth(self): - a = Bucket.add_root(self.widgy_site).add_child(self.widgy_site, RawTextWidget, text='a') - b = RawTextWidget.add_root(self.widgy_site, text='a') + a = Bucket.add_root(widgy_site).add_child(widgy_site, RawTextWidget, text='a') + b = RawTextWidget.add_root(widgy_site, text='a') self.assertFalse(a.node.trees_equal(b.node)) def test_trees_unequal_content(self): - a = RawTextWidget.add_root(self.widgy_site, text='b') - b = RawTextWidget.add_root(self.widgy_site, text='a') + a = RawTextWidget.add_root(widgy_site, text='b') + b = RawTextWidget.add_root(widgy_site, text='a') self.assertFalse(a.node.trees_equal(b.node)) def test_trees_equal_equal(self): - a = RawTextWidget.add_root(self.widgy_site, text='a') - b = RawTextWidget.add_root(self.widgy_site, text='a') + a = RawTextWidget.add_root(widgy_site, text='a') + b = RawTextWidget.add_root(widgy_site, text='a') self.assertTrue(a.node.trees_equal(b.node)) class TestVersioning(RootNodeTestCase): def make_commit(self, delta=datetime.timedelta(0), vt_class=VersionTracker): - root_node = RawTextWidget.add_root(self.widgy_site, text='first').node + root_node = RawTextWidget.add_root(widgy_site, text='first').node tracker = vt_class.objects.create(working_copy=root_node) commit = tracker.commit(publish_at=timezone.now() + delta) return (tracker, commit) def test_clone_tree(self): - left, right = make_a_nice_tree(self.root_node, self.widgy_site) + left, right = make_a_nice_tree(self.root_node) new_tree = self.root_node.clone_tree() for a, b in zip(self.root_node.depth_first_order(), @@ -267,7 +264,7 @@ def test_clone_tree(self): self.assertEqual(b.content.get_attributes(), b.content.get_attributes()) def test_clone_tree_doesnt_mutate_tree(self): - make_a_nice_tree(self.root_node, self.widgy_site) + make_a_nice_tree(self.root_node) self.root_node.prefetch_tree() before = self.root_node.depth_first_order() self.root_node.clone_tree() @@ -275,9 +272,9 @@ def test_clone_tree_doesnt_mutate_tree(self): self.assertEqual(before, after) def test_clone_tree_uses_prefetch(self): - root = Bucket.add_root(self.widgy_site) - root.add_child(self.widgy_site, RawTextWidget, text='a') - root.add_child(self.widgy_site, RawTextWidget, text='b') + root = Bucket.add_root(widgy_site) + root.add_child(widgy_site, RawTextWidget, text='a') + root.add_child(widgy_site, RawTextWidget, text='b') root_node = root.node root_node.prefetch_tree() @@ -290,20 +287,20 @@ def test_clone_tree_uses_prefetch(self): root_node.clone_tree() def test_content_equal(self): - a = RawTextWidget.add_root(self.widgy_site, text='a') - b = RawTextWidget.add_root(self.widgy_site, text='b') + a = RawTextWidget.add_root(widgy_site, text='a') + b = RawTextWidget.add_root(widgy_site, text='b') self.assertFalse(a.equal(b)) b.text = 'a' b.save() self.assertTrue(a.equal(b)) def test_content_equal_mti(self): - a = AnotherLayout.add_root(self.widgy_site) - b = AnotherLayout.add_root(self.widgy_site) + a = AnotherLayout.add_root(widgy_site) + b = AnotherLayout.add_root(widgy_site) self.assertTrue(a.equal(b)) def test_commit(self): - root_node = RawTextWidget.add_root(self.widgy_site, text='first').node + root_node = RawTextWidget.add_root(widgy_site, text='first').node tracker = VersionTracker.objects.create(working_copy=root_node) commit1 = tracker.commit() @@ -321,13 +318,13 @@ def test_commit(self): self.assertEqual(tracker.head, commit2) def test_tree_structure_versioned(self): - root_node = Bucket.add_root(self.widgy_site).node + root_node = Bucket.add_root(widgy_site).node root_node.content.add_child( - self.widgy_site, + widgy_site, RawTextWidget, text='a') root_node.content.add_child( - self.widgy_site, + widgy_site, RawTextWidget, text='b') @@ -338,7 +335,7 @@ def test_tree_structure_versioned(self): commit1 = tracker.commit() new_a, new_b = tracker.working_copy.content.get_children() - new_b.reposition(self.widgy_site, right=new_a) + new_b.reposition(widgy_site, right=new_a) tracker.working_copy = Node.objects.get(pk=root_node.pk) commit2 = tracker.commit() self.assertEqual(['a', 'b'], @@ -347,7 +344,7 @@ def test_tree_structure_versioned(self): [i.content.text for i in commit2.root_node.get_children()]) def test_revert(self): - root_node = RawTextWidget.add_root(self.widgy_site, text='first').node + root_node = RawTextWidget.add_root(widgy_site, text='first').node tracker = VersionTracker.objects.create(working_copy=root_node) commit1 = tracker.commit() @@ -370,7 +367,7 @@ def test_revert(self): [i.root_node.content.text for i in tracker.get_history()]) def test_get_history(self): - root_node = RawTextWidget.add_root(self.widgy_site, text='first').node + root_node = RawTextWidget.add_root(widgy_site, text='first').node tracker = VersionTracker.objects.create(working_copy=root_node) commits = reversed([tracker.commit() for i in range(6)]) @@ -378,7 +375,7 @@ def test_get_history(self): self.assertSequenceEqual(list(tracker.get_history()), list(commits)) def test_old_contents_cant_change(self): - root_node = RawTextWidget.add_root(self.widgy_site, text='first').node + root_node = RawTextWidget.add_root(widgy_site, text='first').node tracker = VersionTracker.objects.create(working_copy=root_node) commit = tracker.commit() @@ -393,25 +390,25 @@ def test_old_contents_cant_change(self): widget.delete() def test_old_structure_cant_change(self): - root_node = Bucket.add_root(self.widgy_site).node - root_node.content.add_child(self.widgy_site, RawTextWidget, text='a') - root_node.content.add_child(self.widgy_site, RawTextWidget, text='b') + root_node = Bucket.add_root(widgy_site).node + root_node.content.add_child(widgy_site, RawTextWidget, text='a') + root_node.content.add_child(widgy_site, RawTextWidget, text='b') root_node = Node.objects.get(pk=root_node.pk) tracker = VersionTracker.objects.create(working_copy=root_node) commit = tracker.commit() a, b = Node.objects.get(pk=commit.root_node.pk).content.get_children() with self.assertRaises(InvalidOperation): - b.reposition(self.widgy_site, right=a) + b.reposition(widgy_site, right=a) with self.assertRaises(InvalidOperation): - commit.root_node.content.add_child(self.widgy_site, RawTextWidget, text='c') + commit.root_node.content.add_child(widgy_site, RawTextWidget, text='c') self.assertEqual([i.content.text for i in commit.root_node.get_children()], ['a', 'b']) def test_frozen_node(self): - c = RawTextWidget.add_root(self.widgy_site) + c = RawTextWidget.add_root(widgy_site) node = c.node node.is_frozen = True node.save() @@ -430,7 +427,7 @@ def test_frozen_node(self): def test_frozen_node_raw(self): # even the treebeard methods called directly on the node should be frozen - node = RawTextWidget.add_root(self.widgy_site).node + node = RawTextWidget.add_root(widgy_site).node node.is_frozen = True node.save() @@ -453,7 +450,7 @@ def test_frozen_node_raw(self): node.move(node) def test_frozen_reposition(self): - left, right = make_a_nice_tree(self.root_node, self.widgy_site) + left, right = make_a_nice_tree(self.root_node) for node in self.root_node.depth_first_order(): node.is_frozen = True node.save() @@ -463,16 +460,16 @@ def test_frozen_reposition(self): before_ids = [i.id for i in self.root_node.depth_first_order()] with self.assertRaises(InvalidOperation): - left.content.reposition(self.widgy_site, parent=right.content) + left.content.reposition(widgy_site, parent=right.content) with self.assertRaises(InvalidOperation): - right.content.reposition(self.widgy_site, right=left.content) + right.content.reposition(widgy_site, right=left.content) with self.assertRaises(InvalidOperation): - right.content.add_child(self.widgy_site, RawTextWidget, text='asdf') + right.content.add_child(widgy_site, RawTextWidget, text='asdf') with self.assertRaises(InvalidOperation): - right.content.get_children()[0].add_sibling(self.widgy_site, RawTextWidget, text='asdf') + right.content.get_children()[0].add_sibling(widgy_site, RawTextWidget, text='asdf') root_node = Node.objects.get(pk=self.root_node.id) self.assertEqual([i.id for i in root_node.depth_first_order()], @@ -483,7 +480,7 @@ def test_frozen_db_is_canonical(self): # I'm not sure if this failure should be expected or not. Should a node # always recheck the database value? Or, should we use a database # trigger to prevent modifications at the db level? - root_node = RawTextWidget.add_root(self.widgy_site, text='asdf') + root_node = RawTextWidget.add_root(widgy_site, text='asdf') a = Node.objects.get(pk=root_node.pk).content b = Node.objects.get(pk=root_node.pk).content @@ -503,7 +500,7 @@ def test_frozen_db_is_canonical(self): b.delete() def test_prefetch_commits(self): - root_node = RawTextWidget.add_root(self.widgy_site, text='first').node + root_node = RawTextWidget.add_root(widgy_site, text='first').node tracker = VersionTracker.objects.create(working_copy=root_node) user = User.objects.create() commits = reversed([tracker.commit(user=user) for i in range(6)]) @@ -517,7 +514,9 @@ def test_prefetch_commits(self): self.assertEqual(list(commits), history) - tracker = VersionTracker.objects.create(working_copy=RawTextWidget.add_root(self.widgy_site).node) + tracker = VersionTracker.objects.create( + working_copy=RawTextWidget.add_root(widgy_site).node + ) self.assertEqual(tracker.get_history_list(), []) def orphan_helper(self): @@ -525,7 +524,7 @@ def orphan_helper(self): b = VersionedPage2.objects.create() c = VersionedPage4.objects.create() - vt = VersionTracker.objects.create(working_copy=Layout.add_root(self.widgy_site).node) + vt = VersionTracker.objects.create(working_copy=Layout.add_root(widgy_site).node) a.version_tracker = vt b.bar = vt a.save() @@ -601,7 +600,7 @@ def test_deletion_prevented(self): """ related = Related.objects.create() - root_node = ForeignKeyWidget.add_root(self.widgy_site, foo=related).node + root_node = ForeignKeyWidget.add_root(widgy_site, foo=related).node tracker = VersionTracker.objects.create(working_copy=root_node) commit = tracker.commit() @@ -619,8 +618,8 @@ def test_deletion_prevented(self): def test_deep_deletion_prevented(self): # do the deletion on something other than the root node related = Related.objects.create() - root_node = Bucket.add_root(self.widgy_site).node - root_node.content.add_child(self.widgy_site, ForeignKeyWidget, foo=related) + root_node = Bucket.add_root(widgy_site).node + root_node.content.add_child(widgy_site, ForeignKeyWidget, foo=related) root_node = Node.objects.get(pk=root_node.pk) tracker = VersionTracker.objects.create(working_copy=root_node) commit = tracker.commit() @@ -644,12 +643,12 @@ def test_field_create(self): self.assertIsInstance(x.version_tracker.working_copy.content, Layout) def test_has_changes(self): - left, right = make_a_nice_tree(self.root_node, self.widgy_site) + left, right = make_a_nice_tree(self.root_node) vt = VersionTracker.objects.create(working_copy=self.root_node) self.assertTrue(vt.has_changes()) vt.commit() self.assertFalse(vt.has_changes()) - left.content.add_child(self.widgy_site, RawTextWidget, text='foo') + left.content.add_child(widgy_site, RawTextWidget, text='foo') vt = VersionTracker.objects.get(pk=vt.pk) self.assertTrue(vt.has_changes()) @@ -681,7 +680,7 @@ def test_daisydiff_unicode(self): self.assertIn(b, diff) def test_reset(self): - root_node = RawTextWidget.add_root(self.widgy_site, text='first').node + root_node = RawTextWidget.add_root(widgy_site, text='first').node tracker = VersionTracker.objects.create(working_copy=root_node) commit1 = tracker.commit() @@ -715,11 +714,11 @@ def test_multiple_publish_at(self): request_factory = RequestFactory() self.assertEqual(tracker.get_published_node(request_factory.get('/')), - commit1.root_node) + commit1.root_node) commit2 = tracker.commit(publish_at=timezone.now() + datetime.timedelta(days=1)) self.assertEqual(tracker.get_published_node(request_factory.get('/')), - commit1.root_node) + commit1.root_node) def test_rollback_commit_publish(self): tracker, commit1 = self.make_commit(datetime.timedelta(days=1)) @@ -728,7 +727,7 @@ def test_rollback_commit_publish(self): commit2 = tracker.commit(publish_at=timezone.now() - datetime.timedelta(days=1)) self.assertEqual(tracker.get_published_node(request_factory.get('/')), - commit2.root_node) + commit2.root_node) def test_created_at(self): tracker, commit = self.make_commit() @@ -770,12 +769,12 @@ def test_review_queue(self): commit2.root_node) def test_cloning_multi_table_inheritance(self): - root = PickyBucket.add_root(self.widgy_site) + root = PickyBucket.add_root(widgy_site) new_root = root.clone() self.assertNotEqual(new_root.pk, root.pk) def test_cloning_multi_table_inheritance_fancy(self): - root = WeirdPkBucket.add_root(self.widgy_site, bubble=2) + root = WeirdPkBucket.add_root(widgy_site, bubble=2) new_root = root.clone() self.assertNotEqual(new_root.pk, root.pk) @@ -800,7 +799,7 @@ def test_delete(self): self.assertEqual(VersionTracker.objects.filter(pk=tracker.pk).count(), 0) def test_delete_deep_tree_and_multiple_commits(self): - make_a_nice_tree(self.root_node, self.widgy_site) + make_a_nice_tree(self.root_node) tracker = VersionTracker.objects.create(working_copy=self.root_node) tracker.commit() tracker.commit() @@ -833,7 +832,7 @@ def test_foreign_key_to_proxy_works(self): class TestPrefetchTree(RootNodeTestCase): def setUp(self): super(TestPrefetchTree, self).setUp() - make_a_nice_tree(self.root_node, self.widgy_site) + make_a_nice_tree(self.root_node) # ensure the ContentType cache is filled for i in ContentType.objects.all(): ContentType.objects.get_for_id(i.pk) @@ -869,7 +868,8 @@ def test_prefetch_tree(self): right_children = list(right.get_children()) self.assertEqual(right_children[0].text, 'right_1') self.assertEqual(right_children[1].text, 'right_2') - self.assertTrue(all(isinstance(i, Content) for i in root_node.content.depth_first_order())) + self.assertTrue(all(isinstance(i, Content) + for i in root_node.content.depth_first_order())) # verify some convience methods are prefetched as well with self.assertNumQueries(0): @@ -907,7 +907,7 @@ def test_prefetch_tree(self): # to_json shouldn't do any more queries either with self.assertNumQueries(0): - root_node.to_json(self.widgy_site) + root_node.to_json(widgy_site) def test_works_on_not_root_node(self): left_node = self.root_node.get_first_child() @@ -980,20 +980,20 @@ def test_content_node_is_set(self): self.assertEqual(self.root_node.content.node, self.root_node) -class TestSite(WidgySiteTestMixin, TestCase): +class TestSite(TestCase): def test_scss_location(self): - scss_files = self.widgy_site.scss_files + scss_files = widgy_site.scss_files self.assertIn('widgy/core_tests/rawtextwidget.scss', scss_files) # widgy.Content will never have an scss file self.assertNotIn('widgy/models/content.scss', scss_files) def test_js_files(self): - js_files = self.widgy_site.js_files + js_files = widgy_site.js_files self.assertIn('widgy/core_tests/rawtextwidget.js', js_files) self.assertNotIn('widgy/models/content.js', js_files) def test_admin_scss_files(self): - files = self.widgy_site.admin_scss_files + files = widgy_site.admin_scss_files self.assertIn('widgy/core_tests/rawtextwidget.admin.scss', files) self.assertIn('widgy/core_tests/admin.scss', files) From 6fe3d72808a9530ce56adb207230e77b007ead60 Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Tue, 25 Jun 2013 15:45:49 -0600 Subject: [PATCH 0658/1061] Add model-based permissions API on WidgySite. The following API views now check permissions: - ContentView.put checks change permission - NodeView.post checks add permission - NodeView.put checks change permission - NodeView.delete checks delete permission - ShelfView.get filters results based on add permission - NodeTemplatesView.get checks change permission - NodeParentsView.get checks change permission - NodeEditView.get checks change permission on Node --- tests/modeltests/core_tests/tests/api.py | 252 +++++++++++++++++++- tests/modeltests/core_tests/tests/base.py | 56 ++++- tests/modeltests/core_tests/urls.py | 3 +- tests/modeltests/core_tests/widgy_config.py | 2 + widgy/site.py | 20 +- widgy/views/api.py | 33 ++- widgy/views/base.py | 7 + 7 files changed, 356 insertions(+), 17 deletions(-) diff --git a/tests/modeltests/core_tests/tests/api.py b/tests/modeltests/core_tests/tests/api.py index 422bc41d1..f013137b1 100644 --- a/tests/modeltests/core_tests/tests/api.py +++ b/tests/modeltests/core_tests/tests/api.py @@ -1,3 +1,5 @@ +from operator import itemgetter +from itertools import chain import json import imp @@ -9,9 +11,12 @@ from widgy.models import Node from widgy.contrib.review_queue.site import ReviewedWidgySite -from modeltests.core_tests.models import ImmovableBucket, UndeletableRawTextWidget, RawTextWidget -from modeltests.core_tests.tests.base import RootNodeTestCase, HttpTestCase, make_a_nice_tree -from modeltests.core_tests.widgy_config import widgy_site +from modeltests.core_tests.widgy_config import widgy_site, authorized_site +from modeltests.core_tests.models import ( + Bucket, ImmovableBucket, UndeletableRawTextWidget, RawTextWidget, Layout, + PickyBucket, +) +from modeltests.core_tests.tests.base import RootNodeTestCase, HttpTestCase, make_a_nice_tree, SwitchUserTestCase class TestApi(RootNodeTestCase, HttpTestCase): @@ -297,3 +302,244 @@ def authorize(self, request, *args, **kwargs): raise PermissionDenied widgy_site = Site() + + +class PermissionsTest(SwitchUserTestCase, RootNodeTestCase, HttpTestCase): + widgy_site = authorized_site + + def setUp(self): + super(PermissionsTest, self).setUp() + # delete those autocreated buckets + for bucket in Bucket.objects.all(): + bucket.delete() + + def extractAvailableChildren(self, data): + return map(itemgetter('__class__'), chain.from_iterable(data.values())) + + def assertCompatibilityContains(self, key, data): + return self.assertIn(key, self.extractAvailableChildren(data)) + + def assertCompatibilityNotContains(self, key, data): + return self.assertNotIn(key, self.extractAvailableChildren(data)) + + def test_available_children(self): + def doit(): + url = self.root_node.to_json(self.widgy_site)['available_children_url'] + return self.get(url) + + def fail(): + resp = doit() + self.assertEqual(resp.status_code, 403) + + def win(): + resp = doit() + self.assertEqual(resp.status_code, 200) + data = json.loads(resp.content) + self.assertCompatibilityContains('core_tests.bucket', data) + + fail() # not logged in + + with self.logged_in() as user: + resp = doit() # not staff + self.assertEqual(resp.status_code, 200) + data = json.loads(resp.content) + self.assertEqual(data, {self.root_node.get_api_url(self.widgy_site): []}) + + with self.as_staffuser() as user: + resp = doit() # staff, no permissions + self.assertEqual(resp.status_code, 200) + data = json.loads(resp.content) + self.assertCompatibilityNotContains('core_tests.bucket', data) + + with self.as_staffuser() as user: + with self.with_permission(user, 'add', Bucket): + win() # staff, with permissions + + with self.as_superuser(): + win() # superuser + + def as_different_types_of_user(self, permissionsargs, fail, win): + fail() # not logged in + + with self.logged_in() as user: + fail() # not staff + + with self.as_staffuser() as user: + fail() # staff, no permissions + + with self.as_staffuser() as user: + with self.with_permission(user, *permissionsargs): + win() # staff, with permissions + + with self.as_superuser(): + win() # superuser + + def test_add_node(self): + def doit(): + url = urlresolvers.reverse(self.widgy_site.node_view) + return self.post(url, { + '__class__': 'core_tests.bucket', + 'right_id': None, + 'parent_id': self.root_node.get_api_url(self.widgy_site), + }) + + def fail(): + before = Bucket.objects.count() + resp = doit() + self.assertEqual(resp.status_code, 403) + self.assertEqual(Bucket.objects.count(), before) + + def win(): + before = Bucket.objects.count() + resp = doit() + self.assertEqual(resp.status_code, 201) + self.assertEqual(Bucket.objects.count(), before + 1) + + # reset + Bucket.objects.get().delete() + + self.as_different_types_of_user(('add', Bucket), fail, win) + + def test_move_node(self): + left = self.root_node.content.add_child(self.widgy_site, Bucket) + right = self.root_node.content.add_child(self.widgy_site, PickyBucket) + + def doit(): + url = right.node.get_api_url(self.widgy_site) + return self.put(url, { + '__class__': 'core_tests.bucket', + 'right_id': left.node.get_api_url(self.widgy_site), + 'parent_id': self.root_node.get_api_url(self.widgy_site), + }) + + def fail(): + resp = doit() + self.assertEqual(resp.status_code, 403) + self.assertEqual(list(Layout.objects.get().get_children()), + [left, right]) + + def win(): + resp = doit() + self.assertEqual(resp.status_code, 200) + self.assertEqual(list(Layout.objects.get().get_children()), + [right, left]) + + # reset + PickyBucket.objects.get().reposition(self.widgy_site, parent=self.root_node.content) + + self.as_different_types_of_user(('change', PickyBucket), fail, win) + + def test_delete_node(self): + # we need to mutate this to reset + _left = [self.root_node.content.add_child(self.widgy_site, Bucket)] + + def doit(): + url = _left[0].node.get_api_url(self.widgy_site) + return self.delete(url) + + def fail(): + before = Bucket.objects.count() + resp = doit() + self.assertEqual(resp.status_code, 403) + self.assertEqual(Bucket.objects.count(), before) + + def win(): + before = Bucket.objects.count() + resp = doit() + self.assertEqual(resp.status_code, 200) + self.assertEqual(Bucket.objects.count(), before - 1) + # reset + _left[0] = self.root_node.content.add_child(self.widgy_site, Bucket) + + self.as_different_types_of_user(('delete', Bucket), fail, win) + + def test_delete_deep_node(self): + self.root_node.content.add_child(self.widgy_site, Bucket) + + with self.as_staffuser() as user: + with self.with_permission(user, 'delete', Layout): + url = self.root_node.get_api_url(self.widgy_site) + resp = self.delete(url) + self.assertEqual(resp.status_code, 403) + self.assertTrue(Bucket.objects.exists()) + + def test_edit_content(self): + content = RawTextWidget.add_root(self.widgy_site) + content.text = 'hello' + content.save() + + def doit(): + url = content.to_json(self.widgy_site)['url'] + return self.put(url, { + 'attributes': {'text': 'goodbye'}, + }) + + def fail(): + resp = doit() + self.assertEqual(resp.status_code, 403) + self.assertEqual(RawTextWidget.objects.get().text, 'hello') + + def win(): + resp = doit() + self.assertEqual(resp.status_code, 200) + self.assertEqual(RawTextWidget.objects.get().text, 'goodbye') + # reset + RawTextWidget.objects.update(text='hello') + + self.as_different_types_of_user(('change', RawTextWidget), fail, win) + + def test_templates_view(self): + def doit(): + url = self.root_node.content.to_json(self.widgy_site)['template_url'] + return self.get(url) + + def fail(): + resp = doit() + self.assertEqual(resp.status_code, 403) + + def win(): + resp = doit() + self.assertEqual(resp.status_code, 200) + + self.as_different_types_of_user(('change', Layout), fail, win) + + def test_parents_view(self): + """ + You only need to be able to see where a widget can go if you can + move it. + """ + bucket = self.root_node.content.add_child(self.widgy_site, PickyBucket) + + def doit(): + url = bucket.node.to_json(self.widgy_site)['possible_parents_url'] + return self.get(url) + + def fail(): + resp = doit() + self.assertEqual(resp.status_code, 403) + + def win(): + resp = doit() + self.assertEqual(resp.status_code, 200) + self.assertEqual(json.loads(resp.content), [self.root_node.get_api_url(self.widgy_site)]) + + self.as_different_types_of_user(('change', PickyBucket), fail, win) + + def test_node_edit_view(self): + bucket = self.root_node.content.add_child(self.widgy_site, PickyBucket) + + def doit(): + bucket.editable = True + url = bucket.to_json(self.widgy_site)['edit_url'] + # not a JSON view + return self.client.get(url) + + def fail(): + resp = doit() + self.assertEqual(resp.status_code, 403) + + def win(): + resp = doit() + self.assertEqual(resp.status_code, 200) + + self.as_different_types_of_user(('change', Node), fail, win) diff --git a/tests/modeltests/core_tests/tests/base.py b/tests/modeltests/core_tests/tests/base.py index 8d36d2c6f..950e6f987 100644 --- a/tests/modeltests/core_tests/tests/base.py +++ b/tests/modeltests/core_tests/tests/base.py @@ -1,7 +1,9 @@ import json +from contextlib import contextmanager from django.test import TestCase -from django.contrib.auth.models import User +from django.contrib.auth.models import User, Permission +from django.contrib.contenttypes.models import ContentType from modeltests.core_tests.models import Layout, RawTextWidget, Bucket from modeltests.core_tests.widgy_config import widgy_site @@ -13,7 +15,6 @@ def setUp(self): self.root_node = Layout.add_root(widgy_site).node - class HttpTestCase(TestCase): def setUp(self): super(HttpTestCase, self).setUp() @@ -50,6 +51,57 @@ def __getattr__(self, attr): return getattr(super(HttpTestCase, self), attr) +class SwitchUserTestCase(TestCase): + username = 'username' + password = 'password' + + def setUp(self): + super(SwitchUserTestCase, self).setUp() + self.user = user = User.objects.create_user( + username=self.username, + password=self.password, + ) + user.save() + self.client.logout() + + @contextmanager + def as_superuser(self): + self.user.is_superuser = True + self.user.save() + with self.as_staffuser() as user: + yield user + self.user.is_superuser = False + self.user.save() + + @contextmanager + def as_staffuser(self): + self.user.is_staff = True + self.user.save() + with self.logged_in() as user: + yield user + self.user.is_staff = False + self.user.save() + + @contextmanager + def logged_in(self): + self.client.login(username=self.username, password=self.password) + yield self.user + self.client.logout() + + @contextmanager + def with_permission(self, user, name, model): + contenttype = ContentType.objects.get_for_model(model) + permission, _ = Permission.objects.get_or_create( + codename='%s_%s' % (name, model._meta.module_name), + defaults={ + 'content_type': contenttype, + } + ) + user.user_permissions.add(permission) + yield user + user.user_permissions.remove(permission) + + def tree_to_dot(node): output = [] output.append('digraph {') diff --git a/tests/modeltests/core_tests/urls.py b/tests/modeltests/core_tests/urls.py index c5b3e811b..96f1c477d 100644 --- a/tests/modeltests/core_tests/urls.py +++ b/tests/modeltests/core_tests/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import patterns, url, include -from .widgy_config import widgy_site +from .widgy_config import authorized_site, widgy_site urlpatterns = patterns('', + url('^authenticated-widgy-site/', include(authorized_site.urls)), url('', include(widgy_site.urls)), ) diff --git a/tests/modeltests/core_tests/widgy_config.py b/tests/modeltests/core_tests/widgy_config.py index ef113e455..bfffc069a 100644 --- a/tests/modeltests/core_tests/widgy_config.py +++ b/tests/modeltests/core_tests/widgy_config.py @@ -3,12 +3,14 @@ from widgy.site import WidgySite from widgy.db.fields import VersionedWidgyField, WidgyField + class UnauthenticatedWidgySite(WidgySite): def authorize(self, request, *args, **kwargs): if request.COOKIES.get('unauthorized_access'): raise PermissionDenied widgy_site = UnauthenticatedWidgySite() +authorized_site = WidgySite() # This emulates importing models from a site file. It must come after # widgy_site is defined, because widgy doesn't exist yet without the diff --git a/widgy/site.py b/widgy/site.py index a9ca0eeae..2ad988409 100644 --- a/widgy/site.py +++ b/widgy/site.py @@ -68,16 +68,28 @@ def reverse(self, *args, **kwargs): """ return reverse(*args, **kwargs) - def authorize(self, request, view, obj=None): - if not request.user.is_authenticated(): - raise PermissionDenied - def get_view_instance(self, view): try: return view.view_instance except AttributeError: raise ValueError("View does not inherit from WidgyViewMixin") + def authorize(self, request, view, obj=None): + if not request.user.is_authenticated(): + raise PermissionDenied + + def has_add_permission(self, request, content_class): + return request.user.has_perm('%s.%s' % (content_class._meta.app_label, content_class._meta.get_add_permission())) + + def has_change_permission(self, request, obj): + return request.user.has_perm('%s.%s' % (obj._meta.app_label, obj._meta.get_change_permission())) + + def has_delete_permission(self, request, obj): + return all( + request.user.has_perm('%s.%s' % (o._meta.app_label, o._meta.get_delete_permission())) + for o in obj.depth_first_order() + ) + # These must return the same instance throughout the whole lifetime # of the widgy site for reverse to work. @cached_property diff --git a/widgy/views/api.py b/widgy/views/api.py index ca781ae1b..49a39a3ac 100644 --- a/widgy/views/api.py +++ b/widgy/views/api.py @@ -2,8 +2,10 @@ Resource views that can be included to enable a REST style API for Widgy nodes and Content objects. """ +from functools import partial + from django.http import Http404 -from django.core.exceptions import ValidationError +from django.core.exceptions import ValidationError, PermissionDenied from django.core.urlresolvers import reverse from django.shortcuts import get_object_or_404 from django.contrib.contenttypes.models import ContentType @@ -34,6 +36,8 @@ class ContentView(WidgyView): .. todo:: change ``put`` method to be more generic. """ + def dispatch(self, request, app_label, object_name, object_pk): + return super(ContentView, self).dispatch(request, app_label, object_name, object_pk) def get_object(self, app_label, object_name, object_pk): """ @@ -51,6 +55,9 @@ def get(self, request, app_label, object_name, object_pk): def put(self, request, app_label, object_name, object_pk): obj = self.get_object(app_label, object_name, object_pk) + if not self.site.has_change_permission(request, obj): + raise PermissionDenied + data = self.data()['attributes'] form = obj.get_form(request, data=data) if not form.is_valid(): @@ -82,7 +89,7 @@ def render_as_node(self, obj, *args, **kwargs): compatibility_node_url = self.request.GET.get('include_compatibility_for', None) if compatibility_node_url: node = get_object_or_404(Node, pk=extract_id(compatibility_node_url)) - obj['compatibility'] = ShelfView.get_compatibility_data(self.site, node) + obj['compatibility'] = ShelfView.get_compatibility_data(self.site, self.request, node) return self.render_to_response(obj, *args, **kwargs) @@ -97,6 +104,8 @@ def post(self, request, node_pk=None): content_class = get_model(app_label, model) if not content_class: raise Http404 + if not self.site.has_add_permission(request, content_class): + raise PermissionDenied try: right = get_object_or_404(Node, pk=extract_id(data['right_id'])) @@ -122,6 +131,8 @@ def put(self, request, node_pk): node = get_object_or_404(Node, pk=node_pk) data = self.data() + if not self.site.has_change_permission(request, node.content): + raise PermissionDenied if not node.content.draggable: raise InvalidTreeMovement({'message': "You can't move me"}) @@ -140,6 +151,8 @@ def put(self, request, node_pk): def delete(self, request, node_pk): node = get_object_or_404(Node, pk=node_pk) + if not self.site.has_delete_permission(request, node.content): + raise PermissionDenied if not node.content.deletable: raise InvalidTreeMovement({'message': "You can't delete me"}) @@ -183,23 +196,24 @@ def serialize_content_classes(site, obj): return res @staticmethod - def get_compatibility_data(site, root_node): + def get_compatibility_data(site, request, root_node): root_node.maybe_prefetch_tree() content_classes = site.get_all_content_classes() + content_classes = filter(partial(site.has_add_permission, request), content_classes) content_classes = root_node.filter_child_classes_recursive(site, content_classes) return ShelfView.serialize_content_classes(site, content_classes) def get(self, request, node_pk): node = get_object_or_404(Node, pk=node_pk) - return self.render_to_response(self.get_compatibility_data(self.site, node)) + return self.render_to_response(self.get_compatibility_data(self.site, request, node)) -class NodeSingleObjectMixin(SingleObjectMixin, AuthorizedMixin): +class NodeSingleObjectMixin(SingleObjectMixin): model = Node pk_url_kwarg = 'node_pk' -class NodeEditView(NodeSingleObjectMixin, DetailView): +class NodeEditView(NodeSingleObjectMixin, AuthorizedMixin, DetailView): """ The only TemplateView in widgy: The interface for popped out node editing. """ @@ -207,6 +221,8 @@ class NodeEditView(NodeSingleObjectMixin, DetailView): template_name = 'widgy/views/edit_node.html' def get_context_data(self, **kwargs): + if not self.site.has_change_permission(self.request, self.object): + raise PermissionDenied kwargs = super(NodeEditView, self).get_context_data(**kwargs) kwargs.update( html_id='node_%s' % (self.object.pk), @@ -220,9 +236,10 @@ class NodeTemplatesView(NodeSingleObjectMixin, WidgyView): """ Gets the dynamic [needing request] templates for a node. """ - def get(self, request, *args, **kwargs): node = self.object = self.get_object() + if not self.site.has_change_permission(request, node.content): + raise PermissionDenied return self.render_to_response(node.content.get_templates(request)) @@ -233,6 +250,8 @@ class NodeParentsView(NodeSingleObjectMixin, WidgyView): def get(self, request, *args, **kwargs): node = self.object = self.get_object() + if not self.site.has_change_permission(request, node.content): + raise PermissionDenied node.prefetch_tree() possible_parents = node.possible_parents(self.site, node.get_root()) return self.render_to_response([i.get_api_url(self.site) for i in possible_parents]) diff --git a/widgy/views/base.py b/widgy/views/base.py index 4e5ebbceb..3144fa52f 100644 --- a/widgy/views/base.py +++ b/widgy/views/base.py @@ -12,6 +12,13 @@ def as_view(cls, **initkwargs): class AuthorizedMixin(WidgyViewMixin): + """ + Makes sure to call auth before doing anything. + + This class should not be used by RestView subclasses. RestView already + makes the call to auth, but conveniently wraps the errors to return them in + JSON-encoded responses. + """ def dispatch(self, *args, **kwargs): self.auth(*args, **kwargs) return super(AuthorizedMixin, self).dispatch(*args, **kwargs) From a7942fa35cc2db6f34899623c6a004ec532517af Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Tue, 25 Jun 2013 16:30:46 -0600 Subject: [PATCH 0659/1061] Added UnsafeHtml Widget. This Widget is unsafe because it provides a potential for permission escalation. No non-superuser should have the following permissions: - page_builder.add_unsafehtml - page_builder.change_unsafehtml - page_builder.delete_unsafehtml --- .../migrations/0013_auto__add_unsafehtml.py | 210 ++++++++++++++++++ widgy/contrib/page_builder/models.py | 11 + .../widgy/page_builder/unsafehtml/render.html | 1 + 3 files changed, 222 insertions(+) create mode 100644 widgy/contrib/page_builder/migrations/0013_auto__add_unsafehtml.py create mode 100644 widgy/contrib/page_builder/templates/widgy/page_builder/unsafehtml/render.html diff --git a/widgy/contrib/page_builder/migrations/0013_auto__add_unsafehtml.py b/widgy/contrib/page_builder/migrations/0013_auto__add_unsafehtml.py new file mode 100644 index 000000000..f9d5ee5c2 --- /dev/null +++ b/widgy/contrib/page_builder/migrations/0013_auto__add_unsafehtml.py @@ -0,0 +1,210 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'UnsafeHtml' + db.create_table('page_builder_unsafehtml', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('content', self.gf('django.db.models.fields.TextField')(default='')), + )) + db.send_create_signal('page_builder', ['UnsafeHtml']) + + + def backwards(self, orm): + # Deleting model 'UnsafeHtml' + db.delete_table('page_builder_unsafehtml') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'filer.file': { + 'Meta': {'object_name': 'File'}, + '_file_size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'folder': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'all_files'", 'null': 'True', 'to': "orm['filer.Folder']"}), + 'has_all_mandatory_data': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'original_filename': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'owned_files'", 'null': 'True', 'to': "orm['auth.User']"}), + 'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'polymorphic_filer.file_set'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}), + 'sha1': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '40', 'blank': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'filer.folder': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('parent', 'name'),)", 'object_name': 'Folder'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'filer_owned_folders'", 'null': 'True', 'to': "orm['auth.User']"}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['filer.Folder']"}), + 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}), + 'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + 'page_builder.accordion': { + 'Meta': {'object_name': 'Accordion'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.button': { + 'Meta': {'object_name': 'Button'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'link_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}), + 'link_object_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), + 'text': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + 'page_builder.callout': { + 'Meta': {'object_name': 'Callout'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'root_node': ('widgy.db.fields.WidgyField', [], {'to': "orm['widgy.Node']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}) + }, + 'page_builder.calloutbucket': { + 'Meta': {'object_name': 'CalloutBucket'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.calloutwidget': { + 'Meta': {'object_name': 'CalloutWidget'}, + 'callout': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['page_builder.Callout']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.defaultlayout': { + 'Meta': {'object_name': 'DefaultLayout'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.figure': { + 'Meta': {'object_name': 'Figure'}, + 'caption': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'position': ('django.db.models.fields.CharField', [], {'default': "u'center'", 'max_length': '50'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1023', 'null': 'True', 'blank': 'True'}) + }, + 'page_builder.googlemap': { + 'Meta': {'object_name': 'GoogleMap'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'default': "'roadmap'", 'max_length': '20'}) + }, + 'page_builder.html': { + 'Meta': {'object_name': 'Html'}, + 'content': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.image': { + 'Meta': {'object_name': 'Image'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.PROTECT', 'to': "orm['filer.File']"}) + }, + 'page_builder.maincontent': { + 'Meta': {'object_name': 'MainContent'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.markdown': { + 'Meta': {'object_name': 'Markdown'}, + 'content': ('widgy.contrib.page_builder.db.fields.MarkdownField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'rendered': ('django.db.models.fields.TextField', [], {}) + }, + 'page_builder.section': { + 'Meta': {'object_name': 'Section'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1023'}) + }, + 'page_builder.sidebar': { + 'Meta': {'object_name': 'Sidebar'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.table': { + 'Meta': {'object_name': 'Table'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.tablebody': { + 'Meta': {'object_name': 'TableBody'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.tabledata': { + 'Meta': {'object_name': 'TableData'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.tableheader': { + 'Meta': {'object_name': 'TableHeader'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.tableheaderdata': { + 'Meta': {'object_name': 'TableHeaderData'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.tablerow': { + 'Meta': {'object_name': 'TableRow'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.unsafehtml': { + 'Meta': {'object_name': 'UnsafeHtml'}, + 'content': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'page_builder.video': { + 'Meta': {'object_name': 'Video'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'video': ('widgy.contrib.page_builder.db.fields.VideoField', [], {'max_length': '200'}) + }, + 'widgy.node': { + 'Meta': {'unique_together': "[('content_type', 'content_id')]", 'object_name': 'Node'}, + 'content_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_frozen': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) + } + } + + complete_apps = ['page_builder'] \ No newline at end of file diff --git a/widgy/contrib/page_builder/models.py b/widgy/contrib/page_builder/models.py index 7cf1b03f0..8b968f7cf 100644 --- a/widgy/contrib/page_builder/models.py +++ b/widgy/contrib/page_builder/models.py @@ -122,6 +122,17 @@ class Meta: verbose_name_plural = _('HTML editors') +@widgy.register +class UnsafeHtml(Content): + content = models.TextField(null=False, default='') + + editable = True + + class Meta: + verbose_name = _('unsafe HTML') + verbose_name_plural = _('unsafe HTML editors') + + @widgy.register class CalloutBucket(Bucket): @classmethod diff --git a/widgy/contrib/page_builder/templates/widgy/page_builder/unsafehtml/render.html b/widgy/contrib/page_builder/templates/widgy/page_builder/unsafehtml/render.html new file mode 100644 index 000000000..a3479348b --- /dev/null +++ b/widgy/contrib/page_builder/templates/widgy/page_builder/unsafehtml/render.html @@ -0,0 +1 @@ +{{ self.content|safe }} From f52014f8f8bb527beb1b8ebc4b916b53665dc611 Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Wed, 26 Jun 2013 17:32:40 -0600 Subject: [PATCH 0660/1061] Added ReviewQueueViewsTest --- tests/modeltests/core_tests/tests/__init__.py | 3 + tests/modeltests/core_tests/tests/api.py | 11 - tests/modeltests/core_tests/tests/base.py | 4 + tests/modeltests/core_tests/tests/core.py | 51 +---- .../core_tests/tests/reviewqueue.py | 213 ++++++++++++++++++ widgy/contrib/review_queue/admin.py | 2 +- widgy/contrib/review_queue/forms.py | 2 +- widgy/contrib/review_queue/models.py | 2 +- widgy/contrib/review_queue/site.py | 2 +- .../templates/review_queue}/undoform.html | 0 widgy/contrib/review_queue/views.py | 11 +- widgy/templates/widgy/commit.html | 1 + 12 files changed, 234 insertions(+), 68 deletions(-) create mode 100644 tests/modeltests/core_tests/tests/reviewqueue.py rename widgy/contrib/{widgy_mezzanine/templates/widgy => review_queue/templates/review_queue}/undoform.html (100%) diff --git a/tests/modeltests/core_tests/tests/__init__.py b/tests/modeltests/core_tests/tests/__init__.py index 50ebcf04e..73d2beab5 100644 --- a/tests/modeltests/core_tests/tests/__init__.py +++ b/tests/modeltests/core_tests/tests/__init__.py @@ -4,3 +4,6 @@ from .forms import * from .templates import * from .links import * + + +from .reviewqueue import * diff --git a/tests/modeltests/core_tests/tests/api.py b/tests/modeltests/core_tests/tests/api.py index f013137b1..ed9433854 100644 --- a/tests/modeltests/core_tests/tests/api.py +++ b/tests/modeltests/core_tests/tests/api.py @@ -4,12 +4,10 @@ import imp from django.core import urlresolvers -from django.core.exceptions import PermissionDenied from django.utils.functional import cached_property from widgy.views import extract_id from widgy.models import Node -from widgy.contrib.review_queue.site import ReviewedWidgySite from modeltests.core_tests.widgy_config import widgy_site, authorized_site from modeltests.core_tests.models import ( @@ -295,15 +293,6 @@ def test_add_with_right_id(self): self.assertEqual(before_children + 1, len(left.get_children())) -class TestApiReviewed(TestApi): - class Site(ReviewedWidgySite): - def authorize(self, request, *args, **kwargs): - if request.COOKIES.get('unauthorized_access'): - raise PermissionDenied - - widgy_site = Site() - - class PermissionsTest(SwitchUserTestCase, RootNodeTestCase, HttpTestCase): widgy_site = authorized_site diff --git a/tests/modeltests/core_tests/tests/base.py b/tests/modeltests/core_tests/tests/base.py index 950e6f987..546cfe828 100644 --- a/tests/modeltests/core_tests/tests/base.py +++ b/tests/modeltests/core_tests/tests/base.py @@ -145,3 +145,7 @@ def make_a_nice_tree(root_node, widgy_site=widgy_site): text='right_2') return left.node, right.node + + +def refetch(obj): + return obj.__class__.objects.get(pk=obj.pk) diff --git a/tests/modeltests/core_tests/tests/core.py b/tests/modeltests/core_tests/tests/core.py index 95b032d8b..290331dc2 100644 --- a/tests/modeltests/core_tests/tests/core.py +++ b/tests/modeltests/core_tests/tests/core.py @@ -9,10 +9,8 @@ from django.contrib.contenttypes.models import ContentType from django.utils import unittest, timezone from django.db.models.deletion import ProtectedError -from django.contrib.auth.models import Permission from widgy.models import Node, UnknownWidget, VersionTracker, Content -from widgy.contrib.review_queue.models import ReviewedVersionTracker from widgy.exceptions import ( ParentWasRejected, ChildWasRejected, MutualRejection, InvalidTreeMovement, InvalidOperation) @@ -23,7 +21,7 @@ Layout, Bucket, RawTextWidget, CantGoAnywhereWidget, PickyBucket, ImmovableBucket, AnotherLayout, VowelBucket, VersionedPage, VersionedPage2, VersionedPage3, VersionedPage4, VersionPageThrough, Related, - ForeignKeyWidget, WeirdPkBucket, ReviewedVersionedPage + ForeignKeyWidget, WeirdPkBucket ) from modeltests.core_tests.tests.base import RootNodeTestCase, make_a_nice_tree @@ -736,38 +734,6 @@ def test_created_at(self): commit.save() self.assertEqual(created_at, commit.created_at) - def refetch(self, obj): - return obj.__class__.objects.get(pk=obj.pk) - - def test_review_queue(self): - tracker, commit1 = self.make_commit(vt_class=ReviewedVersionTracker) - - p = Permission.objects.get(codename='change_versioncommit') - user = User.objects.create() - user.user_permissions.add(p) - user.save() - - request_factory = RequestFactory() - - tracker = self.refetch(tracker) - self.assertFalse(tracker.get_published_node(request_factory.get('/'))) - - commit1.approve(user) - - tracker = self.refetch(tracker) - self.assertEqual(tracker.get_published_node(request_factory.get('/')), - commit1.root_node) - - commit2 = tracker.commit(publish_at=timezone.now()) - tracker = self.refetch(tracker) - self.assertEqual(tracker.get_published_node(request_factory.get('/')), - commit1.root_node) - - commit2.approve(user) - tracker = self.refetch(tracker) - self.assertEqual(tracker.get_published_node(request_factory.get('/')), - commit2.root_node) - def test_cloning_multi_table_inheritance(self): root = PickyBucket.add_root(widgy_site) new_root = root.clone() @@ -813,21 +779,6 @@ def test_delete_after_revert(self): tracker.revert_to(commit) tracker.delete() - def test_foreign_key_to_proxy_works(self): - """ - If ReviewedVersionTracker is implemented as a proxy, ensure a - foreign key returns a ReviewedVersionTracker instance (instead - of the base model). - """ - tracker, commit1 = self.make_commit(vt_class=ReviewedVersionTracker) - page = ReviewedVersionedPage.objects.create( - version_tracker=tracker, - ) - - page = ReviewedVersionedPage.objects.get(pk=page.pk) - self.assertIsInstance(page.version_tracker, ReviewedVersionTracker) - self.assertEqual(page.version_tracker, tracker) - class TestPrefetchTree(RootNodeTestCase): def setUp(self): diff --git a/tests/modeltests/core_tests/tests/reviewqueue.py b/tests/modeltests/core_tests/tests/reviewqueue.py new file mode 100644 index 000000000..948538a8b --- /dev/null +++ b/tests/modeltests/core_tests/tests/reviewqueue.py @@ -0,0 +1,213 @@ +import datetime +import imp +import json + +from django.utils import timezone +from django.utils.functional import cached_property +from django.core.exceptions import PermissionDenied +from django.contrib.auth.models import Permission, User +from django.test.client import RequestFactory + +from widgy.contrib.review_queue.site import ReviewedWidgySite +from widgy.contrib.review_queue.models import ( + ReviewedVersionTracker, ReviewedVersionCommit, +) + +from modeltests.core_tests.tests.base import ( + RootNodeTestCase, refetch, SwitchUserTestCase, +) +from modeltests.core_tests.tests.api import TestApi +from modeltests.core_tests.models import ReviewedVersionedPage, RawTextWidget +from modeltests.core_tests.widgy_config import widgy_site + + +def make_commit(delta=datetime.timedelta(0), vt_class=ReviewedVersionTracker): + root_node = RawTextWidget.add_root(widgy_site, text='first').node + tracker = vt_class.objects.create(working_copy=root_node) + commit = tracker.commit(publish_at=timezone.now() + delta) + + return (tracker, commit) + + +class TestApiReviewed(TestApi): + class Site(ReviewedWidgySite): + def authorize(self, request, *args, **kwargs): + if request.COOKIES.get('unauthorized_access'): + raise PermissionDenied + + widgy_site = Site() + + +class ReviewQueueTest(RootNodeTestCase): + + def test_review_queue(self): + tracker, commit1 = make_commit(vt_class=ReviewedVersionTracker) + + p = Permission.objects.get(codename='change_versioncommit') + user = User.objects.create() + user.user_permissions.add(p) + user.save() + + request_factory = RequestFactory() + + tracker = refetch(tracker) + self.assertFalse(tracker.get_published_node(request_factory.get('/'))) + + commit1.approve(user) + + tracker = refetch(tracker) + self.assertEqual(tracker.get_published_node(request_factory.get('/')), + commit1.root_node) + + commit2 = tracker.commit(publish_at=timezone.now()) + tracker = refetch(tracker) + self.assertEqual(tracker.get_published_node(request_factory.get('/')), + commit1.root_node) + + commit2.approve(user) + tracker = refetch(tracker) + self.assertEqual(tracker.get_published_node(request_factory.get('/')), + commit2.root_node) + + def test_foreign_key_to_proxy_works(self): + """ + If ReviewedVersionTracker is implemented as a proxy, ensure a + foreign key returns a ReviewedVersionTracker instance (instead + of the base model). + """ + tracker, commit1 = make_commit(vt_class=ReviewedVersionTracker) + page = ReviewedVersionedPage.objects.create( + version_tracker=tracker, + ) + + page = ReviewedVersionedPage.objects.get(pk=page.pk) + self.assertIsInstance(page.version_tracker, ReviewedVersionTracker) + self.assertEqual(page.version_tracker, tracker) + + +class ReviewQueueViewsTest(SwitchUserTestCase, RootNodeTestCase): + widgy_site = ReviewedWidgySite() + + @cached_property + def urls(self): + urls = imp.new_module('urls') + urls.urlpatterns = self.widgy_site.get_urls() + return urls + + def test_commit_view(self): + tracker, _ = make_commit() + url = self.widgy_site.reverse(self.widgy_site.commit_view, kwargs={ + 'pk': tracker.pk, + }) + + with self.as_staffuser() as user: + self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) + self.assertFalse(refetch(tracker).head.reviewedversioncommit.is_approved) + + with self.as_staffuser() as user: + with self.with_permission(user, 'change', ReviewedVersionCommit): + self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) + self.assertTrue(refetch(tracker).head.reviewedversioncommit.is_approved) + + def test_approve_view(self): + tracker, commit = make_commit() + url = self.widgy_site.reverse(self.widgy_site.approve_view, kwargs={ + 'pk': tracker.pk, + 'commit_pk': commit.pk, + }) + + with self.as_staffuser() as user: + resp = self.client.post(url) + + self.assertEqual(resp.status_code, 403) + self.assertFalse(refetch(commit).is_approved) + + with self.as_staffuser() as user: + with self.with_permission(user, 'change', ReviewedVersionCommit): + resp = self.client.post(url) + + self.assertEqual(resp.status_code, 302) + self.assertTrue(refetch(commit).is_approved) + + def test_unapprove_view(self): + tracker, commit = make_commit() + url = self.widgy_site.reverse(self.widgy_site.unapprove_view, kwargs={ + 'pk': tracker.pk, + 'commit_pk': commit.pk, + }) + commit.approve(self.user) + + with self.as_staffuser() as user: + resp = self.client.post(url) + + self.assertEqual(resp.status_code, 403) + self.assertTrue(refetch(commit).is_approved) + + with self.as_staffuser() as user: + with self.with_permission(user, 'change', ReviewedVersionCommit): + resp = self.client.post(url) + + self.assertEqual(resp.status_code, 302) + self.assertFalse(refetch(commit).is_approved) + + def test_undo_approvals_view(self): + tracker, commit = make_commit() + tracker2, commit2 = make_commit() + url = self.widgy_site.reverse(self.widgy_site.undo_approvals_view) + commit.approve(self.user) + commit2.approve(self.user) + + def doit(): + return self.client.post(url, { + 'actions': json.dumps([commit.pk]), + 'referer': '/referer/', + }) + + with self.as_staffuser() as user: + resp = doit() + + self.assertEqual(resp.status_code, 403) + self.assertTrue(refetch(commit).is_approved) + self.assertTrue(refetch(commit2).is_approved) + + with self.as_staffuser() as user: + with self.with_permission(user, 'change', ReviewedVersionCommit): + resp = doit() + + self.assertEqual(resp.status_code, 302) + self.assertEqual(resp['Location'], 'http://testserver/referer/') + self.assertFalse(refetch(commit).is_approved) + self.assertTrue(refetch(commit2).is_approved) + + def test_undo_approvals_view_safe_redirect(self): + tracker, commit = make_commit() + url = self.widgy_site.reverse(self.widgy_site.undo_approvals_view) + with self.as_staffuser() as user: + with self.with_permission(user, 'change', ReviewedVersionCommit): + for bad_url in ('http://example.com', + 'https://example.com', + 'ftp://exampel.com', + '//example.com'): + + response = self.client.post(url, { + 'actions': json.dumps([commit.pk]), + 'referer': bad_url, + }) + self.assertEqual(response.status_code, 302) + self.assertFalse(bad_url in response['Location'], + "%s should be blocked" % bad_url) + + for good_url in ('/view/?param=http://example.com', + '/view/?param=https://example.com', + '/view?param=ftp://exampel.com', + 'view/?param=//example.com', + 'https:///', + '//testserver/', + '/url%20with%20spaces/'): + response = self.client.post(url, { + 'actions': json.dumps([commit.pk]), + 'referer': good_url, + }) + self.assertEqual(response.status_code, 302) + self.assertTrue(good_url in response['Location'], + "%s should be allowed" % good_url) diff --git a/widgy/contrib/review_queue/admin.py b/widgy/contrib/review_queue/admin.py index 034580ded..baf03c894 100644 --- a/widgy/contrib/review_queue/admin.py +++ b/widgy/contrib/review_queue/admin.py @@ -44,7 +44,7 @@ def get_queryset(self, request): except AttributeError: # BBB: In django 1.5 queryset changed to get_queryset qs = super(VersionCommitAdminBase, self).queryset(request) - return qs.get_non_approved() + return qs.unapproved() queryset = get_queryset diff --git a/widgy/contrib/review_queue/forms.py b/widgy/contrib/review_queue/forms.py index 3ea968a6a..23c5b08bb 100644 --- a/widgy/contrib/review_queue/forms.py +++ b/widgy/contrib/review_queue/forms.py @@ -28,7 +28,7 @@ class UndoApprovalsForm(forms.Form): def render(self, request, site): return mark_safe( render_to_string( - 'widgy/undoform.html', + 'review_queue/undoform.html', { 'form': self, 'site': site, diff --git a/widgy/contrib/review_queue/models.py b/widgy/contrib/review_queue/models.py index 006bdcf40..73e01aa07 100644 --- a/widgy/contrib/review_queue/models.py +++ b/widgy/contrib/review_queue/models.py @@ -21,7 +21,7 @@ class Meta: objects = QuerySetManager() class QuerySet(QuerySet): - def get_non_approved(self): + def unapproved(self): return self.filter(approved_at__isnull=True, approved_by__isnull=True) diff --git a/widgy/contrib/review_queue/site.py b/widgy/contrib/review_queue/site.py index d37f03f0a..a9c98ebba 100644 --- a/widgy/contrib/review_queue/site.py +++ b/widgy/contrib/review_queue/site.py @@ -36,7 +36,7 @@ def authorize(self, request, view, obj=None): approval_views = (VersionCommitAdminBase, ApproveView, UndoApprovalsView, UnapproveView) if isinstance(view, approval_views): - if not request.user.has_perm('widgy.change_versioncommit'): + if not request.user.has_perm('review_queue.change_reviewedversioncommit'): raise PermissionDenied @cached_property diff --git a/widgy/contrib/widgy_mezzanine/templates/widgy/undoform.html b/widgy/contrib/review_queue/templates/review_queue/undoform.html similarity index 100% rename from widgy/contrib/widgy_mezzanine/templates/widgy/undoform.html rename to widgy/contrib/review_queue/templates/review_queue/undoform.html diff --git a/widgy/contrib/review_queue/views.py b/widgy/contrib/review_queue/views.py index 94977196a..25606a9c7 100644 --- a/widgy/contrib/review_queue/views.py +++ b/widgy/contrib/review_queue/views.py @@ -1,10 +1,11 @@ from django.shortcuts import get_object_or_404, redirect from django.contrib import messages from django.utils.translation import ugettext_lazy as _ -from widgy.utils import format_html +from django.utils.http import is_safe_url from django.views.generic import RedirectView, FormView from django.core.exceptions import PermissionDenied +from widgy.utils import format_html from widgy.views.base import AuthorizedMixin from widgy.views.versioning import VersionTrackerMixin, CommitView @@ -31,6 +32,7 @@ class ApprovalChangeBaseView(AuthorizedMixin, VersionTrackerMixin, RedirectView) Abstract class for approving or unapproving commits """ http_method_names = ['post'] + permanent = False def get_redirect_url(self, pk, commit_pk): vt = get_object_or_404(self.get_queryset(), pk=pk) @@ -94,13 +96,16 @@ class UndoApprovalsView(AuthorizedMixin, FormView): def form_valid(self, form): approved_commits = form.cleaned_data['actions'] if not isinstance(approved_commits, list) or \ - not all([isinstance(i, int) for i in approved_commits]): + not all(isinstance(i, int) for i in approved_commits): return self.form_invalid() commits = ReviewedVersionCommit.objects.filter(pk__in=approved_commits) for c in commits: c.unapprove(self.request.user) - return redirect(form.cleaned_data['referer']) + url = form.cleaned_data['referer'] + if not is_safe_url(url=url, host=self.request.get_host()): + url = '/' + return redirect(url) def form_invalid(self, form): return redirect('/') diff --git a/widgy/templates/widgy/commit.html b/widgy/templates/widgy/commit.html index 688fdf376..b6a2a131b 100644 --- a/widgy/templates/widgy/commit.html +++ b/widgy/templates/widgy/commit.html @@ -1,5 +1,6 @@ {% load url from future %} {% load i18n %} +{% load static %}
      From 14548260b82af18283d104f70ca19ec0b0d8f324 Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Thu, 27 Jun 2013 16:37:04 -0600 Subject: [PATCH 0661/1061] Popup improvements commit 88180d869994e5ccf3a1374da8eae23bb23d0190 Author: Rocky Meza Fixed extra single quote commit 07dc09cf80c6c971355e2042ec436b5b3b142047 Author: Rocky Meza fixed pop up headers commit 7aa687c4946c35e1f2885863c05c4d1052f43e8c Author: Gavin Wahl Popup improvements - adds widgy/popup_base.html - adds a loading spinner to the submit buttons - prevents double submissions --- .../templates/widgy/history.html | 1 + widgy/static/widgy/css/django.fusionbox.scss | 2 +- widgy/static/widgy/css/widgy.scss | 4 ++++ widgy/static/widgy/js/popup.js | 20 +++++++++++++++++++ widgy/templates/widgy/commit.html | 11 +++------- widgy/templates/widgy/commit_success.html | 12 +++++------ widgy/templates/widgy/popup_base.html | 12 +++++++++++ widgy/templates/widgy/reset.html | 10 +++------- widgy/templates/widgy/reset_success.html | 15 ++++++++------ widgy/templates/widgy/revert.html | 12 +++++------ 10 files changed, 64 insertions(+), 35 deletions(-) create mode 100644 widgy/static/widgy/js/popup.js create mode 100644 widgy/templates/widgy/popup_base.html diff --git a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html index a68504d9d..6ab1b4104 100644 --- a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html +++ b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html @@ -8,6 +8,7 @@ {% compress css %} + {% endcompress %} {% compress js %} diff --git a/widgy/static/widgy/css/django.fusionbox.scss b/widgy/static/widgy/css/django.fusionbox.scss index 59cea5503..f8603fbc1 100644 --- a/widgy/static/widgy/css/django.fusionbox.scss +++ b/widgy/static/widgy/css/django.fusionbox.scss @@ -278,4 +278,4 @@ ul.messagelist { display: inline; } } -} \ No newline at end of file +} diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss index 4b85c8a18..17970ace8 100644 --- a/widgy/static/widgy/css/widgy.scss +++ b/widgy/static/widgy/css/widgy.scss @@ -1232,6 +1232,10 @@ span.title { font-size: 12px; padding: 4px; } + + .loading { + @extend %loading; + } } .vForeignKeyRawIdAdminField { diff --git a/widgy/static/widgy/js/popup.js b/widgy/static/widgy/js/popup.js new file mode 100644 index 000000000..aabfe97ef --- /dev/null +++ b/widgy/static/widgy/js/popup.js @@ -0,0 +1,20 @@ +$('.popUp form').ajaxForm({ + target: '.popUp', + beforeSubmit: function(data, $form) { + // prevent submission of forms without any enabled submit buttons. + // this is the normal behavior for a form, but ajaxForm doesn't + // implement it. + return $form.find('[type=submit]:not([disabled])').length >= 1; + } +}); +$('.popUp form [type=submit]').click(function() { + $(this).addClass('loading'); +}); +$('.popUp form').submit(function() { + var $form = $(this); + var $submits = $form.find('[type=submit]'); + if ( $form.find('.loading').length == 0 ) { + $submits.first().addClass('loading'); + } + $submits.attr('disabled', true); +}); diff --git a/widgy/templates/widgy/commit.html b/widgy/templates/widgy/commit.html index b6a2a131b..82e3cd97a 100644 --- a/widgy/templates/widgy/commit.html +++ b/widgy/templates/widgy/commit.html @@ -1,19 +1,14 @@ +{% extends "widgy/popup_base.html" %} {% load url from future %} {% load i18n %} -{% load static %} - -
      +{% block content %}

      {% trans "Commit Changes" %}

      {% if changed_anything %} {% block commit_form %} {% include "widgy/_commit_form.html" with commit=object.working_copy action_url=commit_url %} {% endblock %} - {% else %}

      {% trans "Nothing has changed -- no need to commit." %}

      {% endif %} -
      - +{% endblock %} diff --git a/widgy/templates/widgy/commit_success.html b/widgy/templates/widgy/commit_success.html index 241ecb7dc..a51fc77f0 100644 --- a/widgy/templates/widgy/commit_success.html +++ b/widgy/templates/widgy/commit_success.html @@ -1,9 +1,9 @@ +{% extends "widgy/popup_base.html" %} {% load i18n %} -
      +{% block content %}

      {% trans "Commit" %}

      {% trans "Change(s) successfully committed." %}

      -
      - - + +{% endblock %} diff --git a/widgy/templates/widgy/popup_base.html b/widgy/templates/widgy/popup_base.html new file mode 100644 index 000000000..d5ec695e9 --- /dev/null +++ b/widgy/templates/widgy/popup_base.html @@ -0,0 +1,12 @@ +{% load compress %} +
      + {% block content %} + {% endblock %} +
      +{% compress js %} + + +{% endcompress %} +{# this will insert a debug toolbar when viewing the popup as #} +{# a standalone page. #} + diff --git a/widgy/templates/widgy/reset.html b/widgy/templates/widgy/reset.html index 23ce48615..07f854386 100644 --- a/widgy/templates/widgy/reset.html +++ b/widgy/templates/widgy/reset.html @@ -1,8 +1,8 @@ +{% extends "widgy/popup_base.html" %} {% load url from future %} {% load i18n %} - -
      +{% block content %}

      {% trans "Reset" %}

      {% if not has_commits %}

      {% trans "There are no commits yet, nothing to reset to" %}

      @@ -12,11 +12,7 @@

      {% trans "Reset" %}

      {% csrf_token %}

      - {% else %}

      {% trans "Nothing has changed -- no need to reset." %}

      {% endif %} -
      - +{% endblock %} diff --git a/widgy/templates/widgy/reset_success.html b/widgy/templates/widgy/reset_success.html index ab7b7c286..9244321bb 100644 --- a/widgy/templates/widgy/reset_success.html +++ b/widgy/templates/widgy/reset_success.html @@ -1,7 +1,10 @@ +{% extends "widgy/popup_base.html" %} +{% load i18n %} -
      -

      Reset successful.

      -
      - +{% block content %} +

      {% trans 'Reset successful.' %}

      + +{% endblock %} diff --git a/widgy/templates/widgy/revert.html b/widgy/templates/widgy/revert.html index 9d18aa7f7..69f6aa363 100644 --- a/widgy/templates/widgy/revert.html +++ b/widgy/templates/widgy/revert.html @@ -1,11 +1,9 @@ +{% extends "widgy/popup_base.html" %} {% load url from future %} {% load i18n %} - -
      +{% block content %} +

      {% trans "Revert Commit" %}

      + {% include "widgy/_commit_form.html" with commit=object.root_node action_url=revert_url %} - -
      - +{% endblock %} From fe35f29340f8a26ae4d9112336b053ac417312bb Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Thu, 27 Jun 2013 17:48:46 -0600 Subject: [PATCH 0662/1061] Added permission checking to versioning views Also replace siteperms with has_*_permission. --- tests/modeltests/core_tests/tests/core.py | 97 ++++++++++++++++--- .../core_tests/tests/reviewqueue.py | 13 ++- widgy/admin.py | 11 ++- widgy/contrib/review_queue/admin.py | 1 - widgy/contrib/review_queue/site.py | 12 --- .../templates/review_queue/_commit_form.html | 5 +- .../templates/review_queue/history.html | 4 +- widgy/contrib/review_queue/views.py | 17 ++-- .../templates/widgy/history.html | 5 +- widgy/site.py | 17 ++-- widgy/static/widgy/js/modal/modal.js | 15 ++- widgy/templates/widgy/popup_base.html | 12 ++- widgy/templatetags/widgy_tags.py | 62 +++--------- widgy/views/api.py | 15 +-- widgy/views/versioning.py | 39 ++++++++ 15 files changed, 204 insertions(+), 121 deletions(-) diff --git a/tests/modeltests/core_tests/tests/core.py b/tests/modeltests/core_tests/tests/core.py index 290331dc2..e5041e179 100644 --- a/tests/modeltests/core_tests/tests/core.py +++ b/tests/modeltests/core_tests/tests/core.py @@ -10,7 +10,7 @@ from django.utils import unittest, timezone from django.db.models.deletion import ProtectedError -from widgy.models import Node, UnknownWidget, VersionTracker, Content +from widgy.models import Node, UnknownWidget, VersionTracker, Content, VersionCommit from widgy.exceptions import ( ParentWasRejected, ChildWasRejected, MutualRejection, InvalidTreeMovement, InvalidOperation) @@ -23,7 +23,8 @@ VersionedPage3, VersionedPage4, VersionPageThrough, Related, ForeignKeyWidget, WeirdPkBucket ) -from modeltests.core_tests.tests.base import RootNodeTestCase, make_a_nice_tree +from modeltests.core_tests.tests.base import ( + RootNodeTestCase, make_a_nice_tree, SwitchUserTestCase, refetch) class TestCore(RootNodeTestCase): @@ -242,13 +243,13 @@ def test_trees_equal_equal(self): self.assertTrue(a.node.trees_equal(b.node)) -class TestVersioning(RootNodeTestCase): - def make_commit(self, delta=datetime.timedelta(0), vt_class=VersionTracker): - root_node = RawTextWidget.add_root(widgy_site, text='first').node - tracker = vt_class.objects.create(working_copy=root_node) - commit = tracker.commit(publish_at=timezone.now() + delta) +def make_commit(delta=datetime.timedelta(0), vt_class=VersionTracker): + root_node = RawTextWidget.add_root(widgy_site, text='first').node + tracker = vt_class.objects.create(working_copy=root_node) + commit = tracker.commit(publish_at=timezone.now() + delta) - return (tracker, commit) + return (tracker, commit) +class TestVersioning(RootNodeTestCase): def test_clone_tree(self): left, right = make_a_nice_tree(self.root_node) @@ -702,13 +703,13 @@ def test_reset(self): self.assertEqual(textwidget_content.text, 'first') def test_publish_at(self): - tracker, commit1 = self.make_commit(datetime.timedelta(days=1)) + tracker, commit1 = make_commit(datetime.timedelta(days=1)) request_factory = RequestFactory() self.assertFalse(tracker.get_published_node(request_factory.get('/'))) def test_multiple_publish_at(self): - tracker, commit1 = self.make_commit(datetime.timedelta(days=-1)) + tracker, commit1 = make_commit(datetime.timedelta(days=-1)) request_factory = RequestFactory() self.assertEqual(tracker.get_published_node(request_factory.get('/')), @@ -719,7 +720,7 @@ def test_multiple_publish_at(self): commit1.root_node) def test_rollback_commit_publish(self): - tracker, commit1 = self.make_commit(datetime.timedelta(days=1)) + tracker, commit1 = make_commit(datetime.timedelta(days=1)) request_factory = RequestFactory() @@ -728,7 +729,7 @@ def test_rollback_commit_publish(self): commit2.root_node) def test_created_at(self): - tracker, commit = self.make_commit() + tracker, commit = make_commit() created_at = commit.created_at time.sleep(.1) commit.save() @@ -749,7 +750,7 @@ def test_reset_exception(self): Some widgets can't be deleted. We should still be able to reset. """ - tracker, commit1 = self.make_commit(datetime.timedelta(days=-1)) + tracker, commit1 = make_commit(datetime.timedelta(days=-1)) with mock.patch.object(tracker.working_copy.content, 'delete') as delete: delete.side_effect = ProtectedError("can't delete", []) @@ -758,7 +759,7 @@ def test_reset_exception(self): def test_delete(self): self.assertEqual(RawTextWidget.objects.count(), 0) - tracker, commit = self.make_commit() + tracker, commit = make_commit() self.assertNotEqual(RawTextWidget.objects.count(), 0) tracker.delete() self.assertEqual(RawTextWidget.objects.count(), 0) @@ -774,12 +775,78 @@ def test_delete_deep_tree_and_multiple_commits(self): self.assertEqual(VersionTracker.objects.filter(pk=tracker.pk).count(), 0) def test_delete_after_revert(self): - tracker, commit = self.make_commit() + tracker, commit = make_commit() tracker.commit() tracker.revert_to(commit) tracker.delete() +class VersioningViewsTest(SwitchUserTestCase, RootNodeTestCase): + def test_commit_view(self): + tracker, first_commit = make_commit() + + url = widgy_site.reverse(widgy_site.commit_view, kwargs={ + 'pk': tracker.pk, + }) + + with self.as_staffuser() as user: + r = self.client.post(url, {'publish_at': timezone.now()}) + self.assertEqual(r.status_code, 403) + self.assertEquals(len(refetch(tracker).get_history_list()), 1) + self.assertEqual(refetch(tracker).head, first_commit) + + with self.as_staffuser() as user: + with self.with_permission(user, 'add', VersionCommit): + r = self.client.post(url, {'publish_at': timezone.now()}) + self.assertEqual(r.status_code, 200) + self.assertEquals(len(refetch(tracker).get_history_list()), 2) + + def test_reset_view(self): + tracker, commit = make_commit() + + url = widgy_site.reverse(widgy_site.reset_view, kwargs={ + 'pk': tracker.pk, + }) + + + root = tracker.working_copy.content + root.text = 'changed' + root.save() + + with self.as_staffuser() as user: + r = self.client.post(url) + self.assertEqual(r.status_code, 403) + self.assertEqual(refetch(root).text, 'changed') + + with self.as_staffuser() as user: + with self.with_permission(user, 'add', VersionCommit): + r = self.client.post(url) + self.assertEqual(r.status_code, 200) + with self.assertRaises(RawTextWidget.DoesNotExist): + refetch(root) + + def test_revert_view(self): + tracker, commit = make_commit() + + url = widgy_site.reverse(widgy_site.revert_view, kwargs={ + 'pk': tracker.pk, + 'commit_pk': commit.pk, + }) + + with self.as_staffuser() as user: + r = self.client.post(url, {'publish_at': timezone.now()}) + self.assertEqual(r.status_code, 403) + self.assertEquals(len(refetch(tracker).get_history_list()), 1) + self.assertEqual(refetch(tracker).head, commit) + + with self.as_staffuser() as user: + with self.with_permission(user, 'add', VersionCommit): + r = self.client.post(url, {'publish_at': timezone.now()}) + self.assertEqual(r.status_code, 200) + self.assertEquals(len(refetch(tracker).get_history_list()), 2) + + + class TestPrefetchTree(RootNodeTestCase): def setUp(self): super(TestPrefetchTree, self).setUp() diff --git a/tests/modeltests/core_tests/tests/reviewqueue.py b/tests/modeltests/core_tests/tests/reviewqueue.py index 948538a8b..c480c2b8a 100644 --- a/tests/modeltests/core_tests/tests/reviewqueue.py +++ b/tests/modeltests/core_tests/tests/reviewqueue.py @@ -95,19 +95,22 @@ def urls(self): return urls def test_commit_view(self): - tracker, _ = make_commit() + tracker, first_commit = make_commit() url = self.widgy_site.reverse(self.widgy_site.commit_view, kwargs={ 'pk': tracker.pk, }) with self.as_staffuser() as user: - self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) - self.assertFalse(refetch(tracker).head.reviewedversioncommit.is_approved) + with self.with_permission(user, 'add', ReviewedVersionCommit): + self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) + self.assertNotEqual(refetch(tracker).head.reviewedversioncommit, first_commit) + self.assertFalse(refetch(tracker).head.reviewedversioncommit.is_approved) with self.as_staffuser() as user: with self.with_permission(user, 'change', ReviewedVersionCommit): - self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) - self.assertTrue(refetch(tracker).head.reviewedversioncommit.is_approved) + with self.with_permission(user, 'add', ReviewedVersionCommit): + self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) + self.assertTrue(refetch(tracker).head.reviewedversioncommit.is_approved) def test_approve_view(self): tracker, commit = make_commit() diff --git a/widgy/admin.py b/widgy/admin.py index 302301066..365599de8 100644 --- a/widgy/admin.py +++ b/widgy/admin.py @@ -12,9 +12,14 @@ def _has_permission(self, request, obj=None): except PermissionDenied: return False - has_add_permission = _has_permission - has_delete_permission = _has_permission - has_change_permission = _has_permission + def has_add_permission(self, request, obj=None): + return super(AuthorizedAdminMixin, self).has_add_permission(request, obj) and self._has_permission(request, obj) + + def has_change_permission(self, request, obj=None): + return super(AuthorizedAdminMixin, self).has_change_permission(request, obj) and self._has_permission(request, obj) + + def has_delete_permission(self, request, obj=None): + return super(AuthorizedAdminMixin, self).has_delete_permission(request, obj) and self._has_permission(request, obj) class WidgyAdmin(ModelAdmin): diff --git a/widgy/contrib/review_queue/admin.py b/widgy/contrib/review_queue/admin.py index baf03c894..cf6d9eb17 100644 --- a/widgy/contrib/review_queue/admin.py +++ b/widgy/contrib/review_queue/admin.py @@ -98,7 +98,6 @@ def approve_selected(self, request, queryset): ) messages.info(request, message, extra_tags='safe') - approve_selected.short_description = _('Approve selected commits') def save_form(self, request, form, change): diff --git a/widgy/contrib/review_queue/site.py b/widgy/contrib/review_queue/site.py index a9c98ebba..0627002fa 100644 --- a/widgy/contrib/review_queue/site.py +++ b/widgy/contrib/review_queue/site.py @@ -1,5 +1,4 @@ from django.conf.urls import patterns, url -from django.core.exceptions import PermissionDenied from django.utils.functional import cached_property from widgy.site import WidgySite @@ -28,17 +27,6 @@ def get_urls(self): url('^undo-approvals/$', self.undo_approvals_view), ) - def authorize(self, request, view, obj=None): - super(ReviewedWidgySite, self).authorize(request, view, obj) - - from widgy.contrib.review_queue.admin import VersionCommitAdminBase - - approval_views = (VersionCommitAdminBase, ApproveView, UndoApprovalsView, - UnapproveView) - if isinstance(view, approval_views): - if not request.user.has_perm('review_queue.change_reviewedversioncommit'): - raise PermissionDenied - @cached_property def commit_view(self): return ReviewedCommitView.as_view(site=self) diff --git a/widgy/contrib/review_queue/templates/review_queue/_commit_form.html b/widgy/contrib/review_queue/templates/review_queue/_commit_form.html index c4c7178f1..311900337 100644 --- a/widgy/contrib/review_queue/templates/review_queue/_commit_form.html +++ b/widgy/contrib/review_queue/templates/review_queue/_commit_form.html @@ -3,9 +3,8 @@ {% load widgy_tags %} {% block submit_row %} - {% siteperms site as siteperms %} - - {% if siteperms.approve_view %} + {% has_change_permission site site.get_version_tracker_model.commit_model as can_approve %} + {% if can_approve %} {% endif %} {{ block.super }} diff --git a/widgy/contrib/review_queue/templates/review_queue/history.html b/widgy/contrib/review_queue/templates/review_queue/history.html index 70b6bf10b..cd8a95f18 100644 --- a/widgy/contrib/review_queue/templates/review_queue/history.html +++ b/widgy/contrib/review_queue/templates/review_queue/history.html @@ -33,9 +33,9 @@ {% endblock %} {% block commit_actions %} - {% siteperms site as siteperms %} {{ block.super }} - {% if siteperms.approve_view %} + {% has_change_permission site commit.reviewedversioncommit as can_change %} + {% if can_change %} {% if not commit.reviewedversioncommit.is_approved %}
      diff --git a/widgy/contrib/review_queue/views.py b/widgy/contrib/review_queue/views.py index 25606a9c7..c2a03147c 100644 --- a/widgy/contrib/review_queue/views.py +++ b/widgy/contrib/review_queue/views.py @@ -1,6 +1,6 @@ from django.shortcuts import get_object_or_404, redirect from django.contrib import messages -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.utils.http import is_safe_url from django.views.generic import RedirectView, FormView from django.core.exceptions import PermissionDenied @@ -17,13 +17,9 @@ class ReviewedCommitView(CommitView): template_name = 'review_queue/commit.html' def get_form_class(self): - try: - self.site.authorize( - self.request, - self.site.get_view_instance(self.site.approve_view), - ) + if self.site.has_change_permission(self.request, ReviewedVersionCommit): return ReviewedCommitForm - except PermissionDenied: + else: return super(ReviewedCommitView, self).get_form_class() @@ -40,6 +36,9 @@ def get_redirect_url(self, pk, commit_pk): pk=commit_pk) commit.tracker = vt + if not self.site.has_change_permission(self.request, commit.reviewedversioncommit): + raise PermissionDenied(_("You don't have permission to approve commits.")) + self.action(commit) history_url = self.site.reverse(self.site.history_view, kwargs={ @@ -100,6 +99,10 @@ def form_valid(self, form): return self.form_invalid() commits = ReviewedVersionCommit.objects.filter(pk__in=approved_commits) + + if not all(self.site.has_change_permission(self.request, c) for c in commits): + raise PermissionDenied(_("You don't have permission to approve commits.")) + for c in commits: c.unapprove(self.request.user) url = form.cleaned_data['referer'] diff --git a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html index 6ab1b4104..bb4fef641 100644 --- a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html +++ b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html @@ -42,9 +42,10 @@

      {% trans "Page History" %}

      {% endblock %}
      {% block commit_actions %} - {% if commit.root_node != commit.tracker.head.root_node %} + {% has_add_permission site commit as can_revert %} + {% if commit.root_node != commit.tracker.head.root_node and can_revert %} {% trans "Revert to this Version" %} - {% else %} + {% elif can_revert %} {% trans "Can't revert; this is the same as the current version." %} {% endif %} {% if commit.diff_url %} diff --git a/widgy/site.py b/widgy/site.py index 2ad988409..ecc3da2dc 100644 --- a/widgy/site.py +++ b/widgy/site.py @@ -81,14 +81,17 @@ def authorize(self, request, view, obj=None): def has_add_permission(self, request, content_class): return request.user.has_perm('%s.%s' % (content_class._meta.app_label, content_class._meta.get_add_permission())) - def has_change_permission(self, request, obj): - return request.user.has_perm('%s.%s' % (obj._meta.app_label, obj._meta.get_change_permission())) + def has_change_permission(self, request, obj_or_class): + return request.user.has_perm('%s.%s' % (obj_or_class._meta.app_label, obj_or_class._meta.get_change_permission())) - def has_delete_permission(self, request, obj): - return all( - request.user.has_perm('%s.%s' % (o._meta.app_label, o._meta.get_delete_permission())) - for o in obj.depth_first_order() - ) + def has_delete_permission(self, request, obj_or_class): + def has_perm(o): + return request.user.has_perm('%s.%s' % (o._meta.app_label, o._meta.get_delete_permission())) + + if isinstance(obj_or_class, type): + return has_perm(obj_or_class) + else: + return all(map(has_perm, obj_or_class.depth_first_order())) # These must return the same instance throughout the whole lifetime # of the widgy site for reverse to work. diff --git a/widgy/static/widgy/js/modal/modal.js b/widgy/static/widgy/js/modal/modal.js index c2cd6d76b..88996746f 100644 --- a/widgy/static/widgy/js/modal/modal.js +++ b/widgy/static/widgy/js/modal/modal.js @@ -50,12 +50,17 @@ define([ 'widgy.backbone', if ( resp.getResponseHeader('content-type').indexOf('application/json') !== -1 ) { var data = JSON.parse(resp.responseText); var message; - if ( data.message ) - message = data.message; - else if ( resp.status == 404 ) - message = 'Try refreshing the page'; + + if ( _.isObject(data) ) + message = data.message; else - message = 'Unkown error'; + message = data; + + if ( resp.status == 404 ) + message = 'Try refreshing the page'; + + if ( ! message ) + message = 'Unknown error'; raiseError(message); } else { diff --git a/widgy/templates/widgy/popup_base.html b/widgy/templates/widgy/popup_base.html index d5ec695e9..63c5b7deb 100644 --- a/widgy/templates/widgy/popup_base.html +++ b/widgy/templates/widgy/popup_base.html @@ -1,7 +1,13 @@ -{% load compress %} +{% load compress static %}
      - {% block content %} - {% endblock %} + {% if permission_error_message %} + {% block perms_lacking %} +

      {{ permission_error_message }}

      + {% endblock %} + {% else %} + {% block content %} + {% endblock %} + {% endif %}
      {% compress js %} diff --git a/widgy/templatetags/widgy_tags.py b/widgy/templatetags/widgy_tags.py index a5ed2f16e..6647812cb 100644 --- a/widgy/templatetags/widgy_tags.py +++ b/widgy/templatetags/widgy_tags.py @@ -1,8 +1,6 @@ from django import template from django.conf import settings from django.utils.safestring import mark_safe -from django.template import TemplateSyntaxError, Node -from django.core.exceptions import PermissionDenied import markdown @@ -79,50 +77,16 @@ def reverse_site_url(site, view_string, *args, **kwargs): return site.reverse(view, args=args, kwargs=kwargs) -class SitepermsWrapper(object): - def __init__(self, request, site): - self._request = request - self._site = site - - def __getitem__(self, item): - try: - view = getattr(self._site, item) - view_instance = self._site.get_view_instance(view) - self._site.authorize(self._request, view_instance) - return True - except (AttributeError, ValueError): - # View does not exists, either getattr or - # get_view_instance has failed - raise KeyError - except PermissionDenied: - return False - - -class SitepermsNode(Node): - def __init__(self, site, siteperms): - self.site = template.Variable(site) - self.siteperms = siteperms - - def render(self, context): - try: - site = self.site.resolve(context) - except template.VariableDoesNotExist: - raise TemplateSyntaxError(("'siteperms' variable %s " - "not in context") % self.site) - context[self.siteperms] = SitepermsWrapper(context['request'], site) - return '' - - -@register.tag -def siteperms(parser, token): - bits = token.split_contents() - # TODO: Support for permissions on one specific object - # {% siteperms site as variable %} - # {% siteperms site as variable with object %} - # {% siteperms site with object as variable %} - if len(bits) != 4 and bits[2] != 'as': - raise TemplateSyntaxError("'siteperms' syntax should be " - "{% siteperms site as variable %}") - site = bits[1] - siteperms = bits[3] - return SitepermsNode(site, siteperms) +@register.assignment_tag(takes_context=True) +def has_change_permission(context, site, obj): + return site.has_change_permission(context['request'], obj) + + +@register.assignment_tag(takes_context=True) +def has_add_permission(context, site, obj): + return site.has_add_permission(context['request'], obj) + + +@register.assignment_tag(takes_context=True) +def has_delete_permission(context, site, obj): + return site.has_delete_permission(context['request'], obj) diff --git a/widgy/views/api.py b/widgy/views/api.py index 49a39a3ac..603fffba4 100644 --- a/widgy/views/api.py +++ b/widgy/views/api.py @@ -12,6 +12,7 @@ from django.views.generic import DetailView from django.views.generic.detail import SingleObjectMixin from django.db.models import get_model, ProtectedError +from django.utils.translation import ugettext as _ from fusionbox.views.rest import RestView @@ -56,7 +57,7 @@ def get(self, request, app_label, object_name, object_pk): def put(self, request, app_label, object_name, object_pk): obj = self.get_object(app_label, object_name, object_pk) if not self.site.has_change_permission(request, obj): - raise PermissionDenied + raise PermissionDenied(_("You don't have permission to edit this widget.")) data = self.data()['attributes'] form = obj.get_form(request, data=data) @@ -105,7 +106,7 @@ def post(self, request, node_pk=None): if not content_class: raise Http404 if not self.site.has_add_permission(request, content_class): - raise PermissionDenied + raise PermissionDenied(_("You don't have permission to add this widget.")) try: right = get_object_or_404(Node, pk=extract_id(data['right_id'])) @@ -132,7 +133,7 @@ def put(self, request, node_pk): data = self.data() if not self.site.has_change_permission(request, node.content): - raise PermissionDenied + raise PermissionDenied(_("You don't have permission to move this widget.")) if not node.content.draggable: raise InvalidTreeMovement({'message': "You can't move me"}) @@ -152,7 +153,7 @@ def delete(self, request, node_pk): node = get_object_or_404(Node, pk=node_pk) if not self.site.has_delete_permission(request, node.content): - raise PermissionDenied + raise PermissionDenied(_("You don't have permission to delete this widget.")) if not node.content.deletable: raise InvalidTreeMovement({'message': "You can't delete me"}) @@ -222,7 +223,7 @@ class NodeEditView(NodeSingleObjectMixin, AuthorizedMixin, DetailView): def get_context_data(self, **kwargs): if not self.site.has_change_permission(self.request, self.object): - raise PermissionDenied + raise PermissionDenied(_("You don't have permission to edit this widget.")) kwargs = super(NodeEditView, self).get_context_data(**kwargs) kwargs.update( html_id='node_%s' % (self.object.pk), @@ -239,7 +240,7 @@ class NodeTemplatesView(NodeSingleObjectMixin, WidgyView): def get(self, request, *args, **kwargs): node = self.object = self.get_object() if not self.site.has_change_permission(request, node.content): - raise PermissionDenied + raise PermissionDenied(_("You don't have permission to edit this widget.")) return self.render_to_response(node.content.get_templates(request)) @@ -251,7 +252,7 @@ class NodeParentsView(NodeSingleObjectMixin, WidgyView): def get(self, request, *args, **kwargs): node = self.object = self.get_object() if not self.site.has_change_permission(request, node.content): - raise PermissionDenied + raise PermissionDenied(_("You don't have permission to move this widget.")) node.prefetch_tree() possible_parents = node.possible_parents(self.site, node.get_root()) return self.render_to_response([i.get_api_url(self.site) for i in possible_parents]) diff --git a/widgy/views/versioning.py b/widgy/views/versioning.py index 567907a30..7959352e2 100644 --- a/widgy/views/versioning.py +++ b/widgy/views/versioning.py @@ -13,6 +13,7 @@ from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.utils import timezone +from django.core.exceptions import PermissionDenied from BeautifulSoup import BeautifulSoup @@ -54,6 +55,7 @@ def get_queryset(self): class CommitView(AuthorizedMixin, VersionTrackerMixin, FormView): template_name = 'widgy/commit.html' form_class = CommitForm + permission_error_message = _("You don't have permission to commit.") def get_context_data(self, **kwargs): self.object = self.get_object() @@ -62,6 +64,9 @@ def get_context_data(self, **kwargs): kwargs['site'] = self.site kwargs['commit_url'] = self.site.reverse(self.site.commit_view, kwargs={'pk': self.object.pk}) + if not self.has_permission(self.object): + kwargs['permission_error_message'] = self.permission_error_message + if self.object.head: kwargs['diff_url'] = diff_url(self.site, self.object.working_copy, @@ -72,8 +77,15 @@ def get_context_data(self, **kwargs): return kwargs + def has_permission(self, object): + return self.site.has_add_permission(self.request, object.commit_model) + def form_valid(self, form): obj = self.get_object() + + if not self.has_permission(obj): + raise PermissionDenied(self.permission_error_message) + form.commit(obj, self.request.user) return self.response_class( request=self.request, @@ -84,6 +96,7 @@ def form_valid(self, form): class ResetView(AuthorizedMixin, VersionTrackerMixin, TemplateView): template_name = 'widgy/reset.html' + permission_error_message = _("You don't have permission to reset.") def get_context_data(self, **kwargs): self.object = self.get_object() @@ -92,10 +105,24 @@ def get_context_data(self, **kwargs): kwargs['changed_anything'] = self.object.has_changes() kwargs['has_commits'] = bool(self.object.head) kwargs['reset_url'] = self.request.get_full_path() + + if not self.has_permission(self.object): + kwargs['permission_error_message'] = self.permission_error_message + return kwargs + + def has_permission(self, object): + # We don't really add a commit while resetting, but this permission is + # used for everything commit related. + return self.site.has_add_permission(self.request, object.commit_model) + def post(self, request, *args, **kwargs): version_tracker = self.get_object() + + if not self.has_permission(version_tracker): + raise PermissionDenied(self.permission_error_message) + version_tracker.reset() return self.response_class( request=self.request, @@ -123,6 +150,7 @@ class RevertView(AuthorizedMixin, VersionTrackerMixin, FormView): template_name = 'widgy/revert.html' pk_url_kwarg = 'commit_pk' form_class = CommitForm + permission_error_message = _("You don't have permission to revert.") def get_context_data(self, **kwargs): kwargs['object'] = self.object @@ -130,6 +158,10 @@ def get_context_data(self, **kwargs): kwargs['revert_url'] = self.site.reverse( self.site.revert_view, kwargs={'pk': self.object.tracker.pk, 'commit_pk': self.object.pk}) + + if not self.has_permission(self.object): + kwargs['permission_error_message'] = self.permission_error_message + return kwargs def get_object(self, queryset=None): @@ -149,8 +181,15 @@ def get_form_kwargs(self): } return kwargs + def has_permission(self, object): + return self.site.has_add_permission(self.request, object) + def form_valid(self, form): commit = self.get_object() + + if not self.has_permission(commit): + raise PermissionDenied(self.permission_error_message) + commit.tracker.revert_to(commit, user=self.request.user, **form.cleaned_data) return self.response_class( From f054f9dbc1794ac233a5778cc2b3ead5ba80ec2b Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Thu, 27 Jun 2013 17:51:27 -0600 Subject: [PATCH 0663/1061] Rename WidgySite.authorize to authorize_view This communicates its meaning more clearly now that we have the model-level permissions. --- widgy/admin.py | 2 +- widgy/site.py | 2 +- widgy/views/base.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/widgy/admin.py b/widgy/admin.py index 365599de8..58ba89951 100644 --- a/widgy/admin.py +++ b/widgy/admin.py @@ -7,7 +7,7 @@ class AuthorizedAdminMixin(object): def _has_permission(self, request, obj=None): try: - self.get_site().authorize(request, self, obj) + self.get_site().authorize_view(request, self) return True except PermissionDenied: return False diff --git a/widgy/site.py b/widgy/site.py index ecc3da2dc..14b804fd6 100644 --- a/widgy/site.py +++ b/widgy/site.py @@ -74,7 +74,7 @@ def get_view_instance(self, view): except AttributeError: raise ValueError("View does not inherit from WidgyViewMixin") - def authorize(self, request, view, obj=None): + def authorize_view(self, request, view): if not request.user.is_authenticated(): raise PermissionDenied diff --git a/widgy/views/base.py b/widgy/views/base.py index 3144fa52f..d5dd38a05 100644 --- a/widgy/views/base.py +++ b/widgy/views/base.py @@ -2,7 +2,7 @@ class WidgyViewMixin(object): site = None def auth(self, request, *args, **kwargs): - self.site.authorize(request, self) + self.site.authorize_view(request, self) @classmethod def as_view(cls, **initkwargs): From 49aa7ce1b8a6e8cfa27ede7caef82a3b4dfb40f9 Mon Sep 17 00:00:00 2001 From: Gavin Wahl Date: Mon, 1 Jul 2013 16:06:50 -0600 Subject: [PATCH 0664/1061] Extract the root-node creation into its own method `WidgyField.pre_save` creates a root node. This patch extracts that creation into a method called `add_root`. This means - VersionedWidgyField no longer needs to override `pre_save`, it overrides `add_root`. - Application developers can call `add_root` themselves and provide root_content_kwargs when they need to provide values to create the root node (Like when it has non-null fields). --- tests/modeltests/core_tests/tests/fields.py | 9 ++++++ widgy/db/fields.py | 36 +++++++-------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/tests/modeltests/core_tests/tests/fields.py b/tests/modeltests/core_tests/tests/fields.py index 5a74bf22c..193ff37c6 100644 --- a/tests/modeltests/core_tests/tests/fields.py +++ b/tests/modeltests/core_tests/tests/fields.py @@ -53,6 +53,15 @@ class Meta: self.assertEqual(len(layout_contenttypes), 1) self.assertIn(the_layout_contenttype, layout_contenttypes) + def test_add_root(self): + instance = HasAWidgy() + instance.widgy = ContentType.objects.get_for_model(Layout) + root_node = HasAWidgy._meta.get_field('widgy').add_root(instance, { + 'pk': 1337, + }) + + self.assertEqual(root_node.content.pk, 1337) + class TestPlainForm(TestCase): def setUp(self): # WidgyForms cannot be at the root level of a test because they make diff --git a/widgy/db/fields.py b/widgy/db/fields.py index 429f294c1..861444041 100644 --- a/widgy/db/fields.py +++ b/widgy/db/fields.py @@ -70,6 +70,10 @@ def contribute_to_class(self, cls, name): super(WidgyField, self).contribute_to_class(cls, name) setattr(cls, self.name, WidgyFieldObjectDescriptor(self)) + def add_root(self, model_instance, root_content_kwargs={}): + value = getattr(model_instance, self.name) + return value._ct.model_class().add_root(self.site, **root_content_kwargs).node + def pre_save(self, model_instance, add): """ Relies on WidgyFieldObjectDescriptor to set the content type on an @@ -79,14 +83,10 @@ def pre_save(self, model_instance, add): value = getattr(model_instance, self.name) if hasattr(value, '_ct'): - ct = value._ct - - node = ct.model_class().add_root(self.site).node + node = self.add_root(model_instance) setattr(model_instance, self.name, node) setattr(model_instance, self.attname, node.pk) - return node.pk - return super(WidgyField, self).pre_save(model_instance, add) def formfield(self, **kwargs): @@ -158,27 +158,13 @@ def __init__(self, site=None, to=None, root_choices=None, **kwargs): to = get_site(site).get_version_tracker_model() super(VersionedWidgyField, self).__init__(site, to, root_choices, **kwargs) - def pre_save(self, model_instance, add): - """ - Relies on WidgyFieldObjectDescriptor to set the content type on an - unsaved throwaway Node so that we know how to properly instantiate a - real node later on. - """ + def add_root(self, model_instance, root_content_kwargs={}): VersionTracker = self.site.get_version_tracker_model() - value = getattr(model_instance, self.name) - - if hasattr(value, '_ct'): - ct = value._ct - node = ct.model_class().add_root(self.site).node - version_tracker = VersionTracker.objects.create( - working_copy=node - ) - setattr(model_instance, self.name, version_tracker) - setattr(model_instance, self.attname, version_tracker.pk) - - return version_tracker.pk - - return super(VersionedWidgyField, self).pre_save(model_instance, add) + node = super(VersionedWidgyField, self).add_root(model_instance, root_content_kwargs) + version_tracker = VersionTracker.objects.create( + working_copy=node + ) + return version_tracker def formfield(self, **kwargs): from widgy.forms import VersionedWidgyFormField From d0c64db9134984323e3fd8d103c03416beb36bed Mon Sep 17 00:00:00 2001 From: Rocky Meza Date: Mon, 1 Jul 2013 16:47:56 -0600 Subject: [PATCH 0665/1061] Improved scheduled publishing interface. - There is an easy way to publish immediately (most common) - Added datepickers - Popups are now iframes that are isolated from surrounding page --- tests/modeltests/core_tests/tests/core.py | 8 +-- .../core_tests/tests/reviewqueue.py | 4 +- widgy/contrib/review_queue/forms.py | 3 +- .../templates/widgy/history.html | 3 +- widgy/static/widgy/css/popup.scss | 71 +++++++++++++++++++ widgy/static/widgy/css/widgy.scss | 10 --- widgy/static/widgy/css/widgy_common.scss | 9 +++ widgy/static/widgy/js/popup.js | 45 +++++++----- widgy/templates/widgy/_commit_form.html | 20 +++++- widgy/templates/widgy/commit.html | 5 +- widgy/templates/widgy/commit_success.html | 5 +- widgy/templates/widgy/popup_base.html | 35 ++++++--- widgy/templates/widgy/reset.html | 5 +- widgy/templates/widgy/reset_success.html | 6 +- widgy/templates/widgy/revert.html | 4 +- .../widgy/versioned_widgy_field_base.html | 3 +- widgy/views/versioning.py | 58 ++++++++++++--- 17 files changed, 222 insertions(+), 72 deletions(-) create mode 100644 widgy/static/widgy/css/popup.scss diff --git a/tests/modeltests/core_tests/tests/core.py b/tests/modeltests/core_tests/tests/core.py index e5041e179..d8932b73f 100644 --- a/tests/modeltests/core_tests/tests/core.py +++ b/tests/modeltests/core_tests/tests/core.py @@ -790,14 +790,14 @@ def test_commit_view(self): }) with self.as_staffuser() as user: - r = self.client.post(url, {'publish_at': timezone.now()}) + r = self.client.post(url, {'publish_radio': 'now'}) self.assertEqual(r.status_code, 403) self.assertEquals(len(refetch(tracker).get_history_list()), 1) self.assertEqual(refetch(tracker).head, first_commit) with self.as_staffuser() as user: with self.with_permission(user, 'add', VersionCommit): - r = self.client.post(url, {'publish_at': timezone.now()}) + r = self.client.post(url, {'publish_radio': 'now'}) self.assertEqual(r.status_code, 200) self.assertEquals(len(refetch(tracker).get_history_list()), 2) @@ -834,14 +834,14 @@ def test_revert_view(self): }) with self.as_staffuser() as user: - r = self.client.post(url, {'publish_at': timezone.now()}) + r = self.client.post(url, {'publish_radio': 'now'}) self.assertEqual(r.status_code, 403) self.assertEquals(len(refetch(tracker).get_history_list()), 1) self.assertEqual(refetch(tracker).head, commit) with self.as_staffuser() as user: with self.with_permission(user, 'add', VersionCommit): - r = self.client.post(url, {'publish_at': timezone.now()}) + r = self.client.post(url, {'publish_radio': 'now'}) self.assertEqual(r.status_code, 200) self.assertEquals(len(refetch(tracker).get_history_list()), 2) diff --git a/tests/modeltests/core_tests/tests/reviewqueue.py b/tests/modeltests/core_tests/tests/reviewqueue.py index c480c2b8a..75b5569c8 100644 --- a/tests/modeltests/core_tests/tests/reviewqueue.py +++ b/tests/modeltests/core_tests/tests/reviewqueue.py @@ -102,14 +102,14 @@ def test_commit_view(self): with self.as_staffuser() as user: with self.with_permission(user, 'add', ReviewedVersionCommit): - self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) + self.client.post(url, {'approve_it': 1, 'publish_radio': 'now'}) self.assertNotEqual(refetch(tracker).head.reviewedversioncommit, first_commit) self.assertFalse(refetch(tracker).head.reviewedversioncommit.is_approved) with self.as_staffuser() as user: with self.with_permission(user, 'change', ReviewedVersionCommit): with self.with_permission(user, 'add', ReviewedVersionCommit): - self.client.post(url, {'approve_it': 1, 'publish_at': timezone.now()}) + self.client.post(url, {'approve_it': 1, 'publish_radio': 'now'}) self.assertTrue(refetch(tracker).head.reviewedversioncommit.is_approved) def test_approve_view(self): diff --git a/widgy/contrib/review_queue/forms.py b/widgy/contrib/review_queue/forms.py index 23c5b08bb..1c5c3ee41 100644 --- a/widgy/contrib/review_queue/forms.py +++ b/widgy/contrib/review_queue/forms.py @@ -53,10 +53,9 @@ def save(self, request, commit=True): class ReviewedCommitForm(CommitForm): def commit(self, obj, user): - cleaned_data = self.cleaned_data.copy() approve_it = 'approve_it' in self.data - commit = obj.commit(user, **cleaned_data) + commit = super(ReviewedCommitForm, self).commit(obj, user) if approve_it: commit.reviewedversioncommit.approve(user) diff --git a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html index bb4fef641..3e05dcb23 100644 --- a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html +++ b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html @@ -64,7 +64,8 @@

      {% trans "Page History" %}

      diff --git a/widgy/static/widgy/css/popup.scss b/widgy/static/widgy/css/popup.scss new file mode 100644 index 000000000..7ffb6305d --- /dev/null +++ b/widgy/static/widgy/css/popup.scss @@ -0,0 +1,71 @@ +@import 'widgy_common'; + +$label_width: 150px; + +// Clean up grappelli-safe leftovers +.popup { + .breadcrumbs, + #footer { + display: none; + margin: 0 !important; + padding: 0 !important; + } + + #container { + min-width: 660px; + } + + #content { + margin: 0 15px !important; + } +} + +.popUp { + .loading { + @extend %loading; + } + + .denied { + color: $red; + } + + .formField { + @include clearfix; + + margin-bottom: 1em; + + & > label { + display: block; + float: left; + width: $label_width; + } + + textarea { + width: 500px; + height: 100px; + } + + &.publish_at { + li { + display: inline-block; + } + + ul { + display: inline-block; + margin-bottom: 1em; + } + + .publish_at_container { + @include clearfix; + + margin-left: $label_width; + } + } + } + + .submitRow { + input[type=submit] { + float: right; + } + } +} diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss index 17970ace8..62939d4f5 100644 --- a/widgy/static/widgy/css/widgy.scss +++ b/widgy/static/widgy/css/widgy.scss @@ -63,16 +63,6 @@ $table-cell-min-width: 120px; } - -/* Placeholder selectors ------------------------------------------*/ -%loading { - // widgy/static/widgy/image/loading.gif - background: url('data:image/gif;base64,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') center no-repeat !important; - color: transparent !important; -} - - /*| Basic Layout -----------------------------------------*/ body { diff --git a/widgy/static/widgy/css/widgy_common.scss b/widgy/static/widgy/css/widgy_common.scss index 6455e187f..aa7570cc9 100644 --- a/widgy/static/widgy/css/widgy_common.scss +++ b/widgy/static/widgy/css/widgy_common.scss @@ -148,3 +148,12 @@ $purple: #A56ED3; background: url($img) no-repeat; } } + + +/* Placeholder selectors +-----------------------------------------*/ +%loading { + // widgy/static/widgy/image/loading.gif + background: url('data:image/gif;base64,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') center no-repeat !important; + color: transparent !important; +} diff --git a/widgy/static/widgy/js/popup.js b/widgy/static/widgy/js/popup.js index aabfe97ef..b8863bab6 100644 --- a/widgy/static/widgy/js/popup.js +++ b/widgy/static/widgy/js/popup.js @@ -1,20 +1,29 @@ -$('.popUp form').ajaxForm({ - target: '.popUp', - beforeSubmit: function(data, $form) { - // prevent submission of forms without any enabled submit buttons. - // this is the normal behavior for a form, but ajaxForm doesn't - // implement it. - return $form.find('[type=submit]:not([disabled])').length >= 1; +jQuery(function($) { + // show/hide publish at calendar fields according to what the publish_radio + // field dictates. + var $publish_at = $('.publish_at_container'); + function showHideCalendar() { + var publish_now = $('[name=publish_radio]:checked').val() == 'now'; + + if ( publish_now ) { + $publish_at.hide(); + } else { + $publish_at.show(); + } } -}); -$('.popUp form [type=submit]').click(function() { - $(this).addClass('loading'); -}); -$('.popUp form').submit(function() { - var $form = $(this); - var $submits = $form.find('[type=submit]'); - if ( $form.find('.loading').length == 0 ) { - $submits.first().addClass('loading'); - } - $submits.attr('disabled', true); + $('[name=publish_radio]').on('change', showHideCalendar); + showHideCalendar(); + + // Loading spinner + $('.popUp form [type=submit]').click(function() { + $(this).addClass('loading'); + }); + $('.popUp form').submit(function() { + var $form = $(this); + var $submits = $form.find('[type=submit]'); + if ( $form.find('.loading').length == 0 ) { + $submits.first().addClass('loading'); + } + $submits.attr('disabled', true); + }); }); diff --git a/widgy/templates/widgy/_commit_form.html b/widgy/templates/widgy/_commit_form.html index 7af9bb550..b24b8d457 100644 --- a/widgy/templates/widgy/_commit_form.html +++ b/widgy/templates/widgy/_commit_form.html @@ -2,9 +2,23 @@ {% load url from future %} {% csrf_token %} - {% for field in form %} - {% include "widgy/field_as_div.html" %} - {% endfor %} + {{ form.media }} + + {% include "widgy/field_as_div.html" with field=form.message %} + +
      + {{ form.publish_at.label_tag }} + {{ form.publish_radio }} + +
      + {{ form.publish_at }} + {{ form.publish_at.errors }} +
      + + {% if form.publish_at.help_text %} +

      {{ form.publish_at.help_text }}

      + {% endif %} +

      {% block submit_row %} diff --git a/widgy/templates/widgy/commit.html b/widgy/templates/widgy/commit.html index 82e3cd97a..391641ddb 100644 --- a/widgy/templates/widgy/commit.html +++ b/widgy/templates/widgy/commit.html @@ -2,13 +2,12 @@ {% load url from future %} {% load i18n %} -{% block content %} -

      {% trans "Commit Changes" %}

      +{% block popup-content %} {% if changed_anything %} {% block commit_form %} {% include "widgy/_commit_form.html" with commit=object.working_copy action_url=commit_url %} {% endblock %} {% else %} -

      {% trans "Nothing has changed -- no need to commit." %}

      +

      {% trans "Nothing has changed — no need to commit." %}

      {% endif %} {% endblock %} diff --git a/widgy/templates/widgy/commit_success.html b/widgy/templates/widgy/commit_success.html index a51fc77f0..626048ce5 100644 --- a/widgy/templates/widgy/commit_success.html +++ b/widgy/templates/widgy/commit_success.html @@ -1,9 +1,8 @@ {% extends "widgy/popup_base.html" %} {% load i18n %} -{% block content %} -

      {% trans "Commit" %}

      +{% block popup-content %}

      {% trans "Change(s) successfully committed." %}

      {% endblock %} diff --git a/widgy/templates/widgy/popup_base.html b/widgy/templates/widgy/popup_base.html index 63c5b7deb..fc51108f4 100644 --- a/widgy/templates/widgy/popup_base.html +++ b/widgy/templates/widgy/popup_base.html @@ -1,18 +1,37 @@ +{% extends "admin/base.html" %} +{% load url from future %} {% load compress static %} + +{% block extrastyle %}{{ block.super }} +{% compress css %} + +{% endcompress %} +{% endblock %} + +{% block extrahead %}{{ block.super }} +{% url 'admin:jsi18n' as jsi18nurl %} + +{% compress js %} + + + + + +{% endcompress %} + +{% endblock %} + +{% block content %}
      {% if permission_error_message %} {% block perms_lacking %}

      {{ permission_error_message }}

      {% endblock %} {% else %} - {% block content %} + {% block popup-content %} {% endblock %} {% endif %}
      -{% compress js %} - - -{% endcompress %} -{# this will insert a debug toolbar when viewing the popup as #} -{# a standalone page. #} - +{% endblock %} diff --git a/widgy/templates/widgy/reset.html b/widgy/templates/widgy/reset.html index 07f854386..36d89ebd1 100644 --- a/widgy/templates/widgy/reset.html +++ b/widgy/templates/widgy/reset.html @@ -2,8 +2,7 @@ {% load url from future %} {% load i18n %} -{% block content %} -

      {% trans "Reset" %}

      +{% block popup-content %} {% if not has_commits %}

      {% trans "There are no commits yet, nothing to reset to" %}

      {% elif changed_anything %} @@ -13,6 +12,6 @@

      {% trans "Reset" %}

      {% else %} -

      {% trans "Nothing has changed -- no need to reset." %}

      +

      {% trans "Nothing has changed — no need to reset." %}

      {% endif %} {% endblock %} diff --git a/widgy/templates/widgy/reset_success.html b/widgy/templates/widgy/reset_success.html index 9244321bb..e9a5cd60d 100644 --- a/widgy/templates/widgy/reset_success.html +++ b/widgy/templates/widgy/reset_success.html @@ -1,10 +1,10 @@ {% extends "widgy/popup_base.html" %} {% load i18n %} -{% block content %} -

      {% trans 'Reset successful.' %}

      +{% block popup-content %} +

      {% trans 'Your changes were successfully erased.' %}

      {% endblock %} diff --git a/widgy/templates/widgy/revert.html b/widgy/templates/widgy/revert.html index 69f6aa363..ddbf2a2b5 100644 --- a/widgy/templates/widgy/revert.html +++ b/widgy/templates/widgy/revert.html @@ -2,8 +2,6 @@ {% load url from future %} {% load i18n %} -{% block content %} -

      {% trans "Revert Commit" %}

      - +{% block popup-content %} {% include "widgy/_commit_form.html" with commit=object.root_node action_url=revert_url %} {% endblock %} diff --git a/widgy/templates/widgy/versioned_widgy_field_base.html b/widgy/templates/widgy/versioned_widgy_field_base.html index d2a757190..e56ae6515 100644 --- a/widgy/templates/widgy/versioned_widgy_field_base.html +++ b/widgy/templates/widgy/versioned_widgy_field_base.html @@ -17,7 +17,8 @@ - - - - -

      - CKEditor Samples » Create and Destroy Editor Instances for Ajax Applications -

      -
      -

      - This sample shows how to create and destroy CKEditor instances on the fly. After the removal of CKEditor the content created inside the editing - area will be displayed in a <div> element. -

      -

      - For details of how to create this setup check the source code of this sample page - for JavaScript code responsible for the creation and destruction of a CKEditor instance. -

      -
      -

      Click the buttons to create and remove a CKEditor instance.

      -

      - - -

      - -
      -
      - - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/api.html b/widgy/static/widgy/js/lib/ckeditor/samples/api.html deleted file mode 100644 index 1bc8948f8..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/api.html +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - API Usage — CKEditor Sample - - - - - - -

      - CKEditor Samples » Using CKEditor JavaScript API -

      -
      -

      - This sample shows how to use the - CKEditor JavaScript API - to interact with the editor at runtime. -

      -

      - For details on how to create this setup check the source code of this sample page. -

      -
      - - -
      - -
      -
      - - - - -

      -

      - - -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/appendto.html b/widgy/static/widgy/js/lib/ckeditor/samples/appendto.html deleted file mode 100644 index 3a5fbef42..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/appendto.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - CKEDITOR.appendTo — CKEditor Sample - - - - - -

      - CKEditor Samples » Append To Page Element Using JavaScript Code -

      -
      -
      -

      - CKEDITOR.appendTo is basically to place editors - inside existing DOM elements. Unlike CKEDITOR.replace, - a target container to be replaced is no longer necessary. A new editor - instance is inserted directly wherever it is desired. -

      -
      CKEDITOR.appendTo( 'container_id',
-	{ /* Configuration options to be used. */ }
-	'Editor content to be used.'
-);
      -
      - -
      -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/assets/inlineall/logo.png b/widgy/static/widgy/js/lib/ckeditor/samples/assets/inlineall/logo.png deleted file mode 100644 index 334e7ac9958073fdfa1a05a72b45d5c079edcce1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4411 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 - - - - - Sample — CKEditor - - - -

      - CKEditor — Posted Data -

      - - - - - - - - - $value ) - { - if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) - continue; - - if ( get_magic_quotes_gpc() ) - $value = htmlspecialchars( stripslashes((string)$value) ); - else - $value = htmlspecialchars( (string)$value ); -?> - - - - - -
      Field NameValue
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/assets/sample.css b/widgy/static/widgy/js/lib/ckeditor/samples/assets/sample.css deleted file mode 100644 index 64167c258..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/assets/sample.css +++ /dev/null @@ -1,3 +0,0 @@ -/** - * Required by tests (dom/document.html). - */ diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/assets/sample.jpg b/widgy/static/widgy/js/lib/ckeditor/samples/assets/sample.jpg deleted file mode 100644 index a4a77fae83b0f66e77a97f172b4f184e1edac8e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17932 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 - - - - Data Filtering — CKEditor Sample - - - - - - -

      - CKEditor Samples » Data Filtering and Features Activation -

      -
      -

      - This sample page demonstrates the idea of Advanced Content Filter - (ACF), a sophisticated - tool that takes control over what kind of data is accepted by the editor and what - kind of output is produced. -

      -

      When and what is being filtered?

      -

      - ACF controls - every single source of data that comes to the editor. - It process both HTML that is inserted manually (i.e. pasted by the user) - and programmatically like: -

      -
      -editor.setData( '<p>Hello world!</p>' );
-
      -

      - ACF discards invalid, - useless HTML tags and attributes so the editor remains "clean" during - runtime. ACF behaviour - can be configured and adjusted for a particular case to prevent the - output HTML (i.e. in CMS systems) from being polluted. - - This kind of filtering is a first, client-side line of defense - against "tag soups", - the tool that precisely restricts which tags, attributes and styles - are allowed (desired). When properly configured, ACF - is an easy and fast way to produce a high-quality, intentionally filtered HTML. -

      - -

      How to configure or disable ACF?

      -

      - Advanced Content Filter is enabled by default, working in "automatic mode", yet - it provides a set of easy rules that allow adjusting filtering rules - and disabling the entire feature when necessary. The config property - responsible for this feature is config.allowedContent. -

      -

      - By "automatic mode" is meant that loaded plugins decide which kind - of content is enabled and which is not. For example, if the link - plugin is loaded it implies that <a> tag is - automatically allowed. Each plugin is given a set - of predefined ACF rules - that control the editor until - config.allowedContent - is defined manually. -

      -

      - Let's assume our intention is to restrict the editor to accept (produce) paragraphs - only: no attributes, no styles, no other tags. - With ACF - this is very simple. Basically set - config.allowedContent to 'p': -

      -
      -var editor = CKEDITOR.replace( textarea_id, {
-	allowedContent: 'p'
-} );
-
      -

      - Now try to play with allowed content: -

      -
      -// Trying to insert disallowed tag and attribute.
-editor.setData( '<p style="color: red">Hello <em>world</em>!</p>' );
-alert( editor.getData() );
-
-// Filtered data is returned.
-"<p>Hello world!</p>"
-
      -

      - What happened? Since config.allowedContent: 'p' is set the editor assumes - that only plain <p> are accepted. Nothing more. This is why - style attribute and <em> tag are gone. The same - filtering would happen if we pasted disallowed HTML into this editor. -

      -

      - This is just a small sample of what ACF - can do. To know more, please refer to the sample section below and - the official Advanced Content Filter guide. -

      -

      - You may, of course, want CKEditor to avoid filtering of any kind. - To get rid of ACF, - basically set - config.allowedContent to true like this: -

      -
      -CKEDITOR.replace( textarea_id, {
-	allowedContent: true
-} );
-
      - -

      Beyond data flow: Features activation

      -

      - ACF is far more than - I/O control: the entire - UI of the editor is adjusted to what - filters restrict. For example: if <a> tag is - disallowed - by ACF, - then accordingly link command, toolbar button and link dialog - are also disabled. Editor is smart: it knows which features must be - removed from the interface to match filtering rules. -

      -

      - CKEditor can be far more specific. If <a> tag is - allowed by filtering rules to be used but it is restricted - to have only one attribute (href) - config.allowedContent = 'a[!href]', then - "Target" tab of the link dialog is automatically disabled as target - attribute isn't included in ACF rules - for <a>. This behaviour applies to dialog fields, context - menus and toolbar buttons. -

      - -

      Sample configurations

      -

      - There are several editor instances below that present different - ACF setups. All of them, - except the last inline instance, share the same HTML content to visualize - how different filtering rules affect the same input data. -

      -
      - -
      - -
      -

      - This editor is using default configuration ("automatic mode"). It means that - - config.allowedContent is defined by loaded plugins. - Each plugin extends filtering rules to make it's own associated content - available for the user. -

      -
      - - - -
      - -
      - -
      - -
      -

      - This editor is using a custom configuration for - ACF: -

      -
      -CKEDITOR.replace( 'editor2', {
-	allowedContent:
-		'h1 h2 h3 p blockquote strong em;' +
-		'a[!href];' +
-		'img(left,right)[!src,alt,width,height];' +
-		'table tr th td caption;' +
-		'span{!font-family};' +'
-		'span{!color};' +
-		'span(!marker);' +
-		'del ins'
-} );
-
      -

      - The following rules may require additional explanation: -

      -
        -
      • - h1 h2 h3 p blockquote strong em - These tags - are accepted by the editor. Any tag attributes will be discarded. -
        • -
      • - a[!href] - href attribute is obligatory - for <a> tag. Tags without this attribute - are disarded. No other attribute will be accepted. -
        • -
      • - img(left,right)[!src,alt,width,height] - src - attribute is obligatory for <img> tag. - alt, width, height - and class attributes are accepted but - class must be either class="left" - or class="right" -
        • -
      • - table tr th td caption - These tags - are accepted by the editor. Any tag attributes will be discarded. -
        • -
      • - span{!font-family}, span{!color}, - span(!marker) - <span> tags - will be accepted if either font-family or - color style is set or class="marker" - is present. -
        • -
      • - del ins - These tags - are accepted by the editor. Any tag attributes will be discarded. -
        • -
      -

      - Please note that UI of the - editor is different. It's a response to what happened to the filters. - Since text-align isn't allowed, the align toolbar is gone. - The same thing happened to subscript/superscript, strike, underline - (<u>, <sub>, <sup> - are disallowed by - config.allowedContent) and many other buttons. -

      -
      - - -
      - -
      - -
      - -
      -

      - This editor is using a custom configuration for - ACF. - Note that filters can be configured as an object literal - as an alternative to a string-based definition. -

      -
      -CKEDITOR.replace( 'editor3', {
-	allowedContent: {
-		'b i ul ol big small': true,
-		'h1 h2 h3 p blockquote li': {
-			styles: 'text-align'
-		},
-		a: { attributes: '!href,target' },
-		img: {
-			attributes: '!src,alt',
-			styles: 'width,height',
-			classes: 'left,right'
-		}
-	}
-} );
-
      -
      - - -
      - -
      - -
      - -
      -

      - This editor is using a custom set of plugins and buttons. -

      -
      -CKEDITOR.replace( 'editor4', {
-	removePlugins: 'bidi,font,forms,flash,horizontalrule,iframe,justify,table,tabletools,smiley',
-	removeButtons: 'Anchor,Underline,Strike,Subscript,Superscript,Image',
-	format_tags: 'p;h1;h2;h3;pre;address'
-} );
-
      -

      - As you can see, removing plugins and buttons implies filtering. - Several tags are not allowed in the editor because there's no - plugin/button that is responsible for creating and editing this - kind of content (for example: the image is missing because - of removeButtons: 'Image'). The conclusion is that - ACF works "backwards" - as well: modifying UI - elements is changing allowed content rules. -

      -
      - - -
      - -
      - -
      - -
      -

      - This editor is built on editable <h1> element. - ACF takes care of - what can be included in <h1>. Note that there - are no block styles in Styles combo. Also why lists, indentation, - blockquote, div, form and other buttons are missing. -

      -

      - ACF makes sure that - no disallowed tags will come to <h1> so the final - markup is valid. If the user tried to paste some invalid HTML - into this editor (let's say a list), it would be automatically - converted into plain text. -

      -
      -

      - Apollo 11 was the spaceflight that landed the first humans, Americans Neil Armstrong and Buzz Aldrin, on the Moon on July 20, 1969, at 20:18 UTC. -

      -
      - - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/divreplace.html b/widgy/static/widgy/js/lib/ckeditor/samples/divreplace.html deleted file mode 100644 index ac5f5f8c7..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/divreplace.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - - Replace DIV — CKEditor Sample - - - - - - - -

      - CKEditor Samples » Replace DIV with CKEditor on the Fly -

      -
      -

      - This sample shows how to automatically replace <div> elements - with a CKEditor instance on the fly, following user's doubleclick. The content - that was previously placed inside the <div> element will now - be moved into CKEditor editing area. -

      -

      - For details on how to create this setup check the source code of this sample page. -

      -
      -

      - Double-click any of the following <div> elements to transform them into - editor instances. -

      -
      -

      - Part 1 -

      -

      - Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi - semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna - rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla - nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce - eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus. -

      -
      -
      -

      - Part 2 -

      -

      - Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi - semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna - rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla - nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce - eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus. -

      -

      - Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus - sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum - vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate. -

      -
      -
      -

      - Part 3 -

      -

      - Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi - semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna - rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla - nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce - eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus. -

      -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/index.html b/widgy/static/widgy/js/lib/ckeditor/samples/index.html deleted file mode 100644 index b868a2395..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/index.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - CKEditor Samples - - - - -

      - CKEditor Samples -

      -
      -
      -

      - Basic Samples -

      -
      -
      Replace textarea elements by class name
      -
      Automatic replacement of all textarea elements of a given class with a CKEditor instance.
      - -
      Replace textarea elements by code
      -
      Replacement of textarea elements with CKEditor instances by using a JavaScript call.
      -
      - -

      - Basic Customization -

      -
      -
      User Interface color
      -
      Changing CKEditor User Interface color and adding a toolbar button that lets the user set the UI color.
      - -
      User Interface languages
      -
      Changing CKEditor User Interface language and adding a drop-down list that lets the user choose the UI language.
      -
      - - -

      Plugins

      -
      -
      Magicline pluginNew!
      -
      Using the Magicline plugin to access difficult focus spaces.
      - -
      Full page support
      -
      CKEditor inserted with a JavaScript call and used to edit the whole page from <html> to </html>.
      -
      -
      -
      -

      - Inline Editing New! -

      -
      -
      Massive inline editor creation New!
      -
      Turn all elements with contentEditable = true attribute into inline editors.
      - -
      Convert element into an inline editor by code New!
      -
      Conversion of DOM elements into inline CKEditor instances by using a JavaScript call.
      - - -
      - -

      - Advanced Samples -

      -
      -
      Data filtering and features activation New!
      -
      Data filtering and automatic features activation basing on configuration.
      - -
      Replace DIV elements on the fly
      -
      Transforming a div element into an instance of CKEditor with a mouse click.
      - -
      Append editor instances
      -
      Appending editor instances to existing DOM elements.
      - -
      Create and destroy editor instances for Ajax applications
      -
      Creating and destroying CKEditor instances on the fly and saving the contents entered into the editor window.
      - -
      Basic usage of the API
      -
      Using the CKEditor JavaScript API to interact with the editor at runtime.
      - -
      XHTML-compliant style
      -
      Configuring CKEditor to produce XHTML 1.1 compliant attributes and styles.
      - -
      Read-only mode
      -
      Using the readOnly API to block introducing changes to the editor contents.
      - -
      "Tab" key-based navigation New!
      -
      Navigating among editor instances with tab key.
      - - - -
      Using the JavaScript API to customize dialog windows
      -
      Using the dialog windows API to customize dialog windows without changing the original editor code.
      - -
      Using the "Enter" key in CKEditor
      -
      Configuring the behavior of Enter and Shift+Enter keys.
      - -
      Output for Flash
      -
      Configuring CKEditor to produce HTML code that can be used with Adobe Flash.
      - -
      Output HTML
      -
      Configuring CKEditor to produce legacy HTML 4 code.
      - -
      Toolbar ConfigurationsNew!
      -
      Configuring CKEditor to display full or custom toolbar layout.
      - -
      -
      -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/inlineall.html b/widgy/static/widgy/js/lib/ckeditor/samples/inlineall.html deleted file mode 100644 index 2a76b56ce..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/inlineall.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - Massive inline editing — CKEditor Sample - - - - - - - -
      -

      CKEditor Samples » Massive inline editing

      -
      -

      This sample page demonstrates the inline editing feature - CKEditor instances will be created automatically from page elements with contentEditable attribute set to value true:

      - 
      <div contenteditable="true" > ... </div>
      -

      Click inside of any element below to start editing.

      -
      -
      -
      - -
      -
      -
      -

      - Fusce vitae porttitor -

      -

      - - Lorem ipsum dolor sit amet dolor. Duis blandit vestibulum faucibus a, tortor. - -

      -

      - Proin nunc justo felis mollis tincidunt, risus risus pede, posuere cubilia Curae, Nullam euismod, enim. Etiam nibh ultricies dolor ac dignissim erat volutpat. Vivamus fermentum nisl nulla sem in metus. Maecenas wisi. Donec nec erat volutpat. -

      -
      -

      - Fusce vitae porttitor a, euismod convallis nisl, blandit risus tortor, pretium. - Vehicula vitae, imperdiet vel, ornare enim vel sodales rutrum -

      -
      -
      -

      - Libero nunc, rhoncus ante ipsum non ipsum. Nunc eleifend pede turpis id sollicitudin fringilla. Phasellus ultrices, velit ac arcu. -

      -
      -

      Pellentesque nunc. Donec suscipit erat. Pellentesque habitant morbi tristique ullamcorper.

      -

      Mauris mattis feugiat lectus nec mauris. Nullam vitae ante.

      -
      -
      -
      -
      -

      - Integer condimentum sit amet -

      -

      - Aenean nonummy a, mattis varius. Cras aliquet. - Praesent magna non mattis ac, rhoncus nunc, rhoncus eget, cursus pulvinar mollis.

      -

      Proin id nibh. Sed eu libero posuere sed, lectus. Phasellus dui gravida gravida feugiat mattis ac, felis.

      -

      Integer condimentum sit amet, tempor elit odio, a dolor non ante at sapien. Sed ac lectus. Nulla ligula quis eleifend mi, id leo velit pede cursus arcu id nulla ac lectus. Phasellus vestibulum. Nunc viverra enim quis diam.

      -
      -
      -

      - Praesent wisi accumsan sit amet nibh -

      -

      Donec ullamcorper, risus tortor, pretium porttitor. Morbi quam quis lectus non leo.

      -

      Integer faucibus scelerisque. Proin faucibus at, aliquet vulputate, odio at eros. Fusce gravida, erat vitae augue. Fusce urna fringilla gravida.

      -

      In hac habitasse platea dictumst. Praesent wisi accumsan sit amet nibh. Maecenas orci luctus a, lacinia quam sem, posuere commodo, odio condimentum tempor, pede semper risus. Suspendisse pede. In hac habitasse platea dictumst. Nam sed laoreet sit amet erat. Integer.

      -
      -
      -
      -
      -

      - CKEditor logo -

      -

      Quisque justo neque, mattis sed, fermentum ultrices posuere cubilia Curae, Vestibulum elit metus, quis placerat ut, lectus. Ut sagittis, nunc libero, egestas consequat lobortis velit rutrum ut, faucibus turpis. Fusce porttitor, nulla quis turpis. Nullam laoreet vel, consectetuer tellus suscipit ultricies, hendrerit wisi. Donec odio nec velit ac nunc sit amet, accumsan cursus aliquet. Vestibulum ante sit amet sagittis mi.

      -

      - Nullam laoreet vel consectetuer tellus suscipit -

      -
        -
      • Ut sagittis, nunc libero, egestas consequat lobortis velit rutrum ut, faucibus turpis.
        • -
      • Fusce porttitor, nulla quis turpis. Nullam laoreet vel, consectetuer tellus suscipit ultricies, hendrerit wisi.
        • -
      • Mauris eget tellus. Donec non felis. Nam eget dolor. Vestibulum enim. Donec.
        • -
      -

      Quisque justo neque, mattis sed, fermentum ultrices posuere cubilia Curae, Vestibulum elit metus, quis placerat ut, lectus.

      -

      Nullam laoreet vel, consectetuer tellus suscipit ultricies, hendrerit wisi. Ut sagittis, nunc libero, egestas consequat lobortis velit rutrum ut, faucibus turpis. Fusce porttitor, nulla quis turpis.

      -

      Donec odio nec velit ac nunc sit amet, accumsan cursus aliquet. Vestibulum ante sit amet sagittis mi. Sed in nonummy faucibus turpis. Mauris eget tellus. Donec non felis. Nam eget dolor. Vestibulum enim. Donec.

      -
      -
      -
      -
      - Tags of this article: -

      - inline, editing, floating, CKEditor -

      -
      -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/inlinebycode.html b/widgy/static/widgy/js/lib/ckeditor/samples/inlinebycode.html deleted file mode 100644 index e224c6881..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/inlinebycode.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - Inline Editing by Code — CKEditor Sample - - - - - - -

      - CKEditor Samples » Inline Editing by Code -

      -
      -

      - This sample shows how to create an inline editor instance of CKEditor. It is created - with a JavaScript call using the following code: -

      -
      -// This property tells CKEditor to not activate every element with contenteditable=true element.
-CKEDITOR.disableAutoInline = true;
-
-var editor = CKEDITOR.inline( document.getElementById( 'editable' ) );
-
      -

      - Note that editable in the code above is the id - attribute of the <div> element to be converted into an inline instance. -

      -
      -
      -

      Saturn V carrying Apollo 11 Apollo 11

      - -

      Apollo 11 was the spaceflight that landed the first humans, Americans Neil Armstrong and Buzz Aldrin, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.

      - -

      Armstrong spent about three and a half two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5 kg) of lunar material for return to Earth. A third member of the mission, Michael Collins, piloted the command spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.

      - -

      Broadcasting and quotes

      - -

      Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:

      - -
      -

      One small step for [a] man, one giant leap for mankind.

      -
      - -

      Apollo 11 effectively ended the Space Race and fulfilled a national goal proposed in 1961 by the late U.S. President John F. Kennedy in a speech before the United States Congress:

      - -
      -

      [...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.

      -
      - -

      Technical details

      - - - - - - - - - - - - - - - - - - - - - - - -
      Mission crew
      PositionAstronaut
      CommanderNeil A. Armstrong
      Command Module PilotMichael Collins
      Lunar Module PilotEdwin "Buzz" E. Aldrin, Jr.
      - -

      Launched by a Saturn V rocket from Kennedy Space Center in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of NASA's Apollo program. The Apollo spacecraft had three parts:

      - -
        -
      1. Command Module with a cabin for the three astronauts which was the only part which landed back on Earth
        2. -
      2. Service Module which supported the Command Module with propulsion, electrical power, oxygen and water
        3. -
      3. Lunar Module for landing on the Moon.
        4. -
      - -

      After being sent to the Moon by the Saturn V's upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the Sea of Tranquility. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the Pacific Ocean on July 24.

      - -
      -

      Source: Wikipedia.org

      -
      - - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/dialog/assets/my_dialog.js b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/dialog/assets/my_dialog.js deleted file mode 100644 index b80cac91e..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/dialog/assets/my_dialog.js +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.html or http://ckeditor.com/license - */ - -CKEDITOR.dialog.add( 'myDialog', function( editor ) { - return { - title: 'My Dialog', - minWidth: 400, - minHeight: 200, - contents: [ - { - id: 'tab1', - label: 'First Tab', - title: 'First Tab', - elements: [ - { - id: 'input1', - type: 'text', - label: 'Text Field' - }, - { - id: 'select1', - type: 'select', - label: 'Select Field', - items: [ - [ 'option1', 'value1' ], - [ 'option2', 'value2' ] - ] - } - ] - }, - { - id: 'tab2', - label: 'Second Tab', - title: 'Second Tab', - elements: [ - { - id: 'button1', - type: 'button', - label: 'Button Field' - } - ] - } - ] - }; -}); - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/dialog/dialog.html b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/dialog/dialog.html deleted file mode 100644 index 002768454..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/dialog/dialog.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - Using API to Customize Dialog Windows — CKEditor Sample - - - - - - - - - - -

      - CKEditor Samples » Using CKEditor Dialog API -

      -
      -

      - This sample shows how to use the - CKEditor Dialog API - to customize CKEditor dialog windows without changing the original editor code. - The following customizations are being done in the example below: -

      -

      - For details on how to create this setup check the source code of this sample page. -

      -
      -

      A custom dialog is added to the editors using the pluginsLoaded event, from an external dialog definition file:

      -
        -
      1. Creating a custom dialog window – "My Dialog" dialog window opened with the "My Dialog" toolbar button.
        2. -
      2. Creating a custom button – Add button to open the dialog with "My Dialog" toolbar button.
        3. -
      - - -

      The below editor modify the dialog definition of the above added dialog using the dialogDefinition event:

      -
        -
      1. Adding dialog tab – Add new tab "My Tab" to dialog window.
        2. -
      2. Removing a dialog window tab – Remove "Second Tab" page from the dialog window.
        3. -
      3. Adding dialog window fields – Add "My Custom Field" to the dialog window.
        4. -
      4. Removing dialog window field – Remove "Select Field" selection field from the dialog window.
        5. -
      5. Setting default values for dialog window fields – Set default value of "Text Field" text field.
        6. -
      6. Setup initial focus for dialog window – Put initial focus on "My Custom Field" text field.
        7. -
      - - - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/enterkey/enterkey.html b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/enterkey/enterkey.html deleted file mode 100644 index c2b19b5d0..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/enterkey/enterkey.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - ENTER Key Configuration — CKEditor Sample - - - - - - - - - -

      - CKEditor Samples » ENTER Key Configuration -

      -
      -

      - This sample shows how to configure the Enter and Shift+Enter keys - to perform actions specified in the - enterMode - and shiftEnterMode - parameters, respectively. - You can choose from the following options: -

      -
        -
      • ENTER_P – new <p> paragraphs are created;
        • -
      • ENTER_BR – lines are broken with <br> elements;
        • -
      • ENTER_DIV – new <div> blocks are created.
        • -
      -

      - The sample code below shows how to configure CKEditor to create a <div> block when Enter key is pressed. -

      -
      -CKEDITOR.replace( 'textarea_id', {
-	enterMode: CKEDITOR.ENTER_DIV
-});
      -

      - Note that textarea_id in the code above is the id attribute of - the <textarea> element to be replaced. -

      -
      -
      - When Enter is pressed:
      - -
      -
      - When Shift+Enter is pressed:
      - -
      -
      -
      -

      -
      - -

      -

      - -

      -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/outputforflash.fla deleted file mode 100644 index 27e68ccd1cb7192c8bda2418d198d90f1aff10a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85504 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 diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js deleted file mode 100644 index 95fdf0a7a..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/assets/outputforflash/swfobject.js +++ /dev/null @@ -1,18 +0,0 @@ -var swfobject=function(){function u(){if(!s){try{var a=d.getElementsByTagName("body")[0].appendChild(d.createElement("span"));a.parentNode.removeChild(a)}catch(b){return}s=!0;for(var a=x.length,c=0;cf){f++;setTimeout(arguments.callee,10);return}a.removeChild(b);c=null;D()})()}else D()}function D(){var a=p.length;if(0e.wk))t(c,!0),f&&(g.success=!0,g.ref=E(c),f(g));else if(p[b].expressInstall&&F()){g={};g.data=p[b].expressInstall;g.width=d.getAttribute("width")||"0";g.height=d.getAttribute("height")||"0";d.getAttribute("class")&&(g.styleclass=d.getAttribute("class"));d.getAttribute("align")&&(g.align=d.getAttribute("align"));for(var h={},d=d.getElementsByTagName("param"),j=d.length,k=0;ke.wk)}function G(a,b,c,f){A=!0;H=f||null;N={success:!1,id:c};var g=n(c);if(g){"OBJECT"==g.nodeName?(w=I(g),B=null):(w=g,B=c);a.id= -O;if(typeof a.width==i||!/%$/.test(a.width)&&310>parseInt(a.width,10))a.width="310";if(typeof a.height==i||!/%$/.test(a.height)&&137>parseInt(a.height,10))a.height="137";d.title=d.title.slice(0,47)+" - Flash Player Installation";f=e.ie&&e.win?"ActiveX":"PlugIn";f="MMredirectURL="+m.location.toString().replace(/&/g,"%26")+"&MMplayerType="+f+"&MMdoctitle="+d.title;b.flashvars=typeof b.flashvars!=i?b.flashvars+("&"+f):f;e.ie&&(e.win&&4!=g.readyState)&&(f=d.createElement("div"),c+="SWFObjectNew",f.setAttribute("id", -c),g.parentNode.insertBefore(f,g),g.style.display="none",function(){g.readyState==4?g.parentNode.removeChild(g):setTimeout(arguments.callee,10)}());J(a,b,c)}}function W(a){if(e.ie&&e.win&&4!=a.readyState){var b=d.createElement("div");a.parentNode.insertBefore(b,a);b.parentNode.replaceChild(I(a),b);a.style.display="none";(function(){4==a.readyState?a.parentNode.removeChild(a):setTimeout(arguments.callee,10)})()}else a.parentNode.replaceChild(I(a),a)}function I(a){var b=d.createElement("div");if(e.win&& -e.ie)b.innerHTML=a.innerHTML;else if(a=a.getElementsByTagName(r)[0])if(a=a.childNodes)for(var c=a.length,f=0;fe.wk)return f;if(g)if(typeof a.id==i&&(a.id=c),e.ie&&e.win){var o="",h;for(h in a)a[h]!=Object.prototype[h]&&("data"==h.toLowerCase()?b.movie=a[h]:"styleclass"==h.toLowerCase()?o+=' class="'+a[h]+'"':"classid"!=h.toLowerCase()&&(o+=" "+ -h+'="'+a[h]+'"'));h="";for(var j in b)b[j]!=Object.prototype[j]&&(h+='');g.outerHTML='"+h+"";C[C.length]=a.id;f=n(a.id)}else{j=d.createElement(r);j.setAttribute("type",y);for(var k in a)a[k]!=Object.prototype[k]&&("styleclass"==k.toLowerCase()?j.setAttribute("class",a[k]):"classid"!=k.toLowerCase()&&j.setAttribute(k,a[k]));for(o in b)b[o]!=Object.prototype[o]&&"movie"!=o.toLowerCase()&& -(a=j,h=o,k=b[o],c=d.createElement("param"),c.setAttribute("name",h),c.setAttribute("value",k),a.appendChild(c));g.parentNode.replaceChild(j,g);f=j}return f}function P(a){var b=n(a);b&&"OBJECT"==b.nodeName&&(e.ie&&e.win?(b.style.display="none",function(){if(4==b.readyState){var c=n(a);if(c){for(var f in c)"function"==typeof c[f]&&(c[f]=null);c.parentNode.removeChild(c)}}else setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))}function n(a){var b=null;try{b=d.getElementById(a)}catch(c){}return b} -function U(a,b,c){a.attachEvent(b,c);v[v.length]=[a,b,c]}function z(a){var b=e.pv,a=a.split(".");a[0]=parseInt(a[0],10);a[1]=parseInt(a[1],10)||0;a[2]=parseInt(a[2],10)||0;return b[0]>a[0]||b[0]==a[0]&&b[1]>a[1]||b[0]==a[0]&&b[1]==a[1]&&b[2]>=a[2]?!0:!1}function Q(a,b,c,f){if(!e.ie||!e.mac){var g=d.getElementsByTagName("head")[0];if(g){c=c&&"string"==typeof c?c:"screen";f&&(K=l=null);if(!l||K!=c)f=d.createElement("style"),f.setAttribute("type","text/css"),f.setAttribute("media",c),l=g.appendChild(f), -e.ie&&(e.win&&typeof d.styleSheets!=i&&0\.;]/.exec(a)&&typeof encodeURIComponent!=i?encodeURIComponent(a):a}var i="undefined",r="object",y="application/x-shockwave-flash", -O="SWFObjectExprInst",m=window,d=document,q=navigator,T=!1,x=[function(){T?V():D()}],p=[],C=[],v=[],w,B,H,N,s=!1,A=!1,l,K,R=!0,e=function(){var a=typeof d.getElementById!=i&&typeof d.getElementsByTagName!=i&&typeof d.createElement!=i,b=q.userAgent.toLowerCase(),c=q.platform.toLowerCase(),f=c?/win/.test(c):/win/.test(b),c=c?/mac/.test(c):/mac/.test(b),b=/webkit/.test(b)?parseFloat(b.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):!1,g=!+"\v1",e=[0,0,0],h=null;if(typeof q.plugins!=i&&typeof q.plugins["Shockwave Flash"]== -r){if((h=q.plugins["Shockwave Flash"].description)&&!(typeof q.mimeTypes!=i&&q.mimeTypes[y]&&!q.mimeTypes[y].enabledPlugin))T=!0,g=!1,h=h.replace(/^.*\s+(\S+\s+\S+$)/,"$1"),e[0]=parseInt(h.replace(/^(.*)\..*$/,"$1"),10),e[1]=parseInt(h.replace(/^.*\.(.*)\s.*$/,"$1"),10),e[2]=/[a-zA-Z]/.test(h)?parseInt(h.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}else if(typeof m.ActiveXObject!=i)try{var j=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");if(j&&(h=j.GetVariable("$version")))g=!0,h=h.split(" ")[1].split(","), -e=[parseInt(h[0],10),parseInt(h[1],10),parseInt(h[2],10)]}catch(k){}return{w3:a,pv:e,wk:b,ie:g,win:f,mac:c}}();(function(){e.w3&&((typeof d.readyState!=i&&"complete"==d.readyState||typeof d.readyState==i&&(d.getElementsByTagName("body")[0]||d.body))&&u(),s||(typeof d.addEventListener!=i&&d.addEventListener("DOMContentLoaded",u,!1),e.ie&&e.win&&(d.attachEvent("onreadystatechange",function(){"complete"==d.readyState&&(d.detachEvent("onreadystatechange",arguments.callee),u())}),m==top&&function(){if(!s){try{d.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee, -0);return}u()}}()),e.wk&&function(){s||(/loaded|complete/.test(d.readyState)?u():setTimeout(arguments.callee,0))}(),M(u)))})();(function(){e.ie&&e.win&&window.attachEvent("onunload",function(){for(var a=v.length,b=0;be.wk)&&a&&b&&c&&d&&g?(t(b,!1),L(function(){c+="";d+="";var e={};if(k&&typeof k===r)for(var l in k)e[l]=k[l];e.data=a;e.width=c;e.height=d;l={};if(j&&typeof j===r)for(var p in j)l[p]=j[p];if(h&&typeof h===r)for(var q in h)l.flashvars=typeof l.flashvars!=i?l.flashvars+("&"+q+"="+h[q]):q+"="+h[q];if(z(g))p=J(e,l,b),e.id== -b&&t(b,!0),n.success=!0,n.ref=p;else{if(o&&F()){e.data=o;G(e,l,b,m);return}t(b,!0)}m&&m(n)})):m&&m(n)},switchOffAutoHideShow:function(){R=!1},ua:e,getFlashPlayerVersion:function(){return{major:e.pv[0],minor:e.pv[1],release:e.pv[2]}},hasFlashPlayerVersion:z,createSWF:function(a,b,c){if(e.w3)return J(a,b,c)},showExpressInstall:function(a,b,c,d){e.w3&&F()&&G(a,b,c,d)},removeSWF:function(a){e.w3&&P(a)},createCSS:function(a,b,c,d){e.w3&&Q(a,b,c,d)},addDomLoadEvent:L,addLoadEvent:M,getQueryParamValue:function(a){var b= -d.location.search||d.location.hash;if(b){/\?/.test(b)&&(b=b.split("?")[1]);if(null==a)return S(b);for(var b=b.split("&"),c=0;c - - - - Output for Flash — CKEditor Sample - - - - - - - - - - - - -

      - CKEditor Samples » Producing Flash Compliant HTML Output -

      -
      -

      - This sample shows how to configure CKEditor to output - HTML code that can be used with - - Adobe Flash. - The code will contain a subset of standard HTML elements like <b>, - <i>, and <p> as well as HTML attributes. -

      -

      - To add a CKEditor instance outputting Flash compliant HTML code, load the editor using a standard - JavaScript call, and define CKEditor features to use HTML elements and attributes. -

      -

      - For details on how to create this setup check the source code of this sample page. -

      -
      -

      - To see how it works, create some content in the editing area of CKEditor on the left - and send it to the Flash object on the right side of the page by using the - Send to Flash button. -

      - - - - - -
      - - -

      - -

      -       		-
      -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/outputhtml.html b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/outputhtml.html deleted file mode 100644 index 1dddd0d8b..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/htmlwriter/outputhtml.html +++ /dev/null @@ -1,237 +0,0 @@ - - - - - HTML Compliant Output — CKEditor Sample - - - - - - - - - - -

      - CKEditor Samples » Producing HTML Compliant Output -

      -
      -

      - This sample shows how to configure CKEditor to output valid - HTML 4.01 code. - Traditional HTML elements like <b>, - <i>, and <font> are used in place of - <strong>, <em>, and CSS styles. -

      -

      - To add a CKEditor instance outputting legacy HTML 4.01 code, load the editor using a standard - JavaScript call, and define CKEditor features to use the HTML compliant elements and attributes. -

      -

      - A snippet of the configuration code can be seen below; check the source of this page for - full definition: -

      -
      -CKEDITOR.replace( 'textarea_id', {
-	coreStyles_bold: { element: 'b' },
-	coreStyles_italic: { element: 'i' },
-
-	fontSize_style: {
-		element: 'font',
-		attributes: { 'size': '#(size)' }
-	}
-
-	...
-});
      -
      -
      -

      - - - -

      -

      - -

      -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/magicline/magicline.html b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/magicline/magicline.html deleted file mode 100644 index 2ee60ee44..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/magicline/magicline.html +++ /dev/null @@ -1,207 +0,0 @@ - - - - - Using Magicline plugin — CKEditor Sample - - - - - - - - - -

      - CKEditor Samples » Using Magicline plugin -

      -
      -

      - This sample shows the advantages of Magicline plugin - which is to enhance the editing process. Thanks to this plugin, - a number of difficult focus spaces which are inaccessible due to - browser issues can now be focused. -

      -

      - Magicline plugin shows a red line with a handler - which, when clicked, inserts a paragraph and allows typing. To see this, - focus an editor and move your mouse above the focus space you want - to access. The plugin is enabled by default so no additional - configuration is necessary. -

      -
      -
      - -
      -

      - This editor uses a default Magicline setup. -

      -
      - - -
      -
      -
      - -
      -

      - This editor is using a blue line. -

      -
      -CKEDITOR.replace( 'editor2', {
-	magicline_color: 'blue'
-});
      -
      - - -
      - - - diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/toolbar/toolbar.html b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/toolbar/toolbar.html deleted file mode 100644 index b0f7179a3..000000000 --- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/toolbar/toolbar.html +++ /dev/null @@ -1,232 +0,0 @@ - - - - - Toolbar Configuration — CKEditor Sample - - - - - - - - - -

      - CKEditor Samples » Toolbar Configuration -

      -
      -

      - This sample page demonstrates editor with loaded full toolbar (all registered buttons) and, if - current editor's configuration modifies default settings, also editor with modified toolbar. -

      - -

      Since CKEditor 4 there are two ways to configure toolbar buttons.

      - -

      By config.toolbar

      - -

      - You can explicitly define which buttons are displayed in which groups and in which order. - This is the more precise setting, but less flexible. If newly added plugin adds its - own button you'll have to add it manually to your config.toolbar setting as well. -

      - -

      To add a CKEditor instance with custom toolbar setting, insert the following JavaScript call to your code:

      - - 
      -CKEDITOR.replace( 'textarea_id', {
-	toolbar: [
-		{ name: 'document', items: [ 'Source', '-', 'NewPage', 'Preview', '-', 'Templates' ] },	// Defines toolbar group with name (used to create voice label) and items in 3 subgroups.
-		[ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ],			// Defines toolbar group without name.
-		'/',																					// Line break - next group will be placed in new line.
-		{ name: 'basicstyles', items: [ 'Bold', 'Italic' ] }
-	]
-});
      - -

      By config.toolbarGroups

      - -

      - You can define which groups of buttons (like e.g. basicstyles, clipboard - and forms) are displayed and in which order. Registered buttons are associated - with toolbar groups by toolbar property in their definition. - This setting's advantage is that you don't have to modify toolbar configuration - when adding/removing plugins which register their own buttons. -

      - -

      To add a CKEditor instance with custom toolbar groups setting, insert the following JavaScript call to your code:

      - - 
      -CKEDITOR.replace( 'textarea_id', {
-	toolbarGroups: [
-		{ name: 'document',	   groups: [ 'mode', 'document' ] },			// Displays document group with its two subgroups.
- 		{ name: 'clipboard',   groups: [ 'clipboard', 'undo' ] },			// Group's name will be used to create voice label.
- 		'/',																// Line break - next group will be placed in new line.
- 		{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
- 		{ name: 'links' }
-	]
-
-	// NOTE: Remember to leave 'toolbar' property with the default value (null).
-});
      -
      - - - -
      -

      Full toolbar configuration

      -

      Below you can see editor with full toolbar, generated automatically by the editor.

      -

      - Note: To create editor instance with full toolbar you don't have to set anything. - Just leave toolbar and toolbarGroups with the default, null values. -

      - - 
      
-	
      
-
-	
-
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/wysiwygarea/fullpage.html b/widgy/static/widgy/js/lib/ckeditor/samples/plugins/wysiwygarea/fullpage.html
deleted file mode 100644
index a4196aca4..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/plugins/wysiwygarea/fullpage.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-	Full Page Editing — CKEditor Sample
-	
-	
-	
-	
-	
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » Full Page Editing
-	
      
-	
      
-		
      
-			This sample shows how to configure CKEditor to edit entire HTML pages, from the
-			<html> tag to the </html> tag.
-		
      
-		
      
-			The CKEditor instance below is inserted with a JavaScript call using the following code:
-		
      
-
      -CKEDITOR.replace( 'textarea_id', {
-	fullPage: true,
-	allowedContent: true
-});
-
      
-		
      
-			Note that textarea_id in the code above is the id attribute of
-			the <textarea> element to be replaced.
-		
      
-		
      
-			The allowedContent in the code above is set to true to disable content filtering.
-			Setting this option is not obligatory, but in full page mode there is a strong chance that one may want be able to freely enter any HTML content in source mode without any limitations.
-		
      
-	
      
-	
      
-		
-		
-		
-		
      
-			
-		
      
-	
      
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/readonly.html b/widgy/static/widgy/js/lib/ckeditor/samples/readonly.html
deleted file mode 100644
index 5fbb60bbf..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/readonly.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-	Using the CKEditor Read-Only API — CKEditor Sample
-	
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » Using the CKEditor Read-Only API
-	
      
-	
      
-		
      
-			This sample shows how to use the
-			setReadOnly
-			API to put editor into the read-only state that makes it impossible for users to change the editor contents.
-		
      
-		
      
-			For details on how to create this setup check the source code of this sample page.
-		
      
-	
      
-	
      
-		
      
-			
-		
      
-		
      
-			
-			
-		
      
-	
      
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/replacebyclass.html b/widgy/static/widgy/js/lib/ckeditor/samples/replacebyclass.html
deleted file mode 100644
index a95d2612b..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/replacebyclass.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-	Replace Textareas by Class Name — CKEditor Sample
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » Replace Textarea Elements by Class Name
-	
      
-	
      
-		
      
-			This sample shows how to automatically replace all <textarea> elements
-			of a given class with a CKEditor instance.
-		
      
-		
      
-			To replace a <textarea> element, simply assign it the ckeditor
-			class, as in the code below:
-		
      
-
      -<textarea class="ckeditor" name="editor1"></textarea>
-
      
-		
      
-			Note that other <textarea> attributes (like id or name) need to be adjusted to your document.
-		
      
-	
      
-	
      
-		
      
-			
-			
-		
      
-		
      
-			
-		
      
-	
      
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/replacebycode.html b/widgy/static/widgy/js/lib/ckeditor/samples/replacebycode.html
deleted file mode 100644
index d5a01e8d3..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/replacebycode.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-	Replace Textarea by Code — CKEditor Sample
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » Replace Textarea Elements Using JavaScript Code
-	
      
-	
      
-		
      
-			
      
-				This editor is using an <iframe> element-based editing area, provided by the Wysiwygarea plugin.
-			
      
-
      -CKEDITOR.replace( 'textarea_id' )
-
      
-		
      
-		
-		
-		
      
-			
-		
      
-	
      
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/sample.css b/widgy/static/widgy/js/lib/ckeditor/samples/sample.css
deleted file mode 100644
index 14a790aee..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/sample.css
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
-*/
-
-html, body, h1, h2, h3, h4, h5, h6, div, span, blockquote, p, address, form, fieldset, img, ul, ol, dl, dt, dd, li, hr, table, td, th, strong, em, sup, sub, dfn, ins, del, q, cite, var, samp, code, kbd, tt, pre
-{
-	line-height: 1.5em;
-}
-
-body
-{
-	padding: 10px 30px;
-}
-
-input, textarea, select, option, optgroup, button, td, th
-{
-	font-size: 100%;
-}
-
-pre, code, kbd, samp, tt
-{
-	font-family: monospace,monospace;
-	font-size: 1em;
-}
-
-body {
-    width: 960px;
-    margin: 0 auto;
-}
-
-code
-{
-	background: #f3f3f3;
-	border: 1px solid #ddd;
-	padding: 1px 4px;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-abbr
-{
-	border-bottom: 1px dotted #555;
-	cursor: pointer;
-}
-
-.new
-{
-	background: #FF7E00;
-	border: 1px solid #DA8028;
-	color: #fff;
-	font-size: 10px;
-	font-weight: bold;
-	padding: 1px 4px;
-	text-shadow: 0 1px 0 #C97626;
-	text-transform: uppercase;
-	margin: 0 0 0 3px;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-
-	-moz-box-shadow: 0 2px 3px 0 #FFA54E inset;
-	-webkit-box-shadow: 0 2px 3px 0 #FFA54E inset;
-	box-shadow: 0 2px 3px 0 #FFA54E inset;
-}
-
-h1.samples
-{
-	color: #0782C1;
-	font-size: 200%;
-	font-weight: normal;
-	margin: 0;
-	padding: 0;
-}
-
-h1.samples a
-{
-	color: #0782C1;
-	text-decoration: none;
-	border-bottom: 1px dotted #0782C1;
-}
-
-.samples a:hover
-{
-	border-bottom: 1px dotted #0782C1;
-}
-
-h2.samples
-{
-	color: #000000;
-	font-size: 130%;
-	margin: 15px 0 0 0;
-	padding: 0;
-}
-
-p, blockquote, address, form, pre, dl, h1.samples, h2.samples
-{
-	margin-bottom: 15px;
-}
-
-ul.samples
-{
-	margin-bottom: 15px;
-}
-
-.clear
-{
-	clear: both;
-}
-
-fieldset
-{
-	margin: 0;
-	padding: 10px;
-}
-
-body, input, textarea
-{
-	color: #333333;
-	font-family: Arial, Helvetica, sans-serif;
-}
-
-body
-{
-	font-size: 75%;
-}
-
-a.samples
-{
-	color: #189DE1;
-	text-decoration: none;
-}
-
-form
-{
-	margin: 0;
-	padding: 0;
-}
-
-pre.samples
-{
-	background-color: #F7F7F7;
-	border: 1px solid #D7D7D7;
-	overflow: auto;
-	padding: 0.25em;
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-	-moz-tab-size: 4;
-	-o-tab-size: 4;
-	-webkit-tab-size: 4;
-	tab-size: 4;
-}
-
-#footer
-{
-	clear: both;
-	padding-top: 10px;
-}
-
-#footer hr
-{
-	margin: 10px 0 15px 0;
-	height: 1px;
-	border: solid 1px gray;
-	border-bottom: none;
-}
-
-#footer p
-{
-	margin: 0 10px 10px 10px;
-	float: left;
-}
-
-#footer #copy
-{
-	float: right;
-}
-
-#outputSample
-{
-	width: 100%;
-	table-layout: fixed;
-}
-
-#outputSample thead th
-{
-	color: #dddddd;
-	background-color: #999999;
-	padding: 4px;
-	white-space: nowrap;
-}
-
-#outputSample tbody th
-{
-	vertical-align: top;
-	text-align: left;
-}
-
-#outputSample pre
-{
-	margin: 0;
-	padding: 0;
-}
-
-.description
-{
-	border: 1px dotted #B7B7B7;
-	margin-bottom: 10px;
-	padding: 10px 10px 0;
-	overflow: hidden;
-}
-
-label
-{
-	display: block;
-	margin-bottom: 6px;
-}
-
-/**
- *	CKEditor editables are automatically set with the "cke_editable" class
- *	plus cke_editable_(inline|themed) depending on the editor type.
- */
-
-/* Style a bit the inline editables. */
-.cke_editable.cke_editable_inline
-{
-	cursor: pointer;
-}
-
-/* Once an editable element gets focused, the "cke_focus" class is
-   added to it, so we can style it differently. */
-.cke_editable.cke_editable_inline.cke_focus
-{
-	box-shadow: inset 0px 0px 20px 3px #ddd, inset 0 0 1px #000;
-	outline: none;
-	background: #eee;
-	cursor: text;
-}
-
-/* Avoid pre-formatted overflows inline editable. */
-.cke_editable_inline pre
-{
-	white-space: pre-wrap;
-	word-wrap: break-word;
-}
-
-/**
- *	Samples index styles.
- */
-
-.twoColumns,
-.twoColumnsLeft,
-.twoColumnsRight
-{
-	overflow: hidden;
-}
-
-.twoColumnsLeft,
-.twoColumnsRight
-{
-	width: 45%;
-}
-
-.twoColumnsLeft
-{
-	float: left;
-}
-
-.twoColumnsRight
-{
-	float: right;
-}
-
-dl.samples
-{
-	padding: 0 0 0 40px;
-}
-dl.samples > dt
-{
-	display: list-item;
-	list-style-type: disc;
-	list-style-position: outside;
-	margin: 0 0 3px;
-}
-dl.samples > dd
-{
-	margin: 0 0 3px;
-}
-.warning
-{
-    color: #ff0000;
-	background-color: #FFCCBA;
-    border: 2px dotted #ff0000;
-	padding: 15px 10px;
-	margin: 10px 0;
-}
-
-/* Used on inline samples */
-
-blockquote
-{
-	font-style: italic;
-	font-family: Georgia, Times, "Times New Roman", serif;
-	padding: 2px 0;
-	border-style: solid;
-	border-color: #ccc;
-	border-width: 0;
-}
-
-.cke_contents_ltr blockquote
-{
-	padding-left: 20px;
-	padding-right: 8px;
-	border-left-width: 5px;
-}
-
-.cke_contents_rtl blockquote
-{
-	padding-left: 8px;
-	padding-right: 20px;
-	border-right-width: 5px;
-}
-
-img.right {
-    border: 1px solid #ccc;
-    float: right;
-    margin-left: 15px;
-    padding: 5px;
-}
-
-img.left {
-    border: 1px solid #ccc;
-    float: left;
-    margin-right: 15px;
-    padding: 5px;
-}
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/sample.js b/widgy/static/widgy/js/lib/ckeditor/samples/sample.js
deleted file mode 100644
index 8827e789a..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/sample.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.html or http://ckeditor.com/license
- */
-
-// Tool scripts for the sample pages.
-// This file can be ignored and is not required to make use of CKEditor.
-
-(function() {
-	// Check for sample compliance.
-	CKEDITOR.on( 'instanceReady', function( ev ) {
-		var editor = ev.editor,
-			meta = CKEDITOR.document.$.getElementsByName( 'ckeditor-sample-required-plugins' ),
-			requires = meta.length ? CKEDITOR.dom.element.get( meta[ 0 ] ).getAttribute( 'content' ).split( ',' ) : [],
-			missing = [];
-
-		if ( requires.length ) {
-			for ( var i = 0; i < requires.length; i++ ) {
-				if ( !editor.plugins[ requires[ i ] ] )
-					missing.push( '' + requires[ i ] + '' );
-			}
-
-			if ( missing.length ) {
-				var warn = CKEDITOR.dom.element.createFromHtml(
-					'
      ' +
-						'To fully experience this demo, the ' + missing.join( ', ' ) + ' plugin' + ( missing.length > 1 ? 's are' : ' is' ) + ' required.' +
-					'
      '
-				);
-				warn.insertBefore( editor.container );
-			}
-		}
-	});
-})();
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/sample_posteddata.php b/widgy/static/widgy/js/lib/ckeditor/samples/sample_posteddata.php
deleted file mode 100644
index 59de8bef3..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/sample_posteddata.php
+++ /dev/null
@@ -1,16 +0,0 @@
-
      -
--------------------------------------------------------------------------------------------
-  CKEditor - Posted Data
-
-  We are sorry, but your Web server does not support the PHP language used in this script.
-
-  Please note that CKEditor can be used with any other server-side language than just PHP.
-  To save the content created with CKEditor you need to read the POST data on the server
-  side and write it to a file or the database.
-
-  Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
-  For licensing, see LICENSE.html or http://ckeditor.com/license
--------------------------------------------------------------------------------------------
-
-
       */ include "assets/posteddata.php"; ?>
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/tabindex.html b/widgy/static/widgy/js/lib/ckeditor/samples/tabindex.html
deleted file mode 100644
index 24e7d6fb4..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/tabindex.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-	TAB Key-Based Navigation — CKEditor Sample
-	
-	
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » TAB Key-Based Navigation
-	
      
-	
      
-		
      
-			This sample shows how tab key navigation among editor instances is
-			affected by the tabIndex attribute from
-			the original page element. Use TAB key to move between the editors.
-		
      
-	
      
-	
      
-		
-	
      
-	
      
-	
      
-		
-	
      
-	
      
-		
-	
      
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/uicolor.html b/widgy/static/widgy/js/lib/ckeditor/samples/uicolor.html
deleted file mode 100644
index 0e0d2e6c1..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/uicolor.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-	UI Color Picker — CKEditor Sample
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » UI Color
-	
      
-	
      
-		
      
-			This sample shows how to automatically replace <textarea> elements
-			with a CKEditor instance with an option to change the color of its user interface.
      
-			Note:The UI skin color feature depends on the CKEditor skin
-			compatibility. The Moono and Kama skins are examples of skins that work with it.
-		
      
-	
      
-	
      
-	
      
-		This editor instance has a UI color value defined in configuration to change the skin color,
-		To specify the color of the user interface, set the uiColor property:
-	
      
-	
      -CKEDITOR.replace( 'textarea_id', {
-	uiColor: '#14B8C4'
-});
      
-	
      
-		Note that textarea_id in the code above is the id attribute of
-		the <textarea> element to be replaced.
-	
      
-	
      
-		
-		
-	
      
-	
      
-		
-	
      
-	
      
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/uilanguages.html b/widgy/static/widgy/js/lib/ckeditor/samples/uilanguages.html
deleted file mode 100644
index ea2134c6b..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/uilanguages.html
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-	User Interface Globalization — CKEditor Sample
-	
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » User Interface Languages
-	
      
-	
      
-		
      
-			This sample shows how to automatically replace <textarea> elements
-			with a CKEditor instance with an option to change the language of its user interface.
-		
      
-		
      
-			It pulls the language list from CKEditor _languages.js file that contains the list of supported languages and creates
-			a drop-down list that lets the user change the UI language.
-		
      
-		
      
-			By default, CKEditor automatically localizes the editor to the language of the user.
-			The UI language can be controlled with two configuration options:
-			language and
-			
-			defaultLanguage. The defaultLanguage setting specifies the
-			default CKEditor language to be used when a localization suitable for user's settings is not available.
-		
      
-		
      
-			To specify the user interface language that will be used no matter what language is
-			specified in user's browser or operating system, set the language property:
-		
      
-
      -CKEDITOR.replace( 'textarea_id', {
-	// Load the German interface.
-	language: 'de'
-});
      
-		
      
-			Note that textarea_id in the code above is the id attribute of
-			the <textarea> element to be replaced.
-		
      
-	
      
-	
      
-		
      
-			Available languages (  languages!):
      
-			
-			
      
-			
-				(You may see strange characters if your system does not support the selected language)
-			
-		
      
-		
      
-			
-			
-		
      
-	
      
-	
-
-
diff --git a/widgy/static/widgy/js/lib/ckeditor/samples/xhtmlstyle.html b/widgy/static/widgy/js/lib/ckeditor/samples/xhtmlstyle.html
deleted file mode 100644
index cbda16409..000000000
--- a/widgy/static/widgy/js/lib/ckeditor/samples/xhtmlstyle.html
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-
-
-	XHTML Compliant Output — CKEditor Sample
-	
-	
-	
-	
-	
-
-
-	
      
-		CKEditor Samples » Producing XHTML Compliant Output
-	
      
-	
      
-		
      
-			This sample shows how to configure CKEditor to output valid
-			XHTML 1.1 code.
-			Deprecated elements (<font>, <u>) or attributes
-			(size, face) will be replaced with XHTML compliant code.
-		
      
-		
      
-			To add a CKEditor instance outputting valid XHTML code, load the editor using a standard
-			JavaScript call and define CKEditor features to use the XHTML compliant elements and styles.
-		
      
-		
      
-			A snippet of the configuration code can be seen below; check the source of this page for
-			full definition:
-		
      
-
      -CKEDITOR.replace( 'textarea_id', {
-	contentsCss: 'assets/outputxhtml.css',
-
-	coreStyles_bold: {
-		element: 'span',
-		attributes: { 'class': 'Bold' }
-	},
-	coreStyles_italic: {
-		element: 'span',
-		attributes: { 'class': 'Italic' }
-	},
-
-	...
-});
      
-	
      
-	
      
-		
      
-			
-			
-			
-		
      
-		
      
-			
-		
      
-	
      
-	
-
-

From 7ee4ed57a79846f70a6aa74a9944d035267c32b1 Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Wed, 3 Jul 2013 14:12:57 -0600
Subject: [PATCH 0672/1061] Delete confirmation improvements

  - Change the confirmation message to include display_name: 'Are you
    sure you want to delete this section?'
  - Highlight the widgets you will be deleting with the `deleting` CSS
    class, so you can double check that you have the right one.
---
 tests/modeltests/core_tests/models.py | 4 ++++
 widgy/models/base.py                  | 3 ++-
 widgy/static/widgy/css/widgy.scss     | 5 +++++
 widgy/static/widgy/js/modal/modal.js  | 5 ++++-
 widgy/static/widgy/js/nodes/nodes.js  | 9 ++++++++-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/tests/modeltests/core_tests/models.py b/tests/modeltests/core_tests/models.py
index 2442f64c1..52989173e 100644
--- a/tests/modeltests/core_tests/models.py
+++ b/tests/modeltests/core_tests/models.py
@@ -33,6 +33,10 @@ class Bucket(Content):
     def render(self, context, template=None):
         return ''.join(i.render(context) for i in self.get_children())
 
+    class Meta:
+        # test that stuff works with lazily translated strings
+        verbose_name = _("bucket")
+
 
 class RawTextWidget(Content):
     text = models.TextField()
diff --git a/widgy/models/base.py b/widgy/models/base.py
index 9a5a1bb80..6e050243d 100644
--- a/widgy/models/base.py
+++ b/widgy/models/base.py
@@ -453,6 +453,7 @@ def to_json(self, site):
             'shelf': self.shelf,
             'attributes': self.get_attributes(),
             'form_prefix': self.get_form_prefix(),
+            'display_name': self.display_name,
         }
         if self.editable:
             data['edit_url'] = site.reverse(site.node_edit_view, kwargs=node_pk_kwargs)
@@ -478,7 +479,7 @@ def class_to_json(cls, site):
 
     @property
     def display_name(self):
-        return capfirst(self._meta.verbose_name)
+        return unicode(self._meta.verbose_name)
 
     @property
     def class_name(self):
diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss
index 17970ace8..83e42c040 100644
--- a/widgy/static/widgy/css/widgy.scss
+++ b/widgy/static/widgy/css/widgy.scss
@@ -224,6 +224,11 @@ li.node_drop_target {
       cursor: pointer;
     }
 
+    &.deleting * {
+      // fixme!
+      background-color: red;
+    }
+
     // specific node styles
     &.invisible {
       background-color: inherit;
diff --git a/widgy/static/widgy/js/modal/modal.js b/widgy/static/widgy/js/modal/modal.js
index 88996746f..15a4847a4 100644
--- a/widgy/static/widgy/js/modal/modal.js
+++ b/widgy/static/widgy/js/modal/modal.js
@@ -68,10 +68,13 @@ define([ 'widgy.backbone',
     }
   }
 
-  function confirm(message, success) {
+  function confirm(message, success, failure) {
     if ( window.confirm(message) ) {
       success();
+    } else if ( failure ) {
+      failure();
     }
+
   }
 
   return {
diff --git a/widgy/static/widgy/js/nodes/nodes.js b/widgy/static/widgy/js/nodes/nodes.js
index b2607a2c0..9725cb7ee 100644
--- a/widgy/static/widgy/js/nodes/nodes.js
+++ b/widgy/static/widgy/js/nodes/nodes.js
@@ -183,7 +183,14 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/
 
     'delete': function(event) {
       // TODO: A better UI experience would be undo, but this is a stop gap.
-      modal.confirm('Are you sure?', this.deleteSelf);
+      this.$el.addClass('deleting');
+      modal.confirm(
+        'Are you sure you want to delete this ' + this.content.get('display_name') + '?',
+        this.deleteSelf,
+        _.bind(function() {
+          this.$el.removeClass('deleting');
+        }, this)
+      );
       return false;
     },
 

From b10fb989bb819729cda8bce073143f5fe55b7941 Mon Sep 17 00:00:00 2001
From: Rocky Meza 
Date: Fri, 5 Jul 2013 16:48:44 -0600
Subject: [PATCH 0673/1061] Fixed bug with rerendering a widget with a shelf.

---
 widgy/static/widgy/js/nodes/nodes.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/widgy/static/widgy/js/nodes/nodes.js b/widgy/static/widgy/js/nodes/nodes.js
index 9725cb7ee..c424b76ac 100644
--- a/widgy/static/widgy/js/nodes/nodes.js
+++ b/widgy/static/widgy/js/nodes/nodes.js
@@ -72,9 +72,6 @@ define([ 'exports', 'jquery', 'underscore', 'widgy.backbone', 'lib/q', 'shelves/
       this
         .listenTo(this.node, 'remove', this.close);
 
-      this
-        .listenTo(this.content, 'change:preview_template', this.rerender);
-
       this.list = new Backbone.ViewList();
     },
 

From c8703a6598b0f17f3577ae0703c6e7876a192d18 Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Mon, 1 Jul 2013 15:34:23 -0600
Subject: [PATCH 0674/1061] Support for non-nullable WidgyFields

WidgyForms didn't work with them previously, because of how they handle
unsaved instances.

Also changes the default values for null, blank, and on_delete back to
their normal Django values. This might cause backwards-compatibility
problems, be careful.
---
 tests/modeltests/core_tests/models.py       | 14 +++++++++++-
 tests/modeltests/core_tests/tests/fields.py | 12 ++++++++++-
 widgy/contrib/page_builder/models.py        |  2 ++
 widgy/contrib/widgy_mezzanine/models.py     |  8 +++++--
 widgy/db/fields.py                          | 24 +++++++++++++--------
 widgy/forms.py                              |  5 +++--
 6 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/tests/modeltests/core_tests/models.py b/tests/modeltests/core_tests/models.py
index 52989173e..2ffd48516 100644
--- a/tests/modeltests/core_tests/models.py
+++ b/tests/modeltests/core_tests/models.py
@@ -111,13 +111,23 @@ class Meta:
 
 class HasAWidgy(models.Model):
     widgy = WidgyField(
+        null=True,
+        blank=True,
         root_choices=[Layout],
         site='modeltests.core_tests.widgy_config.widgy_site',
     )
 
+class HasAWidgyNonNull(models.Model):
+    widgy = WidgyField(
+        root_choices=[AnotherLayout],
+        site='modeltests.core_tests.widgy_config.widgy_site',
+    )
+
 
 class HasAWidgyOnlyAnotherLayout(models.Model):
     widgy = WidgyField(
+        null=True,
+        blank=True,
         root_choices=[AnotherLayout],
         site='modeltests.core_tests.widgy_config.widgy_site'
     )
@@ -131,11 +141,13 @@ class VersionedPage(models.Model):
     version_tracker = VersionedWidgyField(
         site='modeltests.core_tests.widgy_config.widgy_site',
         root_choices=[Layout, AnotherLayout],
+        blank=True,
+        null=True,
     )
 
 
 class VersionedPage2(models.Model):
-    bar = VersionedWidgyField(site='modeltests.core_tests.widgy_config.widgy_site', related_name='asdf')
+    bar = VersionedWidgyField(site='modeltests.core_tests.widgy_config.widgy_site', related_name='asdf', null=True)
 
 
 class VersionedPage3(models.Model):
diff --git a/tests/modeltests/core_tests/tests/fields.py b/tests/modeltests/core_tests/tests/fields.py
index 193ff37c6..bac168847 100644
--- a/tests/modeltests/core_tests/tests/fields.py
+++ b/tests/modeltests/core_tests/tests/fields.py
@@ -12,7 +12,7 @@
 
 from modeltests.core_tests.widgy_config import widgy_site
 from modeltests.core_tests.models import (
-    HasAWidgy, Layout, HasAWidgyOnlyAnotherLayout, AnotherLayout,
+    HasAWidgy, HasAWidgyNonNull, Layout, HasAWidgyOnlyAnotherLayout, AnotherLayout,
     VersionedPage, RawTextWidget)
 
 
@@ -195,6 +195,16 @@ class Meta:
         instance = x.save()
         self.assertIsInstance(instance.widgy.content, AnotherLayout)
 
+    def test_formfield_non_null(self):
+        class TheForm(WidgyFormMixin, forms.ModelForm):
+            class Meta:
+                model = HasAWidgyNonNull
+
+        x = TheForm({})
+        self.assertTrue(x.is_valid())
+        obj = x.save()
+        self.assertTrue(obj.widgy)
+
 
 class TestVersionedModelForm(TestCase):
     def setUp(self):
diff --git a/widgy/contrib/page_builder/models.py b/widgy/contrib/page_builder/models.py
index 8b968f7cf..41bd75750 100644
--- a/widgy/contrib/page_builder/models.py
+++ b/widgy/contrib/page_builder/models.py
@@ -151,6 +151,8 @@ class Callout(models.Model):
     name = models.CharField(max_length=255, verbose_name=_('name'))
     root_node = WidgyField(
         site=settings.WIDGY_MEZZANINE_SITE,
+        null=True,
+        on_delete=models.SET_NULL,
         verbose_name=_('Widgy Content'),
         root_choices=(
             'CalloutBucket',
diff --git a/widgy/contrib/widgy_mezzanine/models.py b/widgy/contrib/widgy_mezzanine/models.py
index 135d6d6a2..8b80cebc9 100644
--- a/widgy/contrib/widgy_mezzanine/models.py
+++ b/widgy/contrib/widgy_mezzanine/models.py
@@ -1,3 +1,4 @@
+from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django.core import urlresolvers
@@ -57,11 +58,14 @@ class PageSelectRelatedManager(SelectRelatedManager, PageManager):
     class WidgyPage(WidgyPageMixin, Page):
         root_node = VersionedWidgyField(
             site=settings.WIDGY_MEZZANINE_SITE,
-            to=getattr(settings, 'WIDGY_MEZZANINE_VERSIONTRACKER', None),
             verbose_name=_('widgy content'),
             root_choices=(
                 'page_builder.Layout',
-            ))
+            ),
+            # WidgyField used to have these as defaults.
+            null=True,
+            on_delete=models.SET_NULL,
+        )
 
         class Meta:
             verbose_name = _('widgy page')
diff --git a/widgy/db/fields.py b/widgy/db/fields.py
index 861444041..f1a729022 100644
--- a/widgy/db/fields.py
+++ b/widgy/db/fields.py
@@ -49,16 +49,9 @@ def __init__(self, site=None, to=None, root_choices=None, **kwargs):
 
         self.root_choices = root_choices
 
-        defaults = {
-            'blank': True,
-            'null': True,
-            'on_delete': models.SET_NULL
-        }
-        defaults.update(kwargs)
-
         self.site = get_site(site)
 
-        super(WidgyField, self).__init__(to, **defaults)
+        super(WidgyField, self).__init__(to, **kwargs)
 
     def contribute_to_class(self, cls, name):
         """
@@ -80,7 +73,10 @@ def pre_save(self, model_instance, add):
         unsaved throwaway Node so that we know how to properly instantiate a
         real node later on.
         """
-        value = getattr(model_instance, self.name)
+        try:
+            value = getattr(model_instance, self.name)
+        except models.ObjectDoesNotExist:
+            value = None
 
         if hasattr(value, '_ct'):
             node = self.add_root(model_instance)
@@ -151,6 +147,16 @@ def render(self, model_instance, context=None, node=None):
         with update_context(context, env) as context:
             return root_node.render(context)
 
+    def validate(self, value, model_instance):
+        # `value` is our root node's pk. If we're currently creating
+        # the root node, it isn't saved so it can't have a pk. The base
+        # field's validate will fail, even though pre_save will actually
+        # create a node and set the fk field.
+        if value is None and not self.blank and getattr(model_instance, self.name):
+            return
+        else:
+            return super(WidgyField, self).validate(value, model_instance)
+
 
 class VersionedWidgyField(WidgyField):
     def __init__(self, site=None, to=None, root_choices=None, **kwargs):
diff --git a/widgy/forms.py b/widgy/forms.py
index 50b3cc363..e95fd9304 100644
--- a/widgy/forms.py
+++ b/widgy/forms.py
@@ -5,6 +5,7 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
+from django.core.exceptions import ObjectDoesNotExist
 
 from widgy.utils import format_html
 from widgy.models import Node
@@ -169,9 +170,9 @@ def __init__(self, *args, **kwargs):
 
         for name, field in self.fields.iteritems():
             if isinstance(field, WidgyFormField):
-                if hasattr(self, 'instance'):
+                try:
                     value = getattr(self.instance, name)
-                else:
+                except (AttributeError, ObjectDoesNotExist):
                     value = None
                 field.conform_to_value(value)
 

From 1321a8ee52c3d2b19782829b817e3636ac6f04db Mon Sep 17 00:00:00 2001
From: Rocky Meza 
Date: Mon, 8 Jul 2013 10:25:59 -0600
Subject: [PATCH 0675/1061] Fixed deletion of direct default children.

---
 widgy/static/widgy/js/nodes/models.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/widgy/static/widgy/js/nodes/models.js b/widgy/static/widgy/js/nodes/models.js
index c68ee33fa..1e0932e8a 100644
--- a/widgy/static/widgy/js/nodes/models.js
+++ b/widgy/static/widgy/js/nodes/models.js
@@ -144,6 +144,14 @@ define([ 'underscore', 'widgy.backbone', 'lib/q'
           options.app.setCompatibility(resp.compatibility);
         }
 
+        // Don't pass url onto the success method.  The options are passed all
+        // the way down to the Model constructor which picks it off of options
+        // and sets it on the model, overriding the Node#url function.
+        //
+        // This only manifested itself when a widget that had default children
+        // was added and attempting to delete or move those direct children.
+        delete options.url;
+
         if ( old_success ) old_success(resp, status, xhr);
       };
 

From 826dbfff5f77554d44c03173b03ebba9d46547bc Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Mon, 8 Jul 2013 15:08:57 -0600
Subject: [PATCH 0676/1061] Add a widgy.admin.js to keep the fancybox code

Also adds a loading spinner while the iframe is loading.
---
 .../widgy_mezzanine/templates/widgy/history.html    |  8 +-------
 widgy/static/widgy/js/widgy.admin.js                | 13 +++++++++++++
 .../templates/widgy/versioned_widgy_field_base.html | 10 +---------
 3 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 widgy/static/widgy/js/widgy.admin.js

diff --git a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html
index 3e05dcb23..cde68ea75 100644
--- a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html
+++ b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html
@@ -12,6 +12,7 @@
 {% endcompress %}
 {% compress js %}
 
+
 {% endcompress %}
 {% endblock  %}
 
@@ -62,11 +63,4 @@ 
      {% trans "Page History" %}
      
     {% endfor %}
 
 
-
 {% endblock %}
diff --git a/widgy/static/widgy/js/widgy.admin.js b/widgy/static/widgy/js/widgy.admin.js
new file mode 100644
index 000000000..a69b43d46
--- /dev/null
+++ b/widgy/static/widgy/js/widgy.admin.js
@@ -0,0 +1,13 @@
+$(function() {
+  $('a.widgy-fancybox').fancybox({
+    width: 700,
+    type: 'iframe',
+    onComplete: function() {
+      $.fancybox.showActivity();
+      $('#fancybox-frame').load(function(){
+        $.fancybox.hideActivity();
+      });
+    }
+  });
+  window.closeFancybox = $.fancybox.close;
+});
diff --git a/widgy/templates/widgy/versioned_widgy_field_base.html b/widgy/templates/widgy/versioned_widgy_field_base.html
index e56ae6515..bff2e2e0d 100644
--- a/widgy/templates/widgy/versioned_widgy_field_base.html
+++ b/widgy/templates/widgy/versioned_widgy_field_base.html
@@ -14,15 +14,7 @@
 
    
 {% compress js %}
 
-
+
 {% endcompress %}
 {{ block.super }}
 {% endblock %}

From 3966e4aadfcaac5d206376b9afc32b2c242f8004 Mon Sep 17 00:00:00 2001
From: Rocky Meza 
Date: Mon, 8 Jul 2013 16:39:31 -0600
Subject: [PATCH 0677/1061] Fixed showActivity bug.

The code that calls showActivity/hideActivity accessed a jQuery
reference that doesn't have fancybox.  We need to close over a jQuery
value that does have the fancybox object.
---
 widgy/static/widgy/js/widgy.admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widgy/static/widgy/js/widgy.admin.js b/widgy/static/widgy/js/widgy.admin.js
index a69b43d46..7d6c79ebd 100644
--- a/widgy/static/widgy/js/widgy.admin.js
+++ b/widgy/static/widgy/js/widgy.admin.js
@@ -1,4 +1,4 @@
-$(function() {
+jQuery(function($) {
   $('a.widgy-fancybox').fancybox({
     width: 700,
     type: 'iframe',

From 92bc51cf3ba747c216af71d37fa31e6b567e0987 Mon Sep 17 00:00:00 2001
From: Justin Stollsteimer 
Date: Tue, 9 Jul 2013 14:59:43 -0600
Subject: [PATCH 0678/1061] deleted item highlight

---
 widgy/static/widgy/css/widgy.scss        | 14 +++++++++++---
 widgy/static/widgy/css/widgy_common.scss |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss
index b445e3783..dc89c8637 100644
--- a/widgy/static/widgy/css/widgy.scss
+++ b/widgy/static/widgy/css/widgy.scss
@@ -214,9 +214,17 @@ li.node_drop_target {
       cursor: pointer;
     }
 
-    &.deleting * {
-      // fixme!
-      background-color: red;
+    &.deleting {
+      @include shadow($black50,0px,5px,15px);
+      border-color: $red;
+
+      div.widget {
+        p.drag-row {
+          span.title {
+            color: $red;
+          }
+        }
+      }
     }
 
     // specific node styles
diff --git a/widgy/static/widgy/css/widgy_common.scss b/widgy/static/widgy/css/widgy_common.scss
index aa7570cc9..e390c13c2 100644
--- a/widgy/static/widgy/css/widgy_common.scss
+++ b/widgy/static/widgy/css/widgy_common.scss
@@ -132,6 +132,7 @@
 -----------------------------------------------*/
 
 $black10: rgba(0,0,0,0.1);
+$black50: rgba(0,0,0,0.5);
 $white20: rgba(255,255,255,0.2);
 $reallylightgrey: #fafafa;
 $lightgrey:   #bbbbbb;

From 4f3a55ac5081ed5a828aa399fff16143e72dacf7 Mon Sep 17 00:00:00 2001
From: Justin Stollsteimer 
Date: Tue, 9 Jul 2013 15:05:32 -0600
Subject: [PATCH 0679/1061] rounded corner cutoff fix

---
 widgy/static/widgy/css/widgy.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss
index dc89c8637..273f3b088 100644
--- a/widgy/static/widgy/css/widgy.scss
+++ b/widgy/static/widgy/css/widgy.scss
@@ -358,12 +358,14 @@ li.node_drop_target {
     }
     
     div.widget {
+      @include rounded(4px);
       background: white;
       padding: 0px;
       
       p.drag-row {
         @include clearfix;
         @include gradient(#eee,#fff);
+        @include rounded(4px);
         display: block;
         float: none;
         height: auto;

From 51d144ef931567c7d09cc1a0987097ed38ad4ddc Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Tue, 9 Jul 2013 15:57:42 -0600
Subject: [PATCH 0680/1061] fix intersphinx

---
 docs/conf.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/conf.py b/docs/conf.py
index 3e08d7221..17b9d84d6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -249,3 +249,8 @@
 # all teh paths!
 sys.path.insert(0, os.path.abspath('../..'))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'demo.settings'
+
+intersphinx_mapping = {
+    'django': ('https://docs.djangoproject.com/en/1.5/', 'https://docs.djangoproject.com/en/1.5/_objects/'),
+    'treebeard': ('https://tabo.pe/projects/django-treebeard/docs/2.0b1/', None),
+}

From ce54b195b49fe95a74c68f9c227a89ddc8874771 Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Tue, 9 Jul 2013 16:59:18 -0600
Subject: [PATCH 0681/1061] doc outlines

---
 docs/index.rst  |   3 ++
 docs/models.rst | 136 ++++++++++++++++++++++++++++++++++++++++++++++++
 docs/owners.rst |  40 ++++++++++++++
 docs/site.rst   |  67 ++++++++++++++++++++++++
 4 files changed, 246 insertions(+)
 create mode 100644 docs/models.rst
 create mode 100644 docs/owners.rst
 create mode 100644 docs/site.rst

diff --git a/docs/index.rst b/docs/index.rst
index 92a2567e3..8f0a2c877 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,9 @@ many different uses.
    versioning
    contrib/index
    links
+   owners
+   models
+   site
 
 
 Development
diff --git a/docs/models.rst b/docs/models.rst
new file mode 100644
index 000000000..66125e5f8
--- /dev/null
+++ b/docs/models.rst
@@ -0,0 +1,136 @@
+Base Models
+===========
+
+.. currentmodule:: widgy.models.base
+
+.. class:: Content
+
+    .. attribute:: draggable = True
+
+    .. attribute:: deletable = True
+
+    .. attribute:: editable = False
+
+    .. attribute:: accepting_children = False
+
+    .. attribute:: shelf = False
+
+    .. attribute:: component_name = 'widget'
+
+    .. attribute:: pop_out = CANNOT_POP_OUT
+
+        .. attribute:: CANNOT_POP_OUT
+
+        .. attribute:: CAN_POP_OUT
+
+        .. attribute:: MUST_POP_OUT
+
+    .. attribute:: form = ModelForm
+
+    .. attribute:: formfield_overrides = {}
+
+    .. attribute:: node
+
+    .. attribute:: class_name
+
+    .. attribute:: display_name
+
+
+    .. method:: to_json(self, site)
+
+    .. method:: get_attributes(self)
+
+    .. classmethod:: class_to_json(cls, site)
+
+    .. method:: css_classes(self)
+
+    .. method:: get_root(self)
+
+    .. method:: get_ancestors(self)
+
+    .. method:: depth_first_order(self)
+
+    .. method:: get_children(self)
+
+    .. method:: get_next_sibling(self)
+
+    .. method:: get_parent(self)
+
+    .. method:: get_form_class(self, request)
+
+    .. method:: get_form(self, request, **form_kwargs)
+
+    .. method:: valid_parent_of(self, cls, obj=None)
+
+    .. classmethod:: valid_child_of(cls, parent, obj=None)
+
+    .. classmethod:: add_root(cls, site, **kwargs)
+
+    .. method:: add_child(self, site, cls, **kwargs)
+
+    .. method:: add_sibling(self, site, cls, **kwargs)
+
+    .. method:: post_create(self, site)
+
+    .. classmethod:: get_templates_hierarchy(cls, **kwargs)
+
+    .. classmethod:: get_template_kwargs(cls, **kwargs)
+
+    .. method:: preview_templates(self)
+
+    .. method:: edit_templates(self)
+
+    .. method:: get_render_templates(self, context)
+
+    .. method:: get_form_template(self, request, template=None, context=None)
+
+    .. method:: get_preview_template(self, site)
+
+    .. method:: render(self, context, template=None)
+
+    .. method:: formfield_for_dbfield(self, db_field, **kwargs)
+
+    .. method:: get_templates(self, request)
+
+    .. method:: reposition(self, site, right=None, parent=None)
+
+    .. method:: delete(self, raw=False)
+
+    .. method:: clone(self)
+
+    .. method:: save(self, *args, **kwargs)
+
+
+.. class:: Node
+
+    .. attribute:: content
+
+    .. attribute:: is_frozen
+
+    .. method:: to_json(self, site)
+
+    .. method:: render(self, *args, **kwargs)
+
+    .. method:: depth_first_order(self)
+
+    .. classmethod:: prefetch_trees(cls, *root_nodes)
+
+    .. method:: prefetch_tree(self)
+
+    .. method:: maybe_prefetch_tree(self)
+
+    .. method:: filter_child_classes(self, site, classes)
+
+    .. method:: filter_child_classes_recursive(self, site, classes)
+
+    .. method:: possible_parents(self, site, root_node)
+
+    .. method:: clone_tree(self, freeze=True)
+
+    .. method:: check_frozen(self)
+
+    .. method:: delete(self, *args, **kwargs)
+
+    .. method:: trees_equal(self, other)
+
+    .. classmethod:: find_widgy_problems(cls, site=None)
diff --git a/docs/owners.rst b/docs/owners.rst
new file mode 100644
index 000000000..2dc18b613
--- /dev/null
+++ b/docs/owners.rst
@@ -0,0 +1,40 @@
+Owners
+======
+
+A Widgy owner is a model that has a :class:`~widgy.db.fields.WidgyField`.
+
+Owners should
+
+  - Use a ``WidgyField``
+  - Use :class:`~widgy.admin.WidgyAdmin` (or a :class:`~widgy.forms.WidgyForm`
+    for your admin form)
+  - ``widgy.contrib.form_builder`` requires a ``get_form_action`` method on the
+    owner. It accepts the form widget and the widgy context, and returns a URL
+    for forms to submit to. You normally submit to your own view and mix in
+    :class:`~widgy.contrib.form_builder.views.HandleFormMixin` to help with
+    handling the form submission.  Make sure rerendering after a validation
+    error works.
+  - It's probably a good idea to render the entire page through widgy, so I've
+    used a template like this:
+
+    .. code-block:: html+django
+
+        {# product_list.html #}
+
+        {% include widgy_tags %}{% render_root category 'content' %}
+
+    I have been inserting the 'view' style functionality, in this case a list
+    of products in a category, with ``ProductList`` widget.
+
+  - If layouts should extend something other than ``widgy_base.html``, set the
+    ``base_template`` property on your owner.
+  - Use ``get_action_links`` to add a preview button to the editor. You'll
+    probably have to add support for ``root_node_override`` to your view, like
+    this::
+
+        root_node_pk = self.kwargs.get('root_node_pk')
+        if root_node_pk:
+            site.authorize_view(self.request, self)
+            kwargs['root_node_override'] = get_object_or_404(Node, pk=root_node_pk)
+        elif hasattr(self, 'form_node'):
+            kwargs['root_node_override'] = self.form_node.get_root()
diff --git a/docs/site.rst b/docs/site.rst
new file mode 100644
index 000000000..077b50002
--- /dev/null
+++ b/docs/site.rst
@@ -0,0 +1,67 @@
+Widgy Site
+==========
+
+
+.. currentmodule:: widgy.site
+
+.. class:: WidgySite
+
+    .. attribute:: scss_files
+
+    .. attribute:: js_files
+
+    .. attribute:: admin_scss_files
+
+    .. method:: get_registry(self)
+
+    .. method:: get_all_content_classes(self)
+
+    .. method:: get_urls(self)
+
+    .. method:: urls(self)
+
+    .. method:: reverse(self, *args, **kwargs)
+
+    .. method:: get_view_instance(self, view)
+
+    .. method:: authorize_view(self, request, view)
+
+    .. method:: has_add_permission(self, request, content_class)
+
+    .. method:: has_change_permission(self, request, obj_or_class)
+
+    .. method:: has_delete_permission(self, request, obj_or_class)
+
+    .. method:: node_view(self)
+
+    .. method:: content_view(self)
+
+    .. method:: shelf_view(self)
+
+    .. method:: node_edit_view(self)
+
+    .. method:: node_templates_view(self)
+
+    .. method:: node_parents_view(self)
+
+    .. method:: commit_view(self)
+
+    .. method:: history_view(self)
+
+    .. method:: revert_view(self)
+
+    .. method:: diff_view(self)
+
+    .. method:: reset_view(self)
+
+    .. method:: valid_parent_of(self, parent, child_class, child=None)
+
+    .. method:: valid_child_of(self, parent, child_class, child=None)
+
+    .. method:: validate_relationship(self, parent, child)
+
+    .. method:: get_version_tracker_model(self)
+
+    .. method:: filter_existing_staticfiles(self, filename)
+
+    .. method:: find_media_files(self, extension, hierarchy=['widgy/{app_label}/{module_name}{extension}'])

From 20115a00030d00dfb5dd5167847d3e720b503caf Mon Sep 17 00:00:00 2001
From: Aaron Merriam 
Date: Wed, 10 Jul 2013 10:09:55 -0600
Subject: [PATCH 0682/1061] Fun Fact: The internet is comprised mostly of cats

---
 widgy/cats.py | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 widgy/cats.py

diff --git a/widgy/cats.py b/widgy/cats.py
new file mode 100644
index 000000000..91c1ec22f
--- /dev/null
+++ b/widgy/cats.py
@@ -0,0 +1,105 @@
+#             *     ,MMM8&&&.            *
+#                  MMMM88&&&&&    .
+#                 MMMM88&&&&&&&
+#     *           MMM88&&&&&&&&
+#                 MMM88&&&&&&&&
+#                 'MMM88&&&&&&'
+#                   'MMM8&&&'      *
+#          |\___/|
+#          )     (             .              '
+#         =\     /=
+#           )===(       *
+#          /     \
+#          |     |
+#         /       \
+#         \       /
+#  _/\_/\_/\__  _/_/\_/\_/\_/\_/\_/\_/\_/\_/\_
+#  |  |  |  |( (  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  | ) ) |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |(_(  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#             *     ,MMM8&&&.            *
+#                  MMMM88&&&&&    .
+#                 MMMM88&&&&&&&
+#     *           MMM88&&&&&&&&
+#                 MMM88&&&&&&&&
+#                 'MMM88&&&&&&'
+#                   'MMM8&&&'      *
+#          |\___/|
+#         =) ^Y^ (=            .              '
+#          \  ^  /
+#           )=*=(       *
+#          /     \
+#          |     |
+#         /| | | |\
+#         \| | |_|/\
+#  /\_/\_//_// ___/\_/\_/\_/\_/\_/\_/\_/\_/\_
+#  |  |  |  | \_) |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#             *     ,MMM8&&&.            *
+#                  MMMM88&&&&&    .
+#                 MMMM88&&&&&&&
+#     *           MMM88&&&&&&&&
+#                 MMM88&&&&&&&&
+#                 'MMM88&&&&&&'
+#                   'MMM8&&&'      *    _
+#          |\___/|                      \\
+#         =) ^Y^ (=   |\_/|              ||    '
+#          \  ^  /    )a a '._.-""""-.  //
+#           )=*=(    =\T_= /    ~  ~  \//
+#          /     \     `"`\   ~   / ~  /
+#          |     |         |~   \ |  ~/
+#         /| | | |\         \  ~/- \ ~\
+#         \| | |_|/|        || |  // /`
+#  /\__/\_//_// __//\_/\_/\_((_|\((_//\_/\_/\_
+#  |  |  |  | \_) |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#            *     ,MMM8&&&.            *
+#                  MMMM88&&&&&    .
+#                 MMMM88&&&&&&&
+#     *           MMM88&&&&&&&&
+#                 MMM88&&&&&&&&
+#                 'MMM88&&&&&&'
+#                   'MMM8&&&'      *    
+#          |\___/|     /\___/\
+#          )     (     )    ~( .              '
+#         =\     /=   =\~    /=
+#           )===(       ) ~ (
+#          /     \     /     \
+#          |     |     ) ~   (
+#         /       \   /     ~ \
+#         \       /   \~     ~/
+#  _/\_/\_/\__  _/_/\_/\__~__/_/\_/\_/\_/\_/\_
+#  |  |  |  |( (  |  |  | ))  |  |  |  |  |  |
+#  |  |  |  | ) ) |  |  |//|  |  |  |  |  |  |
+#  |  |  |  |(_(  |  |  (( |  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |\)|  |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
+#             *     ,MMM8&&&.            *
+#                  MMMM88&&&&&    .
+#                 MMMM88&&&&&&&
+#     *           MMM88&&&&&&&&
+#                 MMM88&&&&&&&&
+#                 'MMM88&&&&&&'
+#                   'MMM8&&&'      *    
+#           /\/|_      __/\\
+#          /    -\    /-   ~\  .              '
+#          \    = Y =T_ =   /
+#           )==*(`     `) ~ \
+#          /     \     /     \
+#          |     |     ) ~   (
+#         /       \   /     ~ \
+#         \       /   \~     ~/
+#  _/\_/\_/\__  _/_/\_/\__~__/_/\_/\_/\_/\_/\_
+#  |  |  |  | ) ) |  |  | ((  |  |  |  |  |  |
+#  |  |  |  |( (  |  |  |  \\ |  |  |  |  |  |
+#  |  |  |  | )_) |  |  |  |))|  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  (/ |  |  |  |  |  |
+#  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |

From 91f4f2bbc9b8136e770d5a3b70d9a5264dcc59c4 Mon Sep 17 00:00:00 2001
From: Justin Stollsteimer 
Date: Wed, 10 Jul 2013 10:34:55 -0600
Subject: [PATCH 0683/1061] for tables with an edit option on each table row,
 the edit button is now displayed, reduced, and alongside the 'delete row'
 button

---
 widgy/static/widgy/css/widgy.scss | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss
index 273f3b088..0dcc1b921 100644
--- a/widgy/static/widgy/css/widgy.scss
+++ b/widgy/static/widgy/css/widgy.scss
@@ -541,7 +541,7 @@ li.node_drop_target {
             border: 0px;
             margin: 0 1em;
             overflow: visible;
-            padding: 0px 0px 0px 40px;
+            padding: 0px 0px 0px 60px;
           
             > div.widget {
               > p.drag-row {
@@ -675,7 +675,7 @@ li.node_drop_target {
             border: 0px;
             margin: 0 1em;
             overflow: visible;
-            padding: 0px 0px 0px 40px;
+            padding: 0px 0px 0px 60px;
             
             div.widget {
               ul.nodeChildren {
@@ -718,6 +718,26 @@ li.node_drop_target {
                           display: none;
                         }
                       }
+
+                      button.edit {
+                        font-size: 9px;
+                        line-height: 9px;
+                        height: 15px;
+                        padding: 0px;
+                        position: absolute;
+                        top: 3px;
+                        left: -60px;
+                        width: 15px;
+                        z-index: 10;
+
+                        i {
+                          width: 1em;
+                        }
+
+                        span {
+                          display: none;
+                        }
+                      }
                     }
                       
                     ul.nodeChildren {
@@ -845,7 +865,7 @@ li.node_drop_target {
           width: auto !important;
 
           span.title {
-            background-position: 5px 5px;
+            background-position: 5px 3px;
             font-size: 11px;
             padding: 2px 0px 2px 26px;
             text-transform: capitalize;

From fedc37a916aa4dd7e96eddeeb7ff2d870ebaae40 Mon Sep 17 00:00:00 2001
From: Justin Stollsteimer 
Date: Wed, 10 Jul 2013 10:26:08 -0600
Subject: [PATCH 0684/1061] unsafe HTML widget icon

---
 .../static/widgy/page_builder/admin.scss         |   1 +
 .../widgy/image/widget-skull-and-crossbones.png  | Bin 0 -> 1320 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 widgy/static/widgy/image/widget-skull-and-crossbones.png

diff --git a/widgy/contrib/page_builder/static/widgy/page_builder/admin.scss b/widgy/contrib/page_builder/static/widgy/page_builder/admin.scss
index b795ae7e3..de3300176 100644
--- a/widgy/contrib/page_builder/static/widgy/page_builder/admin.scss
+++ b/widgy/contrib/page_builder/static/widgy/page_builder/admin.scss
@@ -16,4 +16,5 @@ li.shelfItem {
   @include node-icon("page_builder.tablerow", "../image/widget-tablerow.png");
   @include node-icon("page_builder.tabs", "../image/widget-tab.png");
   @include node-icon("page_builder.video", "../image/widget-video.gif");
+  @include node-icon("page_builder.unsafehtml", "../image/widget-skull-and-crossbones.png");
 }
diff --git a/widgy/static/widgy/image/widget-skull-and-crossbones.png b/widgy/static/widgy/image/widget-skull-and-crossbones.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e85c1e8c65a24e75eed331e7fec29e20ff775cf
GIT binary patch
literal 1320
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV
z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA){ffi_eM3D1{oGuTzrd=COM+4n&cLd=IHa;5RX-@T
zIKQ+g85kdF$}r8qu)}W=NFmTQR{lkqz(`5Vami0E%}vcK@pQ3O0?O#6WTsdd7+M$@
z8k(CJm>U_GSr{5RS(q5O8X1`wTAG_VnVXxy%)qAC$j!vU*~!4g)zA@WhO3dKld*}L
zsU^@f3s*~LV^f%3&%EN2#JuEGn7x@md!c%r@#?j5E=o--$uA1Y&(DFSfPjqrlKkR~
z`~n5%U{eL(#N^C85FZph5Z}6_7G;*DrnnX5=PH21*D4c>{RWO`{x)&_yNiK=F~ZZu
zF{I+wl*?zeT>>SJf3$qO^oEDd8l5!PjT<)0M*4`AIcI77W7O`Nw3qdoP*_)vN0?Wy
zi0aKVPD!ns93wjlYUS&Kzt7uQerlzEas0gBbDqz6-oxFb@Ra{~Oy7LQEsv$Q-%$Ow
zL+OUl6vJ5?^81C?v_G!j|53;%{HMi_+4{2--iltC{OkD#VVkV8lV@C9bAHAFryRC?
z&dNKlce!!$mCipnbwA7V@dlOEqKA|>?ckY?V9@1asH`LiDTC58>n)~Rg*{(lt+#47fmTT+u
T%c(iXg32yWS3j3^P6
Date: Wed, 10 Jul 2013 12:02:28 -0600
Subject: [PATCH 0685/1061] form styles for top-node editors

---
 widgy/static/widgy/css/widgy.scss | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/widgy/static/widgy/css/widgy.scss b/widgy/static/widgy/css/widgy.scss
index 0dcc1b921..184bcadf7 100644
--- a/widgy/static/widgy/css/widgy.scss
+++ b/widgy/static/widgy/css/widgy.scss
@@ -925,11 +925,48 @@ div.widgy {
           padding: 5px 0;
         }
         
+        p.drag-row {
+          button {
+            position: relative;
+            top: -5px;
+          }
+        }
+
         > ul.nodeChildren {
           clear: left;
           float: left;
           width: 63% !important;
         }
+
+        > div.preview {
+          // top-level forms
+          width: 63%;
+
+          > div {
+            margin: 0px 0px 10px 0px;
+          }
+
+          .formField {
+            clear: both;
+            display: block;
+            margin: 0px 0px 10px 0px;
+          }
+
+          button, input[type='submit'] {
+            @include button;
+            float: left;
+            margin-left: 10px;
+
+            &.cancel {
+              line-height: 11px;
+              margin-left: 130px;
+            }
+          }
+
+          p.help_text {
+            padding-left: 130px;
+          }
+        }
       }
       
       // yet another wrapper

From 0f128f7ef6a19b29bb2ff06f2fd4e639a79ba149 Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Fri, 12 Jul 2013 11:17:13 -0600
Subject: [PATCH 0686/1061] Make qs argument optional in
 PatchUrlconfMiddleware.get_urlconf

signalhandlers.patch_url_conf calls get_urlconf with a single argument.
---
 widgy/contrib/urlconf_include/middleware.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/widgy/contrib/urlconf_include/middleware.py b/widgy/contrib/urlconf_include/middleware.py
index e8b000cf2..5ae163f87 100644
--- a/widgy/contrib/urlconf_include/middleware.py
+++ b/widgy/contrib/urlconf_include/middleware.py
@@ -29,7 +29,9 @@ def get_pages(cls, logged_in):
         return qs
 
     @classmethod
-    def get_urlconf(cls, root_urlconf, qs):
+    def get_urlconf(cls, root_urlconf, qs=None):
+        if qs is None:
+            qs = cls.get_pages(logged_in=False)
         urlconf_pages = sorted(qs, key=lambda p: len(p.slug))
 
         new_urlconf = imp.new_module('urlconf')

From 0aa8360cd3df65c5f8d7ee2878eed836124084b6 Mon Sep 17 00:00:00 2001
From: Rocky Meza 
Date: Fri, 12 Jul 2013 17:57:16 -0600
Subject: [PATCH 0687/1061] reorganized documentation

---
 docs/api/index.rst                            |  10 +++
 docs/{ => api}/links.rst                      |   0
 docs/{ => api}/site.rst                       |   0
 docs/contrib/form-builder/index.rst           |  14 +++-
 docs/contrib/page-builder/index.rst           |   9 ++-
 docs/contrib/widgy-mezzanine/index.rst        |  18 ++++++
 docs/customizing.rst                          |   5 --
 .../_images/interface-example.png             | Bin
 docs/design/data-model.rst                    |  38 +++++++++++
 docs/design/index.rst                         |  20 ++++++
 docs/design/javascript.rst                    |  12 ++++
 docs/{ => design}/models.rst                  |   0
 docs/design/owners.rst                        |  58 +++++++++++++++++
 docs/design/site.rst                          |  48 ++++++++++++++
 docs/{ => design}/versioning.rst              |   5 ++
 docs/index.rst                                |  12 +---
 docs/intro.rst                                |  61 ------------------
 docs/owners.rst                               |  40 ------------
 docs/roadmap.md                               |  42 ++++++++++++
 docs/tutorial.rst                             |   5 --
 docs/tutorials/index.rst                      |  10 +++
 .../widgy-mezzanine-tutorial.rst}             |   0
 22 files changed, 284 insertions(+), 123 deletions(-)
 create mode 100644 docs/api/index.rst
 rename docs/{ => api}/links.rst (100%)
 rename docs/{ => api}/site.rst (100%)
 delete mode 100644 docs/customizing.rst
 rename docs/{ => design}/_images/interface-example.png (100%)
 create mode 100644 docs/design/data-model.rst
 create mode 100644 docs/design/index.rst
 create mode 100644 docs/design/javascript.rst
 rename docs/{ => design}/models.rst (100%)
 create mode 100644 docs/design/owners.rst
 create mode 100644 docs/design/site.rst
 rename docs/{ => design}/versioning.rst (96%)
 delete mode 100644 docs/intro.rst
 delete mode 100644 docs/owners.rst
 create mode 100644 docs/roadmap.md
 delete mode 100644 docs/tutorial.rst
 create mode 100644 docs/tutorials/index.rst
 rename docs/{quickstart.rst => tutorials/widgy-mezzanine-tutorial.rst} (100%)

diff --git a/docs/api/index.rst b/docs/api/index.rst
new file mode 100644
index 000000000..a350c878f
--- /dev/null
+++ b/docs/api/index.rst
@@ -0,0 +1,10 @@
+API Reference
+=============
+
+.. toctree::
+    :maxdepth: 1
+
+    fields
+    forms
+    site
+    links
diff --git a/docs/links.rst b/docs/api/links.rst
similarity index 100%
rename from docs/links.rst
rename to docs/api/links.rst
diff --git a/docs/site.rst b/docs/api/site.rst
similarity index 100%
rename from docs/site.rst
rename to docs/api/site.rst
diff --git a/docs/contrib/form-builder/index.rst b/docs/contrib/form-builder/index.rst
index 612a1db85..298d2d760 100644
--- a/docs/contrib/form-builder/index.rst
+++ b/docs/contrib/form-builder/index.rst
@@ -53,11 +53,21 @@ Views
     even more robust example implementation.
 
 
+.. currentmodule:: widgy.contrib.form_builder.models
+
+Success Handlers
+----------------
+
+When a user submits a :class:`Form`, the :class:`Form` will loop through all of
+the success handler widgets to do the things that you would normally put in the
+``form_valid`` method of a :class:`~django:django.views.generic.FormView`, for
+example.  Form Builder provides a couple of built-in success handlers that do
+things like saving the data, sending emails, or submitting to Salesforce.
+
+
 Widgets
 -------
 
-.. currentmodule:: widgy.contrib.form_builder.models
-
 .. class:: Form
 
     This widget corresponds to the HTML ``
    `` tag. It acts as a container
diff --git a/docs/contrib/page-builder/index.rst b/docs/contrib/page-builder/index.rst
index 9f9dac43c..a18231853 100644
--- a/docs/contrib/page-builder/index.rst
+++ b/docs/contrib/page-builder/index.rst
@@ -29,7 +29,7 @@ Page builder is a collection of widgets for the purpose of creating HTML pages.
     capability to add images or tables, because there are already widgets that
     the developer can control.
 
-    .. warning::
+    .. note::
 
         There is a possible permission escalation vulnerability with allowing
         any admin user to add HTML. For this reason, the :class:`Html` widget
@@ -42,6 +42,13 @@ Page builder is a collection of widgets for the purpose of creating HTML pages.
     unsafe because a non-superuser could gain publishing the unsafe HTML on the
     website with XSS code to cause permission escalation.
 
+    .. warning::
+
+        The ``page_builder.add_unsafehtml`` and ``page_builder.edit_unsafehtml``
+        permissions are equivalent to ``is_superuser`` status because of the
+        possibility of a staff user inserting JavaScript that a superuser will
+        execute.
+
 .. class:: CalloutWidget
 
 
diff --git a/docs/contrib/widgy-mezzanine/index.rst b/docs/contrib/widgy-mezzanine/index.rst
index 6388b9d58..b3d9abdf6 100644
--- a/docs/contrib/widgy-mezzanine/index.rst
+++ b/docs/contrib/widgy-mezzanine/index.rst
@@ -7,5 +7,23 @@ providing a subclass of Mezzanine's Page model called
 :class:`~widgy.contrib.widgy_mezzanine.models.WidgyPage` which delegates to
 Page Builder for all content.
 
+In order to use Widgy Mezzanine, you must provide ``WIDGY_MEZZANINE_SITE`` in
+your settings.  This is a fully-qualified import path to an instance of
+:class:`~widgy.site.WidgySite`.  You also need to install the URLs. ::
+
+    url(r'^widgy-mezzanine/', include('widgy.contrib.widgy_mezzanine.urls')),
+
+
+.. class:: widgy.contrib.widgy_mezzanine.models.WidgyPage
+
+    The :class:`~widgy.content.widgy_mezzanine.models.WidgyPage` class is
+    ``swappable`` like :class:`~django.contrib.auth.models.User`.  If you want to
+    override it, specify a ``WIDGY_MEZZANINE_PAGE_MODEL`` in your settings.  the
+    :class:`widgy.contrib.widgy_mezzanine.models.WidgyPageMixin` mixin is
+    provided for ease of overriding.  Any code that references a
+    :class:`~widgy.contrib.widgy_mezzanine.models.WidgyPage` should use the
+    :func:`widgy.contrib.widgy_mezzanine.get_widgypage_model` to get the
+    correct class.
+
 
 .. _Mezzanine: http://mezzanine.jupo.org/
diff --git a/docs/customizing.rst b/docs/customizing.rst
deleted file mode 100644
index eadf7d02f..000000000
--- a/docs/customizing.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Customization
-=============
-
-.. outline customization options here, mention things like draggable/deletable,
-   also mention proxying, also mention JavaScript components
diff --git a/docs/_images/interface-example.png b/docs/design/_images/interface-example.png
similarity index 100%
rename from docs/_images/interface-example.png
rename to docs/design/_images/interface-example.png
diff --git a/docs/design/data-model.rst b/docs/design/data-model.rst
new file mode 100644
index 000000000..4405f16c1
--- /dev/null
+++ b/docs/design/data-model.rst
@@ -0,0 +1,38 @@
+Data Model
+==========
+
+Central to Widgy are Nodes, Contents, and Widgets. :class:`~widgy.models.Node`
+is a subclass of Treebeard's :class:`~treebeard:treebeard.mp_tree.MP_Node`.
+Nodes concern themselves with the tree structure. Each Node is associated with
+an instance of :class:`~widgy.models.Content` subclass. A Node + Content
+combination is called a Widget.
+
+Storing all the structure data in Node and having that point to any subclass of
+Content allows us to have all the benefits of a tree, but also the flexibility
+to store very different data within a tree.
+
+:class:`Nodes ` are associated with their
+:class:`~widgy.models.Content` through a
+:class:`~django:django.contrib.contenttypes.generic.GenericForeignKey`.
+
+This is what a hypothetical Widgy tree might look like.::
+
+    Node (TwoColumnLayout)
+    |
+    +-- Node (MainBucket)
+    |   |
+    |   +-- Node (Text)
+    |   |
+    |   +-- Node (Image)
+    |   |
+    |   +-- Node (Form)
+    |       |
+    |       +-- Node (Input)
+    |       |
+    |       +-- Node (Checkboxes)
+    |       |
+    |       +-- Node (SubmitButton)
+    |
+    +-- Node (SidebarBucket)
+        |
+        +-- Node (CallToAction)
diff --git a/docs/design/index.rst b/docs/design/index.rst
new file mode 100644
index 000000000..b74d65180
--- /dev/null
+++ b/docs/design/index.rst
@@ -0,0 +1,20 @@
+Design
+======
+
+django-widgy is a heterogeneous tree editor for Django. It enables you to
+combine different model of different types into a tree structure.
+
+The django-widgy project is split into two main pieces. Widgy core provides
+:class:`~widgy.models.Node`, the :class:`~widgy.models.Content` abstract class,
+versioning models, views, configuration helpers, and the JavaScript editor
+code. Much like in Django, django-widgy has many contrib packages that provide
+the batteries.
+
+.. toctree::
+    :maxdepth: 1
+
+    data-model
+    versioning
+    site
+    owners
+    javascript
diff --git a/docs/design/javascript.rst b/docs/design/javascript.rst
new file mode 100644
index 000000000..f26a94800
--- /dev/null
+++ b/docs/design/javascript.rst
@@ -0,0 +1,12 @@
+Editor
+======
+
+Widgy provides a drag and drop JavaScript editor interface to the tree in the
+form of a Django formfield.
+
+.. figure:: _images/interface-example.png
+   :scale: 50 %
+   :alt: Interface example
+
+The editor is built on Backbone.js and RequireJS to provide a modular and
+customizable interface.
diff --git a/docs/models.rst b/docs/design/models.rst
similarity index 100%
rename from docs/models.rst
rename to docs/design/models.rst
diff --git a/docs/design/owners.rst b/docs/design/owners.rst
new file mode 100644
index 000000000..bbbeca488
--- /dev/null
+++ b/docs/design/owners.rst
@@ -0,0 +1,58 @@
+Owners
+======
+
+A Widgy owner is a model that has a :class:`~widgy.db.fields.WidgyField`.
+
+Admin
+-----
+
+Use :class:`~widgy.admin.WidgyAdmin` (or a :class:`~widgy.forms.WidgyForm` for
+your admin form)
+
+Use ``get_action_links`` to add a preview button to the editor.
+
+
+Page Builder
+------------
+If layouts should extend something other than ``layout_base.html``, set the
+``base_template`` property on your owner.
+
+
+Form Builder
+------------
+``widgy.contrib.form_builder`` requires a ``get_form_action`` method on the
+owner. It accepts the form widget and the Widgy context, and returns a URL for
+forms to submit to. You normally submit to your own view and mix in
+:class:`~widgy.contrib.form_builder.views.HandleFormMixin` to help with handling
+the form submission.  Make sure re-rendering after a validation error works.
+
+
+.. todo::
+
+    tutorials/owner
+
+
+Tutorial
+--------
+  - It's probably a good idea to render the entire page through Widgy, so I've
+    used a template like this:
+
+    .. code-block:: html+django
+
+        {# product_list.html #}
+
+        {% include widgy_tags %}{% render_root category 'content' %}
+
+    I have been inserting the 'view' style functionality, in this case a list
+    of products in a category, with ``ProductList`` widget.
+
+
+You'll probably have to add support for ``root_node_override`` to your view,
+like this::
+
+    root_node_pk = self.kwargs.get('root_node_pk')
+    if root_node_pk:
+        site.authorize_view(self.request, self)
+        kwargs['root_node_override'] = get_object_or_404(Node, pk=root_node_pk)
+    elif hasattr(self, 'form_node'):
+        kwargs['root_node_override'] = self.form_node.get_root()
diff --git a/docs/design/site.rst b/docs/design/site.rst
new file mode 100644
index 000000000..886ca251c
--- /dev/null
+++ b/docs/design/site.rst
@@ -0,0 +1,48 @@
+Customization
+=============
+
+.. outline customization options here, mention proxying
+
+
+There are two main ways to customize the behavior of Widgy and existing widgets.
+The first is through the :class:`~widgy.site.WidgySite`.
+:class:`~widgy.site.WidgySite` is a centralized source of configuration for
+a Widgy instance, much like Django's
+:class:`~django:django.contrib.admin.AdminSite`.  You can also configure each
+widget's behavior by subclassing it with a proxy.
+
+
+WidgySite
+---------
+
+- tracks installed widgets
+- stores URLs
+- authorization
+- allows centralized overriding of compatibility
+- allows having more than one instance of widgy
+
+Proxying a Widget
+-----------------
+
+Widgy uses a special subclass of
+:class:`~django.contrib.contenttypes.generic.GenericForeignKey` that supports
+retrieving proxy models.  Subclassing a model as a proxy is a lightweight method
+for providing custom behavior for widgets that you don't control.  For example,
+if you wanted to override the compatibility and ``verbose_name`` for Page
+Builder's :class:`~widgy.contrib.page_builder.models.CalloutBucket`, you could
+do the following::
+
+    import widgy
+    from widgy.contrib.page_builder.models import CalloutBucket
+
+    widgy.unregister(CalloutBucket)
+
+    @widgy.register
+    class MyCalloutBucket(CalloutBucket):
+        class Meta:
+            proxy = True
+            verbose_name = 'Awesome Callout'
+
+        def valid_parent_of(self, cls, obj=None):
+            return issubclass(cls, (MyWidget)) or \
+                super(MyCalloutBucket, self).valid_parent_of(self, cls, obj)
diff --git a/docs/versioning.rst b/docs/design/versioning.rst
similarity index 96%
rename from docs/versioning.rst
rename to docs/design/versioning.rst
index 48f1ff892..c8c88fa5e 100644
--- a/docs/versioning.rst
+++ b/docs/design/versioning.rst
@@ -16,3 +16,8 @@ publish time for a commit that allows a user to future publish content.
 To enable versioning, all you need to do is use
 :class:`widgy.db.fields.VersionedWidgyfield` instead of
 :class:`widgy.db.fields.WidgyField`.
+
+
+.. todo::
+
+    diagram
diff --git a/docs/index.rst b/docs/index.rst
index 8f0a2c877..b0749e2d7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -13,16 +13,10 @@ many different uses.
 .. toctree::
    :maxdepth: 2
 
-   intro
-   quickstart
-   tutorial
-   customizing
-   versioning
+   design/index
    contrib/index
-   links
-   owners
-   models
-   site
+   api/index
+   tutorials/index
 
 
 Development
diff --git a/docs/intro.rst b/docs/intro.rst
deleted file mode 100644
index cc6901580..000000000
--- a/docs/intro.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-Introduction
-============
-
-django-widgy is a heterogeneous tree editor for Django. It enables you to
-combine different model of different types into a tree structure.
-
-The django-widgy project is split into two main pieces. Widgy core provides
-:class:`~widgy.models.Node`, the :class:`~widgy.models.Content` abstract class,
-versioning models, views, configuration helpers, and the JavaScript editor
-code. Much like in Django, django-widgy has many contrib packages that provide
-the batteries.
-
-
-Data Model
-----------
-
-Central to Widgy are Nodes, Contents, and Widgets. :class:`~widgy.models.Node`
-is a subclass of Treebeard's :class:`~treebeard:treebeard.mp_tree.MP_Node`.
-Nodes concern themselves with the tree structure. Each Node is associated with
-an instance of :class:`~widgy.models.Content` subclass. A Node + Content
-combination is called a Widget.
-
-Storing all the structure data in Node and having that point to any subclass of
-Content allows us to have all the benefits of a tree, but also the flexibility
-to store very different data within a tree.
-
-.. todo::
-
-    Give an example, maybe something with this sort of diagram::
-
-        Node (TwoColumnLayout)
-        |
-        +-- Node (MainBucket)
-        |   |
-        |   +-- Node (Text)
-        |   |
-        |   +-- Node (Image)
-        |   |
-        |   +-- Node (Form)
-        |       |
-        |       +-- Node (Input)
-        |       |
-        |       +-- Node (Checkboxes)
-        |
-        +-- Node (SidebarBucket)
-            |
-            +-- Node (CallToAction)
-
-
-Editor
-------
-
-Widgy provides a drag and drop JavaScript editor interface to the tree in the
-form of a Django formfield.
-
-.. figure:: _images/interface-example.png
-   :scale: 50 %
-   :alt: Interface example
-
-The editor is built on Backbone.js and RequireJS to provide a modular and
-customizable interface.
diff --git a/docs/owners.rst b/docs/owners.rst
deleted file mode 100644
index 2dc18b613..000000000
--- a/docs/owners.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-Owners
-======
-
-A Widgy owner is a model that has a :class:`~widgy.db.fields.WidgyField`.
-
-Owners should
-
-  - Use a ``WidgyField``
-  - Use :class:`~widgy.admin.WidgyAdmin` (or a :class:`~widgy.forms.WidgyForm`
-    for your admin form)
-  - ``widgy.contrib.form_builder`` requires a ``get_form_action`` method on the
-    owner. It accepts the form widget and the widgy context, and returns a URL
-    for forms to submit to. You normally submit to your own view and mix in
-    :class:`~widgy.contrib.form_builder.views.HandleFormMixin` to help with
-    handling the form submission.  Make sure rerendering after a validation
-    error works.
-  - It's probably a good idea to render the entire page through widgy, so I've
-    used a template like this:
-
-    .. code-block:: html+django
-
-        {# product_list.html #}
-
-        {% include widgy_tags %}{% render_root category 'content' %}
-
-    I have been inserting the 'view' style functionality, in this case a list
-    of products in a category, with ``ProductList`` widget.
-
-  - If layouts should extend something other than ``widgy_base.html``, set the
-    ``base_template`` property on your owner.
-  - Use ``get_action_links`` to add a preview button to the editor. You'll
-    probably have to add support for ``root_node_override`` to your view, like
-    this::
-
-        root_node_pk = self.kwargs.get('root_node_pk')
-        if root_node_pk:
-            site.authorize_view(self.request, self)
-            kwargs['root_node_override'] = get_object_or_404(Node, pk=root_node_pk)
-        elif hasattr(self, 'form_node'):
-            kwargs['root_node_override'] = self.form_node.get_root()
diff --git a/docs/roadmap.md b/docs/roadmap.md
new file mode 100644
index 000000000..43d7b4acf
--- /dev/null
+++ b/docs/roadmap.md
@@ -0,0 +1,42 @@
+Design
+
+    Data Model
+    Base Model structure
+    Versioning
+    WidgySite (rationale)
+    Owner Contract
+    JavaScript (low priority)
+
+Contrib Packages
+
+    Page Builder (list of widgets)
+    Form Builder
+      - installation (HandleFormMixin)
+      - list of widgets
+      - Form API
+      - success handlers
+    Widgy Mezzanine
+      - installation
+    Review Queue
+      - installation / permissions
+
+API Reference
+
+    Model Fields
+    Forms/Formfields
+    Node API
+    Content API
+    WidgySite (API)
+    Links API
+
+
+Tutorials
+
+    Tutorial with Widgy Mezzanine
+      - start at startproject
+      - install Mezzanine
+      - end at creating your own widget.
+    Creating your first Widget
+    Creating a custom widgy owner
+      - views
+    Creating a component (low priority)
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
deleted file mode 100644
index aafde12b5..000000000
--- a/docs/tutorial.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Tutorial: Creating Your First Widget
-====================================
-
-.. scenario, you have a blog app, but are tired of CKEditor and want
-   to add a photo gallery or something.
diff --git a/docs/tutorials/index.rst b/docs/tutorials/index.rst
new file mode 100644
index 000000000..77fc1380b
--- /dev/null
+++ b/docs/tutorials/index.rst
@@ -0,0 +1,10 @@
+Tutorials
+=========
+
+
+.. toctree::
+    :maxdepth: 1
+
+    widgy-mezzanine-tutorial
+    first-widget
+    custom-owner
diff --git a/docs/quickstart.rst b/docs/tutorials/widgy-mezzanine-tutorial.rst
similarity index 100%
rename from docs/quickstart.rst
rename to docs/tutorials/widgy-mezzanine-tutorial.rst

From f035b98f2ab5f107259f53a2221f25e8dfc08037 Mon Sep 17 00:00:00 2001
From: Antoine Catton 
Date: Mon, 15 Jul 2013 12:46:28 -0600
Subject: [PATCH 0688/1061] Make FormSuccesHandler draggable

It's awkward to be able to drop the success handler anywhere, but
not be able to move it aftewards.
---
 widgy/contrib/form_builder/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widgy/contrib/form_builder/models.py b/widgy/contrib/form_builder/models.py
index 6cfad3df7..24dfab8a6 100644
--- a/widgy/contrib/form_builder/models.py
+++ b/widgy/contrib/form_builder/models.py
@@ -50,7 +50,7 @@ def valid_child_of(cls, parent, obj=None):
 
 
 class FormSuccessHandler(FormElement):
-    draggable = False
+    draggable = True
 
     class Meta:
         abstract = True

From ece03620eeffd34b6e1938af70542ceda8cb960a Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Mon, 15 Jul 2013 11:37:06 -0600
Subject: [PATCH 0689/1061] Preserve submit-button data in popup forms

If we disable the submit button in the submit handler, the browser won't
submit its value. We need this value to determine which button was
pressed.
---
 widgy/static/widgy/js/popup.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/widgy/static/widgy/js/popup.js b/widgy/static/widgy/js/popup.js
index b8863bab6..e4567ea05 100644
--- a/widgy/static/widgy/js/popup.js
+++ b/widgy/static/widgy/js/popup.js
@@ -22,8 +22,14 @@ jQuery(function($) {
     var $form = $(this);
     var $submits = $form.find('[type=submit]');
     if ( $form.find('.loading').length == 0 ) {
+      // enter pressed
       $submits.first().addClass('loading');
     }
-    $submits.attr('disabled', true);
+    // We want to disable the submit buttons to prevent double-submission, but
+    // we need the data from the submit button to be submitted, which won't
+    // happen if it's disabled in this frame.
+    setTimeout(function() {
+      $submits.attr('disabled', true);
+    }, 0);
   });
 });

From a243efbd9a939289b46ae327bac6598e60900702 Mon Sep 17 00:00:00 2001
From: Gavin Wahl 
Date: Fri, 5 Jul 2013 16:33:30 -0600
Subject: [PATCH 0690/1061] Add get_action_links to Widgy owners

Models with WidgyFields should define a get_action_links method. It
takes a root_node and returns a list of links. This is used for preview
links.

  - Removes the dependency in core on widgy_mezzanine for preview links
  - Removes the VersionCommitAdmin.get_commit_name and
    get_commit_preview_url methods.
  - Removes an attempt at making forms.WidgyField work for non-model
    forms. We'll revisit this when it comes up.
  - Adds preview and diff links for every owner of a VersionTracker.
---
 tests/modeltests/core_tests/tests/fields.py   |  4 ++
 widgy/contrib/review_queue/admin.py           | 63 +++++++++++-------
 .../review_queue/commit_preview.html          | 12 +++-
 widgy/contrib/widgy_mezzanine/admin.py        | 33 +++-------
 widgy/contrib/widgy_mezzanine/models.py       | 14 +++-
 .../templates/widgy/history.html              | 13 ++--
 .../widgy/page_builder/layout/preview.html    |  7 --
 widgy/contrib/widgy_mezzanine/tests.py        |  4 ++
 widgy/contrib/widgy_mezzanine/urls.py         |  5 +-
 widgy/contrib/widgy_mezzanine/views.py        | 33 ++++++----
 widgy/forms.py                                | 14 ++--
 widgy/models/versioning.py                    | 16 +++++
 widgy/site.py                                 |  2 +-
 widgy/static/widgy/css/django.fusionbox.scss  |  1 +
 widgy/templates/widgy/_commit_form.html       | 15 +++--
 widgy/templates/widgy/commit.html             |  2 +-
 widgy/templates/widgy/revert.html             |  2 +-
 .../widgy/versioned_widgy_field_base.html     | 19 ++----
 widgy/templates/widgy/widgy_field.html        | 16 ++++-
 widgy/templatetags/widgy_tags.py              | 10 +++
 widgy/utils.py                                |  7 +-
 widgy/views/versioning.py                     | 65 ++++++++++---------
 22 files changed, 219 insertions(+), 138 deletions(-)
 delete mode 100644 widgy/contrib/widgy_mezzanine/templates/widgy/page_builder/layout/preview.html

diff --git a/tests/modeltests/core_tests/tests/fields.py b/tests/modeltests/core_tests/tests/fields.py
index bac168847..2cd3ec2f9 100644
--- a/tests/modeltests/core_tests/tests/fields.py
+++ b/tests/modeltests/core_tests/tests/fields.py
@@ -4,6 +4,7 @@
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.template import Context
+from django.utils import unittest
 
 import mock
 
@@ -62,6 +63,8 @@ def test_add_root(self):
 
         self.assertEqual(root_node.content.pk, 1337)
 
+
+@unittest.skip("We want WidgyFields to work with non-modelforms, but we haven't designed an API yet.")
 class TestPlainForm(TestCase):
     def setUp(self):
         # WidgyForms cannot be at the root level of a test because they make
@@ -110,6 +113,7 @@ def test_second_save(self):
         root_node = Layout.add_root(widgy_site)
         x = self.form(initial={'widgy_field': root_node})
 
+
 class TestModelForm(TestCase):
     def setUp(self):
         class WidgiedModelForm(WidgyFormMixin, forms.ModelForm):
diff --git a/widgy/contrib/review_queue/admin.py b/widgy/contrib/review_queue/admin.py
index cf6d9eb17..bc8984b22 100644
--- a/widgy/contrib/review_queue/admin.py
+++ b/widgy/contrib/review_queue/admin.py
@@ -4,7 +4,7 @@
 from django.contrib.admin.views.main import ChangeList
 from django.contrib import messages
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _, ugettext, ungettext
+from django.utils.translation import ugettext_lazy as _, ungettext
 from django.conf import settings
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
@@ -14,6 +14,7 @@
 from widgy.admin import AuthorizedAdminMixin
 
 from .forms import ApproveForm
+from .models import ReviewedVersionTracker
 
 
 # BBB: Before django 1.5, only session storage supported safe string in
@@ -31,12 +32,30 @@ class VersionCommitChangeList(ChangeList):
     def get_ordering(self, request, queryset):
         return ['tracker__pk', ] + super(VersionCommitChangeList, self).get_ordering(request, queryset) or []
 
+    def get_results(self, request):
+        ret = super(VersionCommitChangeList, self).get_results(request)
+
+        # Manually prefetch owners. We can't do a normal
+        # ReviewedVersionCommit.objects.prefetch_related('tracker__widgypage_set')
+        # because ReviewedVersionCommit.tracker is a VersionTracker (which
+        # doesn't have the reverse relationship), not a ReviewedVersionTracker.
+        trackers = ReviewedVersionTracker.objects.prefetch_related(
+            *ReviewedVersionTracker.get_owner_related_names()
+        ).in_bulk(
+            set(commit.tracker_id for commit in self.result_list)
+        )
+        for commit in self.result_list:
+            commit.tracker = trackers[commit.tracker_id]
+
+        return ret
+
 
 class VersionCommitAdminBase(AuthorizedAdminMixin, ModelAdmin):
     list_display = ('commit_name', 'author', 'publish_at', 'commit_preview')
     readonly_fields = ('preview', )
     list_select_related = True
     form = ApproveForm
+    actions = ['approve_selected']
 
     def get_queryset(self, request):
         try:
@@ -44,8 +63,7 @@ def get_queryset(self, request):
         except AttributeError:
             # BBB: In django 1.5 queryset changed to get_queryset
             qs = super(VersionCommitAdminBase, self).queryset(request)
-        return qs.unapproved()
-
+        return qs.unapproved().select_related('author', 'root_node')
     queryset = get_queryset
 
     def get_object(self, request, object_id):
@@ -65,8 +83,6 @@ def has_add_permission(self, request):
     def has_delete_permission(self, request, obj=None):
         return False
 
-    actions = ['approve_selected']
-
     def get_actions(self, request):
         actions = super(VersionCommitAdminBase, self).get_actions(request)
         del actions['delete_selected']
@@ -107,36 +123,33 @@ def save_form(self, request, form, change):
         # request.user during the saving.
         return form.save(request, commit=False)
 
+    def commit_name(self, commit):
+        assert isinstance(commit.tracker, ReviewedVersionTracker), (
+            "We rely on the VersionCommitChangeList to set commit.tracker"
+            " to a ReviewedVersionTracker."
+        )
+        return ', '.join(unicode(owner) for owner in commit.tracker.owners)
+    commit_name.short_description = _("Commit name")
+
     def commit_preview(self, commit):
-        url = self.get_commit_preview_url(commit)
-        return format_html('{preview}',
-                           url=url, preview=ugettext('preview'))
+        res = []
+        for owner in commit.tracker.owners:
+            if hasattr(owner, 'get_action_links'):
+                for link in owner.get_action_links(commit.root_node):
+                    res.append(format_html('{text}', **link))
+        return ' '.join(res)
     commit_preview.short_description = ''
     commit_preview.allow_tags = True
 
     def preview(self, commit):
         context = {
-            'commit_url': self.get_commit_preview_url(commit)
+            'owners': ReviewedVersionTracker.objects.get(pk=commit.tracker_id).owners,
+            'node': commit.root_node,
         }
         return mark_safe(render_to_string('review_queue/commit_preview.html',
                                           context))
     preview.short_description = _('Preview')
 
-    def commit_name(self, commit):
-        return self.get_commit_name(commit)
-    commit_name.short_description = _("Commit name")
-
     # Override this method in subclasses
     def get_site(self):
-        raise NotImplementedError('get_site should be implemented in '
-                                  'in subclasses')
-
-    # Override this method in subclasses
-    def get_commit_name(self, commit):
-        raise NotImplementedError('get_commit_name should be implemented '
-                                  'in subclasses')
-
-    # Override this method in subclasses
-    def get_commit_preview_url(self, commit):
-        raise NotImplementedError('get_commit_preview_url should be '
-                                  'in subclasses')
+        raise NotImplementedError('get_site should be implemented in subclasses')
diff --git a/widgy/contrib/review_queue/templates/review_queue/commit_preview.html b/widgy/contrib/review_queue/templates/review_queue/commit_preview.html
index 6cb8e43d2..826535fa7 100644
--- a/widgy/contrib/review_queue/templates/review_queue/commit_preview.html
+++ b/widgy/contrib/review_queue/templates/review_queue/commit_preview.html
@@ -1,5 +1,13 @@
-{% load compress %}
-
+{% load compress widgy_tags %}
+{% for owner in owners %}
+  {% get_action_links owner node as links %}
+  {% for link in links %}
+    {% if link.type == 'preview' %}
+      {{ link.text }}
+      
+    {% endif %}
+  {% endfor %}
+{% endfor %}
 {% compress css %}
 
 {% endcompress %}
diff --git a/widgy/contrib/widgy_mezzanine/admin.py b/widgy/contrib/widgy_mezzanine/admin.py
index 2c4620c61..dd9cc807b 100644
--- a/widgy/contrib/widgy_mezzanine/admin.py
+++ b/widgy/contrib/widgy_mezzanine/admin.py
@@ -18,7 +18,6 @@
 
 from widgy.forms import WidgyFormMixin
 from widgy.contrib.widgy_mezzanine import get_widgypage_model
-from widgy.contrib.widgy_mezzanine.views import get_page_from_node
 from widgy.utils import fancy_import, format_html
 from widgy.models import links
 
@@ -27,19 +26,18 @@
 WidgyPage = get_widgypage_model()
 
 
-class GetSiteMixin(object):
-    def get_site(self):
-        return fancy_import(settings.WIDGY_MEZZANINE_SITE)
-
-
 class WidgyPageAdminForm(WidgyFormMixin, PageAdminForm):
     class Meta:
         model = WidgyPage
 
     def __init__(self, *args, **kwargs):
         super(WidgyPageAdminForm, self).__init__(*args, **kwargs)
-        self.fields['publish_date'].help_text = _("If you enter a date here, the page will not be viewable on the site until then")
-        self.fields['expiry_date'].help_text = _("If you enter a date here, the page will not be viewable after this time")
+        self.fields['publish_date'].help_text = _(
+            "If you enter a date here, the page will not be viewable on the site until then"
+        )
+        self.fields['expiry_date'].help_text = _(
+            "If you enter a date here, the page will not be viewable after this time"
+        )
         self.fields['status'].initial = CONTENT_STATUS_DRAFT
 
     def clean_status(self):
@@ -50,17 +48,10 @@ def clean_status(self):
         return status
 
 
-class WidgyPageAdmin(PageAdmin, GetSiteMixin):
+class WidgyPageAdmin(PageAdmin):
     change_form_template = 'widgy/page_builder/widgypage_change_form.html'
     form = WidgyPageAdminForm
 
-    def render_change_form(self, request, context, *args, **kwargs):
-        if 'original' in context and context['original'].root_node:
-            # we are rendering a change form
-            obj = context['original']
-            site = self.get_site()
-        return super(WidgyPageAdmin, self).render_change_form(request, context, *args, **kwargs)
-
 
 class UndeleteField(forms.ModelChoiceField):
     widget = forms.RadioSelect
@@ -133,13 +124,9 @@ def __init__(self, *args, **kwargs):
         return super(UndeletePage, self).__init__(*args, **kwargs)
 
 
-class VersionCommitAdmin(GetSiteMixin, VersionCommitAdminBase):
-    def get_commit_name(self, commit):
-        return get_page_from_node(commit.root_node).title
-
-    def get_commit_preview_url(self, commit):
-        return reverse('widgy.contrib.widgy_mezzanine.views.preview',
-                       kwargs={'node_pk': commit.root_node.pk})
+class VersionCommitAdmin(VersionCommitAdminBase):
+    def get_site(self):
+        return fancy_import(settings.WIDGY_MEZZANINE_SITE)
 
 
 # Remove built in Mezzanine models from the admin center
diff --git a/widgy/contrib/widgy_mezzanine/models.py b/widgy/contrib/widgy_mezzanine/models.py
index 8b80cebc9..0be8ac3b8 100644
--- a/widgy/contrib/widgy_mezzanine/models.py
+++ b/widgy/contrib/widgy_mezzanine/models.py
@@ -26,9 +26,21 @@ def get_form_action_url(self, form, widgy):
             'widgy.contrib.widgy_mezzanine.views.handle_form',
             kwargs={
                 'form_node_pk': form.node.pk,
-                'root_node_pk': widgy['root_node'].pk,
+                'slug': self.slug,
             })
 
+    def get_action_links(self, root_node):
+        return [
+            {
+                'type': 'preview',
+                'text': _('Preview'),
+                'url': urlresolvers.reverse(
+                    'widgy.contrib.widgy_mezzanine.views.preview',
+                    kwargs={'slug': self.slug, 'node_pk': root_node.pk}
+                )
+            },
+        ]
+
     def get_content_model(self):
         """
         This is needed to render an unsaved WidgyPage. The template
diff --git a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html
index cde68ea75..6a4d65298 100644
--- a/widgy/contrib/widgy_mezzanine/templates/widgy/history.html
+++ b/widgy/contrib/widgy_mezzanine/templates/widgy/history.html
@@ -49,10 +49,15 @@ 
    {% trans "Page History" %}
    
             {% elif can_revert %}
               {% trans "Can't revert; this is the same as the current version." %}
             {% endif %}
-            {% if commit.diff_url %}
-              {% trans "Diff" %}
-            {% endif %}
-            {% trans "View" %}
+            {% for diff_url in commit.diff_urls %}
+              {% trans "Diff" %}
+            {% endfor %}
+            {% for owner in object.owners %}
+              {% get_action_links owner commit.root_node as links %}
+              {% for link in links %}
+                {{ link.text }}
+              {% endfor %}
+            {% endfor %}
             {% endblock %}