diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
index 7ba3ff2c03..af5950fdbd 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/vendor/hallo.js
@@ -1,671 +1,607 @@
-// Generated by CoffeeScript 1.3.3
-(function() {
-
-  $.widget("ncri.hallohtml", {
-    options: {
-      editable: null,
+/* Hallo 1.0.4 - rich text editor for jQuery UI
+* by Henri Bergius and contributors. Available under the MIT license.
+* See http://hallojs.org for more information
+*/(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.hallo', {
       toolbar: null,
-      uuid: "",
-      lang: 'en',
-      dialogOpts: {
-        autoOpen: false,
-        width: 600,
-        height: 'auto',
-        modal: false,
-        resizable: true,
-        draggable: true,
-        dialogClass: 'htmledit-dialog'
+      bound: false,
+      originalContent: '',
+      previousContent: '',
+      uuid: '',
+      selection: null,
+      _keepActivated: false,
+      originalHref: null,
+      options: {
+        editable: true,
+        plugins: {},
+        toolbar: 'halloToolbarContextual',
+        parentElement: 'body',
+        buttonCssClass: null,
+        toolbarCssClass: null,
+        toolbarPositionAbove: false,
+        toolbarOptions: {},
+        placeholder: '',
+        forceStructured: true,
+        checkTouch: true,
+        touchScreen: null
       },
-      dialog: null,
-      buttonCssClass: null
-    },
-    translations: {
-      en: {
-        title: 'Edit HTML',
-        update: 'Update'
+      _create: function() {
+        var options, plugin, _ref,
+          _this = this;
+        this.id = this._generateUUID();
+        if (this.options.checkTouch && this.options.touchScreen === null) {
+          this.checkTouch();
+        }
+        _ref = this.options.plugins;
+        for (plugin in _ref) {
+          options = _ref[plugin];
+          if (!jQuery.isPlainObject(options)) {
+            options = {};
+          }
+          jQuery.extend(options, {
+            editable: this,
+            uuid: this.id,
+            buttonCssClass: this.options.buttonCssClass
+          });
+          jQuery(this.element)[plugin](options);
+        }
+        this.element.one('halloactivated', function() {
+          return _this._prepareToolbar();
+        });
+        return this.originalContent = this.getContents();
       },
-      de: {
-        title: 'HTML bearbeiten',
-        update: 'Aktualisieren'
-      }
-    },
-    texts: null,
-    populateToolbar: function($toolbar) {
-      var $buttonHolder, $buttonset, id, widget;
-      widget = this;
-      this.texts = this.translations[this.options.lang];
-      this.options.toolbar = $toolbar;
-      this.options.dialog = $("<div>").attr('id', "" + this.options.uuid + "-htmledit-dialog");
-      $buttonset = $("<span>").addClass(widget.widgetName);
-      id = "" + this.options.uuid + "-htmledit";
-      $buttonHolder = $('<span>');
-      $buttonHolder.hallobutton({
-        label: this.texts.title,
-        icon: 'icon-list-alt',
-        editable: this.options.editable,
-        command: null,
-        queryState: false,
-        uuid: this.options.uuid,
-        cssClass: this.options.buttonCssClass
-      });
-      $buttonset.append($buttonHolder);
-      this.button = $buttonHolder;
-      this.button.click(function() {
-        if (widget.options.dialog.dialog("isOpen")) {
-          widget._closeDialog();
+      _init: function() {
+        if (this.options.editable) {
+          return this.enable();
         } else {
-          widget._openDialog();
+          return this.disable();
+        }
+      },
+      destroy: function() {
+        var options, plugin, _ref;
+        this.disable();
+        if (this.toolbar) {
+          this.toolbar.remove();
+          this.element[this.options.toolbar]('destroy');
+        }
+        _ref = this.options.plugins;
+        for (plugin in _ref) {
+          options = _ref[plugin];
+          jQuery(this.element)[plugin]('destroy');
+        }
+        return jQuery.Widget.prototype.destroy.call(this);
+      },
+      disable: function() {
+        var _this = this;
+        this.element.attr("contentEditable", false);
+        this.element.off("focus", this._activated);
+        this.element.off("blur", this._deactivated);
+        this.element.off("keyup paste change", this._checkModified);
+        this.element.off("keyup", this._keys);
+        this.element.off("keyup mouseup", this._checkSelection);
+        this.bound = false;
+        jQuery(this.element).removeClass('isModified');
+        jQuery(this.element).removeClass('inEditMode');
+        this.element.parents('a').addBack().each(function(idx, elem) {
+          var element;
+          element = jQuery(elem);
+          if (!element.is('a')) {
+            return;
+          }
+          if (!_this.originalHref) {
+            return;
+          }
+          return element.attr('href', _this.originalHref);
+        });
+        return this._trigger("disabled", null);
+      },
+      enable: function() {
+        var _this = this;
+        this.element.parents('a[href]').addBack().each(function(idx, elem) {
+          var element;
+          element = jQuery(elem);
+          if (!element.is('a[href]')) {
+            return;
+          }
+          _this.originalHref = element.attr('href');
+          return element.removeAttr('href');
+        });
+        this.element.attr("contentEditable", true);
+        if (!jQuery.parseHTML(this.element.html())) {
+          this.element.html(this.options.placeholder);
+          jQuery(this.element).addClass('inPlaceholderMode');
+          this.element.css({
+            'min-width': this.element.innerWidth(),
+            'min-height': this.element.innerHeight()
+          });
+        }
+        if (!this.bound) {
+          this.element.on("focus", this, this._activated);
+          this.element.on("blur", this, this._deactivated);
+          this.element.on("keyup paste change", this, this._checkModified);
+          this.element.on("keyup", this, this._keys);
+          this.element.on("keyup mouseup", this, this._checkSelection);
+          this.bound = true;
+        }
+        if (this.options.forceStructured) {
+          this._forceStructured();
+        }
+        return this._trigger("enabled", null);
+      },
+      activate: function() {
+        return this.element.focus();
+      },
+      containsSelection: function() {
+        var range;
+        range = this.getSelection();
+        return this.element.has(range.startContainer).length > 0;
+      },
+      getSelection: function() {
+        var range, sel;
+        sel = rangy.getSelection();
+        range = null;
+        if (sel.rangeCount > 0) {
+          range = sel.getRangeAt(0);
+        } else {
+          range = rangy.createRange();
+        }
+        return range;
+      },
+      restoreSelection: function(range) {
+        var sel;
+        sel = rangy.getSelection();
+        return sel.setSingleRange(range);
+      },
+      replaceSelection: function(cb) {
+        var newTextNode, r, range, sel, t;
+        if (navigator.appName === 'Microsoft Internet Explorer') {
+          t = document.selection.createRange().text;
+          r = document.selection.createRange();
+          return r.pasteHTML(cb(t));
+        } else {
+          sel = window.getSelection();
+          range = sel.getRangeAt(0);
+          newTextNode = document.createTextNode(cb(range.extractContents()));
+          range.insertNode(newTextNode);
+          range.setStartAfter(newTextNode);
+          sel.removeAllRanges();
+          return sel.addRange(range);
+        }
+      },
+      removeAllSelections: function() {
+        if (navigator.appName === 'Microsoft Internet Explorer') {
+          return range.empty();
+        } else {
+          return window.getSelection().removeAllRanges();
+        }
+      },
+      getPluginInstance: function(plugin) {
+        var instance;
+        instance = jQuery(this.element).data("IKS-" + plugin);
+        if (instance) {
+          return instance;
+        }
+        instance = jQuery(this.element).data(plugin);
+        if (instance) {
+          return instance;
+        }
+        throw new Error("Plugin " + plugin + " not found");
+      },
+      getContents: function() {
+        var cleanup, instance, plugin;
+        for (plugin in this.options.plugins) {
+          instance = this.getPluginInstance(plugin);
+          if (!instance) {
+            continue;
+          }
+          cleanup = instance.cleanupContentClone;
+          if (!jQuery.isFunction(cleanup)) {
+            continue;
+          }
+          jQuery(this.element)[plugin]('cleanupContentClone', this.element);
+        }
+        return this.element.html();
+      },
+      setContents: function(contents) {
+        return this.element.html(contents);
+      },
+      isModified: function() {
+        if (!this.previousContent) {
+          this.previousContent = this.originalContent;
+        }
+        return this.previousContent !== this.getContents();
+      },
+      setUnmodified: function() {
+        jQuery(this.element).removeClass('isModified');
+        return this.previousContent = this.getContents();
+      },
+      setModified: function() {
+        jQuery(this.element).addClass('isModified');
+        return this._trigger('modified', null, {
+          editable: this,
+          content: this.getContents()
+        });
+      },
+      restoreOriginalContent: function() {
+        return this.element.html(this.originalContent);
+      },
+      execute: function(command, value) {
+        if (document.execCommand(command, false, value)) {
+          return this.element.trigger("change");
+        }
+      },
+      protectFocusFrom: function(el) {
+        var _this = this;
+        return el.on("mousedown", function(event) {
+          event.preventDefault();
+          _this._protectToolbarFocus = true;
+          return setTimeout(function() {
+            return _this._protectToolbarFocus = false;
+          }, 300);
+        });
+      },
+      keepActivated: function(_keepActivated) {
+        this._keepActivated = _keepActivated;
+      },
+      _generateUUID: function() {
+        var S4;
+        S4 = function() {
+          return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1);
+        };
+        return "" + (S4()) + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + (S4()) + (S4());
+      },
+      _prepareToolbar: function() {
+        var defaults, instance, plugin, populate, toolbarOptions;
+        this.toolbar = jQuery('<div class="hallotoolbar"></div>').hide();
+        if (this.options.toolbarCssClass) {
+          this.toolbar.addClass(this.options.toolbarCssClass);
+        }
+        defaults = {
+          editable: this,
+          parentElement: this.options.parentElement,
+          toolbar: this.toolbar,
+          positionAbove: this.options.toolbarPositionAbove
+        };
+        toolbarOptions = jQuery.extend({}, defaults, this.options.toolbarOptions);
+        this.element[this.options.toolbar](toolbarOptions);
+        for (plugin in this.options.plugins) {
+          instance = this.getPluginInstance(plugin);
+          if (!instance) {
+            continue;
+          }
+          populate = instance.populateToolbar;
+          if (!jQuery.isFunction(populate)) {
+            continue;
+          }
+          this.element[plugin]('populateToolbar', this.toolbar);
+        }
+        this.element[this.options.toolbar]('setPosition');
+        return this.protectFocusFrom(this.toolbar);
+      },
+      changeToolbar: function(element, toolbar, hide) {
+        var originalToolbar;
+        if (hide == null) {
+          hide = false;
+        }
+        originalToolbar = this.options.toolbar;
+        this.options.parentElement = element;
+        if (toolbar) {
+          this.options.toolbar = toolbar;
+        }
+        if (!this.toolbar) {
+          return;
+        }
+        this.element[originalToolbar]('destroy');
+        this.toolbar.remove();
+        this._prepareToolbar();
+        if (hide) {
+          return this.toolbar.hide();
+        }
+      },
+      _checkModified: function(event) {
+        var widget;
+        widget = event.data;
+        if (widget.isModified()) {
+          return widget.setModified();
+        }
+      },
+      _keys: function(event) {
+        var old, widget;
+        widget = event.data;
+        if (event.keyCode === 27) {
+          old = widget.getContents();
+          widget.restoreOriginalContent(event);
+          widget._trigger("restored", null, {
+            editable: widget,
+            content: widget.getContents(),
+            thrown: old
+          });
+          return widget.turnOff();
+        }
+      },
+      _rangesEqual: function(r1, r2) {
+        if (r1.startContainer !== r2.startContainer) {
+          return false;
+        }
+        if (r1.startOffset !== r2.startOffset) {
+          return false;
+        }
+        if (r1.endContainer !== r2.endContainer) {
+          return false;
+        }
+        if (r1.endOffset !== r2.endOffset) {
+          return false;
+        }
+        return true;
+      },
+      _checkSelection: function(event) {
+        var widget;
+        if (event.keyCode === 27) {
+          return;
+        }
+        widget = event.data;
+        return setTimeout(function() {
+          var sel;
+          sel = widget.getSelection();
+          if (widget._isEmptySelection(sel) || widget._isEmptyRange(sel)) {
+            if (widget.selection) {
+              widget.selection = null;
+              widget._trigger("unselected", null, {
+                editable: widget,
+                originalEvent: event
+              });
+            }
+            return;
+          }
+          if (!widget.selection || !widget._rangesEqual(sel, widget.selection)) {
+            widget.selection = sel.cloneRange();
+            return widget._trigger("selected", null, {
+              editable: widget,
+              selection: widget.selection,
+              ranges: [widget.selection],
+              originalEvent: event
+            });
+          }
+        }, 0);
+      },
+      _isEmptySelection: function(selection) {
+        if (selection.type === "Caret") {
+          return true;
         }
         return false;
-      });
-      this.options.editable.element.on("hallodeactivated", function() {
-        return widget._closeDialog();
-      });
-      $toolbar.append($buttonset);
-      this.options.dialog.dialog(this.options.dialogOpts);
-      return this.options.dialog.dialog("option", "title", this.texts.title);
-    },
-    _openDialog: function() {
-      var $editableEl, html, widget, xposition, yposition,
-        _this = this;
-      widget = this;
-      $editableEl = $(this.options.editable.element);
-      xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
-      yposition = this.options.toolbar.offset().top - $(document).scrollTop();
-      this.options.dialog.dialog("option", "position", [xposition, yposition]);
-      this.options.editable.keepActivated(true);
-      this.options.dialog.dialog("open");
-      this.options.dialog.on('dialogclose', function() {
-        $('label', _this.button).removeClass('ui-state-active');
-        _this.options.editable.element.focus();
-        return _this.options.editable.keepActivated(false);
-      });
-      this.options.dialog.html($("<textarea>").addClass('html_source'));
-      html = this.options.editable.element.html();
-      this.options.dialog.children('.html_source').val(html);
-      this.options.dialog.prepend($("<button>" + this.texts.update + "</button>"));
-      return this.options.dialog.on('click', 'button', function() {
-        html = widget.options.dialog.children('.html_source').val();
-        widget.options.editable.element.html(html);
-        widget.options.editable.element.trigger('change');
+      },
+      _isEmptyRange: function(range) {
+        if (range.collapsed) {
+          return true;
+        }
+        if (range.isCollapsed) {
+          if (typeof range.isCollapsed === 'function') {
+            return range.isCollapsed();
+          }
+          return range.isCollapsed;
+        }
         return false;
-      });
-    },
-    _closeDialog: function() {
-      return this.options.dialog.dialog("close");
-    }
-  });
+      },
+      turnOn: function() {
+        if (this.getContents() === this.options.placeholder) {
+          this.setContents('');
+        }
+        jQuery(this.element).removeClass('inPlaceholderMode');
+        jQuery(this.element).addClass('inEditMode');
+        return this._trigger("activated", null, this);
+      },
+      turnOff: function() {
+        jQuery(this.element).removeClass('inEditMode');
+        this._trigger("deactivated", null, this);
+        if (!this.getContents()) {
+          jQuery(this.element).addClass('inPlaceholderMode');
+          return this.setContents(this.options.placeholder);
+        }
+      },
+      _activated: function(event) {
+        return event.data.turnOn();
+      },
+      _deactivated: function(event) {
+        if (event.data._keepActivated) {
+          return;
+        }
+        if (event.data._protectToolbarFocus !== true) {
+          return event.data.turnOff();
+        } else {
+          return setTimeout(function() {
+            return jQuery(event.data.element).focus();
+          }, 300);
+        }
+      },
+      _forceStructured: function(event) {
+        var e;
+        try {
+          return document.execCommand('styleWithCSS', 0, false);
+        } catch (_error) {
+          e = _error;
+          try {
+            return document.execCommand('useCSS', 0, true);
+          } catch (_error) {
+            e = _error;
+            try {
+              return document.execCommand('styleWithCSS', false, false);
+            } catch (_error) {
+              e = _error;
+            }
+          }
+        }
+      },
+      checkTouch: function() {
+        return this.options.touchScreen = !!('createTouch' in document);
+      }
+    });
+  })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget("IKS.hallolists", {
+    var z;
+    z = null;
+    if (this.VIE !== void 0) {
+      z = new VIE;
+      z.use(new z.StanbolService({
+        proxyDisabled: true,
+        url: 'http://dev.iks-project.eu:8081'
+      }));
+    }
+    return jQuery.widget('IKS.halloannotate', {
       options: {
+        vie: z,
         editable: null,
         toolbar: null,
         uuid: '',
-        lists: {
-          ordered: true,
-          unordered: true
-        },
+        select: function() {},
+        decline: function() {},
+        remove: function() {},
         buttonCssClass: null
       },
-      populateToolbar: function(toolbar) {
-        var buttonize, buttonset,
-          _this = this;
-        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
-        buttonize = function(type, label) {
-          var buttonElement;
-          buttonElement = jQuery('<span></span>');
-          buttonElement.hallobutton({
-            uuid: _this.options.uuid,
-            editable: _this.options.editable,
-            label: label,
-            command: "insert" + type + "List",
-            icon: "icon-list-" + (label.toLowerCase()),
-            cssClass: _this.options.buttonCssClass
-          });
-          return buttonset.append(buttonElement);
-        };
-        if (this.options.lists.ordered) {
-          buttonize("Ordered", "OL");
-        }
-        if (this.options.lists.unordered) {
-          buttonize("Unordered", "UL");
-        }
-        buttonset.hallobuttonset();
-        return toolbar.append(buttonset);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget("IKS.halloformat", {
-      options: {
-        editable: null,
-        uuid: '',
-        formattings: {
-          bold: true,
-          italic: true,
-          strikeThrough: false,
-          underline: false
-        },
-        buttonCssClass: null
-      },
-      populateToolbar: function(toolbar) {
-        var buttonize, buttonset, enabled, format, widget, _ref,
-          _this = this;
+      _create: function() {
+        var editableElement, turnOffAnnotate, widget;
         widget = this;
-        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
-        buttonize = function(format) {
-          var buttonHolder;
-          buttonHolder = jQuery('<span></span>');
-          buttonHolder.hallobutton({
-            label: format,
-            editable: _this.options.editable,
-            command: format,
-            uuid: _this.options.uuid,
-            cssClass: _this.options.buttonCssClass
-          });
-          return buttonset.append(buttonHolder);
-        };
-        _ref = this.options.formattings;
-        for (format in _ref) {
-          enabled = _ref[format];
-          if (!enabled) {
-            continue;
-          }
-          buttonize(format);
+        if (this.options.vie === void 0) {
+          throw new Error('The halloannotate plugin requires VIE');
+          return;
         }
-        buttonset.hallobuttonset();
-        return toolbar.append(buttonset);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget("IKS.hallolink", {
-      options: {
-        editable: null,
-        uuid: "",
-        link: true,
-        image: true,
-        defaultUrl: 'http://',
-        dialogOpts: {
-          autoOpen: false,
-          width: 540,
-          height: 95,
-          title: "Enter Link",
-          buttonTitle: "Insert",
-          buttonUpdateTitle: "Update",
-          modal: true,
-          resizable: false,
-          draggable: false,
-          dialogClass: 'hallolink-dialog'
-        },
-        buttonCssClass: null
+        if (typeof this.element.annotate !== 'function') {
+          throw new Error('The halloannotate plugin requires annotate.js');
+          return;
+        }
+        this.state = 'off';
+        this.instantiate();
+        turnOffAnnotate = function() {
+          var editable;
+          editable = this;
+          return jQuery(editable).halloannotate('turnOff');
+        };
+        editableElement = this.options.editable.element;
+        return editableElement.on('hallodisabled', turnOffAnnotate);
       },
       populateToolbar: function(toolbar) {
-        var butTitle, butUpdateTitle, buttonize, buttonset, dialog, dialogId, dialogSubmitCb, isEmptyLink, urlInput, widget,
+        var buttonHolder,
           _this = this;
-        widget = this;
-        dialogId = "" + this.options.uuid + "-dialog";
-        butTitle = this.options.dialogOpts.buttonTitle;
-        butUpdateTitle = this.options.dialogOpts.buttonUpdateTitle;
-        dialog = jQuery("<div id=\"" + dialogId + "\">        <form action=\"#\" method=\"post\" class=\"linkForm\">          <input class=\"url\" type=\"text\" name=\"url\"            value=\"" + this.options.defaultUrl + "\" />          <input type=\"submit\" id=\"addlinkButton\" value=\"" + butTitle + "\"/>        </form></div>");
-        urlInput = jQuery('input[name=url]', dialog).focus(function(e) {
-          return this.select();
+        buttonHolder = jQuery("<span class=\"" + this.widgetName + "\"></span>");
+        this.button = buttonHolder.hallobutton({
+          label: 'Annotate',
+          icon: 'icon-tags',
+          editable: this.options.editable,
+          command: null,
+          uuid: this.options.uuid,
+          cssClass: this.options.buttonCssClass,
+          queryState: false
         });
-        isEmptyLink = function(link) {
-          if ((new RegExp(/^\s*$/)).test(link)) {
-            return true;
+        buttonHolder.on('change', function(event) {
+          if (_this.state === "pending") {
+            return;
           }
-          if (link === widget.options.defaultUrl) {
-            return true;
+          if (_this.state === "off") {
+            return _this.turnOn();
           }
-          return false;
-        };
-        dialogSubmitCb = function(event) {
-          var link, selectionStart;
-          event.preventDefault();
-          link = urlInput.val();
-          widget.options.editable.restoreSelection(widget.lastSelection);
-          if (isEmptyLink(link)) {
-            selectionStart = widget.lastSelection.startContainer;
-            if (widget.lastSelection.collapsed) {
-              widget.lastSelection.setStartBefore(selectionStart);
-              widget.lastSelection.setEndAfter(selectionStart);
-              window.getSelection().addRange(widget.lastSelection);
-            }
-            document.execCommand("unlink", null, "");
-          } else {
-            if (!(/:\/\//.test(link)) && !(/^mailto:/.test(link))) {
-              link = 'http://' + link;
-            }
-            if (widget.lastSelection.startContainer.parentNode.href === void 0) {
-              document.execCommand("createLink", null, link);
-            } else {
-              widget.lastSelection.startContainer.parentNode.href = link;
-            }
-          }
-          widget.options.editable.element.trigger('change');
-          widget.options.editable.removeAllSelections();
-          dialog.dialog('close');
-          return false;
-        };
-        dialog.find("input[type=submit]").click(dialogSubmitCb);
-        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
-        buttonize = function(type) {
-          var button, buttonHolder, id;
-          id = "" + _this.options.uuid + "-" + type;
-          buttonHolder = jQuery('<span></span>');
-          buttonHolder.hallobutton({
-            label: 'Link',
-            icon: 'icon-link',
-            editable: _this.options.editable,
-            command: null,
-            queryState: false,
-            uuid: _this.options.uuid,
-            cssClass: _this.options.buttonCssClass
+          return _this.turnOff();
+        });
+        buttonHolder.buttonset();
+        return toolbar.append(this.button);
+      },
+      cleanupContentClone: function(el) {
+        if (this.state === 'on') {
+          return el.find(".entity:not([about])").each(function() {
+            return jQuery(this).replaceWith(jQuery(this).html());
           });
-          buttonset.append(buttonHolder);
-          button = buttonHolder;
-          button.on("click", function(event) {
-            var button_selector, selectionParent;
-            widget.lastSelection = widget.options.editable.getSelection();
-            urlInput = jQuery('input[name=url]', dialog);
-            selectionParent = widget.lastSelection.startContainer.parentNode;
-            if (!selectionParent.href) {
-              urlInput.val(widget.options.defaultUrl);
-              jQuery(urlInput[0].form).find('input[type=submit]').val(butTitle);
-            } else {
-              urlInput.val(jQuery(selectionParent).attr('href'));
-              button_selector = 'input[type=submit]';
-              jQuery(urlInput[0].form).find(button_selector).val(butUpdateTitle);
-            }
-            widget.options.editable.keepActivated(true);
-            dialog.dialog('open');
-            dialog.on('dialogclose', function() {
-              jQuery('label', buttonHolder).removeClass('ui-state-active');
-              widget.options.editable.element.focus();
-              return widget.options.editable.keepActivated(false);
-            });
-            return false;
-          });
-          return _this.element.on("keyup paste change mouseup", function(event) {
-            var nodeName, start;
-            start = jQuery(widget.options.editable.getSelection().startContainer);
-            if (start.prop('nodeName')) {
-              nodeName = start.prop('nodeName');
-            } else {
-              nodeName = start.parent().prop('nodeName');
-            }
-            if (nodeName && nodeName.toUpperCase() === "A") {
-              jQuery('label', button).addClass('ui-state-active');
+        }
+      },
+      instantiate: function() {
+        var widget;
+        widget = this;
+        return this.options.editable.element.annotate({
+          vie: this.options.vie,
+          debug: false,
+          showTooltip: true,
+          select: this.options.select,
+          remove: this.options.remove,
+          success: this.options.success,
+          error: this.options.error
+        }).on('annotateselect', function(event, data) {
+          return widget.options.editable.setModified();
+        }).on('annotateremove', function() {
+          return jQuery.noop();
+        });
+      },
+      turnPending: function() {
+        this.state = 'pending';
+        this.button.hallobutton('checked', false);
+        return this.button.hallobutton('disable');
+      },
+      turnOn: function() {
+        var e, widget,
+          _this = this;
+        this.turnPending();
+        widget = this;
+        try {
+          return this.options.editable.element.annotate('enable', function(success) {
+            if (!success) {
               return;
             }
-            return jQuery('label', button).removeClass('ui-state-active');
+            _this.state = 'on';
+            _this.button.hallobutton('checked', true);
+            return _this.button.hallobutton('enable');
           });
-        };
-        if (this.options.link) {
-          buttonize("A");
+        } catch (_error) {
+          e = _error;
+          return alert(e);
         }
-        if (this.options.link) {
-          toolbar.append(buttonset);
-          buttonset.hallobuttonset();
-          return dialog.dialog(this.options.dialogOpts);
+      },
+      turnOff: function() {
+        this.options.editable.element.annotate('disable');
+        this.state = 'off';
+        if (!this.button) {
+          return;
         }
+        this.button.attr('checked', false);
+        this.button.find("label").removeClass("ui-state-clicked");
+        return this.button.button('refresh');
       }
     });
   })(jQuery);
 
-  $.widget("ncri.hallo-image-insert-edit", {
-    options: {
-      editable: null,
-      toolbar: null,
-      uuid: "",
-      insert_file_dialog_ui_url: null,
-      lang: 'en',
-      dialogOpts: {
-        autoOpen: false,
-        width: 560,
-        height: 'auto',
-        modal: false,
-        resizable: true,
-        draggable: true,
-        dialogClass: 'insert-image-dialog'
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloblacklist', {
+      options: {
+        tags: []
       },
-      dialog: null,
-      buttonCssClass: null
-    },
-    translations: {
-      en: {
-        title_insert: 'Insert Image',
-        title_properties: 'Image Properties',
-        insert: 'Insert',
-        chage_image: 'Change Image:',
-        source: 'URL',
-        width: 'Width',
-        height: 'Height',
-        alt: 'Alt Text',
-        padding: 'Padding',
-        float: 'Float',
-        float_left: 'left',
-        float_right: 'right',
-        float_none: 'No'
-      },
-      de: {
-        title_insert: 'Bild einfügen',
-        title_properties: 'Bildeigenschaften',
-        insert: 'Einfügen',
-        chage_image: 'Bild ändern:',
-        source: 'URL',
-        width: 'Breite',
-        height: 'Höhe',
-        alt: 'Alt Text',
-        padding: 'Padding',
-        float: 'Float',
-        float_left: 'Links',
-        float_right: 'Rechts',
-        float_none: 'Nein'
-      }
-    },
-    texts: null,
-    dialog_image_selection_ui_loaded: false,
-    $image: null,
-    populateToolbar: function($toolbar) {
-      var $buttonHolder, $buttonset, dialog_html, widget;
-      widget = this;
-      this.texts = this.translations[this.options.lang];
-      this.options.toolbar = $toolbar;
-      dialog_html = "<div id='hallo_img_properties'></div>";
-      if (this.options.insert_file_dialog_ui_url) {
-        dialog_html += "<div id='hallo_img_file_select_ui'></div>";
-      }
-      this.options.dialog = $("<div>").attr('id', "" + this.options.uuid + "-insert-image-dialog").html(dialog_html);
-      $buttonset = $("<span>").addClass(this.widgetName);
-      $buttonHolder = $('<span>');
-      $buttonHolder.hallobutton({
-        label: this.texts.title_insert,
-        icon: 'icon-picture',
-        editable: this.options.editable,
-        command: null,
-        queryState: false,
-        uuid: this.options.uuid,
-        cssClass: this.options.buttonCssClass
-      });
-      $buttonset.append($buttonHolder);
-      this.button = $buttonHolder;
-      this.button.click(function() {
-        if (widget.options.dialog.dialog("isOpen")) {
-          widget._closeDialog();
-        } else {
-          widget.lastSelection = widget.options.editable.getSelection();
-          widget._openDialog();
-        }
-        return false;
-      });
-      this.options.editable.element.on("halloselected, hallounselected", function() {
-        if (widget.options.dialog.dialog("isOpen")) {
-          return widget.lastSelection = widget.options.editable.getSelection();
-        }
-      });
-      this.options.editable.element.on("hallodeactivated", function() {
-        return widget._closeDialog();
-      });
-      $(this.options.editable.element).on("click", "img", function(e) {
-        widget._openDialog($(this));
-        return false;
-      });
-      this.options.editable.element.on('halloselected', function(event, data) {
-        var toolbar_option;
-        toolbar_option = widget.options.editable.options.toolbar;
-        if (toolbar_option === "halloToolbarContextual" && $(data.originalEvent.target).is('img')) {
-          $toolbar.hide();
-          return false;
-        }
-      });
-      $toolbar.append($buttonset);
-      return this.options.dialog.dialog(this.options.dialogOpts);
-    },
-    _openDialog: function($image) {
-      var $editableEl, widget, xposition, yposition,
-        _this = this;
-      this.$image = $image;
-      widget = this;
-      $editableEl = $(this.options.editable.element);
-      xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
-      if (this.$image) {
-        yposition = this.$image.offset().top - $(document).scrollTop();
-      } else {
-        yposition = this.options.toolbar.offset().top - $(document).scrollTop();
-      }
-      this.options.dialog.dialog("option", "position", [xposition, yposition]);
-      this.options.editable.keepActivated(true);
-      this.options.dialog.dialog("open");
-      if (this.$image) {
-        this.options.dialog.dialog("option", "title", this.texts.title_properties);
-        $(document).keyup(function(e) {
-          if (e.keyCode === 46 || e.keyCode === 8) {
-            $(document).off();
-            widget._closeDialog();
-            widget.$image.remove();
-            widget.$image = null;
-          }
-          return e.preventDefault();
-        });
-        this.options.editable.element.on("click", function() {
-          widget.$image = null;
-          return widget._closeDialog();
-        });
-      } else {
-        this.options.dialog.children('#hallo_img_properties').hide();
-        this.options.dialog.dialog("option", "title", this.texts.title_insert);
-        if ($('#hallo_img_file_select_title').length > 0) {
-          $('#hallo_img_file_select_title').text('');
-        }
-      }
-      this._load_dialog_image_properties_ui();
-      this.options.dialog.on('dialogclose', function() {
-        var scrollbar_pos;
-        $('label', _this.button).removeClass('ui-state-active');
-        scrollbar_pos = $(document).scrollTop();
-        _this.options.editable.element.focus();
-        $(document).scrollTop(scrollbar_pos);
-        return _this.options.editable.keepActivated(false);
-      });
-      if (this.options.insert_file_dialog_ui_url && !this.dialog_image_selection_ui_loaded) {
-        this.options.dialog.on('click', ".reload_link", function() {
-          widget._load_dialog_image_selection_ui();
-          return false;
-        });
-        this.options.dialog.on('click', '.file_preview img', function() {
-          var new_source;
-          if (widget.$image) {
-            new_source = $(this).attr('src').replace(/-thumb/, '');
-            widget.$image.attr('src', new_source);
-            $('#hallo_img_source').val(new_source);
-          } else {
-            widget._insert_image($(this).attr('src').replace(/-thumb/, ''));
-          }
-          return false;
-        });
-        return this._load_dialog_image_selection_ui();
-      }
-    },
-    _insert_image: function(source) {
-      this.options.editable.restoreSelection(this.lastSelection);
-      document.execCommand("insertImage", null, source);
-      this.options.editable.element.trigger('change');
-      this.options.editable.removeAllSelections();
-      return this._closeDialog();
-    },
-    _closeDialog: function() {
-      return this.options.dialog.dialog("close");
-    },
-    _load_dialog_image_selection_ui: function() {
-      var widget;
-      widget = this;
-      return $.ajax({
-        url: this.options.insert_file_dialog_ui_url,
-        success: function(data, textStatus, jqXHR) {
-          var $properties, file_select_title, t;
-          file_select_title = '';
-          $properties = widget.options.dialog.children('#hallo_img_properties');
-          if ($properties.is(':visible')) {
-            file_select_title = widget.texts.change_image;
-          }
-          t = "<div id='hallo_img_file_select_title'>" + file_select_title + "</div>";
-          widget.options.dialog.children('#hallo_img_file_select_ui').html(t + data);
-          return widget.dialog_image_selection_ui_loaded = true;
-        },
-        beforeSend: function() {
-          return widget.options.dialog.children('#hallo_img_file_select_ui').html('<div class="hallo_insert_file_loader"></div>');
-        }
-      });
-    },
-    _load_dialog_image_properties_ui: function() {
-      var $img_properties, button, height, html, widget, width;
-      widget = this;
-      $img_properties = this.options.dialog.children('#hallo_img_properties');
-      if (this.$image) {
-        width = this.$image.is('[width]') ? this.$image.attr('width') : '';
-        height = this.$image.is('[height]') ? this.$image.attr('height') : '';
-        html = this._property_input_html('source', this.$image.attr('src'), {
-          label: this.texts.source
-        }) + this._property_input_html('alt', this.$image.attr('alt') || '', {
-          label: this.texts.alt
-        }) + this._property_row_html(this._property_input_html('width', width, {
-          label: this.texts.width,
-          row: false
-        }) + this._property_input_html('height', height, {
-          label: this.texts.height,
-          row: false
-        })) + this._property_input_html('padding', this.$image.css('padding'), {
-          label: this.texts.padding
-        }) + this._property_row_html(this._property_cb_html('float_left', this.$image.css('float') === 'left', {
-          label: this.texts.float_left,
-          row: false
-        }) + this._property_cb_html('float_right', this.$image.css('float') === 'right', {
-          label: this.texts.float_right,
-          row: false
-        }) + this._property_cb_html('unfloat', this.$image.css('float') === 'none', {
-          label: this.texts.float_none,
-          row: false
-        }), this.texts.float);
-        $img_properties.html(html);
-        $img_properties.show();
-      } else {
-        if (!this.options.insert_file_dialog_ui_url) {
-          $img_properties.html(this._property_input_html('source', '', {
-            label: this.texts.source
-          }));
-          $img_properties.show();
-        }
-      }
-      if (this.$image) {
-        if (!this.options.insert_file_dialog_ui_url) {
-          $('#insert_image_btn').remove();
-        }
-        if ($('#hallo_img_file_select_title').length > 0) {
-          $('#hallo_img_file_select_title').text(this.texts.chage_image);
-        }
-        $('#hallo_img_properties #hallo_img_source').keyup(function() {
-          return widget.$image.attr('src', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_alt').keyup(function() {
-          return widget.$image.attr('alt', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_padding').keyup(function() {
-          return widget.$image.css('padding', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_height').keyup(function() {
-          widget.$image.css('height', this.value);
-          return widget.$image.attr('height', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_width').keyup(function() {
-          widget.$image.css('width', this.value);
-          return widget.$image.attr('width', this.value);
-        });
-        $('#hallo_img_properties #hallo_img_float_left').click(function() {
-          if (!this.checked) {
-            return false;
-          }
-          widget.$image.css('float', 'left');
-          $('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
-          return $('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
-        });
-        $('#hallo_img_properties #hallo_img_float_right').click(function() {
-          if (!this.checked) {
-            return false;
-          }
-          widget.$image.css('float', 'right');
-          $('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
-          return $('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
-        });
-        return $('#hallo_img_properties #hallo_img_unfloat').click(function() {
-          if (!this.checked) {
-            return false;
-          }
-          widget.$image.css('float', 'none');
-          $('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
-          return $('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
-        });
-      } else {
-        if (!this.options.insert_file_dialog_ui_url) {
-          button = "<button id=\"insert_image_btn\">" + this.texts.insert + "</button>";
-          $img_properties.after(button);
-          return $('#insert_image_btn').click(function() {
-            var $img_source;
-            $img_source = $('#hallo_img_properties #hallo_img_source');
-            return widget._insert_image($img_source.val());
+      _init: function() {
+        if (this.options.tags.indexOf('br') !== -1) {
+          return this.element.on('keydown', function(event) {
+            if (event.originalEvent.keyCode === 13) {
+              return event.preventDefault();
+            }
           });
         }
-      }
-    },
-    _property_col_html: function(col_html) {
-      return "<div class='hallo_img_property_col'>" + col_html + "</div>";
-    },
-    _property_row_html: function(row_html, label) {
-      if (label == null) {
-        label = '';
-      }
-      row_html = this._property_col_html(label) + this._property_col_html(row_html);
-      return "<div class='hallo_img_property_row'>" + row_html + "</div>";
-    },
-    _property_html: function(property_html, options) {
-      var entry;
-      if (options == null) {
-        options = {};
-      }
-      if (options.row === false) {
-        if (options.label) {
-          entry = "" + options.label + " " + property_html;
-          property_html = "<span class='img_property_entry'>" + entry + "</span>";
+      },
+      cleanupContentClone: function(el) {
+        var tag, _i, _len, _ref, _results;
+        _ref = this.options.tags;
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          tag = _ref[_i];
+          _results.push(jQuery(tag, el).remove());
         }
-        return property_html;
-      } else {
-        entry = "<span class='img_property_entry'>" + property_html + "</span>";
-        return this._property_row_html(entry, options.label);
+        return _results;
       }
-    },
-    _property_input_html: function(id, value, options) {
-      var text_field;
-      if (options == null) {
-        options = {};
-      }
-      text_field = "<input type='text' id='hallo_img_" + id + "' value='" + value + "'>";
-      return this._property_html(text_field, options);
-    },
-    _property_cb_html: function(id, checked, options) {
-      var cb, checked_attr;
-      if (options == null) {
-        options = {};
-      }
-      checked_attr = checked ? 'checked=checked' : '';
-      cb = "<input type='checkbox' id='hallo_img_" + id + "' " + checked_attr + "'>";
-      return this._property_html(cb, options);
-    }
-  });
+    });
+  })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget('IKS.halloblock', {
       options: {
@@ -753,6 +689,104 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    var rangyMessage;
+    rangyMessage = 'The hallocleanhtml plugin requires the selection save and\
+    restore module from Rangy';
+    return jQuery.widget('IKS.hallocleanhtml', {
+      _create: function() {
+        var editor,
+          _this = this;
+        if (jQuery.htmlClean === void 0) {
+          throw new Error('The hallocleanhtml plugin requires jQuery.htmlClean');
+          return;
+        }
+        editor = this.element;
+        return editor.bind('paste', this, function(event) {
+          var lastContent, lastRange, widget;
+          if (rangy.saveSelection === void 0) {
+            throw new Error(rangyMessage);
+            return;
+          }
+          widget = event.data;
+          widget.options.editable.getSelection().deleteContents();
+          lastRange = rangy.saveSelection();
+          lastContent = editor.html();
+          editor.html('');
+          return setTimeout(function() {
+            var cleanPasted, error, pasted, range;
+            pasted = editor.html();
+            cleanPasted = jQuery.htmlClean(pasted, _this.options);
+            editor.html(lastContent);
+            rangy.restoreSelection(lastRange);
+            if (cleanPasted !== '') {
+              try {
+                return document.execCommand('insertHTML', false, cleanPasted);
+              } catch (_error) {
+                error = _error;
+                range = widget.options.editable.getSelection();
+                return range.insertNode(range.createContextualFragment(cleanPasted));
+              }
+            }
+          }, 4);
+        });
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.halloformat", {
+      options: {
+        editable: null,
+        uuid: '',
+        formattings: {
+          bold: true,
+          italic: true,
+          strikeThrough: false,
+          underline: false
+        },
+        buttonCssClass: null
+      },
+      populateToolbar: function(toolbar) {
+        var buttonize, buttonset, enabled, format, widget, _ref,
+          _this = this;
+        widget = this;
+        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
+        buttonize = function(format) {
+          var buttonHolder;
+          buttonHolder = jQuery('<span></span>');
+          buttonHolder.hallobutton({
+            label: format,
+            editable: _this.options.editable,
+            command: format,
+            uuid: _this.options.uuid,
+            cssClass: _this.options.buttonCssClass
+          });
+          return buttonset.append(buttonHolder);
+        };
+        _ref = this.options.formattings;
+        for (format in _ref) {
+          enabled = _ref[format];
+          if (!enabled) {
+            continue;
+          }
+          buttonize(format);
+        }
+        buttonset.hallobuttonset();
+        return toolbar.append(buttonset);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget("IKS.halloheadings", {
       options: {
@@ -779,7 +813,7 @@
             uuid: _this.options.uuid,
             cssClass: _this.options.buttonCssClass,
             queryState: function(event) {
-              var compared, map, result, val, value, _i, _len, _ref;
+              var compared, e, map, result, val, value, _i, _len, _ref;
               try {
                 value = document.queryCommandValue(command);
                 if (ie) {
@@ -797,8 +831,8 @@
                 }
                 result = compared ? true : false;
                 return buttonHolder.hallobutton('checked', result);
-              } catch (e) {
-
+              } catch (_error) {
+                e = _error;
               }
             }
           });
@@ -816,40 +850,110 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget("IKS.halloreundo", {
+    return jQuery.widget("IKS.hallohtml", {
       options: {
         editable: null,
         toolbar: null,
-        uuid: '',
+        uuid: "",
+        lang: 'en',
+        dialogOpts: {
+          autoOpen: false,
+          width: 600,
+          height: 'auto',
+          modal: false,
+          resizable: true,
+          draggable: true,
+          dialogClass: 'htmledit-dialog'
+        },
+        dialog: null,
         buttonCssClass: null
       },
-      populateToolbar: function(toolbar) {
-        var buttonize, buttonset,
+      translations: {
+        en: {
+          title: 'Edit HTML',
+          update: 'Update'
+        },
+        de: {
+          title: 'HTML bearbeiten',
+          update: 'Aktualisieren'
+        }
+      },
+      texts: null,
+      populateToolbar: function($toolbar) {
+        var $buttonHolder, $buttonset, id, selector, widget;
+        widget = this;
+        this.texts = this.translations[this.options.lang];
+        this.options.toolbar = $toolbar;
+        selector = "" + this.options.uuid + "-htmledit-dialog";
+        this.options.dialog = jQuery("<div>").attr('id', selector);
+        $buttonset = jQuery("<span>").addClass(widget.widgetName);
+        id = "" + this.options.uuid + "-htmledit";
+        $buttonHolder = jQuery('<span>');
+        $buttonHolder.hallobutton({
+          label: this.texts.title,
+          icon: 'icon-list-alt',
+          editable: this.options.editable,
+          command: null,
+          queryState: false,
+          uuid: this.options.uuid,
+          cssClass: this.options.buttonCssClass
+        });
+        $buttonset.append($buttonHolder);
+        this.button = $buttonHolder;
+        this.button.click(function() {
+          if (widget.options.dialog.dialog("isOpen")) {
+            widget._closeDialog();
+          } else {
+            widget._openDialog();
+          }
+          return false;
+        });
+        this.options.editable.element.on("hallodeactivated", function() {
+          return widget._closeDialog();
+        });
+        $toolbar.append($buttonset);
+        this.options.dialog.dialog(this.options.dialogOpts);
+        return this.options.dialog.dialog("option", "title", this.texts.title);
+      },
+      _openDialog: function() {
+        var $editableEl, html, widget, xposition, yposition,
           _this = this;
-        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
-        buttonize = function(cmd, label) {
-          var buttonElement;
-          buttonElement = jQuery('<span></span>');
-          buttonElement.hallobutton({
-            uuid: _this.options.uuid,
-            editable: _this.options.editable,
-            label: label,
-            icon: cmd === 'undo' ? 'icon-undo' : 'icon-repeat',
-            command: cmd,
-            queryState: false,
-            cssClass: _this.options.buttonCssClass
-          });
-          return buttonset.append(buttonElement);
-        };
-        buttonize("undo", "Undo");
-        buttonize("redo", "Redo");
-        buttonset.hallobuttonset();
-        return toolbar.append(buttonset);
+        widget = this;
+        $editableEl = jQuery(this.options.editable.element);
+        xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
+        yposition = this.options.toolbar.offset().top - jQuery(document).scrollTop();
+        this.options.dialog.dialog("option", "position", [xposition, yposition]);
+        this.options.editable.keepActivated(true);
+        this.options.dialog.dialog("open");
+        this.options.dialog.on('dialogclose', function() {
+          jQuery('label', _this.button).removeClass('ui-state-active');
+          _this.options.editable.element.focus();
+          return _this.options.editable.keepActivated(false);
+        });
+        this.options.dialog.html(jQuery("<textarea>").addClass('html_source'));
+        html = this.options.editable.element.html();
+        this.options.dialog.children('.html_source').val(html);
+        this.options.dialog.prepend(jQuery("<button>" + this.texts.update + "</button>"));
+        return this.options.dialog.on('click', 'button', function() {
+          html = widget.options.dialog.children('.html_source').val();
+          widget.options.editable.element.html(html);
+          widget.options.editable.element.trigger('change');
+          return false;
+        });
+      },
+      _closeDialog: function() {
+        return this.options.dialog.dialog("close");
       }
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget("IKS.halloimage", {
       options: {
@@ -1040,612 +1144,12 @@
           entity: this.options.entity
         });
       }
-      /*
-          insertImage = () ->
-          # This may need to insert an image that does not have the same URL as
-          # the preview image, since it may be a different size
-            # Check if we have a selection and fall back to @lastSelection otherwise
-            try
-              if not widget.options.editable.getSelection()
-              throw new Error "SelectionNotSet"
-            catch error
-              widget.options.editable.restoreSelection(widget.lastSelection)
-      
-            document.execCommand "insertImage", null, jQuery(this).attr('src')
-            img = document.getSelection().anchorNode.firstChild
-            jQuery(img).attr "alt", jQuery(".caption").value
-      
-            triggerModified = () ->
-              widget.element.trigger "hallomodified"
-            window.setTimeout triggerModified, 100
-            widget._closeDialog()
-      
-            addImage = "##{widget.options.uuid}-#{widget.widgetName-addimage"
-            @options.dialog.find(".halloimage-activeImage, addImage).click insertImage
-      */
-
     });
   })(jQuery);
 
-  (function(jQuery) {
-    return jQuery.widget("Liip.hallooverlay", {
-      options: {
-        editable: null,
-        toolbar: null,
-        uuid: "",
-        overlay: null,
-        padding: 10,
-        background: null
-      },
-      _create: function() {
-        var widget;
-        widget = this;
-        if (!this.options.bound) {
-          this.options.bound = true;
-          this.options.editable.element.on("halloactivated", function(event, data) {
-            widget.options.currentEditable = jQuery(event.target);
-            if (!widget.options.visible) {
-              return widget.showOverlay();
-            }
-          });
-          this.options.editable.element.on("hallomodified", function(event, data) {
-            widget.options.currentEditable = jQuery(event.target);
-            if (widget.options.visible) {
-              return widget.resizeOverlay();
-            }
-          });
-          return this.options.editable.element.on("hallodeactivated", function(event, data) {
-            widget.options.currentEditable = jQuery(event.target);
-            if (widget.options.visible) {
-              return widget.hideOverlay();
-            }
-          });
-        }
-      },
-      showOverlay: function() {
-        this.options.visible = true;
-        if (this.options.overlay === null) {
-          if (jQuery("#halloOverlay").length > 0) {
-            this.options.overlay = jQuery("#halloOverlay");
-          } else {
-            this.options.overlay = jQuery("<div id=\"halloOverlay\"            class=\"halloOverlay\">");
-            jQuery(document.body).append(this.options.overlay);
-          }
-          this.options.overlay.on('click', jQuery.proxy(this.options.editable.turnOff, this.options.editable));
-        }
-        this.options.overlay.show();
-        if (this.options.background === null) {
-          if (jQuery("#halloBackground").length > 0) {
-            this.options.background = jQuery("#halloBackground");
-          } else {
-            this.options.background = jQuery("<div id=\"halloBackground\"            class=\"halloBackground\">");
-            jQuery(document.body).append(this.options.background);
-          }
-        }
-        this.resizeOverlay();
-        this.options.background.show();
-        if (!this.options.originalZIndex) {
-          this.options.originalZIndex = this.options.currentEditable.css("z-index");
-        }
-        return this.options.currentEditable.css('z-index', '350');
-      },
-      resizeOverlay: function() {
-        var offset;
-        offset = this.options.currentEditable.offset();
-        return this.options.background.css({
-          top: offset.top - this.options.padding,
-          left: offset.left - this.options.padding,
-          width: this.options.currentEditable.width() + 2 * this.options.padding,
-          height: this.options.currentEditable.height() + 2 * this.options.padding
-        });
-      },
-      hideOverlay: function() {
-        this.options.visible = false;
-        this.options.overlay.hide();
-        this.options.background.hide();
-        return this.options.currentEditable.css('z-index', this.options.originalZIndex);
-      },
-      _findBackgroundColor: function(jQueryfield) {
-        var color;
-        color = jQueryfield.css("background-color");
-        if (color !== 'rgba(0, 0, 0, 0)' && color !== 'transparent') {
-          return color;
-        }
-        if (jQueryfield.is("body")) {
-          return "white";
-        } else {
-          return this._findBackgroundColor(jQueryfield.parent());
-        }
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloindicator', {
-      options: {
-        editable: null,
-        className: 'halloEditIndicator'
-      },
-      _create: function() {
-        var _this = this;
-        return this.element.on('halloenabled', function() {
-          return _this.buildIndicator();
-        });
-      },
-      populateToolbar: function() {},
-      buildIndicator: function() {
-        var editButton;
-        editButton = jQuery('<div><i class="icon-edit"></i> Edit</div>');
-        editButton.addClass(this.options.className);
-        editButton.hide();
-        this.element.before(editButton);
-        this.bindIndicator(editButton);
-        return this.setIndicatorPosition(editButton);
-      },
-      bindIndicator: function(indicator) {
-        var _this = this;
-        indicator.on('click', function() {
-          return _this.options.editable.element.focus();
-        });
-        this.element.on('halloactivated', function() {
-          return indicator.hide();
-        });
-        this.element.on('hallodisabled', function() {
-          return indicator.remove();
-        });
-        return this.options.editable.element.hover(function() {
-          if (jQuery(this).hasClass('inEditMode')) {
-            return;
-          }
-          return indicator.show();
-        }, function(data) {
-          if (jQuery(this).hasClass('inEditMode')) {
-            return;
-          }
-          if (data.relatedTarget === indicator.get(0)) {
-            return;
-          }
-          return indicator.hide();
-        });
-      },
-      setIndicatorPosition: function(indicator) {
-        var offset;
-        indicator.css('position', 'absolute');
-        offset = this.element.position();
-        indicator.css('top', offset.top + 2);
-        return indicator.css('left', offset.left + 2);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    var z;
-    z = null;
-    if (this.VIE !== void 0) {
-      z = new VIE;
-      z.use(new z.StanbolService({
-        proxyDisabled: true,
-        url: 'http://dev.iks-project.eu:8081'
-      }));
-    }
-    return jQuery.widget('IKS.halloannotate', {
-      options: {
-        vie: z,
-        editable: null,
-        toolbar: null,
-        uuid: '',
-        select: function() {},
-        decline: function() {},
-        remove: function() {},
-        buttonCssClass: null
-      },
-      _create: function() {
-        var editableElement, turnOffAnnotate, widget;
-        widget = this;
-        if (this.options.vie === void 0) {
-          throw new Error('The halloannotate plugin requires VIE');
-          return;
-        }
-        if (typeof this.element.annotate !== 'function') {
-          throw new Error('The halloannotate plugin requires annotate.js');
-          return;
-        }
-        this.state = 'off';
-        this.instantiate();
-        turnOffAnnotate = function() {
-          var editable;
-          editable = this;
-          return jQuery(editable).halloannotate('turnOff');
-        };
-        editableElement = this.options.editable.element;
-        return editableElement.on('hallodisabled', turnOffAnnotate);
-      },
-      populateToolbar: function(toolbar) {
-        var buttonHolder,
-          _this = this;
-        buttonHolder = jQuery("<span class=\"" + this.widgetName + "\"></span>");
-        this.button = buttonHolder.hallobutton({
-          label: 'Annotate',
-          icon: 'icon-tags',
-          editable: this.options.editable,
-          command: null,
-          uuid: this.options.uuid,
-          cssClass: this.options.buttonCssClass,
-          queryState: false
-        });
-        buttonHolder.on('change', function(event) {
-          if (_this.state === "pending") {
-            return;
-          }
-          if (_this.state === "off") {
-            return _this.turnOn();
-          }
-          return _this.turnOff();
-        });
-        buttonHolder.buttonset();
-        return toolbar.append(this.button);
-      },
-      cleanupContentClone: function(el) {
-        if (this.state === 'on') {
-          return el.find(".entity:not([about])").each(function() {
-            return jQuery(this).replaceWith(jQuery(this).html());
-          });
-        }
-      },
-      instantiate: function() {
-        var widget;
-        widget = this;
-        return this.options.editable.element.annotate({
-          vie: this.options.vie,
-          debug: false,
-          showTooltip: true,
-          select: this.options.select,
-          remove: this.options.remove,
-          success: this.options.success,
-          error: this.options.error
-        }).on('annotateselect', function(event, data) {
-          return widget.options.editable.setModified();
-        }).on('annotateremove', function() {
-          return jQuery.noop();
-        });
-      },
-      turnPending: function() {
-        this.state = 'pending';
-        this.button.hallobutton('checked', false);
-        return this.button.hallobutton('disable');
-      },
-      turnOn: function() {
-        var widget,
-          _this = this;
-        this.turnPending();
-        widget = this;
-        try {
-          return this.options.editable.element.annotate('enable', function(success) {
-            if (!success) {
-              return;
-            }
-            _this.state = 'on';
-            _this.button.hallobutton('checked', true);
-            return _this.button.hallobutton('enable');
-          });
-        } catch (e) {
-          return alert(e);
-        }
-      },
-      turnOff: function() {
-        this.options.editable.element.annotate('disable');
-        this.state = 'off';
-        if (!this.button) {
-          return;
-        }
-        this.button.attr('checked', false);
-        this.button.find("label").removeClass("ui-state-clicked");
-        return this.button.button('refresh');
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloimagesearch', {
-      options: {
-        imageWidget: null,
-        searchCallback: null,
-        searchUrl: null,
-        limit: 5
-      },
-      _create: function() {
-        return this.element.html('<div>\
-        <form method="get">\
-          <input type="text" class="searchInput" placeholder="Search" />\
-          <input type="submit" class="btn searchButton" value="OK" />\
-        </form>\
-        <div class="searchResults imageThumbnailContainer">\
-          <div class="activitySpinner">Loading images...</div>\
-          <ul></ul>\
-        </div>\
-      </div>');
-      },
-      _init: function() {
-        var _this = this;
-        if (this.options.searchUrl && !this.options.searchCallback) {
-          this.options.searchCallback = this._ajaxSearch;
-        }
-        jQuery('.activitySpinner', this.element).hide();
-        return jQuery('form', this.element).submit(function(event) {
-          var query;
-          event.preventDefault();
-          jQuery('.activitySpinner', _this.element).show();
-          query = jQuery('.searchInput', _this.element.element).val();
-          return _this.options.searchCallback(query, _this.options.limit, 0, function(results) {
-            return _this._showResults(results);
-          });
-        });
-      },
-      _showResult: function(image) {
-        var html,
-          _this = this;
-        if (!image.label) {
-          image.label = image.alt;
-        }
-        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\"></li>");
-        html.on('click', function() {
-          return _this.options.imageWidget.setCurrent(image);
-        });
-        jQuery('img', html).on('mousedown', function(event) {
-          event.preventDefault();
-          return _this.options.imageWidget.setCurrent(image);
-        });
-        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
-      },
-      _showNextPrev: function(results) {
-        var container,
-          _this = this;
-        container = jQuery('imageThumbnailContainer ul', this.element);
-        container.prepend(jQuery('<div class="pager-prev" style="display:none" />'));
-        container.append(jQuery('<div class="pager-next" style="display:none" />'));
-        if (results.offset > 0) {
-          jQuery('.pager-prev', container).show();
-        }
-        if (results.offset < results.total) {
-          jQuery('.pager-next', container).show();
-        }
-        jQuery('.pager-prev', container).click(function(event) {
-          var offset;
-          offset = results.offset - _this.options.limit;
-          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
-            return _this._showResults(results);
-          });
-        });
-        return jQuery('.pager-next', container).click(function(event) {
-          var offset;
-          offset = results.offset + _this.options.limit;
-          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
-            return _this._showResults(results);
-          });
-        });
-      },
-      _showResults: function(results) {
-        var image, _i, _len, _ref;
-        jQuery('.activitySpinner', this.element).hide();
-        jQuery('.imageThumbnailContainer ul', this.element).empty();
-        jQuery('.imageThumbnailContainer ul', this.element).show();
-        _ref = results.assets;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          image = _ref[_i];
-          this._showResult(image);
-        }
-        this.options.imageWidget.setCurrent(results.assets.shift());
-        return this._showNextPrev(results);
-      },
-      _ajaxSearch: function(query, limit, offset, success) {
-        var searchUrl;
-        searchUrl = this.searchUrl + '?' + jQuery.param({
-          q: query,
-          limit: limit,
-          offset: offset
-        });
-        return jQuery.getJSON(searchUrl, success);
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloimageupload', {
-      options: {
-        uploadCallback: null,
-        uploadUrl: null,
-        imageWidget: null,
-        entity: null
-      },
-      _create: function() {
-        return this.element.html('\
-        <form class="upload">\
-        <input type="file" class="file" name="userfile" accept="image/*" />\
-        <input type="hidden" name="tags" value="" />\
-        <input type="text" class="caption" name="caption" placeholder="Title" />\
-        <button class="uploadSubmit">Upload</button>\
-        </form>\
-      ');
-      },
-      _init: function() {
-        var widget;
-        widget = this;
-        if (widget.options.uploadUrl && !widget.options.uploadCallback) {
-          widget.options.uploadCallback = widget._iframeUpload;
-        }
-        return jQuery('.uploadSubmit', this.element).on('click', function(event) {
-          event.preventDefault();
-          event.stopPropagation();
-          return widget.options.uploadCallback({
-            widget: widget,
-            success: function(url) {
-              return widget.options.imageWidget.setCurrent({
-                url: url,
-                label: ''
-              });
-            }
-          });
-        });
-      },
-      _prepareIframe: function(widget) {
-        var iframe, iframeName;
-        iframeName = "" + widget.widgetName + "_postframe_" + widget.options.uuid;
-        iframeName = iframeName.replace(/-/g, '_');
-        iframe = jQuery("#" + iframeName);
-        if (iframe.length) {
-          return iframe;
-        }
-        iframe = jQuery("<iframe name=\"" + iframeName + "\" id=\"" + iframeName + "\"        class=\"hidden\" style=\"display:none\" />");
-        this.element.append(iframe);
-        iframe.get(0).name = iframeName;
-        return iframe;
-      },
-      _iframeUpload: function(data) {
-        var iframe, uploadForm, uploadUrl, widget;
-        widget = data.widget;
-        iframe = widget._prepareIframe(widget);
-        uploadForm = jQuery('form.upload', widget.element);
-        if (typeof widget.options.uploadUrl === 'function') {
-          uploadUrl = widget.options.uploadUrl(widget.options.entity);
-        } else {
-          uploadUrl = widget.options.uploadUrl;
-        }
-        iframe.on('load', function() {
-          var imageUrl;
-          imageUrl = iframe.get(0).contentWindow.location.href;
-          widget.element.hide();
-          return data.success(imageUrl);
-        });
-        uploadForm.attr('action', uploadUrl);
-        uploadForm.attr('method', 'post');
-        uploadForm.attr('target', iframe.get(0).name);
-        uploadForm.attr('enctype', 'multipart/form-data');
-        uploadForm.attr('encoding', 'multipart/form-data');
-        return uploadForm.submit();
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.halloimagesuggestions', {
-      loaded: false,
-      options: {
-        entity: null,
-        vie: null,
-        dbPediaUrl: null,
-        getSuggestions: null,
-        thumbnailUri: '<http://dbpedia.org/ontology/thumbnail>'
-      },
-      _create: function() {
-        return this.element.html('\
-      <div id="' + this.options.uuid + '-tab-suggestions">\
-        <div class="imageThumbnailContainer">\
-          <div class="activitySpinner">Loading images...</div>\
-          <ul></ul>\
-        </div>\
-      </div>');
-      },
-      _init: function() {
-        return jQuery('.activitySpinner', this.element).hide();
-      },
-      _normalizeRelated: function(related) {
-        if (_.isString(related)) {
-          return related;
-        }
-        if (_.isArray(related)) {
-          return related.join(',');
-        }
-        return related.pluck('@subject').join(',');
-      },
-      _prepareVIE: function() {
-        if (!this.options.vie) {
-          this.options.vie = new VIE;
-        }
-        if (this.options.vie.services.dbpedia) {
-          return;
-        }
-        if (!this.options.dbPediaUrl) {
-          return;
-        }
-        return this.options.vie.use(new vie.DBPediaService({
-          url: this.options.dbPediaUrl,
-          proxyDisabled: true
-        }));
-      },
-      _getSuggestions: function() {
-        var limit, normalizedTags, tags;
-        if (this.loaded) {
-          return;
-        }
-        if (!this.options.entity) {
-          return;
-        }
-        jQuery('.activitySpinner', this.element).show();
-        tags = this.options.entity.get('skos:related');
-        if (tags.length === 0) {
-          jQuery("#activitySpinner").html('No images found.');
-          return;
-        }
-        jQuery('.imageThumbnailContainer ul', this.element).empty();
-        normalizedTags = this._normalizeRelated(tags);
-        limit = this.options.limit;
-        if (this.options.getSuggestions) {
-          this.options.getSuggestions(normalizedTags, limit, 0, this._showSuggestions);
-        }
-        this._prepareVIE();
-        if (this.options.vie.services.dbpedia) {
-          this._getSuggestionsDbPedia(tags);
-        }
-        return this.loaded = true;
-      },
-      _getSuggestionsDbPedia: function(tags) {
-        var thumbId, widget;
-        widget = this;
-        thumbId = 1;
-        return _.each(tags, function(tag) {
-          return vie.load({
-            entity: tag
-          }).using('dbpedia').execute().done(function(entities) {
-            jQuery('.activitySpinner', this.element).hide();
-            return _.each(entities, function(entity) {
-              var img, thumbnail;
-              thumbnail = entity.attributes[widget.options.thumbnailUri];
-              if (!thumbnail) {
-                return;
-              }
-              if (_.isObject(thumbnail)) {
-                img = thumbnail[0].value;
-              }
-              if (_.isString(thumbnail)) {
-                img = widget.options.entity.fromReference(thumbnail);
-              }
-              return widget._showSuggestion({
-                url: img,
-                label: tag
-              });
-            });
-          });
-        });
-      },
-      _showSuggestion: function(image) {
-        var html,
-          _this = this;
-        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\">        </li>");
-        html.on('click', function() {
-          return _this.options.imageWidget.setCurrent(image);
-        });
-        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
-      },
-      _showSuggestions: function(suggestions) {
-        var _this = this;
-        jQuery('.activitySpinner', this.element).hide();
-        return _.each(suggestions, function(image) {
-          return _this._showSuggestion(image);
-        });
-      }
-    });
-  })(jQuery);
+}).call(this);
 
+(function() {
   (function(jQuery) {
     return jQuery.widget('IKS.halloimagecurrent', {
       options: {
@@ -1997,6 +1501,734 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloimagesearch', {
+      options: {
+        imageWidget: null,
+        searchCallback: null,
+        searchUrl: null,
+        limit: 5
+      },
+      _create: function() {
+        return this.element.html('<div>\
+        <form method="get">\
+          <input type="text" class="searchInput" placeholder="Search" />\
+          <input type="submit" class="btn searchButton" value="OK" />\
+        </form>\
+        <div class="searchResults imageThumbnailContainer">\
+          <div class="activitySpinner">Loading images...</div>\
+          <ul></ul>\
+        </div>\
+      </div>');
+      },
+      _init: function() {
+        var _this = this;
+        if (this.options.searchUrl && !this.options.searchCallback) {
+          this.options.searchCallback = this._ajaxSearch;
+        }
+        jQuery('.activitySpinner', this.element).hide();
+        return jQuery('form', this.element).submit(function(event) {
+          var query;
+          event.preventDefault();
+          jQuery('.activitySpinner', _this.element).show();
+          query = jQuery('.searchInput', _this.element.element).val();
+          return _this.options.searchCallback(query, _this.options.limit, 0, function(results) {
+            return _this._showResults(results);
+          });
+        });
+      },
+      _showResult: function(image) {
+        var html,
+          _this = this;
+        if (!image.label) {
+          image.label = image.alt;
+        }
+        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\"></li>");
+        html.on('click', function() {
+          return _this.options.imageWidget.setCurrent(image);
+        });
+        jQuery('img', html).on('mousedown', function(event) {
+          event.preventDefault();
+          return _this.options.imageWidget.setCurrent(image);
+        });
+        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
+      },
+      _showNextPrev: function(results) {
+        var container,
+          _this = this;
+        container = jQuery('imageThumbnailContainer ul', this.element);
+        container.prepend(jQuery('<div class="pager-prev" style="display:none" />'));
+        container.append(jQuery('<div class="pager-next" style="display:none" />'));
+        if (results.offset > 0) {
+          jQuery('.pager-prev', container).show();
+        }
+        if (results.offset < results.total) {
+          jQuery('.pager-next', container).show();
+        }
+        jQuery('.pager-prev', container).click(function(event) {
+          var offset;
+          offset = results.offset - _this.options.limit;
+          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
+            return _this._showResults(results);
+          });
+        });
+        return jQuery('.pager-next', container).click(function(event) {
+          var offset;
+          offset = results.offset + _this.options.limit;
+          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
+            return _this._showResults(results);
+          });
+        });
+      },
+      _showResults: function(results) {
+        var image, _i, _len, _ref;
+        jQuery('.activitySpinner', this.element).hide();
+        jQuery('.imageThumbnailContainer ul', this.element).empty();
+        jQuery('.imageThumbnailContainer ul', this.element).show();
+        _ref = results.assets;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          image = _ref[_i];
+          this._showResult(image);
+        }
+        this.options.imageWidget.setCurrent(results.assets.shift());
+        return this._showNextPrev(results);
+      },
+      _ajaxSearch: function(query, limit, offset, success) {
+        var searchUrl;
+        searchUrl = this.searchUrl + '?' + jQuery.param({
+          q: query,
+          limit: limit,
+          offset: offset
+        });
+        return jQuery.getJSON(searchUrl, success);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloimagesuggestions', {
+      loaded: false,
+      options: {
+        entity: null,
+        vie: null,
+        dbPediaUrl: null,
+        getSuggestions: null,
+        thumbnailUri: '<http://dbpedia.org/ontology/thumbnail>'
+      },
+      _create: function() {
+        return this.element.html('\
+      <div id="' + this.options.uuid + '-tab-suggestions">\
+        <div class="imageThumbnailContainer">\
+          <div class="activitySpinner">Loading images...</div>\
+          <ul></ul>\
+        </div>\
+      </div>');
+      },
+      _init: function() {
+        return jQuery('.activitySpinner', this.element).hide();
+      },
+      _normalizeRelated: function(related) {
+        if (_.isString(related)) {
+          return related;
+        }
+        if (_.isArray(related)) {
+          return related.join(',');
+        }
+        return related.pluck('@subject').join(',');
+      },
+      _prepareVIE: function() {
+        if (!this.options.vie) {
+          this.options.vie = new VIE;
+        }
+        if (this.options.vie.services.dbpedia) {
+          return;
+        }
+        if (!this.options.dbPediaUrl) {
+          return;
+        }
+        return this.options.vie.use(new vie.DBPediaService({
+          url: this.options.dbPediaUrl,
+          proxyDisabled: true
+        }));
+      },
+      _getSuggestions: function() {
+        var limit, normalizedTags, tags;
+        if (this.loaded) {
+          return;
+        }
+        if (!this.options.entity) {
+          return;
+        }
+        jQuery('.activitySpinner', this.element).show();
+        tags = this.options.entity.get('skos:related');
+        if (tags.length === 0) {
+          jQuery("#activitySpinner").html('No images found.');
+          return;
+        }
+        jQuery('.imageThumbnailContainer ul', this.element).empty();
+        normalizedTags = this._normalizeRelated(tags);
+        limit = this.options.limit;
+        if (this.options.getSuggestions) {
+          this.options.getSuggestions(normalizedTags, limit, 0, this._showSuggestions);
+        }
+        this._prepareVIE();
+        if (this.options.vie.services.dbpedia) {
+          this._getSuggestionsDbPedia(tags);
+        }
+        return this.loaded = true;
+      },
+      _getSuggestionsDbPedia: function(tags) {
+        var thumbId, widget;
+        widget = this;
+        thumbId = 1;
+        return _.each(tags, function(tag) {
+          return vie.load({
+            entity: tag
+          }).using('dbpedia').execute().done(function(entities) {
+            jQuery('.activitySpinner', this.element).hide();
+            return _.each(entities, function(entity) {
+              var img, thumbnail;
+              thumbnail = entity.attributes[widget.options.thumbnailUri];
+              if (!thumbnail) {
+                return;
+              }
+              if (_.isObject(thumbnail)) {
+                img = thumbnail[0].value;
+              }
+              if (_.isString(thumbnail)) {
+                img = widget.options.entity.fromReference(thumbnail);
+              }
+              return widget._showSuggestion({
+                url: img,
+                label: tag
+              });
+            });
+          });
+        });
+      },
+      _showSuggestion: function(image) {
+        var html,
+          _this = this;
+        html = jQuery("<li>        <img src=\"" + image.url + "\" class=\"imageThumbnail\"          title=\"" + image.label + "\">        </li>");
+        html.on('click', function() {
+          return _this.options.imageWidget.setCurrent(image);
+        });
+        return jQuery('.imageThumbnailContainer ul', this.element).append(html);
+      },
+      _showSuggestions: function(suggestions) {
+        var _this = this;
+        jQuery('.activitySpinner', this.element).hide();
+        return _.each(suggestions, function(image) {
+          return _this._showSuggestion(image);
+        });
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloimageupload', {
+      options: {
+        uploadCallback: null,
+        uploadUrl: null,
+        imageWidget: null,
+        entity: null
+      },
+      _create: function() {
+        return this.element.html('\
+        <form class="upload">\
+        <input type="file" class="file" name="userfile" accept="image/*" />\
+        <input type="hidden" name="tags" value="" />\
+        <input type="text" class="caption" name="caption" placeholder="Title" />\
+        <button class="uploadSubmit">Upload</button>\
+        </form>\
+      ');
+      },
+      _init: function() {
+        var widget;
+        widget = this;
+        if (widget.options.uploadUrl && !widget.options.uploadCallback) {
+          widget.options.uploadCallback = widget._iframeUpload;
+        }
+        return jQuery('.uploadSubmit', this.element).on('click', function(event) {
+          event.preventDefault();
+          event.stopPropagation();
+          return widget.options.uploadCallback({
+            widget: widget,
+            success: function(url) {
+              return widget.options.imageWidget.setCurrent({
+                url: url,
+                label: ''
+              });
+            }
+          });
+        });
+      },
+      _prepareIframe: function(widget) {
+        var iframe, iframeName;
+        iframeName = "" + widget.widgetName + "_postframe_" + widget.options.uuid;
+        iframeName = iframeName.replace(/-/g, '_');
+        iframe = jQuery("#" + iframeName);
+        if (iframe.length) {
+          return iframe;
+        }
+        iframe = jQuery("<iframe name=\"" + iframeName + "\" id=\"" + iframeName + "\"        class=\"hidden\" style=\"display:none\" />");
+        this.element.append(iframe);
+        iframe.get(0).name = iframeName;
+        return iframe;
+      },
+      _iframeUpload: function(data) {
+        var iframe, uploadForm, uploadUrl, widget;
+        widget = data.widget;
+        iframe = widget._prepareIframe(widget);
+        uploadForm = jQuery('form.upload', widget.element);
+        if (typeof widget.options.uploadUrl === 'function') {
+          uploadUrl = widget.options.uploadUrl(widget.options.entity);
+        } else {
+          uploadUrl = widget.options.uploadUrl;
+        }
+        iframe.on('load', function() {
+          var imageUrl;
+          imageUrl = iframe.get(0).contentWindow.location.href;
+          widget.element.hide();
+          return data.success(imageUrl);
+        });
+        uploadForm.attr('action', uploadUrl);
+        uploadForm.attr('method', 'post');
+        uploadForm.attr('target', iframe.get(0).name);
+        uploadForm.attr('enctype', 'multipart/form-data');
+        uploadForm.attr('encoding', 'multipart/form-data');
+        return uploadForm.submit();
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.hallo-image-insert-edit", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: "",
+        insert_file_dialog_ui_url: null,
+        lang: 'en',
+        dialogOpts: {
+          autoOpen: false,
+          width: 560,
+          height: 'auto',
+          modal: false,
+          resizable: true,
+          draggable: true,
+          dialogClass: 'insert-image-dialog'
+        },
+        dialog: null,
+        buttonCssClass: null
+      },
+      translations: {
+        en: {
+          title_insert: 'Insert Image',
+          title_properties: 'Image Properties',
+          insert: 'Insert',
+          chage_image: 'Change Image:',
+          source: 'URL',
+          width: 'Width',
+          height: 'Height',
+          alt: 'Alt Text',
+          padding: 'Padding',
+          'float': 'Float',
+          float_left: 'left',
+          float_right: 'right',
+          float_none: 'No'
+        },
+        de: {
+          title_insert: 'Bild einfügen',
+          title_properties: 'Bildeigenschaften',
+          insert: 'Einfügen',
+          chage_image: 'Bild ändern:',
+          source: 'URL',
+          width: 'Breite',
+          height: 'Höhe',
+          alt: 'Alt Text',
+          padding: 'Padding',
+          'float': 'Float',
+          float_left: 'Links',
+          float_right: 'Rechts',
+          float_none: 'Nein'
+        }
+      },
+      texts: null,
+      dialog_image_selection_ui_loaded: false,
+      $image: null,
+      populateToolbar: function($toolbar) {
+        var $buttonHolder, $buttonset, dialog_html, widget;
+        widget = this;
+        this.texts = this.translations[this.options.lang];
+        this.options.toolbar = $toolbar;
+        dialog_html = "<div id='hallo_img_properties'></div>";
+        if (this.options.insert_file_dialog_ui_url) {
+          dialog_html += "<div id='hallo_img_file_select_ui'></div>";
+        }
+        this.options.dialog = jQuery("<div>").attr('id', "" + this.options.uuid + "-insert-image-dialog").html(dialog_html);
+        $buttonset = jQuery("<span>").addClass(this.widgetName);
+        $buttonHolder = jQuery('<span>');
+        $buttonHolder.hallobutton({
+          label: this.texts.title_insert,
+          icon: 'icon-picture',
+          editable: this.options.editable,
+          command: null,
+          queryState: false,
+          uuid: this.options.uuid,
+          cssClass: this.options.buttonCssClass
+        });
+        $buttonset.append($buttonHolder);
+        this.button = $buttonHolder;
+        this.button.click(function() {
+          if (widget.options.dialog.dialog("isOpen")) {
+            widget._closeDialog();
+          } else {
+            widget.lastSelection = widget.options.editable.getSelection();
+            widget._openDialog();
+          }
+          return false;
+        });
+        this.options.editable.element.on("halloselected, hallounselected", function() {
+          if (widget.options.dialog.dialog("isOpen")) {
+            return widget.lastSelection = widget.options.editable.getSelection();
+          }
+        });
+        this.options.editable.element.on("hallodeactivated", function() {
+          return widget._closeDialog();
+        });
+        jQuery(this.options.editable.element).on("click", "img", function(e) {
+          widget._openDialog(jQuery(this));
+          return false;
+        });
+        this.options.editable.element.on('halloselected', function(event, data) {
+          var toolbar_option;
+          toolbar_option = widget.options.editable.options.toolbar;
+          if (toolbar_option === "halloToolbarContextual" && jQuery(data.originalEvent.target).is('img')) {
+            $toolbar.hide();
+            return false;
+          }
+        });
+        $toolbar.append($buttonset);
+        return this.options.dialog.dialog(this.options.dialogOpts);
+      },
+      _openDialog: function($image) {
+        var $editableEl, widget, xposition, yposition,
+          _this = this;
+        this.$image = $image;
+        widget = this;
+        $editableEl = jQuery(this.options.editable.element);
+        xposition = $editableEl.offset().left + $editableEl.outerWidth() + 10;
+        if (this.$image) {
+          yposition = this.$image.offset().top - jQuery(document).scrollTop();
+        } else {
+          yposition = this.options.toolbar.offset().top - jQuery(document).scrollTop();
+        }
+        this.options.dialog.dialog("option", "position", [xposition, yposition]);
+        this.options.editable.keepActivated(true);
+        this.options.dialog.dialog("open");
+        if (this.$image) {
+          this.options.dialog.dialog("option", "title", this.texts.title_properties);
+          jQuery(document).keyup(function(e) {
+            if (e.keyCode === 46 || e.keyCode === 8) {
+              jQuery(document).off();
+              widget._closeDialog();
+              widget.$image.remove();
+              widget.$image = null;
+            }
+            return e.preventDefault();
+          });
+          this.options.editable.element.on("click", function() {
+            widget.$image = null;
+            return widget._closeDialog();
+          });
+        } else {
+          this.options.dialog.children('#hallo_img_properties').hide();
+          this.options.dialog.dialog("option", "title", this.texts.title_insert);
+          if (jQuery('#hallo_img_file_select_title').length > 0) {
+            jQuery('#hallo_img_file_select_title').text('');
+          }
+        }
+        this._load_dialog_image_properties_ui();
+        this.options.dialog.on('dialogclose', function() {
+          var scrollbar_pos;
+          jQuery('label', _this.button).removeClass('ui-state-active');
+          scrollbar_pos = jQuery(document).scrollTop();
+          _this.options.editable.element.focus();
+          jQuery(document).scrollTop(scrollbar_pos);
+          return _this.options.editable.keepActivated(false);
+        });
+        if (this.options.insert_file_dialog_ui_url && !this.dialog_image_selection_ui_loaded) {
+          this.options.dialog.on('click', ".reload_link", function() {
+            widget._load_dialog_image_selection_ui();
+            return false;
+          });
+          this.options.dialog.on('click', '.file_preview img', function() {
+            var new_source;
+            if (widget.$image) {
+              new_source = jQuery(this).attr('src').replace(/-thumb/, '');
+              widget.$image.attr('src', new_source);
+              jQuery('#hallo_img_source').val(new_source);
+            } else {
+              widget._insert_image(jQuery(this).attr('src').replace(/-thumb/, ''));
+            }
+            return false;
+          });
+          return this._load_dialog_image_selection_ui();
+        }
+      },
+      _insert_image: function(source) {
+        this.options.editable.restoreSelection(this.lastSelection);
+        document.execCommand("insertImage", null, source);
+        this.options.editable.element.trigger('change');
+        this.options.editable.removeAllSelections();
+        return this._closeDialog();
+      },
+      _closeDialog: function() {
+        return this.options.dialog.dialog("close");
+      },
+      _load_dialog_image_selection_ui: function() {
+        var widget;
+        widget = this;
+        return jQuery.ajax({
+          url: this.options.insert_file_dialog_ui_url,
+          success: function(data, textStatus, jqXHR) {
+            var $properties, file_select_title, t;
+            file_select_title = '';
+            $properties = widget.options.dialog.children('#hallo_img_properties');
+            if ($properties.is(':visible')) {
+              file_select_title = widget.texts.change_image;
+            }
+            t = "<div id='hallo_img_file_select_title'>" + file_select_title + "</div>";
+            widget.options.dialog.children('#hallo_img_file_select_ui').html(t + data);
+            return widget.dialog_image_selection_ui_loaded = true;
+          },
+          beforeSend: function() {
+            return widget.options.dialog.children('#hallo_img_file_select_ui').html('<div class="hallo_insert_file_loader"></div>');
+          }
+        });
+      },
+      _load_dialog_image_properties_ui: function() {
+        var $img_properties, button, height, html, widget, width;
+        widget = this;
+        $img_properties = this.options.dialog.children('#hallo_img_properties');
+        if (this.$image) {
+          width = this.$image.is('[width]') ? this.$image.attr('width') : '';
+          height = this.$image.is('[height]') ? this.$image.attr('height') : '';
+          html = this._property_input_html('source', this.$image.attr('src'), {
+            label: this.texts.source
+          }) + this._property_input_html('alt', this.$image.attr('alt') || '', {
+            label: this.texts.alt
+          }) + this._property_row_html(this._property_input_html('width', width, {
+            label: this.texts.width,
+            row: false
+          }) + this._property_input_html('height', height, {
+            label: this.texts.height,
+            row: false
+          })) + this._property_input_html('padding', this.$image.css('padding'), {
+            label: this.texts.padding
+          }) + this._property_row_html(this._property_cb_html('float_left', this.$image.css('float') === 'left', {
+            label: this.texts.float_left,
+            row: false
+          }) + this._property_cb_html('float_right', this.$image.css('float') === 'right', {
+            label: this.texts.float_right,
+            row: false
+          }) + this._property_cb_html('unfloat', this.$image.css('float') === 'none', {
+            label: this.texts.float_none,
+            row: false
+          }), this.texts[float]);
+          $img_properties.html(html);
+          $img_properties.show();
+        } else {
+          if (!this.options.insert_file_dialog_ui_url) {
+            $img_properties.html(this._property_input_html('source', '', {
+              label: this.texts.source
+            }));
+            $img_properties.show();
+          }
+        }
+        if (this.$image) {
+          if (!this.options.insert_file_dialog_ui_url) {
+            jQuery('#insert_image_btn').remove();
+          }
+          if (jQuery('#hallo_img_file_select_title').length > 0) {
+            jQuery('#hallo_img_file_select_title').text(this.texts.chage_image);
+          }
+          jQuery('#hallo_img_properties #hallo_img_source').keyup(function() {
+            return widget.$image.attr('src', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_alt').keyup(function() {
+            return widget.$image.attr('alt', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_padding').keyup(function() {
+            return widget.$image.css('padding', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_height').keyup(function() {
+            widget.$image.css('height', this.value);
+            return widget.$image.attr('height', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_width').keyup(function() {
+            widget.$image.css('width', this.value);
+            return widget.$image.attr('width', this.value);
+          });
+          jQuery('#hallo_img_properties #hallo_img_float_left').click(function() {
+            if (!this.checked) {
+              return false;
+            }
+            widget.$image.css('float', 'left');
+            jQuery('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
+            return jQuery('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
+          });
+          jQuery('#hallo_img_properties #hallo_img_float_right').click(function() {
+            if (!this.checked) {
+              return false;
+            }
+            widget.$image.css('float', 'right');
+            jQuery('#hallo_img_properties #hallo_img_unfloat').removeAttr('checked');
+            return jQuery('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
+          });
+          return jQuery('#hallo_img_properties #hallo_img_unfloat').click(function() {
+            if (!this.checked) {
+              return false;
+            }
+            widget.$image.css('float', 'none');
+            jQuery('#hallo_img_properties #hallo_img_float_right').removeAttr('checked');
+            return jQuery('#hallo_img_properties #hallo_img_float_left').removeAttr('checked');
+          });
+        } else {
+          if (!this.options.insert_file_dialog_ui_url) {
+            button = "<button id=\"insert_image_btn\">" + this.texts.insert + "</button>";
+            $img_properties.after(button);
+            return jQuery('#insert_image_btn').click(function() {
+              var $img_source;
+              $img_source = jQuery('#hallo_img_properties #hallo_img_source');
+              return widget._insert_image($img_source.val());
+            });
+          }
+        }
+      },
+      _property_col_html: function(col_html) {
+        return "<div class='hallo_img_property_col'>" + col_html + "</div>";
+      },
+      _property_row_html: function(row_html, label) {
+        if (label == null) {
+          label = '';
+        }
+        row_html = this._property_col_html(label) + this._property_col_html(row_html);
+        return "<div class='hallo_img_property_row'>" + row_html + "</div>";
+      },
+      _property_html: function(property_html, options) {
+        var entry;
+        if (options == null) {
+          options = {};
+        }
+        if (options.row === false) {
+          if (options.label) {
+            entry = "" + options.label + " " + property_html;
+            property_html = "<span class='img_property_entry'>" + entry + "</span>";
+          }
+          return property_html;
+        } else {
+          entry = "<span class='img_property_entry'>" + property_html + "</span>";
+          return this._property_row_html(entry, options.label);
+        }
+      },
+      _property_input_html: function(id, value, options) {
+        var text_field;
+        if (options == null) {
+          options = {};
+        }
+        text_field = "<input type='text' id='hallo_img_" + id + "' value='" + value + "'>";
+        return this._property_html(text_field, options);
+      },
+      _property_cb_html: function(id, checked, options) {
+        var cb, checked_attr;
+        if (options == null) {
+          options = {};
+        }
+        checked_attr = checked ? 'checked=checked' : '';
+        cb = "<input type='checkbox' id='hallo_img_" + id + "' " + checked_attr + "'>";
+        return this._property_html(cb, options);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloindicator', {
+      options: {
+        editable: null,
+        className: 'halloEditIndicator'
+      },
+      _create: function() {
+        var _this = this;
+        return this.element.on('halloenabled', function() {
+          return _this.buildIndicator();
+        });
+      },
+      populateToolbar: function() {},
+      buildIndicator: function() {
+        var editButton;
+        editButton = jQuery('<div><i class="icon-edit"></i> Edit</div>');
+        editButton.addClass(this.options.className);
+        editButton.hide();
+        this.element.before(editButton);
+        this.bindIndicator(editButton);
+        return this.setIndicatorPosition(editButton);
+      },
+      bindIndicator: function(indicator) {
+        var _this = this;
+        indicator.on('click', function() {
+          return _this.options.editable.element.focus();
+        });
+        this.element.on('halloactivated', function() {
+          return indicator.hide();
+        });
+        this.element.on('hallodisabled', function() {
+          return indicator.remove();
+        });
+        return this.options.editable.element.hover(function() {
+          if (jQuery(this).hasClass('inEditMode')) {
+            return;
+          }
+          return indicator.show();
+        }, function(data) {
+          if (jQuery(this).hasClass('inEditMode')) {
+            return;
+          }
+          if (data.relatedTarget === indicator.get(0)) {
+            return;
+          }
+          return indicator.hide();
+        });
+      },
+      setIndicatorPosition: function(indicator) {
+        var offset;
+        indicator.css('position', 'absolute');
+        offset = this.element.position();
+        indicator.css('top', offset.top + 2);
+        return indicator.css('left', offset.left + 2);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget("IKS.hallojustify", {
       options: {
@@ -2031,35 +2263,324 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget('IKS.halloblacklist', {
+    return jQuery.widget("IKS.hallolink", {
       options: {
-        tags: []
+        editable: null,
+        uuid: "",
+        link: true,
+        image: true,
+        defaultUrl: 'http://',
+        dialogOpts: {
+          autoOpen: false,
+          width: 540,
+          height: 200,
+          title: "Enter Link",
+          buttonTitle: "Insert",
+          buttonUpdateTitle: "Update",
+          modal: true,
+          resizable: false,
+          draggable: false,
+          dialogClass: 'hallolink-dialog'
+        },
+        buttonCssClass: null
       },
-      _init: function() {
-        if (this.options.tags.indexOf('br') !== -1) {
-          return this.element.on('keydown', function(event) {
-            if (event.originalEvent.keyCode === 13) {
-              return event.preventDefault();
+      populateToolbar: function(toolbar) {
+        var butTitle, butUpdateTitle, buttonize, buttonset, dialog, dialogId, dialogSubmitCb, isEmptyLink, urlInput, widget,
+          _this = this;
+        widget = this;
+        dialogId = "" + this.options.uuid + "-dialog";
+        butTitle = this.options.dialogOpts.buttonTitle;
+        butUpdateTitle = this.options.dialogOpts.buttonUpdateTitle;
+        dialog = jQuery("<div id=\"" + dialogId + "\">        <form action=\"#\" method=\"post\" class=\"linkForm\">          <input class=\"url\" type=\"text\" name=\"url\"            value=\"" + this.options.defaultUrl + "\" />          <input type=\"submit\" id=\"addlinkButton\" value=\"" + butTitle + "\"/>        </form></div>");
+        urlInput = jQuery('input[name=url]', dialog);
+        isEmptyLink = function(link) {
+          if ((new RegExp(/^\s*$/)).test(link)) {
+            return true;
+          }
+          if (link === widget.options.defaultUrl) {
+            return true;
+          }
+          return false;
+        };
+        dialogSubmitCb = function(event) {
+          var link, linkNode;
+          event.preventDefault();
+          link = urlInput.val();
+          dialog.dialog('close');
+          widget.options.editable.restoreSelection(widget.lastSelection);
+          if (isEmptyLink(link)) {
+            document.execCommand("unlink", null, "");
+          } else {
+            if (!(/:\/\//.test(link)) && !(/^mailto:/.test(link))) {
+              link = 'http://' + link;
             }
+            if (widget.lastSelection.startContainer.parentNode.href === void 0) {
+              if (widget.lastSelection.collapsed) {
+                linkNode = jQuery("<a href='" + link + "'>" + link + "</a>")[0];
+                widget.lastSelection.insertNode(linkNode);
+              } else {
+                document.execCommand("createLink", null, link);
+              }
+            } else {
+              widget.lastSelection.startContainer.parentNode.href = link;
+            }
+          }
+          widget.options.editable.element.trigger('change');
+          return false;
+        };
+        dialog.find("input[type=submit]").click(dialogSubmitCb);
+        buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
+        buttonize = function(type) {
+          var button, buttonHolder, id;
+          id = "" + _this.options.uuid + "-" + type;
+          buttonHolder = jQuery('<span></span>');
+          buttonHolder.hallobutton({
+            label: 'Link',
+            icon: 'icon-link',
+            editable: _this.options.editable,
+            command: null,
+            queryState: false,
+            uuid: _this.options.uuid,
+            cssClass: _this.options.buttonCssClass
           });
+          buttonset.append(buttonHolder);
+          button = buttonHolder;
+          button.on("click", function(event) {
+            var button_selector, selectionParent;
+            widget.lastSelection = widget.options.editable.getSelection();
+            urlInput = jQuery('input[name=url]', dialog);
+            selectionParent = widget.lastSelection.startContainer.parentNode;
+            if (!selectionParent.href) {
+              urlInput.val(widget.options.defaultUrl);
+              jQuery(urlInput[0].form).find('input[type=submit]').val(butTitle);
+            } else {
+              urlInput.val(jQuery(selectionParent).attr('href'));
+              button_selector = 'input[type=submit]';
+              jQuery(urlInput[0].form).find(button_selector).val(butUpdateTitle);
+            }
+            widget.options.editable.keepActivated(true);
+            dialog.dialog('open');
+            dialog.on('dialogclose', function() {
+              widget.options.editable.restoreSelection(widget.lastSelection);
+              jQuery('label', buttonHolder).removeClass('ui-state-active');
+              widget.options.editable.element.focus();
+              return widget.options.editable.keepActivated(false);
+            });
+            return false;
+          });
+          return _this.element.on("keyup paste change mouseup", function(event) {
+            var nodeName, start;
+            start = jQuery(widget.options.editable.getSelection().startContainer);
+            if (start.prop('nodeName')) {
+              nodeName = start.prop('nodeName');
+            } else {
+              nodeName = start.parent().prop('nodeName');
+            }
+            if (nodeName && nodeName.toUpperCase() === "A") {
+              jQuery('label', button).addClass('ui-state-active');
+              return;
+            }
+            return jQuery('label', button).removeClass('ui-state-active');
+          });
+        };
+        if (this.options.link) {
+          buttonize("A");
         }
-      },
-      cleanupContentClone: function(el) {
-        var tag, _i, _len, _ref, _results;
-        _ref = this.options.tags;
-        _results = [];
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          tag = _ref[_i];
-          _results.push(jQuery(tag, el).remove());
+        if (this.options.link) {
+          toolbar.append(buttonset);
+          buttonset.hallobuttonset();
+          return dialog.dialog(this.options.dialogOpts);
         }
-        return _results;
       }
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget("Liip.hallotoolbarlinebreak", {
+    return jQuery.widget("IKS.hallolists", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: '',
+        lists: {
+          ordered: true,
+          unordered: true
+        },
+        buttonCssClass: null
+      },
+      populateToolbar: function(toolbar) {
+        var buttonize, buttonset,
+          _this = this;
+        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
+        buttonize = function(type, label) {
+          var buttonElement;
+          buttonElement = jQuery('<span></span>');
+          buttonElement.hallobutton({
+            uuid: _this.options.uuid,
+            editable: _this.options.editable,
+            label: label,
+            command: "insert" + type + "List",
+            icon: "icon-list-" + (label.toLowerCase()),
+            cssClass: _this.options.buttonCssClass
+          });
+          return buttonset.append(buttonElement);
+        };
+        if (this.options.lists.ordered) {
+          buttonize("Ordered", "OL");
+        }
+        if (this.options.lists.unordered) {
+          buttonize("Unordered", "UL");
+        }
+        buttonset.hallobuttonset();
+        return toolbar.append(buttonset);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.hallooverlay", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: "",
+        overlay: null,
+        padding: 10,
+        background: null
+      },
+      _create: function() {
+        var widget;
+        widget = this;
+        if (!this.options.bound) {
+          this.options.bound = true;
+          this.options.editable.element.on("halloactivated", function(event, data) {
+            widget.options.currentEditable = jQuery(event.target);
+            if (!widget.options.visible) {
+              return widget.showOverlay();
+            }
+          });
+          this.options.editable.element.on("hallomodified", function(event, data) {
+            widget.options.currentEditable = jQuery(event.target);
+            if (widget.options.visible) {
+              return widget.resizeOverlay();
+            }
+          });
+          return this.options.editable.element.on("hallodeactivated", function(event, data) {
+            widget.options.currentEditable = jQuery(event.target);
+            if (widget.options.visible) {
+              return widget.hideOverlay();
+            }
+          });
+        }
+      },
+      showOverlay: function() {
+        this.options.visible = true;
+        if (this.options.overlay === null) {
+          if (jQuery("#halloOverlay").length > 0) {
+            this.options.overlay = jQuery("#halloOverlay");
+          } else {
+            this.options.overlay = jQuery("<div id=\"halloOverlay\"            class=\"halloOverlay\">");
+            jQuery(document.body).append(this.options.overlay);
+          }
+          this.options.overlay.on('click', jQuery.proxy(this.options.editable.turnOff, this.options.editable));
+        }
+        this.options.overlay.show();
+        if (this.options.background === null) {
+          if (jQuery("#halloBackground").length > 0) {
+            this.options.background = jQuery("#halloBackground");
+          } else {
+            this.options.background = jQuery("<div id=\"halloBackground\"            class=\"halloBackground\">");
+            jQuery(document.body).append(this.options.background);
+          }
+        }
+        this.resizeOverlay();
+        this.options.background.show();
+        if (!this.options.originalZIndex) {
+          this.options.originalZIndex = this.options.currentEditable.css("z-index");
+        }
+        return this.options.currentEditable.css('z-index', '350');
+      },
+      resizeOverlay: function() {
+        var offset;
+        offset = this.options.currentEditable.offset();
+        return this.options.background.css({
+          top: offset.top - this.options.padding,
+          left: offset.left - this.options.padding,
+          width: this.options.currentEditable.width() + 2 * this.options.padding,
+          height: this.options.currentEditable.height() + 2 * this.options.padding
+        });
+      },
+      hideOverlay: function() {
+        this.options.visible = false;
+        this.options.overlay.hide();
+        this.options.background.hide();
+        return this.options.currentEditable.css('z-index', this.options.originalZIndex);
+      },
+      _findBackgroundColor: function(jQueryfield) {
+        var color;
+        color = jQueryfield.css("background-color");
+        if (color !== 'rgba(0, 0, 0, 0)' && color !== 'transparent') {
+          return color;
+        }
+        if (jQueryfield.is("body")) {
+          return "white";
+        } else {
+          return this._findBackgroundColor(jQueryfield.parent());
+        }
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.halloreundo", {
+      options: {
+        editable: null,
+        toolbar: null,
+        uuid: '',
+        buttonCssClass: null
+      },
+      populateToolbar: function(toolbar) {
+        var buttonize, buttonset,
+          _this = this;
+        buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
+        buttonize = function(cmd, label) {
+          var buttonElement;
+          buttonElement = jQuery('<span></span>');
+          buttonElement.hallobutton({
+            uuid: _this.options.uuid,
+            editable: _this.options.editable,
+            label: label,
+            icon: cmd === 'undo' ? 'icon-undo' : 'icon-repeat',
+            command: cmd,
+            queryState: false,
+            cssClass: _this.options.buttonCssClass
+          });
+          return buttonset.append(buttonElement);
+        };
+        buttonize("undo", "Undo");
+        buttonize("redo", "Redo");
+        buttonset.hallobuttonset();
+        return toolbar.append(buttonset);
+      }
+    });
+  })(jQuery);
+
+}).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget("IKS.hallotoolbarlinebreak", {
       options: {
         editable: null,
         uuid: "",
@@ -2095,226 +2616,139 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    jQuery.widget('IKS.hallobutton', {
-      button: null,
-      isChecked: false,
+    return jQuery.widget('IKS.halloToolbarContextual', {
+      toolbar: null,
       options: {
-        uuid: '',
-        label: null,
-        icon: null,
+        parentElement: 'body',
         editable: null,
-        command: null,
-        commandValue: null,
-        queryState: true,
-        cssClass: null
+        toolbar: null,
+        positionAbove: false
       },
       _create: function() {
-        var hoverclass, id, opts, _base, _ref,
-          _this = this;
-        if ((_ref = (_base = this.options).icon) == null) {
-          _base.icon = "icon-" + (this.options.label.toLowerCase());
-        }
-        id = "" + this.options.uuid + "-" + this.options.label;
-        opts = this.options;
-        this.button = this._createButton(id, opts.command, opts.label, opts.icon);
-        this.element.append(this.button);
-        if (this.options.cssClass) {
-          this.button.addClass(this.options.cssClass);
-        }
-        if (this.options.editable.options.touchScreen) {
-          this.button.addClass('btn-large');
-        }
-        this.button.data('hallo-command', this.options.command);
-        if (this.options.commandValue) {
-          this.button.data('hallo-command-value', this.options.commandValue);
-        }
-        hoverclass = 'ui-state-hover';
-        this.button.on('mouseenter', function(event) {
-          if (_this.isEnabled()) {
-            return _this.button.addClass(hoverclass);
-          }
-        });
-        return this.button.on('mouseleave', function(event) {
-          return _this.button.removeClass(hoverclass);
+        var _this = this;
+        this.toolbar = this.options.toolbar;
+        jQuery(this.options.parentElement).append(this.toolbar);
+        this._bindEvents();
+        return jQuery(window).resize(function(event) {
+          return _this._updatePosition(_this._getPosition(event));
         });
       },
-      _init: function() {
-        var editableElement, events, queryState,
-          _this = this;
-        if (!this.button) {
-          this.button = this._prepareButton();
-        }
-        this.element.append(this.button);
-        if (this.options.queryState === true) {
-          queryState = function(event) {
-            var compared, value;
-            if (!_this.options.command) {
-              return;
-            }
-            try {
-              if (_this.options.commandValue) {
-                value = document.queryCommandValue(_this.options.command);
-                compared = value.match(new RegExp(_this.options.commandValue, "i"));
-                return _this.checked(compared ? true : false);
-              } else {
-                return _this.checked(document.queryCommandState(_this.options.command));
-              }
-            } catch (e) {
-
-            }
-          };
-        } else {
-          queryState = this.options.queryState;
-        }
-        if (this.options.command) {
-          this.button.on('click', function(event) {
-            if (_this.options.commandValue) {
-              _this.options.editable.execute(_this.options.command, _this.options.commandValue);
-            } else {
-              _this.options.editable.execute(_this.options.command);
-            }
-            queryState();
-            return false;
-          });
-        }
-        if (!this.options.queryState) {
+      _getPosition: function(event, selection) {
+        var eventType, position;
+        if (!event) {
           return;
         }
-        editableElement = this.options.editable.element;
-        events = 'keyup paste change mouseup hallomodified';
-        editableElement.on(events, queryState);
-        editableElement.on('halloenabled', function() {
-          return editableElement.on(events, queryState);
-        });
-        return editableElement.on('hallodisabled', function() {
-          return editableElement.off(events, queryState);
-        });
+        eventType = event.type;
+        switch (eventType) {
+          case 'keydown':
+          case 'keyup':
+          case 'keypress':
+            return this._getCaretPosition(selection);
+          case 'click':
+          case 'mousedown':
+          case 'mouseup':
+            return position = {
+              top: event.pageY,
+              left: event.pageX
+            };
+        }
       },
-      enable: function() {
-        return this.button.removeAttr('disabled');
+      _getCaretPosition: function(range) {
+        var newRange, position, tmpSpan;
+        tmpSpan = jQuery("<span/>");
+        newRange = rangy.createRange();
+        newRange.setStart(range.endContainer, range.endOffset);
+        newRange.insertNode(tmpSpan.get(0));
+        position = {
+          top: tmpSpan.offset().top,
+          left: tmpSpan.offset().left
+        };
+        tmpSpan.remove();
+        return position;
       },
-      disable: function() {
-        return this.button.attr('disabled', 'true');
+      setPosition: function() {
+        if (this.options.parentElement !== 'body') {
+          this.options.parentElement = 'body';
+          jQuery(this.options.parentElement).append(this.toolbar);
+        }
+        this.toolbar.css('position', 'absolute');
+        this.toolbar.css('top', this.element.offset().top - 20);
+        return this.toolbar.css('left', this.element.offset().left);
       },
-      isEnabled: function() {
-        return this.button.attr('disabled') !== 'true';
-      },
-      refresh: function() {
-        if (this.isChecked) {
-          return this.button.addClass('ui-state-active');
+      _updatePosition: function(position, selection) {
+        var left, selectionRect, toolbar_height_offset, top, top_offset;
+        if (selection == null) {
+          selection = null;
+        }
+        if (!position) {
+          return;
+        }
+        if (!(position.top && position.left)) {
+          return;
+        }
+        toolbar_height_offset = this.toolbar.outerHeight() + 10;
+        if (selection && !selection.collapsed && selection.nativeRange) {
+          selectionRect = selection.nativeRange.getBoundingClientRect();
+          if (this.options.positionAbove) {
+            top_offset = selectionRect.top - toolbar_height_offset;
+          } else {
+            top_offset = selectionRect.bottom + 10;
+          }
+          top = jQuery(window).scrollTop() + top_offset;
+          left = jQuery(window).scrollLeft() + selectionRect.left;
         } else {
-          return this.button.removeClass('ui-state-active');
+          if (this.options.positionAbove) {
+            top_offset = -10 - toolbar_height_offset;
+          } else {
+            top_offset = 20;
+          }
+          top = position.top + top_offset;
+          left = position.left - this.toolbar.outerWidth() / 2 + 30;
         }
+        this.toolbar.css('top', top);
+        return this.toolbar.css('left', left);
       },
-      checked: function(checked) {
-        this.isChecked = checked;
-        return this.refresh();
-      },
-      _createButton: function(id, command, label, icon) {
-        var classes;
-        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only', "" + command + "_button"];
-        return jQuery("<button id=\"" + id + "\"        class=\"" + (classes.join(' ')) + "\" title=\"" + label + "\">          <span class=\"ui-button-text\">            <i class=\"" + icon + "\"></i>          </span>        </button>");
-      }
-    });
-    return jQuery.widget('IKS.hallobuttonset', {
-      buttons: null,
-      _create: function() {
-        return this.element.addClass('ui-buttonset');
-      },
-      _init: function() {
-        return this.refresh();
-      },
-      refresh: function() {
-        var rtl;
-        rtl = this.element.css('direction') === 'rtl';
-        this.buttons = this.element.find('.ui-button');
-        this.buttons.removeClass('ui-corner-all ui-corner-left ui-corner-right');
-        if (rtl) {
-          this.buttons.filter(':first').addClass('ui-corner-right');
-          return this.buttons.filter(':last').addClass('ui-corner-left');
-        } else {
-          this.buttons.filter(':first').addClass('ui-corner-left');
-          return this.buttons.filter(':last').addClass('ui-corner-right');
-        }
-      }
-    });
-  })(jQuery);
-
-  (function(jQuery) {
-    return jQuery.widget('IKS.hallodropdownbutton', {
-      button: null,
-      options: {
-        uuid: '',
-        label: null,
-        icon: null,
-        editable: null,
-        target: '',
-        cssClass: null
-      },
-      _create: function() {
-        var _base, _ref;
-        return (_ref = (_base = this.options).icon) != null ? _ref : _base.icon = "icon-" + (this.options.label.toLowerCase());
-      },
-      _init: function() {
-        var target,
-          _this = this;
-        target = jQuery(this.options.target);
-        target.css('position', 'absolute');
-        target.addClass('dropdown-menu');
-        target.hide();
-        if (!this.button) {
-          this.button = this._prepareButton();
-        }
-        this.button.on('click', function() {
-          if (target.hasClass('open')) {
-            _this._hideTarget();
+      _bindEvents: function() {
+        var _this = this;
+        this.element.on('click', function(event, data) {
+          var position, scrollTop;
+          position = {};
+          scrollTop = $('window').scrollTop();
+          position.top = event.clientY + scrollTop;
+          position.left = event.clientX;
+          _this._updatePosition(position, null);
+          if (_this.toolbar.html() !== '') {
+            return _this.toolbar.show();
+          }
+        });
+        this.element.on('halloselected', function(event, data) {
+          var position;
+          position = _this._getPosition(data.originalEvent, data.selection);
+          if (!position) {
             return;
           }
-          return _this._showTarget();
+          _this._updatePosition(position, data.selection);
+          if (_this.toolbar.html() !== '') {
+            return _this.toolbar.show();
+          }
         });
-        target.on('click', function() {
-          return _this._hideTarget();
+        this.element.on('hallounselected', function(event, data) {
+          return _this.toolbar.hide();
         });
-        this.options.editable.element.on('hallodeactivated', function() {
-          return _this._hideTarget();
+        return this.element.on('hallodeactivated', function(event, data) {
+          return _this.toolbar.hide();
         });
-        return this.element.append(this.button);
-      },
-      _showTarget: function() {
-        var target;
-        target = jQuery(this.options.target);
-        this._updateTargetPosition();
-        target.addClass('open');
-        return target.show();
-      },
-      _hideTarget: function() {
-        var target;
-        target = jQuery(this.options.target);
-        target.removeClass('open');
-        return target.hide();
-      },
-      _updateTargetPosition: function() {
-        var left, target, top, _ref;
-        target = jQuery(this.options.target);
-        _ref = this.button.position(), top = _ref.top, left = _ref.left;
-        top += this.button.outerHeight();
-        target.css('top', top);
-        return target.css('left', left - 20);
-      },
-      _prepareButton: function() {
-        var buttonEl, classes, id;
-        id = "" + this.options.uuid + "-" + this.options.label;
-        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only'];
-        buttonEl = jQuery("<button id=\"" + id + "\"       class=\"" + (classes.join(' ')) + "\" title=\"" + this.options.label + "\">       <span class=\"ui-button-text\"><i class=\"" + this.options.icon + "\"></i></span>       </button>");
-        if (this.options.cssClass) {
-          buttonEl.addClass(this.options.cssClass);
-        }
-        return buttonEl;
       }
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
     return jQuery.widget('IKS.halloToolbarFixed', {
       toolbar: null,
@@ -2411,8 +2845,11 @@
     });
   })(jQuery);
 
+}).call(this);
+
+(function() {
   (function(jQuery) {
-    return jQuery.widget('IKS.halloToolbarContextual', {
+    return jQuery.widget('IKS.halloToolbarInstant', {
       toolbar: null,
       options: {
         parentElement: 'body',
@@ -2506,6 +2943,17 @@
       },
       _bindEvents: function() {
         var _this = this;
+        this.element.on('click', function(event, data) {
+          var position, scrollTop;
+          position = {};
+          scrollTop = $('window').scrollTop();
+          position.top = event.clientY + scrollTop;
+          position.left = event.clientX;
+          _this._updatePosition(position, null);
+          if (_this.toolbar.html() !== '') {
+            return _this.toolbar.show();
+          }
+        });
         this.element.on('halloselected', function(event, data) {
           var position;
           position = _this._getPosition(data.originalEvent, data.selection);
@@ -2527,423 +2975,232 @@
     });
   })(jQuery);
 
-  /*
-  Hallo 1.0.2 - a rich text editing jQuery UI widget
-  (c) 2011 Henri Bergius, IKS Consortium
-  Hallo may be freely distributed under the MIT license
-  http://hallojs.org
-  */
-
+}).call(this);
 
+(function() {
   (function(jQuery) {
-    return jQuery.widget('IKS.hallo', {
-      toolbar: null,
-      bound: false,
-      originalContent: '',
-      previousContent: '',
-      uuid: '',
-      selection: null,
-      _keepActivated: false,
-      originalHref: null,
+    jQuery.widget('IKS.hallobutton', {
+      button: null,
+      isChecked: false,
       options: {
-        editable: true,
-        plugins: {},
-        toolbar: 'halloToolbarContextual',
-        parentElement: 'body',
-        buttonCssClass: null,
-        toolbarCssClass: null,
-        toolbarPositionAbove: false,
-        toolbarOptions: {},
-        placeholder: '',
-        forceStructured: true,
-        checkTouch: true,
-        touchScreen: null
+        uuid: '',
+        label: null,
+        icon: null,
+        editable: null,
+        command: null,
+        commandValue: null,
+        queryState: true,
+        cssClass: null
       },
       _create: function() {
-        var options, plugin, _ref,
+        var hoverclass, id, opts, _base,
           _this = this;
-        this.id = this._generateUUID();
-        if (this.options.checkTouch && this.options.touchScreen === null) {
-          this.checkTouch();
+        if ((_base = this.options).icon == null) {
+          _base.icon = "icon-" + (this.options.label.toLowerCase());
         }
-        _ref = this.options.plugins;
-        for (plugin in _ref) {
-          options = _ref[plugin];
-          if (!jQuery.isPlainObject(options)) {
-            options = {};
+        id = "" + this.options.uuid + "-" + this.options.label;
+        opts = this.options;
+        this.button = this._createButton(id, opts.command, opts.label, opts.icon);
+        this.element.append(this.button);
+        if (this.options.cssClass) {
+          this.button.addClass(this.options.cssClass);
+        }
+        if (this.options.editable.options.touchScreen) {
+          this.button.addClass('btn-large');
+        }
+        this.button.data('hallo-command', this.options.command);
+        if (this.options.commandValue) {
+          this.button.data('hallo-command-value', this.options.commandValue);
+        }
+        hoverclass = 'ui-state-hover';
+        this.button.on('mouseenter', function(event) {
+          if (_this.isEnabled()) {
+            return _this.button.addClass(hoverclass);
           }
-          jQuery.extend(options, {
-            editable: this,
-            uuid: this.id,
-            buttonCssClass: this.options.buttonCssClass
-          });
-          jQuery(this.element)[plugin](options);
-        }
-        this.element.one('halloactivated', function() {
-          return _this._prepareToolbar();
         });
-        return this.originalContent = this.getContents();
+        return this.button.on('mouseleave', function(event) {
+          return _this.button.removeClass(hoverclass);
+        });
       },
       _init: function() {
-        if (this.options.editable) {
-          return this.enable();
+        var editableElement, events, queryState,
+          _this = this;
+        if (!this.button) {
+          this.button = this._prepareButton();
+        }
+        this.element.append(this.button);
+        if (this.options.queryState === true) {
+          queryState = function(event) {
+            var compared, e, value;
+            if (!_this.options.command) {
+              return;
+            }
+            try {
+              if (_this.options.commandValue) {
+                value = document.queryCommandValue(_this.options.command);
+                compared = value.match(new RegExp(_this.options.commandValue, "i"));
+                return _this.checked(compared ? true : false);
+              } else {
+                return _this.checked(document.queryCommandState(_this.options.command));
+              }
+            } catch (_error) {
+              e = _error;
+            }
+          };
         } else {
-          return this.disable();
+          queryState = this.options.queryState;
         }
-      },
-      destroy: function() {
-        var options, plugin, _ref;
-        this.disable();
-        if (this.toolbar) {
-          this.toolbar.remove();
-          this.element[this.options.toolbar]('destroy');
+        if (this.options.command) {
+          this.button.on('click', function(event) {
+            if (_this.options.commandValue) {
+              _this.options.editable.execute(_this.options.command, _this.options.commandValue);
+            } else {
+              _this.options.editable.execute(_this.options.command);
+            }
+            if (typeof queryState === 'function') {
+              queryState();
+            }
+            return false;
+          });
         }
-        _ref = this.options.plugins;
-        for (plugin in _ref) {
-          options = _ref[plugin];
-          jQuery(this.element)[plugin]('destroy');
+        if (!this.options.queryState) {
+          return;
         }
-        return jQuery.Widget.prototype.destroy.call(this);
-      },
-      disable: function() {
-        var _this = this;
-        this.element.attr("contentEditable", false);
-        this.element.off("focus", this._activated);
-        this.element.off("blur", this._deactivated);
-        this.element.off("keyup paste change", this._checkModified);
-        this.element.off("keyup", this._keys);
-        this.element.off("keyup mouseup", this._checkSelection);
-        this.bound = false;
-        jQuery(this.element).removeClass('isModified');
-        jQuery(this.element).removeClass('inEditMode');
-        this.element.parents('a').andSelf().each(function(idx, elem) {
-          var element;
-          element = jQuery(elem);
-          if (!element.is('a')) {
-            return;
-          }
-          if (!_this.originalHref) {
-            return;
-          }
-          return element.attr('href', _this.originalHref);
+        editableElement = this.options.editable.element;
+        events = 'keyup paste change mouseup hallomodified';
+        editableElement.on(events, queryState);
+        editableElement.on('halloenabled', function() {
+          return editableElement.on(events, queryState);
+        });
+        return editableElement.on('hallodisabled', function() {
+          return editableElement.off(events, queryState);
         });
-        return this._trigger("disabled", null);
       },
       enable: function() {
-        var _this = this;
-        this.element.parents('a[href]').andSelf().each(function(idx, elem) {
-          var element;
-          element = jQuery(elem);
-          if (!element.is('a[href]')) {
-            return;
-          }
-          _this.originalHref = element.attr('href');
-          return element.removeAttr('href');
-        });
-        this.element.attr("contentEditable", true);
-        if (!this.element.html().trim()) {
-          this.element.html(this.options.placeholder);
-          this.element.css({
-            'min-width': this.element.innerWidth(),
-            'min-height': this.element.innerHeight()
-          });
-        }
-        if (!this.bound) {
-          this.element.on("focus", this, this._activated);
-          this.element.on("blur", this, this._deactivated);
-          this.element.on("keyup paste change", this, this._checkModified);
-          this.element.on("keyup", this, this._keys);
-          this.element.on("keyup mouseup", this, this._checkSelection);
-          this.bound = true;
-        }
-        if (this.options.forceStructured) {
-          this._forceStructured();
-        }
-        return this._trigger("enabled", null);
+        return this.button.removeAttr('disabled');
       },
-      activate: function() {
-        return this.element.focus();
+      disable: function() {
+        return this.button.attr('disabled', 'true');
       },
-      containsSelection: function() {
-        var range;
-        range = this.getSelection();
-        return this.element.has(range.startContainer).length > 0;
+      isEnabled: function() {
+        return this.button.attr('disabled') !== 'true';
       },
-      getSelection: function() {
-        var range, sel;
-        sel = rangy.getSelection();
-        range = null;
-        if (sel.rangeCount > 0) {
-          range = sel.getRangeAt(0);
+      refresh: function() {
+        if (this.isChecked) {
+          return this.button.addClass('ui-state-active');
         } else {
-          range = rangy.createRange();
+          return this.button.removeClass('ui-state-active');
         }
-        return range;
       },
-      restoreSelection: function(range) {
-        var sel;
-        sel = rangy.getSelection();
-        return sel.setSingleRange(range);
+      checked: function(checked) {
+        this.isChecked = checked;
+        return this.refresh();
       },
-      replaceSelection: function(cb) {
-        var newTextNode, r, range, sel, t;
-        if (navigator.appName === 'Microsoft Internet Explorer') {
-          t = document.selection.createRange().text;
-          r = document.selection.createRange();
-          return r.pasteHTML(cb(t));
+      _createButton: function(id, command, label, icon) {
+        var classes;
+        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only', "" + command + "_button"];
+        return jQuery("<button id=\"" + id + "\"        class=\"" + (classes.join(' ')) + "\" title=\"" + label + "\">          <span class=\"ui-button-text\">            <i class=\"" + icon + "\"></i>          </span>        </button>");
+      }
+    });
+    return jQuery.widget('IKS.hallobuttonset', {
+      buttons: null,
+      _create: function() {
+        return this.element.addClass('ui-buttonset');
+      },
+      _init: function() {
+        return this.refresh();
+      },
+      refresh: function() {
+        var rtl;
+        rtl = this.element.css('direction') === 'rtl';
+        this.buttons = this.element.find('.ui-button');
+        this.buttons.removeClass('ui-corner-all ui-corner-left ui-corner-right');
+        if (rtl) {
+          this.buttons.filter(':first').addClass('ui-corner-right');
+          return this.buttons.filter(':last').addClass('ui-corner-left');
         } else {
-          sel = window.getSelection();
-          range = sel.getRangeAt(0);
-          newTextNode = document.createTextNode(cb(range.extractContents()));
-          range.insertNode(newTextNode);
-          range.setStartAfter(newTextNode);
-          sel.removeAllRanges();
-          return sel.addRange(range);
+          this.buttons.filter(':first').addClass('ui-corner-left');
+          return this.buttons.filter(':last').addClass('ui-corner-right');
         }
-      },
-      removeAllSelections: function() {
-        if (navigator.appName === 'Microsoft Internet Explorer') {
-          return range.empty();
-        } else {
-          return window.getSelection().removeAllRanges();
-        }
-      },
-      getContents: function() {
-        var cleanup, contentClone, plugin;
-        contentClone = this.element.clone();
-        for (plugin in this.options.plugins) {
-          cleanup = jQuery(this.element).data('IKS-' + plugin).cleanupContentClone;
-          if (!jQuery.isFunction(cleanup)) {
-            continue;
-          }
-          jQuery(this.element)[plugin]('cleanupContentClone', contentClone);
-        }
-        return contentClone.html();
-      },
-      setContents: function(contents) {
-        return this.element.html(contents);
-      },
-      isModified: function() {
-        if (!this.previousContent) {
-          this.previousContent = this.originalContent;
-        }
-        return this.previousContent !== this.getContents();
-      },
-      setUnmodified: function() {
-        jQuery(this.element).removeClass('isModified');
-        return this.previousContent = this.getContents();
-      },
-      setModified: function() {
-        jQuery(this.element).addClass('isModified');
-        return this._trigger('modified', null, {
-          editable: this,
-          content: this.getContents()
-        });
-      },
-      restoreOriginalContent: function() {
-        return this.element.html(this.originalContent);
-      },
-      execute: function(command, value) {
-        if (document.execCommand(command, false, value)) {
-          return this.element.trigger("change");
-        }
-      },
-      protectFocusFrom: function(el) {
-        var _this = this;
-        return el.on("mousedown", function(event) {
-          event.preventDefault();
-          _this._protectToolbarFocus = true;
-          return setTimeout(function() {
-            return _this._protectToolbarFocus = false;
-          }, 300);
-        });
-      },
-      keepActivated: function(_keepActivated) {
-        this._keepActivated = _keepActivated;
-      },
-      _generateUUID: function() {
-        var S4;
-        S4 = function() {
-          return ((1 + Math.random()) * 0x10000 | 0).toString(16).substring(1);
-        };
-        return "" + (S4()) + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + (S4()) + (S4());
-      },
-      _prepareToolbar: function() {
-        var defaults, plugin, populate, toolbarOptions;
-        this.toolbar = jQuery('<div class="hallotoolbar"></div>').hide();
-        if (this.options.toolbarCssClass) {
-          this.toolbar.addClass(this.options.toolbarCssClass);
-        }
-        defaults = {
-          editable: this,
-          parentElement: this.options.parentElement,
-          toolbar: this.toolbar,
-          positionAbove: this.options.toolbarPositionAbove
-        };
-        toolbarOptions = $.extend({}, defaults, this.options.toolbarOptions);
-        this.element[this.options.toolbar](toolbarOptions);
-        for (plugin in this.options.plugins) {
-          populate = jQuery(this.element).data('IKS-' + plugin).populateToolbar;
-          if (!jQuery.isFunction(populate)) {
-            continue;
-          }
-          this.element[plugin]('populateToolbar', this.toolbar);
-        }
-        this.element[this.options.toolbar]('setPosition');
-        return this.protectFocusFrom(this.toolbar);
-      },
-      changeToolbar: function(element, toolbar, hide) {
-        var originalToolbar;
-        if (hide == null) {
-          hide = false;
-        }
-        originalToolbar = this.options.toolbar;
-        this.options.parentElement = element;
-        if (toolbar) {
-          this.options.toolbar = toolbar;
-        }
-        if (!this.toolbar) {
-          return;
-        }
-        this.element[originalToolbar]('destroy');
-        this.toolbar.remove();
-        this._prepareToolbar();
-        if (hide) {
-          return this.toolbar.hide();
-        }
-      },
-      _checkModified: function(event) {
-        var widget;
-        widget = event.data;
-        if (widget.isModified()) {
-          return widget.setModified();
-        }
-      },
-      _keys: function(event) {
-        var old, widget;
-        widget = event.data;
-        if (event.keyCode === 27) {
-          old = widget.getContents();
-          widget.restoreOriginalContent(event);
-          widget._trigger("restored", null, {
-            editable: widget,
-            content: widget.getContents(),
-            thrown: old
-          });
-          return widget.turnOff();
-        }
-      },
-      _rangesEqual: function(r1, r2) {
-        if (r1.startContainer !== r2.startContainer) {
-          return false;
-        }
-        if (r1.startOffset !== r2.startOffset) {
-          return false;
-        }
-        if (r1.endContainer !== r2.endContainer) {
-          return false;
-        }
-        if (r1.endOffset !== r2.endOffset) {
-          return false;
-        }
-        return true;
-      },
-      _checkSelection: function(event) {
-        var widget;
-        if (event.keyCode === 27) {
-          return;
-        }
-        widget = event.data;
-        return setTimeout(function() {
-          var sel;
-          sel = widget.getSelection();
-          if (widget._isEmptySelection(sel) || widget._isEmptyRange(sel)) {
-            if (widget.selection) {
-              widget.selection = null;
-              widget._trigger("unselected", null, {
-                editable: widget,
-                originalEvent: event
-              });
-            }
-            return;
-          }
-          if (!widget.selection || !widget._rangesEqual(sel, widget.selection)) {
-            widget.selection = sel.cloneRange();
-            return widget._trigger("selected", null, {
-              editable: widget,
-              selection: widget.selection,
-              ranges: [widget.selection],
-              originalEvent: event
-            });
-          }
-        }, 0);
-      },
-      _isEmptySelection: function(selection) {
-        if (selection.type === "Caret") {
-          return true;
-        }
-        return false;
-      },
-      _isEmptyRange: function(range) {
-        if (range.collapsed) {
-          return true;
-        }
-        if (range.isCollapsed) {
-          if (typeof range.isCollapsed === 'function') {
-            return range.isCollapsed();
-          }
-          return range.isCollapsed;
-        }
-        return false;
-      },
-      turnOn: function() {
-        if (this.getContents() === this.options.placeholder) {
-          this.setContents('');
-        }
-        jQuery(this.element).addClass('inEditMode');
-        return this._trigger("activated", null, this);
-      },
-      turnOff: function() {
-        jQuery(this.element).removeClass('inEditMode');
-        this._trigger("deactivated", null, this);
-        if (!this.getContents()) {
-          return this.setContents(this.options.placeholder);
-        }
-      },
-      _activated: function(event) {
-        return event.data.turnOn();
-      },
-      _deactivated: function(event) {
-        if (event.data._keepActivated) {
-          return;
-        }
-        if (event.data._protectToolbarFocus !== true) {
-          return event.data.turnOff();
-        } else {
-          return setTimeout(function() {
-            return jQuery(event.data.element).focus();
-          }, 300);
-        }
-      },
-      _forceStructured: function(event) {
-        try {
-          return document.execCommand('styleWithCSS', 0, false);
-        } catch (e) {
-          try {
-            return document.execCommand('useCSS', 0, true);
-          } catch (e) {
-            try {
-              return document.execCommand('styleWithCSS', false, false);
-            } catch (e) {
-
-            }
-          }
-        }
-      },
-      checkTouch: function() {
-        return this.options.touchScreen = !!('createTouch' in document);
       }
     });
   })(jQuery);
 
 }).call(this);
+
+(function() {
+  (function(jQuery) {
+    return jQuery.widget('IKS.hallodropdownbutton', {
+      button: null,
+      options: {
+        uuid: '',
+        label: null,
+        icon: null,
+        editable: null,
+        target: '',
+        cssClass: null
+      },
+      _create: function() {
+        var _base;
+        return (_base = this.options).icon != null ? (_base = this.options).icon : _base.icon = "icon-" + (this.options.label.toLowerCase());
+      },
+      _init: function() {
+        var target,
+          _this = this;
+        target = jQuery(this.options.target);
+        target.css('position', 'absolute');
+        target.addClass('dropdown-menu');
+        target.hide();
+        if (!this.button) {
+          this.button = this._prepareButton();
+        }
+        this.button.on('click', function() {
+          if (target.hasClass('open')) {
+            _this._hideTarget();
+            return;
+          }
+          return _this._showTarget();
+        });
+        target.on('click', function() {
+          return _this._hideTarget();
+        });
+        this.options.editable.element.on('hallodeactivated', function() {
+          return _this._hideTarget();
+        });
+        return this.element.append(this.button);
+      },
+      _showTarget: function() {
+        var target;
+        target = jQuery(this.options.target);
+        this._updateTargetPosition();
+        target.addClass('open');
+        return target.show();
+      },
+      _hideTarget: function() {
+        var target;
+        target = jQuery(this.options.target);
+        target.removeClass('open');
+        return target.hide();
+      },
+      _updateTargetPosition: function() {
+        var left, target, top, _ref;
+        target = jQuery(this.options.target);
+        _ref = this.button.position(), top = _ref.top, left = _ref.left;
+        top += this.button.outerHeight();
+        target.css('top', top);
+        return target.css('left', left - 20);
+      },
+      _prepareButton: function() {
+        var buttonEl, classes, id;
+        id = "" + this.options.uuid + "-" + this.options.label;
+        classes = ['ui-button', 'ui-widget', 'ui-state-default', 'ui-corner-all', 'ui-button-text-only'];
+        buttonEl = jQuery("<button id=\"" + id + "\"       class=\"" + (classes.join(' ')) + "\" title=\"" + this.options.label + "\">       <span class=\"ui-button-text\"><i class=\"" + this.options.icon + "\"></i></span>       </button>");
+        if (this.options.cssClass) {
+          buttonEl.addClass(this.options.cssClass);
+        }
+        return buttonEl;
+      }
+    });
+  })(jQuery);
+
+}).call(this);
\ No newline at end of file