diff --git a/pub/System/Html5EditContrib/hallo.css b/pub/System/Html5EditContrib/hallo.css
index a59b97d..0b6316d 100644
--- a/pub/System/Html5EditContrib/hallo.css
+++ b/pub/System/Html5EditContrib/hallo.css
@@ -1,4 +1,3 @@
-
 div.hallotoolbar {
     border: 1px solid #babdb6;
     padding: 2px;
@@ -6,69 +5,107 @@ div.hallotoolbar {
     border-radius: 6px;
     font-size: 12pt;
     line-height: 1.1em;
-    width: 260px;
-    z-index: 99999;
-    display: block;
+    z-index: 500;
 }
 
-div.hallotoolbar input {
-    display: none;
+div.halloEditIndicator {
+    background-color: #000000;
+    color: #ffffff;
+    padding: 4px;
+    border-radius: 4px;
 }
-div.hallotoolbar .ui-buttonset,
-div.hallotoolbar .ui-buttonset label {
-    display: inline;
+
+/* Drag n Drop */
+[contenteditable] .tmp {
+    opacity: 0.3
 }
 
-div.hallotoolbar .dropdown-menu {
+[contenteditable] .tmpLine{
+    background-color: #ffffff;
+    width: 98%;
+    height: 2px;
+    margin: 0 auto 10px auto;
+    border-top: 2px solid #1cb8d6;
+    border-bottom: 2px solid #1cb8d6;
+    opacity: 1;
+    padding: 1px;
+}
+
+.dropdown-menu {
     width: "200px";
     background-color: #eeeeec;
-    margin-top: -1px;
-    border-left: 1px solid #babdb6;
-    border-bottom: 1px solid #babdb6;
-    border-right: 1px solid #babdb6;
-    border-bottom-left-radius: 6px;
-    border-bottom-right-radius: 6px;
 }
 
-div.hallotoolbar .dropdown-menu .selected {
+.dropdown-target .selected {
     background-color: #729fcf;
 }
 
-textarea#source {
-    width: 100%;
-    min-height: 400px;
-    color: #ffffff !important;
-    background-color: #2e3436;
-    border: none;
-    border-radius: 8px;
-    font-weight: bold;
+button.blockselector, button.blockselector:focus{
+	display:block;
+	width: 100%;
+	margin:0px;
+	padding: 0px;
+	background: transparent;
+	border: none;
+	-moz-appearance: none;
+	-webkit-appearance: none;
+	outline: none;
 }
 
-[contenteditable="true"].inEditMode {
-    outline-style: auto;
-    outline-width: 3px;
-    outline-color: #111111;
+.bigOverlay, .smallOverlay {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background-color: rgba(28, 184, 214, 0.4);
 }
 
-/* ANNOTATIONS */
-.inEditMode .entity, .inEditMode a[typeof][about] {
-	  border-bottom: 1px #729fcf dotted;
+.bigOverlayRight{
+    display : block;
+    border-right : 3px dashed rgb(28, 184, 214);
+    border-left : none;
 }
-.inEditMode .entity.withSuggestions {
-    border-color: #73d216;
-    border-bottom-style: double;
+
+.bigOverlayLeft{
+    display : block;
+    border-left : 3px dashed rgb(28, 184, 214);
+    border-right : none;
 }
 
-.inEditMode .entity.person, .inEditMode a[typeof][about].person {
-    border-color: #e9b96e;
+.smallOverlayLeft{
+   border-right : 3px dashed rgb(28, 184, 214);
 }
 
-.inEditMode .entity.place, .inEditMode a[typeof][about].place {
-    border-color: #c17d11;
+.smallOverlayRight{
+    border-left : 3px dashed rgb(28, 184, 214);
 }
 
-.inEditMode .entity.organisation, .inEditMode a[typeof][about].organisation {
-    border-color: #8f5902;
+.ui-draggable{
+    cursor: move;
 }
 
+.ui-draggable-dragging{
+    border: 3px solid white;
+}
+
+[contenteditable] img.ui-state-disabled {
+    opacity: 1;
+}
 
+.customHelper{
+    background-size: cover;
+    width: 100px;
+    height: 100px;
+    z-index: 1050;
+}
+
+.trashcan{
+    width: 50px;
+    height: 50px;
+    position: relative;
+    top: 25px;
+    left: 25px;
+    background: rgba(0,0,0,0.8) url('images/trash.png') no-repeat 12px 12px;
+    border-radius: 10px;
+    cursor: none;
+}
diff --git a/pub/System/Html5EditContrib/hallo.js b/pub/System/Html5EditContrib/hallo.js
index b19e9d5..99e78b6 100644
--- a/pub/System/Html5EditContrib/hallo.js
+++ b/pub/System/Html5EditContrib/hallo.js
@@ -11,11 +11,12 @@ http://hallojs.org
 (function() {
 
   (function(jQuery) {
-    return jQuery.widget("IKS.hallo", {
+    return jQuery.widget('IKS.hallo', {
       toolbar: null,
       bound: false,
-      originalContent: "",
-      uuid: "",
+      originalContent: '',
+      previousContent: '',
+      uuid: '',
       selection: null,
       _keepActivated: false,
       originalHref: null,
@@ -25,13 +26,20 @@ http://hallojs.org
         toolbar: 'halloToolbarContextual',
         parentElement: 'body',
         buttonCssClass: null,
+        toolbarCssClass: null,
+        toolbarPositionAbove: false,
         placeholder: '',
-        forceStructured: true
+        forceStructured: true,
+        checkTouch: true,
+        touchScreen: null
       },
       _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];
@@ -57,15 +65,31 @@ http://hallojs.org
           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.unbind("focus", this._activated);
-        this.element.unbind("blur", this._deactivated);
-        this.element.unbind("keyup paste change", this._checkModified);
-        this.element.unbind("keyup", this._keys);
-        this.element.unbind("keyup mouseup", this._checkSelection);
+        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);
@@ -80,8 +104,7 @@ http://hallojs.org
         return this._trigger("disabled", null);
       },
       enable: function() {
-        var widget,
-          _this = this;
+        var _this = this;
         this.element.parents('a[href]').andSelf().each(function(idx, elem) {
           var element;
           element = jQuery(elem);
@@ -94,14 +117,17 @@ http://hallojs.org
         this.element.attr("contentEditable", true);
         if (!this.element.html()) {
           this.element.html(this.options.placeholder);
+          this.element.css({
+            'min-width': this.element.innerWidth(),
+            'min-height': this.element.innerHeight()
+          });
         }
         if (!this.bound) {
-          this.element.bind("focus", this, this._activated);
-          this.element.bind("blur", this, this._deactivated);
-          this.element.bind("keyup paste change", this, this._checkModified);
-          this.element.bind("keyup", this, this._keys);
-          this.element.bind("keyup mouseup", this, this._checkSelection);
-          widget = this;
+          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) {
@@ -112,33 +138,26 @@ http://hallojs.org
       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, userSelection;
-        if (jQuery.browser.msie) {
-          range = document.selection.createRange();
+        var range, sel;
+        sel = rangy.getSelection();
+        range = null;
+        if (sel.rangeCount > 0) {
+          range = sel.getRangeAt(0);
         } else {
-          if (window.getSelection) {
-            userSelection = window.getSelection();
-          } else if (document.selection) {
-            userSelection = document.selection.createRange();
-          } else {
-            throw "Your browser does not support selection handling";
-          }
-          if (userSelection.rangeCount > 0) {
-            range = userSelection.getRangeAt(0);
-          } else {
-            range = userSelection;
-          }
+          range = rangy.createRange();
         }
         return range;
       },
       restoreSelection: function(range) {
-        if (jQuery.browser.msie) {
-          return range.select();
-        } else {
-          window.getSelection().removeAllRanges();
-          return window.getSelection().addRange(range);
-        }
+        var sel;
+        sel = rangy.getSelection();
+        return sel.setSingleRange(range);
       },
       replaceSelection: function(cb) {
         var newTextNode, r, range, sel, t;
@@ -164,9 +183,13 @@ http://hallojs.org
         }
       },
       getContents: function() {
-        var contentClone, plugin;
+        var cleanup, contentClone, plugin;
         contentClone = this.element.clone();
         for (plugin in this.options.plugins) {
+          cleanup = jQuery(this.element).data(plugin).cleanupContentClone;
+          if (!jQuery.isFunction(cleanup)) {
+            continue;
+          }
           jQuery(this.element)[plugin]('cleanupContentClone', contentClone);
         }
         return contentClone.html();
@@ -175,12 +198,17 @@ http://hallojs.org
         return this.element.html(contents);
       },
       isModified: function() {
-        return this.originalContent !== this.getContents();
+        if (!this.previousContent) {
+          this.previousContent = this.originalContent;
+        }
+        return this.previousContent !== this.getContents();
       },
       setUnmodified: function() {
-        return this.originalContent = this.getContents();
+        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()
@@ -195,13 +223,12 @@ http://hallojs.org
         }
       },
       protectFocusFrom: function(el) {
-        var widget;
-        widget = this;
-        return el.bind("mousedown", function(event) {
+        var _this = this;
+        return el.on("mousedown", function(event) {
           event.preventDefault();
-          widget._protectToolbarFocus = true;
+          _this._protectToolbarFocus = true;
           return setTimeout(function() {
-            return widget._protectToolbarFocus = false;
+            return _this._protectToolbarFocus = false;
           }, 300);
         });
       },
@@ -216,19 +243,47 @@ http://hallojs.org
         return "" + (S4()) + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + "-" + (S4()) + (S4()) + (S4());
       },
       _prepareToolbar: function() {
-        var plugin;
+        var plugin, populate;
         this.toolbar = jQuery('<div class="hallotoolbar"></div>').hide();
-        jQuery(this.element)[this.options.toolbar]({
+        if (this.options.toolbarCssClass) {
+          this.toolbar.addClass(this.options.toolbarCssClass);
+        }
+        this.element[this.options.toolbar]({
           editable: this,
           parentElement: this.options.parentElement,
-          toolbar: this.toolbar
+          toolbar: this.toolbar,
+          positionAbove: this.options.toolbarPositionAbove
         });
         for (plugin in this.options.plugins) {
-          jQuery(this.element)[plugin]('populateToolbar', this.toolbar);
+          populate = jQuery(this.element).data(plugin).populateToolbar;
+          if (!jQuery.isFunction(populate)) {
+            continue;
+          }
+          this.element[plugin]('populateToolbar', this.toolbar);
         }
-        jQuery(this.element)[this.options.toolbar]('setPosition');
+        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;
@@ -251,7 +306,19 @@ http://hallojs.org
         }
       },
       _rangesEqual: function(r1, r2) {
-        return r1.startContainer === r2.startContainer && r1.startOffset === r2.startOffset && r1.endContainer === r2.endContainer && r1.endOffset === r2.endOffset;
+        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;
@@ -306,11 +373,11 @@ http://hallojs.org
           this.setContents('');
         }
         jQuery(this.element).addClass('inEditMode');
-        return this._trigger("activated", this);
+        return this._trigger("activated", null, this);
       },
       turnOff: function() {
         jQuery(this.element).removeClass('inEditMode');
-        this._trigger("deactivated", this);
+        this._trigger("deactivated", null, this);
         if (!this.getContents()) {
           return this.setContents(this.options.placeholder);
         }
@@ -344,6 +411,9 @@ http://hallojs.org
             }
           }
         }
+      },
+      checkTouch: function() {
+        return this.options.touchScreen = !!('createTouch' in document);
       }
     });
   })(jQuery);
@@ -355,6 +425,13 @@ http://hallojs.org
         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);
@@ -365,12 +442,15 @@ http://hallojs.org
       },
       bindIndicator: function(indicator) {
         var _this = this;
-        indicator.bind('click', function() {
+        indicator.on('click', function() {
           return _this.options.editable.element.focus();
         });
-        this.element.bind('halloactivated', function() {
+        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;
@@ -389,13 +469,362 @@ http://hallojs.org
       setIndicatorPosition: function(indicator) {
         var offset;
         indicator.css('position', 'absolute');
-        offset = this.element.offset();
+        offset = this.element.position();
         indicator.css('top', offset.top + 2);
         return indicator.css('left', offset.left + 2);
       }
     });
   })(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'
+      },
+      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());
+          });
+        }
+      }
+    },
+    _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);
+    }
+  });
+
   (function(jQuery) {
     return jQuery.widget("IKS.hallolists", {
       options: {
@@ -431,7 +860,7 @@ http://hallojs.org
         if (this.options.lists.unordered) {
           buttonize("Unordered", "UL");
         }
-        buttonset.buttonset();
+        buttonset.hallobuttonset();
         return toolbar.append(buttonset);
       }
     });
@@ -446,27 +875,30 @@ http://hallojs.org
         headers: [1, 2, 3]
       },
       populateToolbar: function(toolbar) {
-        var button, buttonize, buttonset, header, id, label, widget, _i, _len, _ref,
+        var button, buttonize, buttonset, header, id, label, markup, widget, _i, _len, _ref,
           _this = this;
         widget = this;
         buttonset = jQuery("<span class=\"" + widget.widgetName + "\"></span>");
         id = "" + this.options.uuid + "-paragraph";
         label = "P";
-        buttonset.append(jQuery("<input id=\"" + id + "\" type=\"radio\" name=\"" + widget.options.uuid + "-headings\"/><label for=\"" + id + "\" class=\"p_button\">" + label + "</label>").button());
+        markup = "<input id=\"" + id + "\" type=\"radio\"        name=\"" + widget.options.uuid + "-headings\"/>        <label for=\"" + id + "\" class=\"p_button\">" + label + "</label>";
+        buttonset.append(jQuery(markup).button());
         button = jQuery("#" + id, buttonset);
         button.attr("hallo-command", "formatBlock");
-        button.bind("change", function(event) {
+        button.on("change", function(event) {
           var cmd;
           cmd = jQuery(this).attr("hallo-command");
           return widget.options.editable.execute(cmd, "P");
         });
         buttonize = function(headerSize) {
+          var buttonMarkup;
           label = "H" + headerSize;
           id = "" + _this.options.uuid + "-" + headerSize;
-          buttonset.append(jQuery("<input id=\"" + id + "\" type=\"radio\" name=\"" + widget.options.uuid + "-headings\"/><label for=\"" + id + "\" class=\"h" + headerSize + "_button\">" + label + "</label>").button());
+          buttonMarkup = "<input id=\"" + id + "\" type=\"radio\"          name=\"" + widget.options.uuid + "-headings\"/>          <label for=\"" + id + "\" class=\"h" + headerSize + "_button\">" + label + "</label>";
+          buttonset.append(jQuery(buttonMarkup).button());
           button = jQuery("#" + id, buttonset);
           button.attr("hallo-size", "H" + headerSize);
-          return button.bind("change", function(event) {
+          return button.on("change", function(event) {
             var size;
             size = jQuery(this).attr("hallo-size");
             return widget.options.editable.execute("formatBlock", size);
@@ -478,7 +910,7 @@ http://hallojs.org
           buttonize(header);
         }
         buttonset.buttonset();
-        this.element.bind("keyup paste change mouseup", function(event) {
+        this.element.on("keyup paste change mouseup", function(event) {
           var format, formatNumber, labelParent, matches, selectedButton;
           try {
             format = document.queryCommandValue("formatBlock").toUpperCase();
@@ -502,8 +934,7 @@ http://hallojs.org
           }
         });
         return toolbar.append(buttonset);
-      },
-      _init: function() {}
+      }
     });
   })(jQuery);
 
@@ -522,19 +953,19 @@ http://hallojs.org
         widget = this;
         if (!this.options.bound) {
           this.options.bound = true;
-          widget.options.editable.element.bind("halloactivated", function(event, data) {
+          this.options.editable.element.on("halloactivated", function(event, data) {
             widget.options.currentEditable = jQuery(event.target);
             if (!widget.options.visible) {
               return widget.showOverlay();
             }
           });
-          widget.options.editable.element.bind("hallomodified", function(event, data) {
+          this.options.editable.element.on("hallomodified", function(event, data) {
             widget.options.currentEditable = jQuery(event.target);
             if (widget.options.visible) {
               return widget.resizeOverlay();
             }
           });
-          return widget.options.editable.element.bind("hallodeactivated", function(event, data) {
+          return this.options.editable.element.on("hallodeactivated", function(event, data) {
             widget.options.currentEditable = jQuery(event.target);
             if (widget.options.visible) {
               return widget.hideOverlay();
@@ -542,24 +973,23 @@ http://hallojs.org
           });
         }
       },
-      _init: function() {},
       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">');
+            this.options.overlay = jQuery("<div id=\"halloOverlay\"            class=\"halloOverlay\">");
             jQuery(document.body).append(this.options.overlay);
           }
-          this.options.overlay.bind('click', jQuery.proxy(this.options.editable.turnOff, this.options.editable));
+          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">');
+            this.options.background = jQuery("<div id=\"halloBackground\"            class=\"halloBackground\">");
             jQuery(document.body).append(this.options.background);
           }
         }
@@ -573,12 +1003,12 @@ http://hallojs.org
       resizeOverlay: function() {
         var offset;
         offset = this.options.currentEditable.offset();
-        this.options.background.css({
+        return this.options.background.css({
           top: offset.top - this.options.padding,
-          left: offset.left - 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
         });
-        this.options.background.width(this.options.currentEditable.width() + 2 * this.options.padding);
-        return this.options.background.height(this.options.currentEditable.height() + 2 * this.options.padding);
       },
       hideOverlay: function() {
         this.options.visible = false;
@@ -619,9 +1049,6 @@ http://hallojs.org
             </div>\
             <img src="" class="activeImage activeImageBg" />\
           </div>\
-          <div class="metadata" style="display: none;">\
-            <input type="text" class="caption" name="caption" />\
-          </div>\
         </div>');
         this.element.hide();
         return this._prepareDnD();
@@ -631,7 +1058,6 @@ http://hallojs.org
         editable = jQuery(this.options.editable.element);
         widget = this;
         jQuery('img', editable).each(function(index, elem) {
-          elem.contentEditable = false;
           return widget._initDraggable(elem, editable);
         });
         return jQuery('p', editable).each(function(index, elem) {
@@ -668,13 +1094,15 @@ http://hallojs.org
             width: this.options.third * 2,
             height: editable.height()
           }),
-          left: jQuery("<div/>").addClass("smallOverlay smallOverlayLeft").css(overlayMiddleConfig),
-          right: jQuery("<div/>").addClass("smallOverlay smallOverlayRight").css(overlayMiddleConfig).css("left", this.options.third * 2)
+          left: jQuery("<div/>").addClass("smallOverlay smallOverlayLeft"),
+          right: jQuery("<div/>").addClass("smallOverlay smallOverlayRight")
         };
-        editable.bind('halloactivated', function() {
+        this.overlay.left.css(overlayMiddleConfig);
+        this.overlay.right.css(overlayMiddleConfig).css("left", this.options.third * 2);
+        editable.on('halloactivated', function() {
           return widget._enableDragging();
         });
-        return editable.bind('hallodeactivated', function() {
+        return editable.on('hallodeactivated', function() {
           return widget._disableDragging();
         });
       },
@@ -686,7 +1114,6 @@ http://hallojs.org
         jQuery('.activeImage', this.element).attr('src', image.url);
         if (image.label) {
           jQuery('input', this.element).val(image.label);
-          jQuery('.metadata', this.element).show();
         }
         return this._initImage(jQuery(this.options.editable.element));
       },
@@ -698,45 +1125,27 @@ http://hallojs.org
         }
       },
       _calcDropPosition: function(offset, event) {
-        var position;
+        var position, rightTreshold;
         position = offset.left + this.options.third;
-        if (event.pageX >= position && event.pageX <= (offset.left + this.options.third * 2)) {
+        rightTreshold = offset.left + this.options.third * 2;
+        if (event.pageX >= position && event.pageX <= rightTreshold) {
           return 'middle';
         } else if (event.pageX < position) {
           return 'left';
-        } else if (event.pageX > (offset.left + this.options.third * 2)) {
+        } else if (event.pageX > rightTreshold) {
           return 'right';
         }
       },
       _createInsertElement: function(image, tmp) {
-        var imageInsert, maxHeight, maxWidth, tmpImg;
+        var imageInsert, tmpImg;
         imageInsert = jQuery('<img>');
         tmpImg = new Image();
-        maxWidth = this.options.maxWidth;
-        maxHeight = this.options.maxHeight;
-        jQuery(tmpImg).bind('load', function() {
-          var height, ratio, width;
-          width = tmpImg.width;
-          height = tmpImg.height;
-          if (width > maxWidth || height > maxHeight) {
-            if (width > height) {
-              ratio = (tmpImg.width / maxWidth).toFixed();
-            } else {
-              ratio = (tmpImg.height / maxHeight).toFixed();
-            }
-            width = (tmpImg.width / ratio).toFixed();
-            height = (tmpImg.height / ratio).toFixed();
-          }
-          return imageInsert.attr({
-            width: width,
-            height: height
-          });
-        });
+        jQuery(tmpImg).on('load', function() {});
         tmpImg.src = image.src;
         imageInsert.attr({
           src: tmpImg.src,
           alt: !tmp ? jQuery(image).attr('alt') : void 0,
-          "class": tmp ? 'halloTmp' : ''
+          "class": tmp ? 'halloTmp' : 'imageInText'
         });
         imageInsert.show();
         return imageInsert;
@@ -745,6 +1154,9 @@ http://hallojs.org
         return jQuery('<div/>').addClass('halloTmpLine');
       },
       _removeFeedbackElements: function() {
+        this.overlay.big.remove();
+        this.overlay.left.remove();
+        this.overlay.right.remove();
         return jQuery('.halloTmp, .halloTmpLine', this.options.editable.element).remove();
       },
       _removeCustomHelper: function() {
@@ -753,7 +1165,9 @@ http://hallojs.org
       _showOverlay: function(position) {
         var eHeight, editable;
         editable = jQuery(this.options.editable.element);
-        eHeight = editable.height() + parseFloat(editable.css('paddingTop')) + parseFloat(editable.css('paddingBottom'));
+        eHeight = editable.height();
+        eHeight += parseFloat(editable.css('paddingTop'));
+        eHeight += parseFloat(editable.css('paddingBottom'));
         this.overlay.big.css({
           height: eHeight
         });
@@ -765,9 +1179,12 @@ http://hallojs.org
         });
         switch (position) {
           case 'left':
-            this.overlay.big.addClass("bigOverlayLeft").removeClass("bigOverlayRight").css({
+            this.overlay.big.addClass("bigOverlayLeft");
+            this.overlay.big.removeClass("bigOverlayRight");
+            this.overlay.big.css({
               left: this.options.third
-            }).show();
+            });
+            this.overlay.big.show();
             this.overlay.left.hide();
             return this.overlay.right.hide();
           case 'middle':
@@ -776,9 +1193,12 @@ http://hallojs.org
             this.overlay.left.show();
             return this.overlay.right.show();
           case 'right':
-            this.overlay.big.addClass("bigOverlayRight").removeClass("bigOverlayLeft").css({
+            this.overlay.big.addClass("bigOverlayRight");
+            this.overlay.big.removeClass("bigOverlayLeft");
+            this.overlay.big.css({
               left: 0
-            }).show();
+            });
+            this.overlay.big.show();
             this.overlay.left.hide();
             return this.overlay.right.hide();
         }
@@ -789,7 +1209,7 @@ http://hallojs.org
         }
         return false;
       },
-      _createTmpFeedback: function(image, position) {
+      _createFeedback: function(image, position) {
         var el;
         if (position === 'middle') {
           return this._createLineFeedbackElement();
@@ -802,20 +1222,21 @@ http://hallojs.org
         widget = this;
         editable = jQuery(this.options.editable);
         postPone = function() {
-          var position;
+          var position, target;
           window.waitWithTrash = clearTimeout(window.waitWithTrash);
           position = widget._calcDropPosition(widget.options.offset, event);
           jQuery('.trashcan', ui.helper).remove();
-          editable.append(widget.overlay.big);
-          editable.append(widget.overlay.left);
-          editable.append(widget.overlay.right);
+          editable[0].element.append(widget.overlay.big);
+          editable[0].element.append(widget.overlay.left);
+          editable[0].element.append(widget.overlay.right);
           widget._removeFeedbackElements();
-          jQuery(event.target).prepend(widget._createTmpFeedback(ui.draggable[0], position));
+          target = jQuery(event.target);
+          target.prepend(widget._createFeedback(ui.draggable[0], position));
           if (position === 'middle') {
-            jQuery(event.target).prepend(widget._createTmpFeedback(ui.draggable[0], 'right'));
+            target.prepend(widget._createFeedback(ui.draggable[0], 'right'));
             jQuery('.halloTmp', event.target).hide();
           } else {
-            jQuery(event.target).prepend(widget._createTmpFeedback(ui.draggable[0], 'middle'));
+            target.prepend(widget._createFeedback(ui.draggable[0], 'middle'));
             jQuery('.halloTmpLine', event.target).hide();
           }
           return widget._showOverlay(position);
@@ -836,7 +1257,9 @@ http://hallojs.org
           tmpFeedbackLR.hide();
         } else {
           tmpFeedbackMiddle.hide();
-          tmpFeedbackLR.removeClass('inlineImage-left inlineImage-right').addClass("inlineImage-" + position).show();
+          tmpFeedbackLR.removeClass('inlineImage-left inlineImage-right');
+          tmpFeedbackLR.addClass("inlineImage-" + position);
+          tmpFeedbackLR.show();
         }
         return this._showOverlay(position);
       },
@@ -874,23 +1297,28 @@ http://hallojs.org
         return jQuery(document).trigger('stopPreventSave');
       },
       _handleDropEvent: function(event, ui) {
-        var editable, imageInsert, internalDrop, position;
+        var classes, editable, imageInsert, internalDrop, left, position;
         editable = jQuery(this.options.editable.element);
         internalDrop = this._checkOrigin(event);
         position = this._calcDropPosition(this.options.offset, event);
         this._removeFeedbackElements();
         this._removeCustomHelper();
         imageInsert = this._createInsertElement(ui.draggable[0], false);
+        classes = 'inlineImage-middle inlineImage-left inlineImage-right';
         if (position === 'middle') {
           imageInsert.show();
-          imageInsert.removeClass('inlineImage-middle inlineImage-left inlineImage-right');
+          imageInsert.removeClass(classes);
+          left = editable.width();
+          left += parseFloat(editable.css('paddingLeft'));
+          left += parseFloat(editable.css('paddingRight'));
+          left -= imageInsert.attr('width');
           imageInsert.addClass("inlineImage-" + position).css({
             position: 'relative',
-            left: ((editable.width() + parseFloat(editable.css('paddingLeft')) + parseFloat(editable.css('paddingRight'))) - imageInsert.attr('width')) / 2
+            left: left / 2
           });
           imageInsert.insertBefore(jQuery(event.target));
         } else {
-          imageInsert.removeClass('inlineImage-middle inlineImage-left inlineImage-right');
+          imageInsert.removeClass(classes);
           imageInsert.addClass("inlineImage-" + position);
           imageInsert.css('display', 'block');
           jQuery(event.target).prepend(imageInsert);
@@ -965,9 +1393,10 @@ http://hallojs.org
       _create: function() {
         return this.element.html('\
         <form class="upload">\
-          <input type="file" class="file" name="userfile" accept="image/*" />\
-          <input type="hidden" name="tags" value="" />\
-          <button class="uploadSubmit">Upload</button>\
+        <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>\
       ');
       },
@@ -977,7 +1406,7 @@ http://hallojs.org
         if (widget.options.uploadUrl && !widget.options.uploadCallback) {
           widget.options.uploadCallback = widget._iframeUpload;
         }
-        return jQuery('.uploadSubmit', this.element).bind('click', function(event) {
+        return jQuery('.uploadSubmit', this.element).on('click', function(event) {
           event.preventDefault();
           event.stopPropagation();
           return widget.options.uploadCallback({
@@ -993,12 +1422,13 @@ http://hallojs.org
       },
       _prepareIframe: function(widget) {
         var iframe, iframeName;
-        iframeName = ("" + widget.widgetName + "_postframe_" + widget.options.uuid).replace(/-/g, '_');
+        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\" />");
+        iframe = jQuery("<iframe name=\"" + iframeName + "\" id=\"" + iframeName + "\"        class=\"hidden\" style=\"display:none\" />");
         this.element.append(iframe);
         iframe.get(0).name = iframeName;
         return iframe;
@@ -1013,7 +1443,7 @@ http://hallojs.org
         } else {
           uploadUrl = widget.options.uploadUrl;
         }
-        iframe.bind('load', function() {
+        iframe.on('load', function() {
           var imageUrl;
           imageUrl = iframe.get(0).contentWindow.location.href;
           widget.element.hide();
@@ -1040,7 +1470,7 @@ http://hallojs.org
       _create: function() {
         return this.element.html('<div>\
         <form method="get">\
-          <input type="text" class="searchInput" />\
+          <input type="text" class="searchInput" placeholder="Search" />\
           <input type="submit" class="btn searchButton" value="OK" />\
         </form>\
         <div class="searchResults imageThumbnailContainer">\
@@ -1050,19 +1480,18 @@ http://hallojs.org
       </div>');
       },
       _init: function() {
-        var widget;
-        widget = this;
-        if (widget.options.searchUrl && !widget.options.searchCallback) {
-          widget.options.searchCallback = widget._ajaxSearch;
+        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', widget.element).val();
-          return widget.options.searchCallback(query, widget.options.limit, 0, function(results) {
-            return widget._showResults(results);
+          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);
           });
         });
       },
@@ -1072,22 +1501,22 @@ http://hallojs.org
         if (!image.label) {
           image.label = image.alt;
         }
-        html = jQuery("<li><img src=\"" + image.url + "\" class=\"imageThumbnail\" title=\"" + image.label + "\"></li>");
-        html.bind('click', function() {
+        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).bind('mousedown', function(event) {
+        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, widget;
-        widget = this;
+        var container,
+          _this = this;
         container = jQuery('imageThumbnailContainer ul', this.element);
-        container.prepend(jQuery('<div class="pager-prev" style="display:none"></div>'));
-        container.append(jQuery('<div class="pager-next" style="display:none"></div>'));
+        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();
         }
@@ -1095,13 +1524,17 @@ http://hallojs.org
           jQuery('.pager-next', container).show();
         }
         jQuery('.pager-prev', container).click(function(event) {
-          return widget.options.searchCallback(query, widget.options.limit, response.offset - widget.options.limit, function(results) {
-            return widget._showResults(results);
+          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) {
-          return widget.options.searchCallback(query, widget.options.limit, response.offset + widget.options.limit, function(results) {
-            return widget._showResults(results);
+          var offset;
+          offset = results.offset + _this.options.limit;
+          return _this.options.searchCallback(query, _this.options.limit, offset, function(results) {
+            return _this._showResults(results);
           });
         });
       },
@@ -1137,7 +1570,8 @@ http://hallojs.org
         entity: null,
         vie: null,
         dbPediaUrl: null,
-        getSuggestions: null
+        getSuggestions: null,
+        thumbnailUri: '<http://dbpedia.org/ontology/thumbnail>'
       },
       _create: function() {
         return this.element.html('\
@@ -1176,7 +1610,7 @@ http://hallojs.org
         }));
       },
       _getSuggestions: function() {
-        var normalizedTags, tags;
+        var limit, normalizedTags, tags;
         if (this.loaded) {
           return;
         }
@@ -1191,8 +1625,9 @@ http://hallojs.org
         }
         jQuery('.imageThumbnailContainer ul', this.element).empty();
         normalizedTags = this._normalizeRelated(tags);
+        limit = this.options.limit;
         if (this.options.getSuggestions) {
-          this.options.getSuggestions(normalizedTags, widget.options.limit, 0, this._showSuggestions);
+          this.options.getSuggestions(normalizedTags, limit, 0, this._showSuggestions);
         }
         this._prepareVIE();
         if (this.options.vie.services.dbpedia) {
@@ -1211,7 +1646,7 @@ http://hallojs.org
             jQuery('.activitySpinner', this.element).hide();
             return _.each(entities, function(entity) {
               var img, thumbnail;
-              thumbnail = entity.attributes['<http://dbpedia.org/ontology/thumbnail>'];
+              thumbnail = entity.attributes[widget.options.thumbnailUri];
               if (!thumbnail) {
                 return;
               }
@@ -1232,8 +1667,8 @@ http://hallojs.org
       _showSuggestion: function(image) {
         var html,
           _this = this;
-        html = jQuery("<li><img src=\"" + image.url + "\" class=\"imageThumbnail\" title=\"" + image.label + "\"></li>");
-        html.bind('click', function() {
+        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);
@@ -1256,7 +1691,7 @@ http://hallojs.org
         breakAfter: []
       },
       populateToolbar: function(toolbar) {
-        var buttonset, buttonsets, queuedButtonsets, row, rowcounter, _i, _j, _len, _len1, _ref;
+        var buttonRow, buttonset, buttonsets, queuedButtonsets, row, rowcounter, _i, _j, _len, _len1, _ref;
         buttonsets = jQuery('.ui-buttonset', toolbar);
         queuedButtonsets = jQuery();
         rowcounter = 0;
@@ -1264,11 +1699,12 @@ http://hallojs.org
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
           row = _ref[_i];
           rowcounter++;
+          buttonRow = "<div          class=\"halloButtonrow halloButtonrow-" + rowcounter + "\" />";
           for (_j = 0, _len1 = buttonsets.length; _j < _len1; _j++) {
             buttonset = buttonsets[_j];
             queuedButtonsets = jQuery(queuedButtonsets).add(jQuery(buttonset));
             if (jQuery(buttonset).hasClass(row)) {
-              queuedButtonsets.wrapAll('<div class="halloButtonrow halloButtonrow-' + rowcounter + '" />');
+              queuedButtonsets.wrapAll(buttonRow);
               buttonsets = buttonsets.not(queuedButtonsets);
               queuedButtonsets = jQuery();
               break;
@@ -1277,10 +1713,10 @@ http://hallojs.org
         }
         if (buttonsets.length > 0) {
           rowcounter++;
-          return buttonsets.wrapAll('<div class="halloButtonrow halloButtonrow-' + rowcounter + '" />');
+          buttonRow = "<div          class=\"halloButtonrow halloButtonrow-" + rowcounter + "\" />";
+          return buttonsets.wrapAll(buttonRow);
         }
-      },
-      _init: function() {}
+      }
     });
   })(jQuery);
 
@@ -1309,11 +1745,11 @@ http://hallojs.org
         var editableElement, turnOffAnnotate, widget;
         widget = this;
         if (this.options.vie === void 0) {
-          throw 'The halloannotate plugin requires VIE to be loaded';
+          throw new Error('The halloannotate plugin requires VIE');
           return;
         }
         if (typeof this.element.annotate !== 'function') {
-          throw 'The halloannotate plugin requires annotate.js to be loaded';
+          throw new Error('The halloannotate plugin requires annotate.js');
           return;
         }
         this.state = 'off';
@@ -1324,7 +1760,7 @@ http://hallojs.org
           return jQuery(editable).halloannotate('turnOff');
         };
         editableElement = this.options.editable.element;
-        return editableElement.bind('hallodisabled', turnOffAnnotate);
+        return editableElement.on('hallodisabled', turnOffAnnotate);
       },
       populateToolbar: function(toolbar) {
         var buttonHolder,
@@ -1339,7 +1775,7 @@ http://hallojs.org
           cssClass: this.options.buttonCssClass,
           queryState: false
         });
-        buttonHolder.bind('change', function(event) {
+        buttonHolder.on('change', function(event) {
           if (_this.state === "pending") {
             return;
           }
@@ -1369,9 +1805,9 @@ http://hallojs.org
           remove: this.options.remove,
           success: this.options.success,
           error: this.options.error
-        }).bind('annotateselect', function(event, data) {
+        }).on('annotateselect', function(event, data) {
           return widget.options.editable.setModified();
-        }).bind('annotateremove', function() {
+        }).on('annotateremove', function() {
           return jQuery.noop();
         });
       },
@@ -1387,11 +1823,12 @@ http://hallojs.org
         widget = this;
         try {
           return this.options.editable.element.annotate('enable', function(success) {
-            if (success) {
-              _this.state = 'on';
-              _this.button.hallobutton('checked', true);
-              return _this.button.hallobutton('enable');
+            if (!success) {
+              return;
             }
+            _this.state = 'on';
+            _this.button.hallobutton('checked', true);
+            return _this.button.hallobutton('enable');
           });
         } catch (e) {
           return alert(e);
@@ -1410,6 +1847,128 @@ http://hallojs.org
     });
   })(jQuery);
 
+  $.widget("ncri.hallohtml", {
+    options: {
+      editable: null,
+      toolbar: null,
+      uuid: "",
+      lang: 'en',
+      dialogOpts: {
+        autoOpen: false,
+        width: 600,
+        height: 'auto',
+        modal: false,
+        resizable: true,
+        draggable: true,
+        dialogClass: 'htmledit-dialog'
+      },
+      dialog: null,
+      buttonCssClass: null
+    },
+    translations: {
+      en: {
+        title: 'Edit HTML',
+        update: 'Update'
+      },
+      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();
+        } 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;
+      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');
+        return false;
+      });
+    },
+    _closeDialog: function() {
+      return this.options.dialog.dialog("close");
+    }
+  });
+
+  (function(jQuery) {
+    return jQuery.widget('IKS.halloblacklist', {
+      options: {
+        tags: []
+      },
+      _init: function() {
+        if (this.options.tags.indexOf('br') !== -1) {
+          return this.element.on('keydown', function(event) {
+            if (event.originalEvent.keyCode === 13) {
+              return event.preventDefault();
+            }
+          });
+        }
+      },
+      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 _results;
+      }
+    });
+  })(jQuery);
+
   (function(jQuery) {
     return jQuery.widget("Liip.halloimage", {
       options: {
@@ -1442,18 +2001,21 @@ http://hallojs.org
         maxHeight: 250
       },
       populateToolbar: function(toolbar) {
-        var buttonHolder, buttonset, dialogId, id, widget;
+        var buttonHolder, buttonset, dialogId, id, tabContent, tabs, widget;
+        this.options.toolbar = toolbar;
         widget = this;
         dialogId = "" + this.options.uuid + "-image-dialog";
-        this.options.dialog = jQuery("<div id=\"" + dialogId + "\">                <div class=\"nav\">                    <ul class=\"tabs\">                    </ul>                    <div id=\"" + this.options.uuid + "-tab-activeIndicator\" class=\"tab-activeIndicator\" />                </div>                <div class=\"dialogcontent\">            </div>");
+        this.options.dialog = jQuery("<div id=\"" + dialogId + "\">        <div class=\"nav\">          <ul class=\"tabs\">          </ul>          <div id=\"" + this.options.uuid + "-tab-activeIndicator\"            class=\"tab-activeIndicator\" />        </div>        <div class=\"dialogcontent\">        </div>");
+        tabs = jQuery('.tabs', this.options.dialog);
+        tabContent = jQuery('.dialogcontent', this.options.dialog);
         if (widget.options.suggestions) {
-          this._addGuiTabSuggestions(jQuery(".tabs", this.options.dialog), jQuery(".dialogcontent", this.options.dialog));
+          this._addGuiTabSuggestions(tabs, tabContent);
         }
         if (widget.options.search || widget.options.searchUrl) {
-          this._addGuiTabSearch(jQuery(".tabs", this.options.dialog), jQuery(".dialogcontent", this.options.dialog));
+          this._addGuiTabSearch(tabs, tabContent);
         }
         if (widget.options.upload || widget.options.uploadUrl) {
-          this._addGuiTabUpload(jQuery(".tabs", this.options.dialog), jQuery(".dialogcontent", this.options.dialog));
+          this._addGuiTabUpload(tabs, tabContent);
         }
         this.current = jQuery('<div class="currentImage"></div>').halloimagecurrent({
           uuid: this.options.uuid,
@@ -1478,20 +2040,20 @@ http://hallojs.org
         });
         buttonset.append(buttonHolder);
         this.button = buttonHolder;
-        this.button.bind("change", function(event) {
+        this.button.on("click", function(event) {
           if (widget.options.dialog.dialog("isOpen")) {
-            return widget._closeDialog();
+            widget._closeDialog();
           } else {
-            return widget._openDialog();
+            widget._openDialog();
           }
+          return false;
         });
-        this.options.editable.element.bind("hallodeactivated", function(event) {
+        this.options.editable.element.on("hallodeactivated", function(event) {
           return widget._closeDialog();
         });
         jQuery(this.options.editable.element).delegate("img", "click", function(event) {
           return widget._openDialog();
         });
-        buttonset.buttonset();
         toolbar.append(buttonset);
         this.options.dialog.dialog(this.options.dialogOpts);
         return this._handleTabs();
@@ -1502,17 +2064,20 @@ http://hallojs.org
       _handleTabs: function() {
         var widget;
         widget = this;
-        jQuery('.nav li', this.options.dialog).bind('click', function() {
-          var id;
+        jQuery('.nav li', this.options.dialog).on('click', function() {
+          var id, left;
           jQuery("." + widget.widgetName + "-tab").hide();
           id = jQuery(this).attr('id');
           jQuery("#" + id + "-content").show();
-          return jQuery("#" + widget.options.uuid + "-tab-activeIndicator").css("margin-left", jQuery(this).position().left + (jQuery(this).width() / 2));
+          left = jQuery(this).position().left + (jQuery(this).width() / 2);
+          return jQuery("#" + widget.options.uuid + "-tab-activeIndicator").css({
+            "margin-left": left
+          });
         });
         return jQuery('.nav li', this.options.dialog).first().click();
       },
       _openDialog: function() {
-        var cleanUp, widget, xposition, yposition,
+        var cleanUp, editableEl, getActive, suggestionSelector, toolbarEl, widget, xposition, yposition,
           _this = this;
         widget = this;
         cleanUp = function() {
@@ -1528,17 +2093,24 @@ http://hallojs.org
             });
           }, 15000);
         };
-        jQuery("#" + this.options.uuid + "-sugg-activeImage").attr("src", jQuery("#" + this.options.uuid + "-tab-suggestions-content .imageThumbnailActive").first().attr("src"));
-        jQuery("#" + this.options.uuid + "-sugg-activeImageBg").attr("src", jQuery("#" + this.options.uuid + "-tab-suggestions-content .imageThumbnailActive").first().attr("src"));
+        suggestionSelector = "#" + this.options.uuid + "-tab-suggestions-content";
+        getActive = function() {
+          return jQuery('.imageThumbnailActive', suggestionSelector).first().attr("src");
+        };
+        jQuery("#" + this.options.uuid + "-sugg-activeImage").attr("src", getActive());
+        jQuery("#" + this.options.uuid + "-sugg-activeImageBg").attr("src", getActive());
         this.lastSelection = this.options.editable.getSelection();
-        xposition = jQuery(this.options.editable.element).offset().left + jQuery(this.options.editable.element).outerWidth() - 3;
-        yposition = jQuery(this.options.toolbar).offset().top - jQuery(document).scrollTop() - 29;
+        editableEl = jQuery(this.options.editable.element);
+        toolbarEl = jQuery(this.options.toolbar);
+        xposition = editableEl.offset().left + editableEl.outerWidth() - 3;
+        yposition = toolbarEl.offset().top + toolbarEl.outerHeight() + 29;
+        yposition -= jQuery(document).scrollTop();
         this.options.dialog.dialog("option", "position", [xposition, yposition]);
         cleanUp();
         widget.options.loaded = 1;
         this.options.editable.keepActivated(true);
         this.options.dialog.dialog("open");
-        return this.options.dialog.bind('dialogclose', function() {
+        return 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);
@@ -1549,8 +2121,8 @@ http://hallojs.org
       },
       _addGuiTabSuggestions: function(tabs, element) {
         var tab;
-        tabs.append(jQuery("<li id=\"" + this.options.uuid + "-tab-upload\" class=\"" + this.widgetName + "-tabselector " + this.widgetName + "-tab-upload\"><span>Upload</span></li>"));
-        tab = jQuery("<div id=\"" + this.options.uuid + "-tab-upload-content\" class=\"" + this.widgetName + "-tab tab-upload\"></div>");
+        tabs.append(jQuery("<li id=\"" + this.options.uuid + "-tab-suggestions\"        class=\"" + this.widgetName + "-tabselector " + this.widgetName + "-tab-suggestions\">          <span>Suggestions</span>        </li>"));
+        tab = jQuery("<div id=\"" + this.options.uuid + "-tab-suggestions-content\"        class=\"" + this.widgetName + "-tab tab-suggestions\"></div>");
         element.append(tab);
         return tab.halloimagesuggestions({
           uuid: this.options.uuid,
@@ -1562,8 +2134,8 @@ http://hallojs.org
         var dialogId, tab, widget;
         widget = this;
         dialogId = "" + this.options.uuid + "-image-dialog";
-        tabs.append(jQuery("<li id=\"" + this.options.uuid + "-tab-search\" class=\"" + widget.widgetName + "-tabselector " + widget.widgetName + "-tab-search\"><span>Search</span></li>"));
-        tab = jQuery("<div id=\"" + this.options.uuid + "-tab-search-content\" class=\"" + widget.widgetName + "-tab tab-search\"></div>");
+        tabs.append(jQuery("<li id=\"" + this.options.uuid + "-tab-search\"        class=\"" + this.widgetName + "-tabselector " + this.widgetName + "-tab-search\">          <span>Search</span>        </li>"));
+        tab = jQuery("<div id=\"" + this.options.uuid + "-tab-search-content\"        class=\"" + widget.widgetName + "-tab tab-search\"></div>");
         element.append(tab);
         return tab.halloimagesearch({
           uuid: this.options.uuid,
@@ -1576,8 +2148,8 @@ http://hallojs.org
       },
       _addGuiTabUpload: function(tabs, element) {
         var tab;
-        tabs.append(jQuery("<li id=\"" + this.options.uuid + "-tab-upload\" class=\"" + this.widgetName + "-tabselector " + this.widgetName + "-tab-upload\"><span>Upload</span></li>"));
-        tab = jQuery("<div id=\"" + this.options.uuid + "-tab-upload-content\" class=\"" + this.widgetName + "-tab tab-upload\"></div>");
+        tabs.append(jQuery("<li id=\"" + this.options.uuid + "-tab-upload\"        class=\"" + this.widgetName + "-tabselector " + this.widgetName + "-tab-upload\">          <span>Upload</span>        </li>"));
+        tab = jQuery("<div id=\"" + this.options.uuid + "-tab-upload-content\"        class=\"" + this.widgetName + "-tab tab-upload\"></div>");
         element.append(tab);
         return tab.halloimageupload({
           uuid: this.options.uuid,
@@ -1586,30 +2158,31 @@ http://hallojs.org
           imageWidget: this,
           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()
-        
-                    @options.dialog.find(".halloimage-activeImage, ##{widget.options.uuid}-#{widget.widgetName}-addimage").click insertImage
-        */
-
       }
+      /*
+          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);
 
@@ -1617,7 +2190,7 @@ http://hallojs.org
     return jQuery.widget("IKS.halloformat", {
       options: {
         editable: null,
-        uuid: "",
+        uuid: '',
         formattings: {
           bold: true,
           italic: true,
@@ -1646,11 +2219,12 @@ http://hallojs.org
         _ref = this.options.formattings;
         for (format in _ref) {
           enabled = _ref[format];
-          if (enabled) {
-            buttonize(format);
+          if (!enabled) {
+            continue;
           }
+          buttonize(format);
         }
-        buttonset.buttonset();
+        buttonset.hallobuttonset();
         return toolbar.append(buttonset);
       }
     });
@@ -1684,10 +2258,9 @@ http://hallojs.org
         };
         buttonize("undo", "Undo");
         buttonize("redo", "Redo");
-        buttonset.buttonset();
+        buttonset.hallobuttonset();
         return toolbar.append(buttonset);
-      },
-      _init: function() {}
+      }
     });
   })(jQuery);
 
@@ -1705,9 +2278,10 @@ http://hallojs.org
         buttonset = jQuery("<span class=\"" + this.widgetName + "\"></span>");
         contentId = "" + this.options.uuid + "-" + this.widgetName + "-data";
         target = this._prepareDropdown(contentId);
+        toolbar.append(buttonset);
+        buttonset.hallobuttonset();
         buttonset.append(target);
-        buttonset.append(this._prepareButton(target));
-        return toolbar.append(buttonset);
+        return buttonset.append(this._prepareButton(target));
       },
       _prepareDropdown: function(contentId) {
         var addElement, containingElement, contentArea, element, _i, _len, _ref,
@@ -1715,19 +2289,25 @@ http://hallojs.org
         contentArea = jQuery("<div id=\"" + contentId + "\"></div>");
         containingElement = this.options.editable.element.get(0).tagName.toLowerCase();
         addElement = function(element) {
-          var el, queryState;
-          el = jQuery("<" + element + " class=\"menu-item\">" + element + "</" + element + ">");
+          var el, events, queryState;
+          el = jQuery("<button class='blockselector'>          <" + element + " class=\"menu-item\">" + element + "</" + element + ">        </button>");
           if (containingElement === element) {
             el.addClass('selected');
           }
           if (containingElement !== 'div') {
             el.addClass('disabled');
           }
-          el.bind('click', function() {
+          el.on('click', function() {
+            var tagName;
+            tagName = element.toUpperCase();
             if (el.hasClass('disabled')) {
               return;
             }
-            return _this.options.editable.execute('formatBlock', element.toUpperCase());
+            if (jQuery.browser.msie) {
+              _this.options.editable.execute('FormatBlock', "<" + tagName + ">");
+              return;
+            }
+            return _this.options.editable.execute('formatBlock', tagName);
           });
           queryState = function(event) {
             var block;
@@ -1738,11 +2318,13 @@ http://hallojs.org
             }
             return el.removeClass('selected');
           };
-          _this.options.editable.element.bind('halloenabled', function() {
-            return _this.options.editable.element.bind('keyup paste change mouseup', queryState);
+          events = 'keyup paste change mouseup';
+          _this.options.editable.element.on(events, queryState);
+          _this.options.editable.element.on('halloenabled', function() {
+            return _this.options.editable.element.on(events, queryState);
           });
-          _this.options.editable.element.bind('hallodisabled', function() {
-            return _this.options.editable.element.unbind('keyup paste change mouseup', queryState);
+          _this.options.editable.element.on('hallodisabled', function() {
+            return _this.options.editable.element.off(events, queryState);
           });
           return el;
         };
@@ -1782,35 +2364,50 @@ http://hallojs.org
           width: 540,
           height: 95,
           title: "Enter Link",
+          buttonTitle: "Insert",
           modal: true,
           resizable: false,
           draggable: false,
           dialogClass: 'hallolink-dialog'
         },
-        butonCssClass: null
+        buttonCssClass: null
       },
       populateToolbar: function(toolbar) {
-        var buttonize, buttonset, dialog, dialogId, dialogSubmitCb, urlInput, widget,
+        var butTitle, buttonize, buttonset, dialog, dialogId, dialogSubmitCb, isEmptyLink, urlInput, widget,
           _this = this;
         widget = this;
         dialogId = "" + this.options.uuid + "-dialog";
-        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=\"Insert\" /></form></div>");
+        butTitle = this.options.dialogOpts.buttonTitle;
+        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();
         });
+        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;
+          var link, selectionStart;
           event.preventDefault();
           link = urlInput.val();
           widget.options.editable.restoreSelection(widget.lastSelection);
-          if (((new RegExp(/^\s*$/)).test(link)) || link === widget.options.defaultUrl) {
+          if (isEmptyLink(link)) {
+            selectionStart = widget.lastSelection.startContainer;
             if (widget.lastSelection.collapsed) {
-              widget.lastSelection.setStartBefore(widget.lastSelection.startContainer);
-              widget.lastSelection.setEndAfter(widget.lastSelection.startContainer);
+              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 {
@@ -1839,27 +2436,34 @@ http://hallojs.org
           });
           buttonset.append(buttonHolder);
           button = buttonHolder;
-          button.bind("change", function(event) {
+          button.on("click", function(event) {
+            var selectionParent;
             widget.lastSelection = widget.options.editable.getSelection();
             urlInput = jQuery('input[name=url]', dialog);
-            if (widget.lastSelection.startContainer.parentNode.href === void 0) {
+            selectionParent = widget.lastSelection.startContainer.parentNode;
+            if (!selectionParent.href) {
               urlInput.val(widget.options.defaultUrl);
             } else {
-              urlInput.val(jQuery(widget.lastSelection.startContainer.parentNode).attr('href'));
+              urlInput.val(jQuery(selectionParent).attr('href'));
               jQuery(urlInput[0].form).find('input[type=submit]').val('update');
             }
             widget.options.editable.keepActivated(true);
             dialog.dialog('open');
-            return dialog.bind('dialogclose', function() {
+            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.bind("keyup paste change mouseup", function(event) {
+          return _this.element.on("keyup paste change mouseup", function(event) {
             var nodeName, start;
             start = jQuery(widget.options.editable.getSelection().startContainer);
-            nodeName = start.prop('nodeName') ? start.prop('nodeName') : start.parent().prop('nodeName');
+            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;
@@ -1871,12 +2475,11 @@ http://hallojs.org
           buttonize("A");
         }
         if (this.options.link) {
-          buttonset.buttonset();
           toolbar.append(buttonset);
+          buttonset.hallobuttonset();
           return dialog.dialog(this.options.dialogOpts);
         }
-      },
-      _init: function() {}
+      }
     });
   })(jQuery);
 
@@ -1908,16 +2511,16 @@ http://hallojs.org
         buttonize("Left");
         buttonize("Center");
         buttonize("Right");
-        buttonset.buttonset();
+        buttonset.hallobuttonset();
         return toolbar.append(buttonset);
-      },
-      _init: function() {}
+      }
     });
   })(jQuery);
 
   (function(jQuery) {
-    return jQuery.widget('IKS.hallobutton', {
+    jQuery.widget('IKS.hallobutton', {
       button: null,
+      isChecked: false,
       options: {
         uuid: '',
         label: null,
@@ -1928,39 +2531,39 @@ http://hallojs.org
         cssClass: null
       },
       _create: function() {
-        var id, _base, _ref;
+        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;
-        this.element.append(this._createButton(id, this.options.command));
-        this.element.append(this._createLabel(id, this.options.command, this.options.label, this.options.icon));
-        if (this.options.cssClass) {
-          this.element.find('label').addClass(this.options.cssClass);
-        }
-        this.button = this.element.find('input');
-        this.button.button();
+        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);
         }
-        return this.button.data('hallo-command', this.options.command);
+        if (this.options.editable.options.touchScreen) {
+          this.button.addClass('btn-large');
+        }
+        this.button.data('hallo-command', this.options.command);
+        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);
+        });
       },
       _init: function() {
-        var editableElement, queryState,
+        var editableElement, events, queryState,
           _this = this;
         if (!this.button) {
           this.button = this._prepareButton();
         }
         this.element.append(this.button);
-        if (this.options.command) {
-          this.button.bind('change', function(event) {
-            return _this.options.editable.execute(_this.options.command);
-          });
-        }
-        if (!this.options.queryState) {
-          return;
-        }
-        editableElement = this.options.editable.element;
         queryState = function(event) {
           if (!_this.options.command) {
             return;
@@ -1971,32 +2574,73 @@ http://hallojs.org
 
           }
         };
-        editableElement.bind('keyup paste change mouseup hallomodified', queryState);
-        editableElement.bind('halloenabled', function() {
-          return editableElement.bind('keyup paste change mouseup hallomodified', queryState);
+        if (this.options.command) {
+          this.button.on('click', function(event) {
+            _this.options.editable.execute(_this.options.command);
+            queryState;
+
+            return false;
+          });
+        }
+        if (!this.options.queryState) {
+          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.bind('hallodisabled', function() {
-          return editableElement.unbind('keyup paste change mouseup hallomodified', queryState);
+        return editableElement.on('hallodisabled', function() {
+          return editableElement.off(events, queryState);
         });
       },
       enable: function() {
-        return this.button.button('enable');
+        return this.button.removeAttr('disabled');
       },
       disable: function() {
-        return this.button.button('disable');
+        return this.button.attr('disabled', 'true');
+      },
+      isEnabled: function() {
+        return this.button.attr('disabled') !== 'true';
       },
       refresh: function() {
-        return this.button.button('refresh');
+        if (this.isChecked) {
+          return this.button.addClass('ui-state-active');
+        } else {
+          return this.button.removeClass('ui-state-active');
+        }
       },
       checked: function(checked) {
-        this.button.attr('checked', checked);
+        this.isChecked = checked;
         return this.refresh();
       },
-      _createButton: function(id) {
-        return jQuery("<input id=\"" + id + "\" type=\"checkbox\" />");
+      _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();
       },
-      _createLabel: function(id, command, label, icon) {
-        return jQuery("<label for=\"" + id + "\" class=\"" + command + "_button\" title=\"" + label + "\"><i class=\"" + icon + "\"></i></label>");
+      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);
@@ -2026,17 +2670,17 @@ http://hallojs.org
         if (!this.button) {
           this.button = this._prepareButton();
         }
-        this.button.bind('click', function() {
+        this.button.on('click', function() {
           if (target.hasClass('open')) {
             _this._hideTarget();
             return;
           }
           return _this._showTarget();
         });
-        target.bind('click', function() {
+        target.on('click', function() {
           return _this._hideTarget();
         });
-        this.options.editable.element.bind('hallodeactivated', function() {
+        this.options.editable.element.on('hallodeactivated', function() {
           return _this._hideTarget();
         });
         return this.element.append(this.button);
@@ -2055,21 +2699,22 @@ http://hallojs.org
         return target.hide();
       },
       _updateTargetPosition: function() {
-        var bottom, left, target, _ref;
+        var left, target, top, _ref;
         target = jQuery(this.options.target);
-        _ref = this.element.position(), bottom = _ref.bottom, left = _ref.left;
-        target.css('top', bottom);
+        _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 button, buttonEl, id;
+        var buttonEl, classes, id;
         id = "" + this.options.uuid + "-" + this.options.label;
-        buttonEl = jQuery("<button id=\"" + id + "\" data-toggle=\"dropdown\" data-target=\"#" + (this.options.target.attr('id')) + "\" title=\"" + this.options.label + "\">\n  <span class=\"ui-button-text\"><i class=\"" + this.options.icon + "\"></i></span>\n</button>");
+        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);
         }
-        button = buttonEl.button();
-        return button;
+        return buttonEl;
       }
     });
   })(jQuery);
@@ -2080,7 +2725,8 @@ http://hallojs.org
       options: {
         parentElement: 'body',
         editable: null,
-        toolbar: null
+        toolbar: null,
+        positionAbove: false
       },
       _create: function() {
         var _this = this;
@@ -2092,24 +2738,29 @@ http://hallojs.org
         });
       },
       _getPosition: function(event, selection) {
-        var position;
+        var eventType, position;
         if (!event) {
           return;
         }
-        if (event.originalEvent instanceof KeyboardEvent) {
-          return this._getCaretPosition(selection);
-        }
-        if (event.originalEvent instanceof MouseEvent) {
-          return position = {
-            top: event.pageY,
-            left: event.pageX
-          };
+        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
+            };
         }
       },
       _getCaretPosition: function(range) {
         var newRange, position, tmpSpan;
         tmpSpan = jQuery("<span/>");
-        newRange = document.createRange();
+        newRange = rangy.createRange();
         newRange.setStart(range.endContainer, range.endOffset);
         newRange.insertNode(tmpSpan.get(0));
         position = {
@@ -2128,31 +2779,56 @@ http://hallojs.org
         this.toolbar.css('top', this.element.offset().top - 20);
         return this.toolbar.css('left', this.element.offset().left);
       },
-      _updatePosition: function(position) {
+      _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;
         }
-        this.toolbar.css('top', position.top);
-        return this.toolbar.css('left', position.left);
+        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 = $(window).scrollTop() + top_offset;
+          left = $(window).scrollLeft() + selectionRect.left;
+        } else {
+          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);
       },
       _bindEvents: function() {
         var _this = this;
-        this.element.bind('halloselected', function(event, data) {
+        this.element.on('halloselected', function(event, data) {
           var position;
           position = _this._getPosition(data.originalEvent, data.selection);
           if (!position) {
             return;
           }
-          _this._updatePosition(position);
-          return _this.toolbar.show();
+          _this._updatePosition(position, data.selection);
+          if (_this.toolbar.html() !== '') {
+            return _this.toolbar.show();
+          }
         });
-        this.element.bind('hallounselected', function(event, data) {
+        this.element.on('hallounselected', function(event, data) {
           return _this.toolbar.hide();
         });
-        return this.element.bind('hallodeactivated', function(event, data) {
+        return this.element.on('hallodeactivated', function(event, data) {
           return _this.toolbar.hide();
         });
       }
@@ -2175,9 +2851,9 @@ http://hallojs.org
         jQuery(this.options.parentElement).append(this.toolbar);
         this._bindEvents();
         jQuery(window).resize(function(event) {
-          return _this._updatePosition(_this._getPosition(event));
+          return _this.setPosition();
         });
-        if (this.options.parentElement === 'body' && !this.options.floating) {
+        if (this.options.parentElement === 'body') {
           el = jQuery(this.element);
           widthToAdd = parseFloat(el.css('padding-left'));
           widthToAdd += parseFloat(el.css('padding-right'));
@@ -2189,11 +2865,12 @@ http://hallojs.org
         }
       },
       _getPosition: function(event, selection) {
-        var offset, position;
+        var offset, position, width;
         if (!event) {
           return;
         }
-        offset = parseFloat(this.element.css('outline-width')) + parseFloat(this.element.css('outline-offset'));
+        width = parseFloat(this.element.css('outline-width'));
+        offset = width + parseFloat(this.element.css('outline-offset'));
         return position = {
           top: this.element.offset().top - this.toolbar.outerHeight() - offset,
           left: this.element.offset().left - offset
@@ -2202,7 +2879,7 @@ http://hallojs.org
       _getCaretPosition: function(range) {
         var newRange, position, tmpSpan;
         tmpSpan = jQuery("<span/>");
-        newRange = document.createRange();
+        newRange = rangy.createRange();
         newRange.setStart(range.endContainer, range.endOffset);
         newRange.insertNode(tmpSpan.get(0));
         position = {
@@ -2218,16 +2895,16 @@ http://hallojs.org
         }
         this.toolbar.css('position', 'absolute');
         this.toolbar.css('top', this.element.offset().top - this.toolbar.outerHeight());
-        return this.toolbar.css('left', this.element.offset().left);
+        return this.toolbar.css('left', this.element.offset().left + 10);
       },
       _updatePosition: function(position) {},
       _bindEvents: function() {
         var _this = this;
-        this.element.bind('halloactivated', function(event, data) {
-          _this._updatePosition(_this._getPosition(event));
+        this.element.on('halloactivated', function(event, data) {
+          _this.setPosition();
           return _this.toolbar.show();
         });
-        return this.element.bind('hallodeactivated', function(event, data) {
+        return this.element.on('hallodeactivated', function(event, data) {
           return _this.toolbar.hide();
         });
       }