From e4ccd64647dd65bae7a8657f74bc95c59937f999 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 11:32:27 -0600
Subject: [PATCH 01/67] preliminary work on video plugin, based on image plugin

---
 src/plugins/oerpub/video/README.md            |   68 +
 src/plugins/oerpub/video/css/image.css        |  133 ++
 src/plugins/oerpub/video/demo/crop.html       |   76 +
 src/plugins/oerpub/video/demo/crop.php        |   21 +
 src/plugins/oerpub/video/demo/cropnresize.jpg |  Bin 0 -> 76312 bytes
 src/plugins/oerpub/video/demo/index.html      |  120 ++
 src/plugins/oerpub/video/img/blank.jpg        |  Bin 0 -> 685 bytes
 src/plugins/oerpub/video/img/crop-buttons.gif |  Bin 0 -> 856 bytes
 src/plugins/oerpub/video/img/cropnresize.png  |  Bin 0 -> 1981 bytes
 src/plugins/oerpub/video/img/handle-sw.png    |  Bin 0 -> 728 bytes
 .../oerpub/video/img/image-align-left.png     |  Bin 0 -> 6702 bytes
 .../oerpub/video/img/image-align-none.png     |  Bin 0 -> 6653 bytes
 .../oerpub/video/img/image-align-right.png    |  Bin 0 -> 6719 bytes
 src/plugins/oerpub/video/img/image-border.png |  Bin 0 -> 6233 bytes
 src/plugins/oerpub/video/img/image-title.png  |  Bin 0 -> 6597 bytes
 src/plugins/oerpub/video/img/image.gif        |  Bin 0 -> 621 bytes
 .../oerpub/video/img/padding-decrease.gif     |  Bin 0 -> 359 bytes
 .../oerpub/video/img/padding-increase.gif     |  Bin 0 -> 358 bytes
 src/plugins/oerpub/video/img/page.png         |  Bin 0 -> 635 bytes
 .../oerpub/video/img/size-decrease.gif        |  Bin 0 -> 346 bytes
 .../oerpub/video/img/size-increase.gif        |  Bin 0 -> 345 bytes
 .../oerpub/video/lib/image-floatingMenu.js    |  316 ++++
 .../oerpub/video/lib/image-plugin-actions.js  |    0
 src/plugins/oerpub/video/lib/image-plugin.js  | 1391 +++++++++++++++++
 src/plugins/oerpub/video/nls/cz/i18n.js       |   16 +
 src/plugins/oerpub/video/nls/de/i18n.js       |    1 +
 src/plugins/oerpub/video/nls/fr/i18n.js       |    1 +
 src/plugins/oerpub/video/nls/i18n.js          |    7 +
 src/plugins/oerpub/video/nls/ru/i18n.js       |   16 +
 src/plugins/oerpub/video/package.json         |    1 +
 src/plugins/oerpub/video/test/test.css        |   12 +
 src/plugins/oerpub/video/test/test.html       |   40 +
 .../oerpub/video/vendor/jcrop/jcrop.gif       |  Bin 0 -> 329 bytes
 .../video/vendor/jcrop/jquery.jcrop.css       |   46 +
 .../video/vendor/jcrop/jquery.jcrop.min.js    |  165 ++
 .../video/vendor/mousewheel/mousewheel.js     |   85 +
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 0 -> 260 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 0 -> 251 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 0 -> 178 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 0 -> 104 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 0 -> 125 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 0 -> 105 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 0 -> 3762 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 0 -> 90 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 0 -> 129 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 0 -> 4369 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 0 -> 4369 bytes
 50 files changed, 2515 insertions(+)
 create mode 100755 src/plugins/oerpub/video/README.md
 create mode 100755 src/plugins/oerpub/video/css/image.css
 create mode 100644 src/plugins/oerpub/video/demo/crop.html
 create mode 100644 src/plugins/oerpub/video/demo/crop.php
 create mode 100644 src/plugins/oerpub/video/demo/cropnresize.jpg
 create mode 100644 src/plugins/oerpub/video/demo/index.html
 create mode 100755 src/plugins/oerpub/video/img/blank.jpg
 create mode 100644 src/plugins/oerpub/video/img/crop-buttons.gif
 create mode 100755 src/plugins/oerpub/video/img/cropnresize.png
 create mode 100644 src/plugins/oerpub/video/img/handle-sw.png
 create mode 100755 src/plugins/oerpub/video/img/image-align-left.png
 create mode 100755 src/plugins/oerpub/video/img/image-align-none.png
 create mode 100755 src/plugins/oerpub/video/img/image-align-right.png
 create mode 100755 src/plugins/oerpub/video/img/image-border.png
 create mode 100755 src/plugins/oerpub/video/img/image-title.png
 create mode 100755 src/plugins/oerpub/video/img/image.gif
 create mode 100755 src/plugins/oerpub/video/img/padding-decrease.gif
 create mode 100755 src/plugins/oerpub/video/img/padding-increase.gif
 create mode 100755 src/plugins/oerpub/video/img/page.png
 create mode 100755 src/plugins/oerpub/video/img/size-decrease.gif
 create mode 100755 src/plugins/oerpub/video/img/size-increase.gif
 create mode 100644 src/plugins/oerpub/video/lib/image-floatingMenu.js
 create mode 100644 src/plugins/oerpub/video/lib/image-plugin-actions.js
 create mode 100755 src/plugins/oerpub/video/lib/image-plugin.js
 create mode 100755 src/plugins/oerpub/video/nls/cz/i18n.js
 create mode 100755 src/plugins/oerpub/video/nls/de/i18n.js
 create mode 100755 src/plugins/oerpub/video/nls/fr/i18n.js
 create mode 100755 src/plugins/oerpub/video/nls/i18n.js
 create mode 100755 src/plugins/oerpub/video/nls/ru/i18n.js
 create mode 100755 src/plugins/oerpub/video/package.json
 create mode 100644 src/plugins/oerpub/video/test/test.css
 create mode 100644 src/plugins/oerpub/video/test/test.html
 create mode 100755 src/plugins/oerpub/video/vendor/jcrop/jcrop.gif
 create mode 100755 src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css
 create mode 100755 src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js
 create mode 100644 src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_222222_256x240.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_228ef1_256x240.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png
 create mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffffff_256x240.png

diff --git a/src/plugins/oerpub/video/README.md b/src/plugins/oerpub/video/README.md
new file mode 100755
index 0000000000..6b1f2485b0
--- /dev/null
+++ b/src/plugins/oerpub/video/README.md
@@ -0,0 +1,68 @@
+
+# The AlohaEditor Image Plugin
+
+Image Plugin for enabling basic images manipulations in Aloha Editor
+
+## Features
+
+* Insert image
+* Edit url and title
+* set align
+* Handles [DragnDropFiles Plugin](https://github.com/alohaeditor/Aloha-Plugin-DragAndDropFiles) events for image files dropped in current page.
+* css resize with controlbuttons or mousedrag
+* reset to natural size (DEV)
+* canvas crop (EXPERIMENTAL)
+
+## Example conf
+
+    config: {
+			'img': {
+				'max_width': '50px',
+				'max_height': '50px',
+				//Image manipulation options - ONLY in default config section
+				'ui': {
+					'align': true,       // Menu elements to show/hide in menu
+					'resize': true,		 //resize buttons
+					'meta': true,
+					'margin': true,
+					'crop':true,
+					'resizable': true,   //resizable ui-drag image
+					'aspectRatio': true
+				},
+				/**
+				 * crop callback is triggered after the user clicked accept to accept his crop
+				 * @param image jquery image object reference
+				 * @param props cropping properties
+				 */
+				'onCropped':function (image, props) {},
+				/**
+				 * reset callback is triggered before the internal reset procedure is applied
+				 * if this function returns true, then the reset has been handled by the callback
+				 * which means that no other reset will be applied
+				 * if false is returned the internal reset procedure will be applied
+				 * @param image jquery image object reference
+				 * @return true if a reset has been applied, false otherwise
+				 */
+				'onReset': function (image) { return false; }
+			}
+		}
+
+## TODO
+
+* resize slider
+* canvas resize
+
+Copyright (c) 2010-2011 Gentics Software GmbH, aloha@gentics.com 
+
+Author : [Nicolas Karageuzian](https://github.com/nka11)
+
+Contributors :
+
+* [Nils Dehl](https://github.com/mrsunshine) 
+* [Benjamin Athur Lupton](https://github.com/balupton)
+* [Christopher Hlubek](https://github.com/chlu)
+* [Thomas Lete](https://github.com/bistory)
+* [Haymo Meran](https://github.com/draftkraft)
+* [Clemens Prerovsky](https://github.com/cprerovsky) (base of crop and resize feature is a borrow from cropnresize plugin)
+* [Norbert Pomaroli](https://github.com/npomaroli) (for his patience explaining Selection and Range)
+* [Kirk Austin](http://www.kirkaustin.com/) who gave the impulsion to dive into html5 canvas	
diff --git a/src/plugins/oerpub/video/css/image.css b/src/plugins/oerpub/video/css/image.css
new file mode 100755
index 0000000000..c7bbba6aa7
--- /dev/null
+++ b/src/plugins/oerpub/video/css/image.css
@@ -0,0 +1,133 @@
+
+/* Images */
+.aloha-image-align-left {
+    background: url(../img/image-align-left.png);
+}
+
+.aloha-image-align-right {
+    background: url(../img/image-align-right.png);
+}
+
+.aloha-image-align-none {
+    background: url(../img/image-align-none.png);
+}
+
+.aloha-img.aloha-image-title {
+    background: url(../img/image-title.png);
+}
+
+.aloha-img.aloha-image-border {
+    background: url(../img/image-border.png);
+}
+
+.aloha-image-insert {
+    background: url(../img/image.gif) !important;
+}
+
+.aloha-img.aloha-image-padding-increase {
+	background: url(../img/padding-increase.gif);
+}
+
+.aloha-img.aloha-image-padding-decrease {
+	background: url(../img/padding-decrease.gif);
+}
+
+.aloha-img.aloha-image-size-increase {
+	background: url(../img/size-increase.gif);
+}
+
+.aloha-img.aloha-image-size-decrease {
+	background: url(../img/size-decrease.gif);
+}
+
+.aloha-default-file-icon {
+	background: url(../img/page.png);
+
+	width: 16px;
+	height:16px;
+	margin: 0;
+	padding:0;
+}
+
+/* Crop and Resize */
+.aloha-icon-cnr-resize, .aloha-icon-cnr-crop, .aloha-icon-cnr-reset {
+	background: url(../img/cropnresize.png);
+}
+
+.aloha-icon-cnr-crop {
+	background-position: -2px -2px !important;
+}
+
+.aloha-icon-cnr-reset {
+	background-position: -42px -2px !important;
+}
+
+.aloha-icon-cnr-ratio {
+	background-image: url(../img/cropnresize.png) !important;
+	background-position: -60px -2px !important;
+}
+
+#aloha-CropNResize-btns {
+	z-index: 10000;
+	width: 70px;
+	display: none;
+	position: absolute;
+}
+
+#aloha-CropNResize-btns button {
+	background: #ededed;
+	border: 1px solid #c6c6c6;
+	cursor: pointer;
+	color: #96ca03;
+	text-shadow: -1px -1px 1px rgba(0,0,0,0.3);
+	font-size: 16px;
+	border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	padding: 0px;
+	width: 23px;
+	height: 23px;
+	margin-right: 3px;
+}
+
+#aloha-CropNResize-btns button.cnr-crop-apply {
+	padding-left: 2px;
+}
+
+#aloha-CropNResize-btns button.cnr-crop-cancel {
+	color: #c92404;
+}
+
+/*
+ * fix to use big resize handle for images
+ */
+.aloha .ui-resizable-se {
+	width: 16px;
+	height: 16px;
+	background-position: -80px -224px !important;
+}
+
+
+.aloha-image-box-active {
+	-moz-box-shadow:	0px 2px 8px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow:	0px 2px 8px rgba(0, 0, 0, 0.2);
+	box-shadow:			0px 2px 8px rgba(0, 0, 0, 0.2);
+}
+
+.aloha-image-box-active .ui-resizable-handle.ui-resizable-nw {
+}
+.aloha-image-box-active .ui-resizable-handle.ui-resizable-ne {
+}
+.aloha-image-box-active .ui-resizable-handle.ui-resizable-se {
+}
+.aloha-image-box-active .ui-resizable-handle.ui-resizable-sw {
+}
+
+.aloha.aloha-toolbar .aloha-image-input-label .aloha-ui-label-text {
+	/* give labels a reasonable static width so that the url, title, width,
+	   height labeled input elements will align vertically */
+	display: inline-block;
+	width: 31px;
+}
+
+@import	"../vendor/jcrop/jquery.jcrop.css";
diff --git a/src/plugins/oerpub/video/demo/crop.html b/src/plugins/oerpub/video/demo/crop.html
new file mode 100644
index 0000000000..bf7f98ccf0
--- /dev/null
+++ b/src/plugins/oerpub/video/demo/crop.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Aloha, World!</title>
+	<script src="../../lib/require.js" data-main="../../lib/aloha.js" id="aloha-script-include" data-plugins="common/format,common/highlighteditables,common/list,common/undo,common/paste,common/image"></script>
+	<link rel="stylesheet" href="../../css/aloha.css" id="aloha-style-include">
+	<link rel="stylesheet" href="../../demo/common/index.css" type="text/css">
+	<script type="text/javascript">
+	if (window.Aloha === undefined || window.Aloha === null)
+		Aloha = {};
+
+		Aloha.settings = {
+		"plugins": {
+		 	"com.gentics.aloha.plugins.Image": {
+				onCropped : function (image, props) {
+					// invoke the image cropper crop.php
+					image
+						.width(props.w) // set width
+						.height(props.h) // and height to new values
+						.attr("src", "crop.php?src=" // and adjust src to the cropped image
+							+ image.attr('src')
+							+ "&x=" + props.x 
+							+ "&y=" + props.y
+							+ "&w=" + props.w
+							+ "&h=" + props.h
+						);
+					jQuery("#info").append("<li>Cropped \"" + image.attr("src") + "\"</li>");
+				},
+				onResized : function (image) {
+					// this is the point where you would add a server-side image-resizer
+					jQuery("#info").append("<li>Resized \"" + image.attr("src") + "\"</li>");
+				},
+				onReset : function (image) {
+					// handle resetting the image
+					jQuery("#info").append("<li>Resetted \"" + image.attr("src") + "\" to it's initial state</li>");
+				},
+				aspectRatio : false, // if set to false the aspectRatio will not be maintained anymore when resizing
+				maxHeight : 500, // supply a maximum height for resizing
+				minHeight : 200, // and a minimum height
+				maxWidth : 700, // maximum image width for resizing
+				minWidth : 200, // and minimum width
+				grid : 100 // snap to an invisible grid when resizing
+			}
+		}
+	};
+
+	require.ready(function() {
+		// Prepare
+		var	$ = window.jQuery,
+			$body = $('body');
+
+		$body.bind('aloha',function(){
+			$('#title').aloha();
+			$('#teaser').aloha();
+			$('#content').aloha();
+		});
+	});
+	</script>
+</head>
+<body>
+<div id="main"> 
+<h1 id="title">Aloha, Images! (Extended Version :)</h1>
+<div id="bodyContent">
+<div id="teaser" class="shorttext">
+<p>This <b>extended example</b> is intended for developers planning to use the the CropNResize plugin found at <a href="https://github.com/alohaeditor/Aloha-Plugin-CropNResize">https://github.com/alohaeditor/Aloha-Plugin-CropNResize</a>. It displays the whole set of configuration options currently available. Well, just take a look at the code.</p>
+</div>
+<div id="content" class="article">
+<p>Click the image to start resizing right away, as a resize handle will appear in it's south-east corner.</p>
+<p><img src="cropnresize.jpg" /></p>
+</div>
+</div>
+<ol id="info"></ol>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/plugins/oerpub/video/demo/crop.php b/src/plugins/oerpub/video/demo/crop.php
new file mode 100644
index 0000000000..350a35959f
--- /dev/null
+++ b/src/plugins/oerpub/video/demo/crop.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Simple, very basic image cropper for CropNResize plugin demonstration
+ * @author Clemens Prerovsky
+ */
+header('Content-type: image/jpeg');
+
+// load parameters from url
+$src = $_GET["src"];
+$x = intval($_GET["x"]);
+$y = intval($_GET["y"]);
+$w = intval($_GET["w"]);
+$h = intval($_GET["h"]);
+
+// resize image
+$img = imagecreatefromjpeg($src) or die("Error: unknown src");
+$cropped = imagecreatetruecolor($w, $h);
+imagecopyresampled($cropped, $img, 0, 0, $x, $y, $w, $h, $w, $h);
+imagejpeg($cropped);
+imagedestroy($cropped);
+?>
diff --git a/src/plugins/oerpub/video/demo/cropnresize.jpg b/src/plugins/oerpub/video/demo/cropnresize.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e0fad22ff479befbe3efdfd08e74d299e46dc72e
GIT binary patch
literal 76312
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
RIC`t^zyiHne>^Zh|JidpWUBxG

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/demo/index.html b/src/plugins/oerpub/video/demo/index.html
new file mode 100644
index 0000000000..c0f1800314
--- /dev/null
+++ b/src/plugins/oerpub/video/demo/index.html
@@ -0,0 +1,120 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<title>Aloha, Images!</title>
+
+
+<script type="text/javascript">
+	
+	(function(window, undefined) {
+
+		function _onCropped(image, props) {
+
+			var canvas = document.createElement('canvas'),
+			 	context = canvas.getContext("2d"),
+			 	img = image.get(0),
+			 	finalprops = {},
+			 	ratio = {img:{}, disp: {}};
+			
+			ratio.img.h = img.height;// image natural height
+			ratio.img.w = img.width;// image natural width
+			ratio.disp.h = image.height(); // image diplay heigth
+			ratio.disp.w = image.width(); // image diplay width
+			ratio.h = (ratio.img.h / ratio.disp.h);
+			ratio.w = (ratio.img.w / ratio.disp.w);
+			
+			/* 
+			var sourceX = 150;
+	        var sourceY = 0;
+	        var sourceWidth = 150;
+	        var sourceHeight = 150;
+	        var destWidth = sourceWidth;
+	        var destHeight = sourceHeight;
+	        var destX = canvas.width / 2 - destWidth / 2;
+	        var destY = canvas.height / 2 - destHeight / 2;
+			context.drawImage(imageObj, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY, destWidth, destHeight);
+			 */
+			 
+			// props are related to displayed size of image.
+			// apply w/h ratio to props to get fprops which will be related to 'real' image dimensions
+			finalprops.x = props.x * ratio.w;
+			finalprops.y = props.y * ratio.h;
+			finalprops.w = props.w * ratio.w;
+			finalprops.h = props.h * ratio.h;
+			context.drawImage(img,
+					finalprops.x, finalprops.y,
+					finalprops.w, finalprops.h,
+					0,0,
+//					props.x2, props.y2,
+					props.w, props.h);
+			$('body').append(canvas);
+		}
+
+		if (window.Aloha === undefined || window.Aloha === null) {
+			var Aloha = window.Aloha = {};		
+		}
+		
+		Aloha.settings = {
+
+			logLevels: {'error': true, 'warn': true, 'info': true, 'debug': false},
+				
+			'plugins': {
+				'image': {
+					'fixedAspectRatio': false,
+					'maxWidth': 1024,
+					'minWidth': 10,
+					'maxHeight': 786,
+					'minHeight': 10,
+					'globalselector': '.global',
+					'ui': {
+						'oneTab': false
+					}
+				}
+			}
+		};
+    
+    })(window);
+	</script>
+
+	<script src="../../../../lib/aloha.js" data-aloha-plugins="common/format, common/highlighteditables, common/image"></script>
+
+	<link rel="stylesheet" href="../../../../css/aloha.css" id="aloha-style-include" type="text/css">
+	<link rel="stylesheet" href="../../../../demo/common/index.css" type="text/css">
+	
+</head>
+<body>
+  <div id="main">
+  
+		<div id="tree-div"></div>
+		<h1 id="title">Aloha, Images!</h1>
+		<div id="bodyContent">
+			<div id="teaser" class="shorttext">
+				<p>This example will show you how to use the Image plugin found at <a href="https://github.com/alohaeditor/Aloha-Plugin-Image">https://github.com/alohaeditor/Aloha-Plugin-Image</a>.</p>
+			</div>
+			<div id="content" class="article">
+			
+				<p><img src="cropnresize.jpg"></p>
+				<p>Click the image to start resizing right away, as a resize handle will appear in it's south-east corner.</p>
+			
+				<p><em>Note:</em> This is a very simple example, that will not allow subsequent cropping actions, or cropping combined with resizing.</p>
+			</div>
+			
+			Outside of the editable
+			<p><img class="global" src="cropnresize.jpg"></p>
+		</div>
+		
+		
+  </div>
+	
+	
+	<script type="text/javascript">
+	Aloha.ready( function(){
+		var $ = Aloha.jQuery;
+		$('#title').aloha();
+		$('#teaser').aloha();
+		$('#content').aloha();
+	});
+  </script>
+</body>
+</html>
diff --git a/src/plugins/oerpub/video/img/blank.jpg b/src/plugins/oerpub/video/img/blank.jpg
new file mode 100755
index 0000000000000000000000000000000000000000..f882a38ccbf20bf6b8525f035bfc9b144eec88a9
GIT binary patch
literal 685
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=TnT3UgnH5N|va+(V^Kh^O0Y5i4CyyY%
zkdPq1prEjrjJU9fl&GMfgrbC$tgO7eys)^Eijtg)jGVk2$Ph-LR(3XaJ`N5(IT1k-
zIg-Ku0}O&33`Pt_%#2D5OoEKef{g!<Fi3!$3Un+IVB=(F2g;}jFfgz(u`wgbF)}f;
zu(7j>n}?T8Rorq(5U5H7RWHaGkf<P%E{M_pZ!z!y&0-Q{7G$tz_;%VbXYH2Xwyx*q
z=4WaKJ-PfruJ-$ejMs%%S6T6T2ldLY3Y<A}=KRUVqBH%o%`Wx4SX{%}d6A31_u;+G
zNoQEnf^VJOve-)FKI4>cn{zeJb(tU7%peF?$_A5WI>V5%^m(Tk>%+AQ2Yb#$OkBnJ
zX2W6KNz$2|6E=AXP5LlpqM)E)g_45o`fb~<&zUUvErvlVHL1j@`Ef=0nj4!1r>VPW
z*qOIio$WRNdqdK+cI&=9PiFLQdcgYa+ON-(lI%`5F#D|W>j<dH=leQaEXnA|i&pky
zAKpi9Oatp+Rzn!Q@7DdeA|Lmg1q_9a#d$s)h7S(z2+fI@ILlkd;GD4{@0OP7j{>Gl
z`p+OVNl8gbpT)&G?dat@yUy>O{EdNewzz-MYrAj$H}H!w`PJ+Ue(o{X%KOsNlcoN4
Yzt2hCDb2FKs_SL11r1XM2KoOt0fZOc5dZ)H

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/crop-buttons.gif b/src/plugins/oerpub/video/img/crop-buttons.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b854ca4faf904e713fa939c66039d96888b21209
GIT binary patch
literal 856
zcmV-e1E>5)Nk%w1VK@L80LFU&$s`2HCkM$Z48|=F%PkJZFcZcy6~{Fh!#^g(KPJjQ
zB+ybi(o{UrRXx&HKGIo1yI)P$ab3H4Y}ayM#&~GTcxcOgZOwmg%!+-@i+-_|k+7GN
z+l_s*n3L9&hs~FbxuBb|rK8iJmbR;@sj`on#3HM-k*2wEu&}VEx^I`s36{zOm&ps4
z$_1UoFq+35skwZZ$_lcwvY5*U)2pMiv$LSeDYmw@wYRXI%^KjXqqw-Z*|4a&xw*T$
zyQk4Hy}iA?zPrA@zQDl1tkXcX%yhxQ!Q{KMvDHn+#>VBtyw1tUzuI%Z+i}m&&%@h(
z(9qD%)4|oy&(hM;)YR0~)z#M4*3ICU*Vot9+RWM6+0x>o+uPgU-{0om-QeKh+UC0A
z;^OMz;N#=t<mBY*<KpGz<>uz*=jZ3->eT1y;pph->FMd|>*MO`>g((4>g?s~?C9+5
z?CtFA?CtCA?d<LC?fCfk`T6<${QUj>{Qv*}000000000000000A^8LW3IKlqEC2ui
z05|{{000O6fPaF6goTEOh>41WcT-7^kdcy)RCkJvlbMlJd4qUVZ+4=iq@|*7RCtJ=
zp{A~*sCt5+ueGOCh_tq^sDeqmwn>P;q;6<yt!&3~row;3wQ_7^VQ9>w&W6x-Y+pl5
zW^Zd;KvLGF&fBJPXH-HyS#hM<h0t<gKp_bhUs^XE2Sl(z=PTM7C^BH!Sg~c^uu*cb
zj6eVY0EHSF3IGV8gW$7Qa?ngck)p+lCLXmxJoBMqMF<)zKJci{jhQfHwA47UVg-^q
zDeIAvV+MoEqYTQ>EJeo1jwm}!#8~m8O|yrj&{&ah6u<&8S3i;pgQG+Y5-(QdNaKng
zp>4L~ZfqEEv_iP0q{swOv4X{l8DL(y9b~Udj|~R80=O{Hq1aJtoVe(@;z_N+1x3l>
z0wQrm1xGpHg*B!~Pa<?KW3>~KhJcC<yku}0VKgi?Os>EQwwm=C9t0ee3F!gAggLf>
z1%10tiBi^bjv!C299!?|)*oZfu5!C$b=xs(_nywX<L>6|ICIj<d#^+6)4#t{rG51`
iRV*E%Z(lin{eNJhi6)g?;>duR6u8KO3^sU3AOJhEY1D-P

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/cropnresize.png b/src/plugins/oerpub/video/img/cropnresize.png
new file mode 100755
index 0000000000000000000000000000000000000000..ae04f13ac23a73225ebb4676ecc05b5f3452fe17
GIT binary patch
literal 1981
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
P00000NkvXXu0mjf_b143

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/handle-sw.png b/src/plugins/oerpub/video/img/handle-sw.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c8b686f23f0771d441b4c57f0bee1551891e093
GIT binary patch
literal 728
zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipi9
z6E-Gs>Lh>w000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006rNkl<Z
zXx{DE=S~7a6b0b(xVC8Qh`pj>?}f5-gw<VOK@>Gc<9qo6b2hm+uscM4-d}v1nK}1f
zU;uuVC+r%JDBIW>1jM%Sh++jBgMe5w9#MF}it&hi8B3~q)xm)=h+GL#f`}V~$QBVX
zK0mTW%o(2_nF3~v&krk)X;r;c#g;LMbPkh}5PYoRG<1km783-qP7o(yM2wRVTvgR=
z7e`@4j7gH*c5xUwL^6X>lH|+AB)Jb_$(SThS{Nbi$RbJdJyqTHa2-ZORML*P9<BmI
zBrFV*c4R?<a2mKU22r*V3m+nlAxU@38bhanbK?<Db)1C}F)!(ESx@D)kqq)qXhAfd
zk@!daC9!oO>Mh&{iHHahCxIbY7poC*7uY=E6Lwk<&mH7@KH0I}sSCuds^01#*Yg>h
zb+MsDSb0oI<_VVAK_jMxh?o|{E3(=UnF3}dGqw-nG%y5PW3p`rn<sQ3UO!Oj2C*R7
zJF)RJPy~BQ*#@xUU|-UTvz*Y1U>BI}V%fHX4MlxHu(QwdfbE^wc*=Swtq6AZSst)8
zCPT1RoaIDUh*A}sl2^#C;aG|AaM?@5`xjh_@HsYdNvN^CQ@;=~$=PSG5ZeH<8Jl&n
zT_M<$>2vm#uTZUt8-hsn93ee6KCh56)Vvp@RrU583aWbN6IC&ST~wC9?Ci5V=nI1V
zS@y-*v0)du`2tG^;^P}NRsHh^P5NhjzWA-=0<%zSzoDoN0pJ(DI=}pP0$95M0000<
KMNUMnLSTX>aV^yV

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/image-align-left.png b/src/plugins/oerpub/video/img/image-align-left.png
new file mode 100755
index 0000000000000000000000000000000000000000..5436f1760c4fa0879a2ea844a41ba441b88d7634
GIT binary patch
literal 6702
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
Eg3S0G$N&HU

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/image-align-none.png b/src/plugins/oerpub/video/img/image-align-none.png
new file mode 100755
index 0000000000000000000000000000000000000000..e11f030bfee037d488b5fc804a2d7ea80285ff66
GIT binary patch
literal 6653
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
Hu0mjfFgo}B

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/image-align-right.png b/src/plugins/oerpub/video/img/image-align-right.png
new file mode 100755
index 0000000000000000000000000000000000000000..c9a8e27028289342ebce59446e35b793948c314a
GIT binary patch
literal 6719
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
VA>c`+BryO0002ovPDHLkV1nO`7eN33

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/image-border.png b/src/plugins/oerpub/video/img/image-border.png
new file mode 100755
index 0000000000000000000000000000000000000000..9a0e100805d473c08cd23149972a7b9e23a5f39b
GIT binary patch
literal 6233
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
D<K-^j

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/image-title.png b/src/plugins/oerpub/video/img/image-title.png
new file mode 100755
index 0000000000000000000000000000000000000000..f01b9de3c01362cf0bfb7a3991d4d0ef4ecb6f8f
GIT binary patch
literal 6597
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
D@2K9>

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/image.gif b/src/plugins/oerpub/video/img/image.gif
new file mode 100755
index 0000000000000000000000000000000000000000..d5924f4bb36a73a3cd9245b098dba3fd783bd889
GIT binary patch
literal 621
zcmZ?wbhEHb6krfwc*el+;q%v<ufP1g$TI7|wRM-D?0x!w-TnWS>wKSo{`2<<OZ~Rs
z+RcG0@BXjd61e-x|Ay@$Yw!K9+Y)%-+5fGN{<rLjIQ0Dg=7;~cJ^Fw3_LJ(3{>NYb
zUv>7rrlE7qrhvvBp+{c)UwG^PzNi0}-}zs&Ik0krU;WnL?T`LVzxIFq{r?Tyf-Bbh
zHtq~Pedglod;d2)_`mZp(4wHTuYpzsS8w#&bnQ^(dcR$df!v^`onbSt|6g$P|CWdU
zm)!n8|K|Uy4ZfA@eK$V%-?%-bdV~M=NB>W~`oI6_{}p%suetaC{}YC)4SrP{{hN1%
z&%N>g$n*b8Z~t#ybKKE0(kC*%Z0e@a?CyInK0SN$<^TWx3<C!gf3kor*8!2BIALHv
z)ezRy+|t^_$igDc%<SJ6G$A;siG`7aaYo3jS)mfaQ#d?0nba+Pto(S`80Lpbb8s%U
zRj_f>)w2#=%N)wYWTM35t|6wz7aG{KM?ip$%|T4uj8*hRlYgkNu(-26AFGhB)U~i1
ztgMQzLZb3gE{0ETu(O+bO3HHcnhS;oGzEq7{Slay*x19t6=bvE(RnThQI#n@839g?
z0{j*d|Ck>nA7hf>l3Nqu)X3D(7Hq(<;?Sh0Y79CSe`Y%sdrg@gP~`M*!kG!@9UB=K
FtO3mL_vrut

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/padding-decrease.gif b/src/plugins/oerpub/video/img/padding-decrease.gif
new file mode 100755
index 0000000000000000000000000000000000000000..ea186d31a61fcb10b496e3e299fcb64fca3195cb
GIT binary patch
literal 359
zcmZ?wbhEHb6krfwxXQp_nEhnVj!(0e@3aoee*5vyxjXN-AA5N8^83}>PvlqhKYaS3
zW8vBFfBvsof9dGCN6%k>4~@^6wf6Gbz1Nm)IeGK$`_ngn+<E-PF)Z)c`NtDB-2VRK
z@7{CI=50JZch#<ShaRrpe){IKPv@>Z`Tzg_)5l+*KL7as<JS-0|DU_}{p5`w+fTk&
zyZ!RfYxj;`d$x4TIiMN_(t+Yn7DjdkJq8_+R*;_<*jgMMj=Jhdbuv0^VzLlxbrRqF
zvV?Kbwbf6WUnr@~(Z0G=Xy*ABErCsLv)u$9FF%_wMQ%#BVBxh4Iesn?zA9JQS{4-r
zR#vuFmv$v77Ork~c3oyS*-}*%F;;d73Bg&eOkyI6(wcHwypr6@A{oTDi8JqHPI3tj
Ujdb?$*&pD^xZh2K!I8ll0K6xg!T<mO

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/padding-increase.gif b/src/plugins/oerpub/video/img/padding-increase.gif
new file mode 100755
index 0000000000000000000000000000000000000000..08ead14e6789d24fe548983edbfd931d5d6e33cd
GIT binary patch
literal 358
zcmZ?wbhEHb6krfwxXQp_9h5zL`=_?W*A26uy#4rR?cQrittW5ZeSiAqkJZ~x96bGO
z*7BW4FTc;P=zsY1gK<dP_dow<t-bvG_4m;DoYmV;uRHYc_@(<3HrzgU=lz|>U*>H*
z?HHE#{m0)m>o3h+wd>}yPs_HPJbLcYxoc0hAA8ub@a+Hp|DQho`t<q7_aDE0`2PRg
zz3)k_r;cBGws!mFrCZJ&JO6n5$rnI13`7IPpDc{*42BFkARQn-F|aisXf$xsk!tm5
zDU@_pVP{mk_)>+7jnyk@HbW+xcJgW$z1h;onr_Z9^6i;o%F;AR#_X8O%)=8sWY`re
zT;-}+)a4~4l$%{zRb^QCI(c;T7~JHFHPj^~c=W{tXSi}pvMX^Ji0aCUt1NM0W0u}3
b&9H-kncsyuB*>6)pXY&K59gyEjttfSIX9a3

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/page.png b/src/plugins/oerpub/video/img/page.png
new file mode 100755
index 0000000000000000000000000000000000000000..03ddd799fa0a3aec561c75d4221f195db65d6eb9
GIT binary patch
literal 635
zcmV->0)+jEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!4M{{nR2Ufr
z!N0Gba~KEU>;68^d)m`eN0o>(5%D`Q(1;j>g@G;xlf`0VBQ`PFY?6)!N&f?*K}$p;
zB!U=NBn{eB8${1}&-2_L*HuZp@ZP1@clS@cHp)4iM1ewzw59vko7eMM{e9z|%NNdX
z0V;`?KKSzTCvTm5bc{L^CIKLUxc2X{i{ISz$8Sgf{q)1nXTP{`{s?9mQ$4&hPiKC-
zY8q7(Y1Xu5iCf33=O4Vy(+|zQ?rW#gkKB0f%}?+6{G*qT22|DQB-73`YzA{N4W^=s
zq0kQYcbtFfz<m##*q!(HK869IU|<xZ%BV7`j4ER)zyEd1y{C^ocDB6n%$=sq^eW5%
z3G+lLsnTm0WuDl{@XPhs_M&_1+51nZc`PtPLNM155!5J!G?@lFj4s`i7}NkW1dS?6
z34%162~b0=B_kRMFhegSGzv+;80a!jAw`I?HfsYjbVm|G1b_ggRG0^ilN;70V1~6>
zLz)H<&|z(Y4k<R%uxuAFLod;Z_rKdJ(M3`;septAT)b!F_^81Q%d%Qm4)!;mynE=d
zhPCJrBqV%)b&-za!v)N+9Ca_<*{<rVE32-E0v$?p$S9-BJXbGkFEGRL;ri#^&UDwi
zk8k&q450zH@6I4$cT=kLW~zVIrLVvYRr&D6w=ca?RZm1t0SG|^2srHSZ|C76{0~Gp
V9#%DjY7zhd002ovPDHLkV1iYrAH)Cv

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/size-decrease.gif b/src/plugins/oerpub/video/img/size-decrease.gif
new file mode 100755
index 0000000000000000000000000000000000000000..1e1fac4fd5f75bf5ae0ab017d0085fba8b74c90c
GIT binary patch
literal 346
zcmZ?wbhEHb6krfwxXQp_;+=fq;fICm4^LjW*)Z$LhmU^`pS%~8+%RSRt1TzqH%~u&
z|G|g<KmIS;bvHi0fARLqQ<fjzf8~2*Y}(OFkCv}I|KP>vhNU<6pM87k%8&I29)0}z
zZ{pH()3$#4|NsBet>+G$|GweG-IJGp0J#jb0g69a7}*(=7<53!gZ#w6R_-vdz(Yr>
z|7iOs#SAOO2?rfsyo^{MvD*2^i6qOG)|OXq1q@owGbxBvn6fw}876k$3HMznq|U-q
z#vE2#Ey~y~*%+o+DB8v-E-cq2$ReKDK9Nnjv4BIAdnOy3!W<{&c40P2NnSY-X)&%w
Sc7|=+cWm?6y~oXw!5RRtg?q37

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/img/size-increase.gif b/src/plugins/oerpub/video/img/size-increase.gif
new file mode 100755
index 0000000000000000000000000000000000000000..e673ee9ffa50d112ffbf31d0cc653571f5ea2226
GIT binary patch
literal 345
zcmZ?wbhEHb6krfwxXQp_;+=fq;fICm4^LjW*)Z$LhmU^`pS%~8+|aw`&6X4Io2MUM
zwCnDJ2Os|b_`i7j<@o&m(^q~>S$;S&Htp!8N6S~9fAHdS!_u1vF1(++_0#$Tj}Dyw
z{_*F(iA&G@|NnpK)^i(9+yyciXbBX5vM{nUC@|=NECKn6fvwD8LV<^lRKIKcCB+OY
z<%tI!Uc8K0AMx7x#fdo1gtnGfTb&LuEIhFLqJU6~r_`2xd0e7QO@anz*uy1QDnuFE
zB<p2a(xpUO8O4R=Iupc2YbFS@$<#|Hu*?u=W0Rlb#N0MZQj%LvL`ICOo}FRqw(VOz
LcI|d^WUvMRr<-=x

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/lib/image-floatingMenu.js b/src/plugins/oerpub/video/lib/image-floatingMenu.js
new file mode 100644
index 0000000000..a14eb6e3e9
--- /dev/null
+++ b/src/plugins/oerpub/video/lib/image-floatingMenu.js
@@ -0,0 +1,316 @@
+/*global documents: true define: true */
+/*!
+ * Aloha Editor
+ * Author & Copyright (c) 2011 Gentics Software GmbH
+ * aloha-sales@gentics.com
+ * Licensed under the terms of http://www.aloha-editor.com/license.html
+ * 
+ * Author : Nicolas Karageuzian - http://nka.me
+ */
+define([
+	'jquery',
+    'util/class',
+	'i18n!image/nls/i18n',
+	'i18n!aloha/nls/i18n',
+	'ui/ui',
+	'ui/scopes',
+    'ui/button',
+    'ui/toggleButton',
+    'ui/port-helper-attribute-field'
+],
+function (
+	jQuery,
+	Class,
+	i18n,
+	i18nCore,
+	Ui,
+	Scopes,
+	Button,
+	ToggleButton,
+	AttributeField
+) {
+	'use strict';
+
+	var $ = jQuery;
+	var GENTICS = window.GENTICS;
+	var Aloha = window.Aloha;
+
+	/**
+     * Toolbar elements for Image plugin
+     *
+     * @class MyClass
+     */
+	return Class.extend({
+        /**
+         * Empty constructor
+         *
+         * @method
+         * @constructor
+         */
+		_constructor: function () {
+ 
+		},
+
+         /**
+          * Initialize Floating menu buttons according to plugin config
+          */
+        init: function (plugin) {
+			plugin.floatingMenuControl = this;
+			this.plugin = plugin;
+
+			Scopes.createScope(plugin.name, 'Aloha.empty');
+
+			this._addUIInsertButton();
+			this._addUIMetaButtons();
+			this._addUIResetButton();
+			this._addUIAlignButtons();
+			this._addUIMarginButtons();
+			this._addUICropButtons();
+			this._addUIResizeButtons();
+			this._addUIAspectRatioToggleButton();
+
+//			 TODO fix the function and reenable this button 
+//			this._addNaturalSizeButton();
+		},
+
+		/**
+		 * Adds the aspect ratio toggle button to the floating menu
+		 */
+		_addUIAspectRatioToggleButton: function () {
+			var plugin = this.plugin;
+
+			this._imageCnrRatioButton = Ui.adopt("imageCnrRatio", ToggleButton, {
+				tooltip: i18n.t('button.toggle.tooltip'),
+				icon: 'aloha-icon-cnr-ratio',
+				scope: plugin.name,
+				click: function(){
+					plugin.toggleKeepAspectRatio();
+				}
+			});
+
+			// If the setting has been set to a number or false we need to activate the 
+			// toggle button to indicate that the aspect ratio will be preserved.
+			if (plugin.settings.fixedAspectRatio !== false) {
+				this._imageCnrRatioButton.setState(true);
+				plugin.keepAspectRatio = true;
+			}
+		},
+		
+		/**
+		 * Adds the reset button to the floating menu for the given tab 
+		 */
+		_addUIResetButton: function () {
+			var plugin = this.plugin;
+
+			this._imageCnrResetButton = Ui.adopt("imageCnrReset", Button, {
+				tooltip: i18n.t('Reset'),
+				icon: 'aloha-icon-cnr-reset',
+				scope: plugin.name,
+				click: function(){
+					plugin.reset();
+				}
+			});
+		},
+		
+		/**
+		 * Adds the insert button to the floating menu
+		 */
+		_addUIInsertButton: function () {
+			var plugin = this.plugin;
+
+			this._insertImageButton = Ui.adopt("insertImage", Button, {
+				tooltip: i18n.t('button.addimg.tooltip'),
+				icon: 'aloha-button aloha-image-insert',
+				scope: 'Aloha.continuoustext',
+				click: function(){
+					plugin.insertImg();
+				}
+			});
+		},
+
+        /**
+         * Adds the ui meta fields (search, title) to the floating menu. 
+         */
+		_addUIMetaButtons: function () {
+			var plugin = this.plugin;
+			
+			this.imgSrcField = AttributeField({
+				label: i18n.t('field.img.src.label'),
+				labelClass: 'aloha-image-input-label',
+				tooltip: i18n.t('field.img.src.tooltip'),
+				name: 'imageSource',
+				scope: plugin.name
+			});
+			this.imgSrcField.setObjectTypeFilter(plugin.objectTypeFilter);
+			
+			this.imgTitleField = AttributeField({
+				label: i18n.t('field.img.title.label'),
+				labelClass: 'aloha-image-input-label',
+				tooltip: i18n.t('field.img.title.tooltip'),
+				name: 'imageTitle',
+				scope: plugin.name
+			});
+			this.imgTitleField.setObjectTypeFilter();
+
+            this.imgAltField = AttributeField({
+				label: i18n.t('field.img.alt.label'),
+				labelClass: 'aloha-image-input-label',
+				tooltip: i18n.t('field.img.alt.tooltip'),
+				name: 'imageAlt',
+				scope: plugin.name
+            });
+            this.imgTitleField.setObjectTypeFilter();
+		},
+		
+		/**
+		 * Adds the ui align buttons to the floating menu
+		 */
+		_addUIAlignButtons: function () {
+			var plugin = this.plugin;
+		
+			this._imageAlignLeftButton = Ui.adopt("imageAlignLeft", Button, {
+				tooltip: i18n.t('button.img.align.left.tooltip'),
+				icon: 'aloha-img aloha-image-align-left',
+				scope: plugin.name,
+				click : function () {
+					var el = jQuery(plugin.getPluginFocus());
+					el.add(el.parent()).css('float', 'left');
+				}
+			});
+			
+			this._imageAlignRightButton = Ui.adopt("imageAlignRight", Button, {
+				tooltip: i18n.t('button.img.align.right.tooltip'),
+				icon: 'aloha-img aloha-image-align-right',
+				scope: plugin.name,
+				click : function () {
+					var el = jQuery(plugin.getPluginFocus());
+					el.add(el.parent()).css('float', 'right');
+				}
+			});
+
+			this._imageAlignNoneButton = Ui.adopt("imageAlignNone", Button, {
+				tooltip: i18n.t('button.img.align.none.tooltip'),
+				icon: 'aloha-img aloha-image-align-none',
+				scope: plugin.name,
+				click : function () {
+					var el = jQuery(plugin.getPluginFocus());
+					el.add(el.parent()).css({
+						'float': 'none',
+						display: 'inline-block'
+					});
+				}
+			});
+		},
+		
+		/**
+		 * Adds the ui margin buttons to the floating menu
+		 */
+		_addUIMarginButtons: function () {
+			var plugin = this.plugin;
+
+			this._imageIncPaddingButton = Ui.adopt("imageIncPadding", Button, {
+				tooltip: i18n.t('padding.increase'),
+				icon: 'aloha-img aloha-image-padding-increase',
+				scope: plugin.name,
+				click: function () {
+					jQuery(plugin.getPluginFocus()).increase('padding');
+				}
+			});
+			
+			this._imageDecPaddingButton = Ui.adopt("imageDecPadding", Button, {
+				tooltip: i18n.t('padding.decrease'),
+				icon: 'aloha-img aloha-image-padding-decrease',
+				scope: plugin.name,
+				click: function () {
+					jQuery(plugin.getPluginFocus()).decrease('padding');
+				}
+			});
+		},
+		
+		/**
+		 * Adds the crop buttons to the floating menu
+		 */		
+		_addUICropButtons: function () {
+			var plugin = this.plugin;
+
+			Scopes.createScope('Aloha.img', ['Aloha.global']);
+
+			this._imageCropButton = Ui.adopt("imageCropButton", ToggleButton, {
+				tooltip: i18n.t('Crop'),
+				icon: 'aloha-icon-cnr-crop',
+				scope: plugin.name,
+				click: function () {
+					if (this.getState()) {
+						plugin.crop();
+					} else {
+						plugin.endCrop();
+					}
+				}
+			});
+		},
+
+        /**
+         * Adds the resize buttons to the floating menu
+         */	
+		_addUIResizeButtons: function () {
+			var plugin = this.plugin;
+
+			// Manual resize fields
+			this.imgResizeHeightField = AttributeField({
+				label:  i18n.t('height'),
+				labelClass: 'aloha-image-input-label',
+				name: "imageResizeHeight",
+				width: 50,
+				scope: plugin.name
+			});
+			this.imgResizeHeightField.maxValue = plugin.settings.maxHeight;
+			this.imgResizeHeightField.minValue = plugin.settings.minHeight;
+			
+			this.imgResizeWidthField = AttributeField({
+				label:  i18n.t('width'),				
+				labelClass: 'aloha-image-input-label',
+				name: "imageResizeWidth",
+				width: 50,
+				scope: plugin.name
+			});
+			this.imgResizeWidthField.maxValue = plugin.settings.maxWidth;
+			this.imgResizeWidthField.minValue = plugin.settings.minWidth;
+ 		},
+
+		/**
+		 * Adds the natural size button to the floating menu
+		 */
+		/*
+		  TODO currently deactivated see TODO at call site above.
+		_addNaturalSizeButton: function () {
+			var plugin = this.plugin;
+
+			this._imageNaturalSizeButton = Ui.adopt("imageNaturalSize", Button, {
+				icon: 'aloha-img aloha-image-size-natural',
+				label: i18n.t('size.natural'),
+				scope: plugin.name,
+				click: function () {
+					plugin.resetSize();
+				}
+			});
+		},
+		*/
+
+		/**
+		 * Sets the scope
+		 */
+		setScope: function () {
+			Scopes.setScope(this.plugin.name);
+		},
+
+		/**
+		 * Redraws UI
+		 */
+		doLayout: function () {
+			// Implementation was removed while porting this plugin to
+			// the jqueryui toolbar because it seems to be a hack that
+			// is not needed with the new implementation.
+		}
+    });
+});
+	
diff --git a/src/plugins/oerpub/video/lib/image-plugin-actions.js b/src/plugins/oerpub/video/lib/image-plugin-actions.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/plugins/oerpub/video/lib/image-plugin.js b/src/plugins/oerpub/video/lib/image-plugin.js
new file mode 100755
index 0000000000..d3647e345a
--- /dev/null
+++ b/src/plugins/oerpub/video/lib/image-plugin.js
@@ -0,0 +1,1391 @@
+/*global documents: true define: true*/
+/*
+* Aloha Image Plugin - Allow image manipulation in Aloha Editor
+* 
+* Author & Copyright (c) 2011 Gentics Software GmbH
+* aloha-sales@gentics.com
+* Contributors 
+*		Johannes Schüth - http://jotschi.de
+*		Nicolas karageuzian - http://nka.me/
+*		Benjamin Athur Lupton - http://www.balupton.com/
+*		Thomas Lete
+*		Nils Dehl
+*		Christopher Hlubek
+*		Edward Tsech
+*		Haymo Meran
+*
+* Licensed under the terms of http://www.aloha-editor.com/license.html
+*/
+
+define([
+	// js
+	'jquery',
+	'aloha/plugin',
+	'video/image-floatingMenu',
+	'i18n!aloha/nls/i18n',
+	'i18n!image/nls/i18n',
+	'jqueryui',
+	'video/vendor/jcrop/jquery.jcrop.min',
+	'video/vendor/mousewheel/mousewheel'
+], function AlohaImagePlugin(
+	aQuery,
+	Plugin,
+	ImageFloatingMenu,
+	i18nCore,
+	i18n
+){
+	
+	'use strict';
+	
+	var jQuery = aQuery;
+	var $ = aQuery;
+	var GENTICS = window.GENTICS;
+	var Aloha = window.Aloha;
+	
+	// Attributes manipulation utilities
+	// Aloha team may want to factorize, it could be useful for other plugins
+	// Prototypes
+	String.prototype.toInteger = String.prototype.toInteger || function () {
+		return parseInt(String(this).replace(/px$/, '') || 0, 10);
+	};
+	String.prototype.toFloat = String.prototype.toInteger || function () {
+		return parseFloat(String(this).replace(/px$/, '') || 0, 10);
+	};
+	Number.prototype.toInteger = Number.prototype.toInteger || String.prototype.toInteger;
+	Number.prototype.toFloat = Number.prototype.toFloat || String.prototype.toFloat;
+
+	// Insert jQuery Prototypes	
+	jQuery.extend(true, jQuery.fn, {
+		increase: jQuery.fn.increase || function (attr) {
+			var	obj = jQuery(this), value, newValue;
+			if (!obj.length) {
+				return obj;
+			}
+			value = obj.css(attr).toFloat();
+			newValue = Math.round((value || 1) * 1.2);
+			// when value is 2, won't increase
+			if (value === newValue) {
+				newValue++;
+			}
+			obj.css(attr, newValue);
+			return obj;
+		},
+		decrease: jQuery.fn.decrease || function (attr) {
+			var	obj = jQuery(this), value, newValue;
+			// Check
+			if (!obj.length) {
+				return obj;
+			}
+			// Calculate
+			value = obj.css(attr).toFloat();
+			newValue = Math.round((value || 0) * 0.8);
+			// Apply
+			if (value === newValue && newValue > 0) {
+				// when value is 2, won't increase
+				newValue--;
+			}
+			obj.css(attr, newValue);
+			// Chain
+			return obj;
+		}
+	});
+
+	// Create and register Image Plugin
+	return Plugin.create('video', {
+
+		languages: ['en', 'fr', 'de', 'ru', 'cz'],
+
+		defaultSettings: {
+			'maxWidth': 1600,
+			'minWidth': 3,
+			'maxHeight': 1200,
+			'minHeight': 3,
+			// This setting will correct manually values that are out of bounds
+			'autoCorrectManualInput': true,	 
+			// This setting will define a fixed aspect ratio for all resize actions
+			'fixedAspectRatio' : false, 
+			// When enabled this setting will order the plugin to automatically resize images to given bounds
+			'autoResize': false,
+			//Image manipulation options - ONLY in default config section
+			ui: {
+				oneTab		: false, //Place all ui components within one tab
+				insert      : true, // Shows an insert button on std floatingMenu scope
+				reset		: true, // Reset to default size
+				aspectRatioToggle: true, // Toggle button for the aspect ratio 
+				align		: true,	// Menu elements to show/hide in menu
+				resize		: true,	// Resize buttons
+				meta		: true, // Shows field for changing src and title attributes of an image
+				margin		: true, // shows button to increase/decrease image margin properties
+				crop		: true, // enable/show crop actions on a image
+				resizable	: true,	// Resizable ui-drag image
+				handles     : 'ne, se, sw, nw'   // set handles for resize
+			},
+			
+			/**
+			 * Crop callback is triggered after the user clicked accept to accept his crop
+			 * @param image jquery image object reference
+			 * @param props cropping properties
+			 */
+			onCropped: function ($image, props) {
+				Aloha.Log.info('Default onCropped invoked', $image, props);
+			},
+			
+			/**
+			 * Reset callback is triggered before the internal reset procedure is applied
+			 * if this function returns true, then the reset has been handled by the callback
+			 * which means that no other reset will be applied
+			 * if false is returned the internal reset procedure will be applied
+			 * @param image jquery image object reference
+			 * @return true if a reset has been applied, false otherwise
+			 */
+			onReset: function ($image) {
+				Aloha.Log.info('Default onReset invoked', $image);
+				return false;
+			},
+			
+			/**
+			 * Example callback method which gets called while the resize process is beeing executed.
+			 */
+			onResize: function ($image) {
+				Aloha.Log.info('Default onResize invoked', $image);
+			},
+			
+			/**
+			 * Resize callback is triggered after the internal resize procedure is applied.  
+			 */
+			onResized: function ($image) {
+				Aloha.Log.info('Default onResized invoked', $image);
+			},
+
+			/**
+			 * Upload callback is triggered after an image was uploaded
+			 * to determine the server-side URI of the uploaded image.
+			 * The default expects a json-formatted message.
+			 */
+			onUploadSuccess: function(xhr) {
+				return xhr.response;
+			},
+
+			/**
+			 * Upload callback is triggered after an image failed to upload.
+			 */
+			onUploadFail: function(xhr) {
+				Aloha.Log.info('Default onUploadFail invoked');
+			}
+		},
+		
+		/**
+		 * Internal callback hook which gets invoked when cropping has been finished
+		 */
+		_onCropped: function ($image, props) {
+			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
+			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
+			
+			
+			$('body').trigger('aloha-image-cropped', [$image, props]);
+			
+			// Call the custom onCropped function
+			this.onCropped($image, props);
+		},
+
+		/**
+		 * Internal callback hook which gets invoked when resetting images
+		 */
+		_onReset: function ($image) {
+			
+			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
+			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
+			
+			// No default behaviour defined besides event triggering
+			$('body').trigger('aloha-image-reset', $image);
+			
+			// Call the custom resize function
+			return this.onReset($image);
+		},
+		
+		/**
+		 * Internal callback hook which gets invoked while the image is beeing resized
+		 */
+		_onResize: function ($image) {
+
+			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
+			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
+			
+			// No default behaviour defined besides event triggering
+			$('body').trigger('aloha-image-resize', $image);
+			
+			// Call the custom resize function
+			this.onResize($image);
+		},
+
+		/**
+		 * Internal callback hook which gets invoked when the current resizing action has stopped
+		 */
+		_onResized: function ($image) {
+			
+			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
+			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
+
+			$('body').trigger('aloha-image-resized', $image);
+			
+			// Call the custom resize function
+			this.onResized($image);
+		},
+		
+		/**
+		 * The image that is currently edited
+		 */
+		imageObj: null,
+		
+		/**
+		 * The Jcrop API reference
+		 * this is needed to be able to destroy the cropping frame later on
+		 * the variable is linked to the api object whilst cropping, or set to null otherwise
+		 * strange, but done as documented http://deepliquid.com/content/Jcrop_API.html
+		 */
+		jcAPI: null,
+		
+		
+		/**
+		 * State variable for the aspect ratio toggle feature 
+		 */
+		keepAspectRatio: false,
+		
+		/**
+		 * Variable that will hold the start aspect ratio. This ratio will be used once starResize will be called.  
+		 */
+		startAspectRatio: false, 
+		
+		/**
+		 * This will contain an image's original properties to be able to undo previous settings
+		 *
+		 * when an image is clicked for the first time, a new object will be added to the array
+		 * {
+		 *		obj : [the image object reference],
+		 *		src : [the original src url],
+		 *		width : [initial width],
+		 *		height : [initial height]
+		 * }
+		 *
+		 * when an image is clicked the second time, the array will be checked for the image object
+		 * referenct, to prevent for double entries
+		 */
+		restoreProps: [],
+
+		objectTypeFilter: [],
+
+		/**
+		 * Plugin initialization method
+		 */
+		init: function () {
+
+			var plugin = this;
+			
+			var imagePluginUrl = Aloha.getPluginUrl('image');
+			
+			
+			
+			// Extend the default settings with the custom ones (done by default)
+			plugin.startAspectRatio = plugin.settings.fixedAspectRatio; 
+			plugin.config = plugin.defaultSettings;
+			plugin.settings = jQuery.extend(true, plugin.defaultSettings, plugin.settings);
+			
+			plugin.initializeUI();
+			plugin.bindInteractions();
+			plugin.subscribeEvents();
+
+		},
+
+		/**
+		* Create buttons
+		*/
+		initializeUI: function () {
+			
+			var that = this;
+
+			this.ui = new ImageFloatingMenu();
+			this.ui.init(this);
+		},
+		/**
+		 * Bind plugin interactions
+		 */
+		bindInteractions: function () {
+			var	plugin = this;
+			
+			if (plugin.settings.ui.resizable) {
+				try {
+					// this will disable mozillas image resizing facilities
+					document.execCommand('enableObjectResizing', false, false);
+				} catch (e) {
+					Aloha.Log.info(e, 'Could not disable enableObjectResizing');
+					// this is just for internet explorer, who will not support disabling enableObjectResizing
+				}
+			}
+
+			if (plugin.settings.ui.meta) {
+				// update image object when src changes
+				plugin.ui.imgSrcField.addListener('keyup', function (event) {
+					plugin.srcChange();
+				});
+
+				plugin.ui.imgSrcField.addListener('blur', function (event) {
+					// TODO remove image or do something usefull if the user leaves the
+					// image without defining a valid image src.
+					var img = jQuery(plugin.ui.imgSrcField.getTargetObject());
+					if (img.attr('src') === '') {
+						img.remove();
+					} // image removal when src field is blank
+				});
+			}
+			
+			// Override the default method by using the given one
+			if (plugin.settings.onCropped && typeof plugin.settings.onCropped === "function") {
+				plugin.onCropped = plugin.settings.onCropped;
+			}
+			
+			// Override the default method by using the given one
+			if (plugin.settings.onReset && typeof plugin.settings.onReset === "function") {
+				plugin.onReset = plugin.settings.onReset;
+			}
+
+			// Override the default method by using the given one
+			if (plugin.settings.onResized && typeof plugin.settings.onResized === "function") {
+				plugin.onResized = plugin.settings.onResized;
+			}
+			
+			// Override the default method by using the given one
+			if (plugin.settings.onResize && typeof plugin.settings.onResize === "function") {
+				plugin.onResize = this.settings.onResize;
+			}
+			
+		},
+
+		/**
+		 * Subscribe to Aloha events and DragAndDropPlugin Event
+		 */
+		subscribeEvents: function () {
+			var	plugin = this;
+			var config = this.settings;
+			
+			jQuery('img').filter(config.globalselector).unbind();
+			jQuery('img').filter(config.globalselector).click(function (event) {
+				plugin.clickImage(event);
+			});
+
+			Aloha.bind('aloha-drop-files-in-editable', function (event, data) {
+				var img, len = data.filesObjs.length, fileObj, config;
+
+				while (--len >= 0) {
+					fileObj = data.filesObjs[len];
+					if (fileObj.file.type.match(/image\//)) {
+						config = plugin.getEditableConfig(data.editable);
+						// Prepare
+						// If the user is dropping onto an existing image change the existing img tag
+						if (data.range.startContainer === data.range.endContainer && data.range.startContainer.tagName && data.range.startContainer.tagName.toLowerCase() == 'img') {
+						  img = jQuery(data.range.startContainer);
+						  img.attr('src', fileObj.file.objectURL);
+						} else {
+							img = jQuery('<img/>');
+							img.css({
+								"max-width": plugin.maxWidth,
+								"max-height": plugin.maxHeight
+							});
+							img.attr('id', fileObj.id);
+							img.attr('src', fileObj.file.dataURI);
+
+							var start = jQuery(data.range.startContainer).parents('.aloha-image-upload-drop-box');
+							if (start.length != 0) {
+								// Replace the box with the image tag.
+								start.replaceWith(img);
+							} else {
+								GENTICS.Utils.Dom.insertIntoDOM(img, data.range, jQuery(Aloha.activeEditable.obj));
+							}
+						}
+					}
+				}
+			});
+
+            /* Event handlers for successful/failed uploads */
+			Aloha.bind('aloha-upload-success', function (event, data) {
+                // Get the server-side url from the response, set it
+                // as the src for the image.
+                var url = plugin.settings.onUploadSuccess(data.xhr);
+                if ( url !== null && data.file.droptarget) {
+                    var $target = jQuery(data.file.droptarget);
+                    if ($target.is('img')){
+                        jQuery(data.file.droptarget).attr('src', url);
+                    } else {
+                        var $img = jQuery('<img/>');
+                        $img.css({
+                            "max-width": plugin.maxWidth,
+                            "max-height": plugin.maxHeight
+                        });
+                        $img.attr('src', url);
+                        var range = Aloha.Selection.getRangeObject();
+                        GENTICS.Utils.Dom.insertIntoDOM($img, range, $target);
+                    }
+                }
+            });
+
+			Aloha.bind('aloha-upload-failure', function (event, data) {
+                plugin.settings.onUploadFail(data.xhr);
+            });
+
+			/*
+			 * Add the event handler for selection change
+			 */
+			Aloha.bind('aloha-selection-changed', function (event, rangeObject, originalEvent) {
+				var config, foundMarkup;
+				if (originalEvent && originalEvent.target) {
+					// Check if the element is currently beeing resized
+					if (plugin.settings.ui.resizable && !jQuery(originalEvent.target).hasClass('ui-resizable-handle')) {
+						plugin.endResize();
+						plugin.imageObj = null;
+						Aloha.trigger('aloha-image-unselected', originalEvent.target);
+					}
+				}
+
+				if (Aloha.activeEditable !== null) {
+					foundMarkup = plugin.findImgMarkup(rangeObject);
+					config = plugin.getEditableConfig(Aloha.activeEditable.obj);
+
+					if (typeof config !== 'undefined') {
+						plugin.ui._insertImageButton.show();
+					} else {
+						plugin.ui._insertImageButton.hide();
+						return;
+					}
+
+					// Enable image specific ui components if the element is an image
+					if (foundMarkup) { // TODO : this is always null (below is dead code, moving it to clickImage)
+						plugin.ui._insertImageButton.show();
+						plugin.ui.setScope();
+						if (plugin.settings.ui.meta) {
+							plugin.ui.imgSrcField.setTargetObject(foundMarkup, 'src');
+							plugin.ui.imgTitleField.setTargetObject(foundMarkup, 'title');
+							plugin.ui.imgAltField.setTargetObject(foundMarkup, 'alt');
+						}
+						plugin.ui.imgSrcField.foreground();
+						plugin.ui.imgSrcField.focus();
+					} else {
+						if (plugin.settings.ui.meta) {
+							plugin.ui.imgSrcField.setTargetObject(null);
+						}
+					}
+					// TODO this should not be necessary here!
+					plugin.ui.doLayout();
+				}
+
+			});
+			
+			Aloha.bind('aloha-editable-created', function (event, editable) {
+
+				try {
+					// this will disable mozillas image resizing facilities
+					document.execCommand('enableObjectResizing', false, false);
+				} catch (e) {
+					Aloha.Log.info(e, 'Could not disable enableObjectResizing');
+					// this is just for others, who will not support disabling enableObjectResizing
+				}
+
+				// Inital click on images will be handled here
+				// editable.obj.find('img').attr('_moz_resizing', false);
+				// editable.obj.find('img').contentEditable(false);
+				editable.obj.delegate('img', 'mouseup', function (event) {
+					plugin.clickImage(event);
+					event.stopPropagation();
+				});
+			});
+
+			plugin._subscribeToResizeFieldEvents();
+
+		},
+		
+		
+		/**
+		 * Automatically resize the image to fit into defined bounds.
+		 */
+		autoResize: function() {
+			// @todo add an option to do just down scaling and not upscale when image is too small
+			// @todo handle ratio mismatches (eg 4:3 is set but image is 16:9 --> image need to be cut)
+
+			var that = this;
+
+			var width = that.imageObj.width();
+			var height = that.imageObj.height();
+			var resize = false;
+
+			// Only normalize the field values when the image exeeds the definded bounds
+			if (width < that.settings.minWidth || 
+				width > that.settings.maxWidth || 
+				height < that.settings.minHeight || 
+				height > that.settings.maxHeight) {
+				resize = true;
+			}
+
+			if ( resize && width >= height ) {
+				that._setNormalizedFieldValues('width');
+				that.setSizeByFieldValue();
+				return true;
+			} else if ( resize && width < height ) {
+				that._setNormalizedFieldValues('height');
+				that.setSizeByFieldValue();
+				return true;
+			} else {
+				return false;
+			}
+		},
+
+		/**
+		 * Toggle the keep aspect ratio functionallity
+		 */
+		toggleKeepAspectRatio: function() {
+
+			this.keepAspectRatio = !this.keepAspectRatio;
+
+			this.endResize();
+			if (!this.keepAspectRatio) {
+				this.startAspectRatio = false;
+			} else {
+				// If no fixed aspect ratio was given we will calculate a new start 
+				// aspect ratio that will be used for the next starResize action.
+				if ( typeof this.settings.fixedAspectRatio !== 'number' ) {
+					var currentRatio = this.imageObj.width() / this.imageObj.height();
+					this.startAspectRatio = currentRatio;
+				} else {
+					this.startAspectRatio = this.settings.fixedAspectRatio;
+				}
+			}
+			this.startResize();
+		},
+
+		/**
+		 * Bind interaction events that are invoked on the resize fields
+		 */
+		_subscribeToResizeFieldEvents: function () {
+			var plugin = this;
+
+			/**
+			 * Helper function that will update the fields
+			 */
+			function updateField($field, delta, maxValue, minValue) {
+
+				if (typeof minValue === 'undefined') {
+					minValue = 0;
+				}
+
+				if (typeof maxValue === 'undefined') {
+					maxValue = 8000;
+				}
+
+				// If the current value of the field can't be parsed we don't update it
+				var oldValue = parseInt($field.val(), 10);
+				if (isNaN(oldValue)) {
+					$field.css('background-color', 'red');
+					return false;
+				}
+
+				var newValue = oldValue + delta;
+				// Exit if the newValue is above the maxValue limit (only if the user tries to increment) 
+				if (delta >= 0 && newValue > maxValue) {
+
+					// Auto correct out of bounds values
+					if (plugin.settings.autoCorrectManualInput) {
+						$field.val(maxValue);
+						return true;
+					} else {
+						$field.css('background-color', 'red');
+						return false;
+					}
+				 // Exit if the newValue is below the minValue (only if the user tries to decrement)
+				 } else if (delta <= 0 && newValue < minValue) {
+					
+					// Auto correct out of bounds values
+					if (plugin.settings.autoCorrectManualInput) {
+						$field.val(minValue);
+						return true;
+					} else {
+						$field.css('background-color', 'red');
+						return false;
+					}
+				} else {
+					$field.css('background-color', '');
+				}
+				$field.val(oldValue + delta);
+				return true;
+			};
+
+			/**
+			 * Handle the keyup event on the field
+			 */
+			function handleKeyUpEventOnField(e) {
+				
+				// Load the max/min from the data properties of this event
+				var minValue = e.data.minValue;
+				var maxValue = e.data.maxValue;
+				var fieldName = e.data.fieldName;
+				
+				// Allow backspace and delete
+				if (e.keyCode === 8 || e.keyCode === 46) {
+					if($(this).val() >= minValue) {
+						
+						// Check if we are currently in cropping mode
+						if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
+							plugin.setCropAreaByFieldValue();
+						} else {
+							// 1. Normalize the size
+							plugin._setNormalizedFieldValues(fieldName);
+							// 2. Set the final size to the image
+							plugin.setSizeByFieldValue();
+						}
+					}
+				// 0-9 keys
+				} else if (e.keyCode <= 57 && e.keyCode >= 48 || e.keyCode <= 105 && e.keyCode >= 96 ) {
+					if ($(this).val() >= minValue) {
+						
+						// Check if we are currently in cropping mode
+						if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
+							plugin.setCropAreaByFieldValue();
+						} else {
+							// 1. Normalize the size
+							plugin._setNormalizedFieldValues(fieldName);
+							// 2. Set the final size to the image
+							plugin.setSizeByFieldValue();
+						}
+					}
+				} else {
+					var delta = 0;
+					if (e.keyCode === 38 || e.keyCode === 107) {
+						delta = +1;
+					} else if (e.keyCode === 40 || e.keyCode === 109) {
+						delta = -1;
+					}
+					// Handle key combinations 
+					if (e.shiftKey || e.metaKey || e.ctrlKey) {
+						delta = delta * 10;
+					}
+					
+					// Only resize when field values are ok
+					if (updateField($(this), delta, maxValue, minValue)) {
+						// Check if we are currently in cropping mode
+						if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
+							plugin.setCropAreaByFieldValue();
+						} else {
+							// 1. Normalize the size
+							plugin._setNormalizedFieldValues(fieldName);
+							// 2. Set the final size to the image
+							plugin.setSizeByFieldValue();
+						}
+					}
+				}
+				
+				e.preventDefault();
+				return false;
+			}
+
+			/**
+			 * Handle the mouse wheel event on the field
+			 */
+			function handleMouseWheelEventOnField(e, delta) {
+				var minValue = e.data.minValue;
+				var maxValue = e.data.maxValue;
+				var fieldName = e.data.fieldName;
+
+				// Handle key combinations 
+				if (e.shiftKey || e.metaKey || e.ctrlKey) {
+					delta = delta * 10;
+				}
+
+				// Only resize when field values are ok
+				if (updateField($(this), delta, maxValue, minValue)) {
+
+					// Check if we are currently in cropping mode
+					if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
+						plugin.setCropAreaByFieldValue();
+					} else {
+						// 1. Normalize the size
+						plugin._setNormalizedFieldValues(fieldName);
+						// 2. Set the final size to the image
+						plugin.setSizeByFieldValue();
+					}
+				}
+		        return false;
+			}
+
+			/**
+			 * Handle mousewheel,keyup actions on both fields
+			 */
+			var $heightField = $('#' + plugin.ui.imgResizeHeightField.getInputId());
+			var heightEventData = {fieldName: 'height', maxValue: plugin.ui.imgResizeHeightField.maxValue, minValue: plugin.ui.imgResizeHeightField.minValue };
+			$heightField.live('keyup', heightEventData, handleKeyUpEventOnField);
+			$heightField.live('mousewheel', heightEventData, handleMouseWheelEventOnField);
+			
+			var $widthField = $('#' + plugin.ui.imgResizeWidthField.getInputId());
+			var widthEventData = {fieldName: 'width', maxValue: plugin.ui.imgResizeWidthField.maxValue, minValue: plugin.ui.imgResizeWidthField.minValue};
+			$widthField.live('keyup', widthEventData, handleKeyUpEventOnField);
+			$widthField.live('mousewheel', widthEventData, handleMouseWheelEventOnField);
+			
+		},
+
+		
+		/**
+		 * This helper function will keep the aspect ratio for the field with the given name.
+		 *
+		 * @param {string} primaryFieldName What should be used as primary option to calculate (can be 'width' or 'height')
+		 */
+		_setNormalizedFieldValues: function (primaryFieldName) {
+
+			var plugin = this;
+			var widthField = jQuery("#" + plugin.ui.imgResizeWidthField.getInputId());
+			var heightField = jQuery("#" + plugin.ui.imgResizeHeightField.getInputId());
+			var width = widthField.val();
+			var height = heightField.val();
+
+			var size = plugin._normalizeSize(width, height, primaryFieldName);
+
+			widthField.val(size.width);
+			heightField.val(size.height);
+			
+		},
+
+		/**
+		 * Manually set the given size for the current image
+		 */
+		setSize: function (width, height) {
+			
+			var plugin = this;
+			plugin.imageObj.width(width);
+			plugin.imageObj.height(height);
+			var $wrapper = plugin.imageObj.closest('.Aloha_Image_Resize');
+			$wrapper.height(height);
+			$wrapper.width(width);
+
+			plugin._onResize(plugin.imageObj);
+			plugin._onResized(plugin.imageObj);
+		},
+
+		/**
+		 * This method will handle the mouseUp event on images (eg. within editables). 
+		 * It will if enabled activate the resizing action.
+		 */
+		clickImage: function (e) {
+
+			var plugin = this;
+			plugin.endResize(); // removes previous resize handler
+			plugin.imageObj = jQuery(e.target);
+			var currentImage = plugin.imageObj;
+			
+			// Ignore any images that are part of the ui (e.g. block edit and delete icons)
+			if (currentImage.hasClass('aloha-ui')) {
+				return;
+			}
+
+			plugin.ui.setScope();
+			
+			var editable = currentImage.closest('.aloha-editable');
+			
+			// Disabling the content editable. This will disable the resizeHandles in internet explorer
+			// already done in resize on a smaller scope, this block next aloha-selection-change event
+			// to be thrown
+			// editable.contentEditable(false);
+			
+			//Store the current props of the image
+			this.restoreProps.push({
+				obj : e.srcElement,
+				src : plugin.imageObj.attr('src'),
+				width : plugin.imageObj.width(),
+				height : plugin.imageObj.height()
+			});
+
+			// Update the resize input fields with the new width and height
+			$('#' + plugin.ui.imgResizeHeightField.getInputId()).val(plugin.imageObj.height());
+			$('#' + plugin.ui.imgResizeWidthField.getInputId()).val(plugin.imageObj.width());
+			
+			if (plugin.settings.ui.meta) {
+				plugin.ui.imgSrcField.setTargetObject(plugin.imageObj, 'src');
+				plugin.ui.imgTitleField.setTargetObject(plugin.imageObj, 'title');
+				plugin.ui.imgAltField.setTargetObject(plugin.imageObj, 'alt');
+			}
+			Aloha.Selection.preventSelectionChanged();
+			try {
+				plugin.ui.imgSrcField.focus();
+			} catch(e) {
+				// FIXME for some reason execution breaks at this point
+			}
+
+			if (plugin.settings.ui.resizable) {
+				plugin.startResize();
+			}
+			
+			if (plugin.settings.autoResize) {
+				plugin.autoResize();
+			}
+			
+			Aloha.Selection.preventSelectionChangedFlag = false;
+			Aloha.trigger('aloha-image-selected', e.target);
+		},
+
+		/**
+		 * This method extracts determins if the range selection contains an image
+		 * 
+		 * UNUSED as long as clickImage don't change the selection
+		 * @see getPluginFocus instead
+		 */
+		findImgMarkup: function (range) {
+
+			var plugin = this;
+			var config = this.config;
+			var result, targetObj;
+
+			if (typeof range === 'undefined') {
+				range = Aloha.Selection.getRangeObject();
+			}
+
+			targetObj = jQuery(range.startContainer);
+
+			try {
+				if (Aloha.activeEditable) {
+					if ((typeof range.startContainer !== 'undefined' &&
+						typeof range.startContainer.childNodes !== 'undefined' &&
+						typeof range.startOffset !== 'undefined' &&
+						typeof range.startContainer.childNodes[range.startOffset] !== 'undefined' &&
+						range.startContainer.childNodes[range.startOffset].nodeName.toLowerCase() === 'img' &&
+						range.startOffset + 1 === range.endOffset) ||
+						(targetObj.hasClass('Aloha_Image_Resize')))
+					{
+						result = targetObj.find('img')[0];
+						if (! result.css) {
+							result.css = '';
+						}
+						
+						if (! result.title) {
+							result.title = '';
+						}
+						
+						if (! result.src) {
+							result.src = ''; 
+						}
+
+                        if (!result.alt) {
+                            result.alt = '';
+                        }
+						return result;
+					}
+					else {
+						return null;
+					}
+				}
+			} catch (e) {
+				Aloha.Log.debug(e, "Error finding img markup.");
+			}
+			return null;
+		},
+		/**
+		 * Gets the plugin focus target
+		 */
+		getPluginFocus: function () {
+			return this.imageObj;
+		},
+
+		/**
+		 * This helper function will calculate the new width and height while keeping 
+		 * the aspect ratio when the keepAspectRatio flag is set to true. The primarySize 
+		 * can be 'width' or 'height'. The function will first try to normalize the opposite size.
+		 *
+		 * @param {integer} width Target width for the new image size
+		 * @param {integer} height Target height for the new image size
+		 * @param {integer} primarySize can be 'width' or 'height'
+		 * @return Image width and height.
+		 */
+		_normalizeSize: function( width, height, primarySize ) {
+			var that = this;
+			// Convert string values to numbers
+			width = parseInt(width); 
+			height = parseInt(height);
+
+			/**
+			 * Inner function that calculates the new height by examining the width 
+			 */
+			function handleHeight( callHandleWidth ) {
+				// Check whether the value is within bounds 
+				if ( height > that.settings.maxHeight ) {
+					// Throw a notification event
+					var eventProps = { 'org': height, 'new': that.settings.maxHeight};
+					$('body').trigger('aloha-image-resize-outofbounds', ["height", "max", eventProps]);
+					height = that.settings.maxHeight;
+				} else if ( height < that.settings.minHeight ) {
+					// Throw a notification event
+					var eventProps = { 'org': height, 'new': that.settings.minHeight};
+					$('body').trigger('aloha-image-resize-outofbounds', ["height", "min", eventProps]);
+					height = that.settings.minHeight;
+				}
+
+				if ( that.keepAspectRatio ) {
+					width = height * aspectRatio;
+
+					// We don't want to invoke handleWidth again. This would mess up our previously calculated width
+					if ( callHandleWidth ) {
+						handleWidth( false );
+					}
+				}
+			}
+
+			/**
+			 * Inner function that calculates the new width by examining the width
+			 */
+			function handleWidth( callHandleHeight ) {
+
+				// Check whether the value is within bounds 
+				if (width > that.settings.maxWidth) {
+				
+					// Throw a notification event
+					var eventProps = { 'org': width, 'new': that.settings.maxWidth};
+					$('body').trigger('aloha-image-resize-outofbounds', ["width", "max", eventProps]);
+				
+					width = that.settings.maxWidth;
+				} else if ( width < that.settings.minWidth ) {
+					// Throw a notification event
+					var eventProps = { 'org': width, 'new': that.settings.minWidth};
+					$('body').trigger('aloha-image-resize-outofbounds', ["width", "min", eventProps]);
+
+					width = that.settings.minWidth;
+				}
+
+				// Calculate the new height
+				if ( that.keepAspectRatio ) {
+					height = width / aspectRatio;
+				
+					// We don't want to invoke handleHeight again. This would mess up our previously calculated height
+					if ( callHandleHeight ) {
+						handleHeight( false );
+					}
+				
+				}
+			
+			}
+
+			// use the 4:3 ratio as default value.
+			var aspectRatio = 1.33333;
+
+			// if keepAspectRatio is set to true, calculate it from the image size
+			if ( that.keepAspectRatio ) {
+				aspectRatio = width / height;
+			}
+
+			if ( typeof that.startAspectRatio === 'number' ) {
+				aspectRatio = that.startAspectRatio;
+			}  
+
+			// Determin which size should be handled
+			if ( primarySize == 'width' ) {
+				handleWidth( true );
+			}
+
+			if ( primarySize == 'height' ) {
+				handleHeight( true );
+			}
+
+			// Floor the values return them
+			return { 'width': Math.floor( width ), 'height': Math.floor( height ) };
+		},
+
+		/**
+		 * Helper function that will set the new image size using the field values
+		 */
+		setSizeByFieldValue: function () {
+			var plugin = this;
+			var width =  $('#' + plugin.ui.imgResizeWidthField.getInputId()).val();
+			var height = $('#' + plugin.ui.imgResizeHeightField.getInputId()).val();
+			plugin.setSize(width, height);
+		},
+		
+		/**
+		 * Helper function that will set the new crop area width and height using the field values
+		 */
+		setCropAreaByFieldValue: function () {
+			var plugin = this;
+			var currentCropArea = plugin.jcAPI.tellSelect();
+
+			var width =  $('#' + plugin.ui.imgResizeWidthField.getInputId()).val();
+			width = parseInt(width, 10);
+			var height = $('#' + plugin.ui.imgResizeHeightField.getInputId()).val();
+			height = parseInt(height, 10);
+
+			var selection = [currentCropArea['x'], currentCropArea['y'], currentCropArea['x'] + width,currentCropArea['y'] + height];
+			plugin.jcAPI.setSelect(selection);
+		},
+
+		/**
+		* This method will insert a new image dom element into the dom tree
+		*/		
+		insertImg: function () {
+				var range = Aloha.Selection.getRangeObject(),
+				config = this.getEditableConfig(Aloha.activeEditable.obj),
+				imagePluginUrl = Aloha.getPluginUrl('image'),
+				imagestyle, imagetag, newImg;
+
+				if (range.isCollapsed()) {
+					// TODO I would suggest to call the srcChange method. So all image src
+					// changes are on one single point.
+					
+					// Create a div that allows the user to drop an image, upload, or provide a URL
+					var uploadBox = jQuery('<div></div>');
+					uploadBox.addClass('aloha-image-upload-drop-box aloha-ephemera-wrapper');
+					uploadBox.attr('contentEditable', false);
+					uploadBox.append('<span class="aloha-ephemera">Click to upload an image or drop one here</span>');
+
+
+                    // Create upload form and add upload code for it
+                    var $form = $(
+                        '<form />', {method: 'POST',
+                            enctype: 'multipart/form-data'});
+                    var $input = $('<input />', {type: 'file', name: 'upload'});
+                    $form.hide().append($input).addClass('aloha-ephemera');
+                    uploadBox.append($form);
+                    uploadBox.on('click', function(evt){
+                        uploadBox.find('span').remove();
+                        uploadBox.off('click');
+                        $form.show();
+                    });
+                    $input.on('change', function(evt){
+                        // Turn this into a drop event and let the relevant
+                        // plugin handle it
+                        Aloha.trigger('aloha-upload-file', {target: uploadBox[0], files: evt.target.files});
+                    });
+
+					GENTICS.Utils.Dom.insertIntoDOM(uploadBox, range, jQuery(Aloha.activeEditable.obj));
+
+			} else {
+				Aloha.Log.error('img cannot markup a selection');
+				// TODO the desired behavior could be me the selected content is
+				// replaced by an image.
+				// TODO it should be editor's choice, with an NON-Ext Dialog instead of alert
+
+			}
+		},
+
+		srcChange: function () {
+			// TODO the src changed. I suggest :
+			// 1. set an loading image (I suggest set src base64 enc) to show the user
+			// we are trying to load an image
+			// 2. start a request to get the image
+			// 3a. the image is ok change the src
+			// 3b. the image is not availbable show an error.
+			 this.imageObj.attr('src', this.ui.imgSrcField.getValue()); // (the img tag)
+//			 jQuery(img).attr('src', this.imgSrcField.getQueryValue()); // (the query value in the inputfield)
+//			 this.imgSrcField.getItem(); // (optinal a selected resource item)
+			// TODO additionally implement an srcChange Handler to let implementer
+			// customize
+		},
+
+		/**
+		 * Reposition the crop buttons below the crop area
+		 */
+		positionCropButtons: function() {
+		
+			var jt = jQuery('.jcrop-tracker:first'),
+				off = jt.offset(),
+				jtt = off.top,
+				jtl = off.left,
+				jth = jt.height(),
+				jtw = jt.width();
+
+			var oldLeft = 0,
+				oldTop = 0;
+
+			var btns = jQuery('#aloha-CropNResize-btns');
+			
+			// Hack to hide the buttons when the user just clicked into the image
+			if (jtt === 0 && jtl === 0) {
+				btns.hide();
+			}
+			
+			// move the icons to the bottom right side
+			jtt = parseInt(jtt + jth + 3, 10);
+			jtl = parseInt(jtl + (jtw / 2) - (btns.width() / 2) + 10, 10);
+
+			// comparison to old values hinders flickering bug in FF
+			if (oldLeft != jtl || oldTop != jtt) {
+				btns.offset({top: jtt, left: jtl});
+			}
+
+			oldLeft = jtl;
+			oldTop = jtt;
+		},
+
+		/**
+		 * Code imported from CropnResize Plugin
+		 *
+		 */
+		initCropButtons: function() {
+			var that = this,
+				btns;
+
+			jQuery('body').append(
+				'<div id="aloha-CropNResize-btns" display="none">' +
+					'<button class="cnr-crop-apply" title="' + i18n.t('Accept') + '"></button>' +
+					'<button class="cnr-crop-cancel" title="' + i18n.t('Cancel') + '"></button>' +
+				'</div>'
+			);
+
+			btns = jQuery('#aloha-CropNResize-btns');
+			
+			btns.find('.cnr-crop-apply').click(function () {
+				that.acceptCrop();
+			});
+			
+			btns.find('.cnr-crop-cancel').click(function () {
+				that.endCrop();
+			});
+
+			this.interval = setInterval(function () {
+				that.positionCropButtons();
+			}, 10);
+		},
+
+		/**
+		 * Destroy crop confirm and cancel buttons
+		 */
+		destroyCropButtons: function () {
+			jQuery('#aloha-CropNResize-btns').remove();
+			clearInterval(this.interval);
+		},
+
+		/**
+		 * Helper function that will disable selectability of elements
+		 */
+		_disableSelection: function (el) {
+			el.find('*').attr('unselectable', 'on')
+			       .css({
+			        '-moz-user-select':'none',
+			        '-webkit-user-select':'none',
+			        'user-select':'none'
+			       });
+			  /*
+			       .each(function() {
+			        this.onselectstart = function () { return false; };
+			       });
+			       */
+			  
+		},
+
+		/**
+		 * Initiate a crop action
+		 */
+		crop: function () {
+			var plugin = this;
+			var config = this.config;
+
+			plugin.initCropButtons();
+			if (plugin.settings.ui.resizable) {
+				plugin.endResize();
+			}
+			
+			plugin.jcAPI = jQuery.Jcrop(plugin.imageObj, {
+				onSelect : function () {
+					plugin._onCropSelect();
+					// ugly hack to keep scope :(
+					window.setTimeout(function () {
+						plugin.ui.setScope();
+					}, 10);
+				}
+			});
+			
+			plugin._disableSelection($('.jcrop-holder'));
+			plugin._disableSelection($('#imageContainer'));
+			plugin._disableSelection($('#aloha-CropNResize-btns'));
+			$('body').trigger('aloha-image-crop-start', [plugin.imageObj]);
+		},
+
+		/**
+		 * Internal on crop select method
+		 */
+		_onCropSelect: function () {
+			var plugin = this;
+
+			jQuery('#aloha-CropNResize-btns').fadeIn('slow');
+
+			// Hide the crop buttons when the one of the handles is clicked
+			jQuery('.jcrop-handle').mousedown(function () {
+				jQuery('#aloha-CropNResize-btns').hide();
+			});
+
+			jQuery('.jcrop-tracker').mousedown(function () {
+				jQuery('#aloha-CropNResize-btns').hide();
+			});
+
+			// Update the width and height field using the intiial active crop area values
+			if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
+
+				plugin.positionCropButtons();
+				var currentCropArea = plugin.jcAPI.tellSelect();
+				
+				var widthField = jQuery("#" + plugin.ui.imgResizeWidthField.getInputId()).val(currentCropArea['w']);
+				var heightField = jQuery("#" + plugin.ui.imgResizeHeightField.getInputId()).val(currentCropArea['h']);
+			}
+			
+		},
+
+
+		/**
+		 * Terminates a crop
+		 */
+		endCrop: function () {
+			if (this.jcAPI) {
+				this.jcAPI.destroy();
+				this.jcAPI = null;
+			}
+
+			this.destroyCropButtons();
+			this.ui._imageCropButton.setState(false);
+
+			if (this.settings.ui.resizable) {
+				this.startResize();
+			}
+
+			if (this.keepAspectRatio) {
+				var currentRatio = this.imageObj.width() / this.imageObj.height();
+				this.startAspectRatio = currentRatio;
+			}
+			
+			$('body').trigger('aloha-image-crop-stop', [this.imageObj]);
+		},
+
+		/**
+		 * Accept the current cropping area and apply the crop
+		 */
+		acceptCrop: function () {
+			this._onCropped(this.imageObj, this.jcAPI.tellSelect());
+			this.endCrop();
+		},
+
+		/**
+		 * This method will activate the jquery-ui resize functionality for the current image
+		 */
+		startResize: function () {
+			var plugin = this;
+			var currentImageObj = this.imageObj;
+
+			currentImageObj = this.imageObj.css({
+				height		: this.imageObj.height(),
+				width		: this.imageObj.width(),
+				position	: 'relative',
+				'max-height': '',
+				'max-width'	: ''
+			});
+
+			currentImageObj.resizable({
+				maxHeight : plugin.settings.maxHeight,
+				minHeight : plugin.settings.minHeight,
+				maxWidth  : plugin.settings.maxWidth,
+				minWidth  : plugin.settings.minWidth,
+				aspectRatio : plugin.startAspectRatio,
+				handles: plugin.settings.handles,
+				grid : plugin.settings.grid,
+				resize: function (event, ui) { 
+					plugin._onResize(plugin.imageObj);
+				},
+				stop : function (event, ui) {
+					plugin._onResized(plugin.imageObj);
+					
+					// Workaround to finish cropping
+					if (this.enableCrop) {
+						window.setTimeout(function () {
+							plugin.ui.setScope();
+							that.done(event);
+						}, 10);
+					}
+				}
+
+			});
+
+			currentImageObj.css('display', 'inline-block');
+
+			// this will prevent the user from resizing an image
+			// using IE's resize handles
+			// however I could not manage to hide them completely
+			jQuery('.ui-wrapper')
+				.attr('contentEditable', false)
+				.addClass('aloha-ephemera-wrapper aloha-image-box-active Aloha_Image_Resize aloha')
+				.css({
+					position: 'relative',
+					display: 'inline-block',
+					'float': plugin.imageObj.css('float')
+				})
+				.bind('resizestart', function (e) {
+					e.preventDefault();
+				})
+				.bind('mouseup', function (e) {
+					e.originalEvent.stopSelectionUpdate = true;
+				});
+		},
+
+		/**
+		 * This method will end resizing and toggle buttons accordingly and remove all markup that has been added for cropping
+		 */
+		endResize: function () {
+			// Find the nearest contenteditable and reenable it since resizing is finished
+			if (this.imageObj) {
+				var editable = this.imageObj.closest('.aloha-editable');
+				//this.imageObj.contentEditable(true);
+			}
+			
+			if (this.imageObj && this.imageObj.is(":ui-resizable")) {
+				this.imageObj
+					.resizable('destroy')
+					.css({
+						top	 : 0,
+						left : 0
+					});
+			}
+		},
+		resetSize: function () {
+			var	plugin = this,
+				img = new Image();
+			img.onload = function () {
+				var myimage = plugin.getPluginFocus();
+				if (plugin.settings.ui.resizable) {
+					plugin.endResize();
+				}
+				jQuery(myimage).add(myimage.parent()).css({
+						'width': img.width + 'px',
+						'height': img.height + 'px',
+						'max-width': '',
+						'max-height': ''
+					});
+				if (plugin.settings.ui.resizable) {
+					plugin.resize();
+				}
+			};
+			img.src = plugin.getPluginFocus().attr('src');
+		},
+		/**
+		 * Reset the image to it's original properties
+		 */
+		reset: function () {
+			if (this.settings.ui.crop) {
+				this.endCrop();
+			}
+			
+			if (this.settings.ui.resizable) {
+				this.endResize();
+			}
+
+			if (this._onReset(this.imageObj)) {
+				// the external reset procedure has already performed a reset, so there is no need to apply an internal reset
+				return;
+			}
+
+			for (var i = 0;i < this.restoreProps.length;i++) {
+				// restore from restoreProps if there is a match
+				if (this.imageObj.get(0) === this.restoreProps[i].obj) {
+					this.imageObj.attr('src', this.restoreProps[i].src);
+					this.imageObj.width(this.restoreProps[i].width);
+					this.imageObj.height(this.restoreProps[i].height);
+					return;
+				}
+			}
+		}
+	});
+
+});
diff --git a/src/plugins/oerpub/video/nls/cz/i18n.js b/src/plugins/oerpub/video/nls/cz/i18n.js
new file mode 100755
index 0000000000..9e0937fc7d
--- /dev/null
+++ b/src/plugins/oerpub/video/nls/cz/i18n.js
@@ -0,0 +1,16 @@
+define({"button.addimg.tooltip":"Přidat obrázek",
+"floatingmenu.tab.img":"Obrázek",
+"button.uploadimg.tooltip":"Upload obrázek",
+"button.uploadimg.label":"Upload",
+"button.img.align.left.tooltip":"Zarovnat doleva",
+"button.img.align.right.tooltip":"Zarovnání vpravo",
+"button.img.align.none.tooltip":"Žádné vyrovnání",
+"field.img.title.label":"",
+"field.img.title.tooltip":"",
+"field.img.src.label":"",
+"field.img.src.tooltip":"",
+"border ":" Přidat rámeček na obrázek",
+"padding.increase ":" Zvětšit pole",
+"padding.decrease ":" Omezují pole",
+"size.increase ":" Zvětšit velikost",
+"size.decrease ":" Zmenšit velikost"});
diff --git a/src/plugins/oerpub/video/nls/de/i18n.js b/src/plugins/oerpub/video/nls/de/i18n.js
new file mode 100755
index 0000000000..82b0948d44
--- /dev/null
+++ b/src/plugins/oerpub/video/nls/de/i18n.js
@@ -0,0 +1 @@
+define({"button.addimg.tooltip":"Bild hinzuf\u00fcgen","floatingmenu.tab.img":"Bild","button.uploadimg.tooltip":"Bild hochladen","button.uploadimg.label":"Hochladen","button.img.align.left.tooltip":"Linksb\u00fcndig","button.img.align.right.tooltip":"Rechtsb\u00fcndig","button.img.align.none.tooltip":"Keine Ausrichtung","field.img.title.label":"Titel","field.img.title.tooltip":"Titel","field.img.src.label":"URL","field.img.src.tooltip":"URL","border":"Rahmen hinzuf\u00fcgen","padding.increase":"Abstand vergr\u00f6\u00dfern","padding.decrease":"Abstand verkleinern","size.increase":"Bild vergr\u00f6\u00dfern","size.decrease":"Bild verkleinern","height":"H\u00f6he","width":"Breite","button.toggle.tooltip": "Seitenverhältnis beibehalten aktivieren/deaktivieren"});
diff --git a/src/plugins/oerpub/video/nls/fr/i18n.js b/src/plugins/oerpub/video/nls/fr/i18n.js
new file mode 100755
index 0000000000..f79273b239
--- /dev/null
+++ b/src/plugins/oerpub/video/nls/fr/i18n.js
@@ -0,0 +1 @@
+define({"size.natural": "Taille originale", "button.addimg.tooltip":"Ajouter une image","floatingmenu.tab.img":"Image","button.uploadimg.tooltip":"Envoyer une image","button.uploadimg.label":"Upload","button.img.align.left.tooltip":"Aligner \u00e0 gauche","button.img.align.right.tooltip":"Aligner \u00e0 droite","button.img.align.none.tooltip":"Sans alignement","field.img.title.label":"titre","field.img.title.tooltip":"Titre de l'image","field.img.src.label":"src","field.img.src.tooltip":"Adresse d'origine","border":"Add Border to Image","padding.increase":"Augmenter l'espace","padding.decrease":"Reduire l'espace","size.increase":"Augmenter la taille","size.decrease":"Reduire la taille","cnr.crop":"D\u00e9couper","Resize":"Redimensionner","Crop":"D\u00e9couper","Reset":"R\u00e9initialiser","Accept":"Valider","Cancel":"Annuler"});
diff --git a/src/plugins/oerpub/video/nls/i18n.js b/src/plugins/oerpub/video/nls/i18n.js
new file mode 100755
index 0000000000..0a7c86421a
--- /dev/null
+++ b/src/plugins/oerpub/video/nls/i18n.js
@@ -0,0 +1,7 @@
+define({
+	root: {"size.natural": "Original size","button.addimg.tooltip":"add image ref","floatingmenu.tab.img":"Image","floatingmenu.tab.formatting":"Formatting","floatingmenu.tab.resize":"Resize","floatingmenu.tab.crop":"Crop","button.uploadimg.tooltip":"Upload img","button.uploadimg.label":"Upload","button.img.align.left.tooltip":"Left align","button.img.align.right.tooltip":"Right Align","button.img.align.none.tooltip":"No alignment","field.img.title.label":"Title","field.img.title.tooltip":"Title","field.img.src.label":"URL","field.img.src.tooltip":"Source","border":"Add Border to Image","padding.increase":"Increase Padding","padding.decrease":"Decrease Padding","size.increase":"Increase Size","size.decrease":"Decrease Size","Resize":"Resize","Crop":"Crop","Reset":"Reset","Accept":"Accept","Cancel":"Cancel","height":"Height","width":"Width","button.toggle.tooltip": "Toggle keep aspect ratio","field.img.alt.label": "Alternate text", "field.img.alt.tooltip": "Alternate text"},
+	cz: true,
+	de: true,
+	fr: true,
+	ru: true
+});
diff --git a/src/plugins/oerpub/video/nls/ru/i18n.js b/src/plugins/oerpub/video/nls/ru/i18n.js
new file mode 100755
index 0000000000..aa5837fc2c
--- /dev/null
+++ b/src/plugins/oerpub/video/nls/ru/i18n.js
@@ -0,0 +1,16 @@
+define({"button.addimg.tooltip":"Добавить изображение",
+"floatingmenu.tab.img":"Изображение",
+"button.uploadimg.tooltip":"Загрузить изображение",
+"button.uploadimg.label":"Загрузка",
+"button.img.align.left.tooltip":"Выравнивание по левому краю",
+"button.img.align.right.tooltip":"Выравнивание по правому краю",
+"button.img.align.none.tooltip":"Нет выравнивания",
+"field.img.title.label":"",
+"field.img.title.tooltip":"",
+"field.img.src.label":"",
+"field.img.src.tooltip":"",
+"border ":"Добавить рамку к изображению",
+"padding.increase ":"Увеличить поля",
+"padding.decrease ":"Уменьшить поля",
+"size.increase ":"Увеличить размер",
+"size.decrease ":"Уменьшить размер"});
diff --git a/src/plugins/oerpub/video/package.json b/src/plugins/oerpub/video/package.json
new file mode 100755
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/plugins/oerpub/video/package.json
@@ -0,0 +1 @@
+{}
diff --git a/src/plugins/oerpub/video/test/test.css b/src/plugins/oerpub/video/test/test.css
new file mode 100644
index 0000000000..edf6d5d0cf
--- /dev/null
+++ b/src/plugins/oerpub/video/test/test.css
@@ -0,0 +1,12 @@
+#content {
+	margin-left:  auto;
+    margin-right: auto;
+    position: relative; 
+}
+
+.ui-wrapper {
+	margin-left:  auto  !important;
+    margin-right: auto  !important;
+    position: relative  !important;
+ 
+}
\ No newline at end of file
diff --git a/src/plugins/oerpub/video/test/test.html b/src/plugins/oerpub/video/test/test.html
new file mode 100644
index 0000000000..3ad19e1cbc
--- /dev/null
+++ b/src/plugins/oerpub/video/test/test.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="UTF-8">
+	<title>Aloha, Images!</title>
+
+	<script type="text/javascript" src="../../../../lib/vendor/jquery-1.6.1.js"></script>
+	<script type="text/javascript" src="../vendor/ui/jquery-ui-1.8.10.custom.min.js"></script>
+	<link href="../vendor/ui/ui-lightness/jquery-ui-1.8.10.cropnresize.css" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" href="../../../../demo/common/index.css"	type="text/css">
+	<link rel="stylesheet" href="test.css"	type="text/css">
+
+</head>
+<body>
+<script type="text/javascript">
+		$(document).ready(function() {
+			
+			$("#myimg").resizable({
+				grid: 10,
+				minHeight: 10,
+				minWidth: 10,
+				maxHeight: 800,
+				maxWidth: 900, 
+				handles: 'ne, se, sw, nw',
+					stop : function (event, ui) {
+						console.log("stop");
+					}
+				
+				});
+			
+		});
+	</script>
+
+<div id="main">
+<div id="content">
+<img id="myimg" src="../demo/cropnresize.jpg" width="200px"	height="135px">
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/plugins/oerpub/video/vendor/jcrop/jcrop.gif b/src/plugins/oerpub/video/vendor/jcrop/jcrop.gif
new file mode 100755
index 0000000000000000000000000000000000000000..72ea7ccb5321d5384d70437cfaac73011237901e
GIT binary patch
literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css b/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css
new file mode 100755
index 0000000000..06af882ded
--- /dev/null
+++ b/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css
@@ -0,0 +1,46 @@
+/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
+.jcrop-holder { text-align: left; }
+
+.jcrop-vline, .jcrop-hline
+{
+	font-size: 0;
+	position: absolute;
+	background: white url('jcrop.gif') top left repeat;
+}
+.jcrop-vline { height: 100%; width: 1px !important; }
+.jcrop-hline { width: 100%; height: 1px !important; }
+.jcrop-handle {
+	font-size: 1px;
+	width: 7px !important;
+	height: 7px !important;
+	border: 1px #eee solid;
+	background-color: #333;
+	*width: 9px;
+	*height: 9px;
+}
+
+.cnr-crop-apply {
+	background-image: url(../../img/crop-buttons.gif) !important;
+	background-position: -2px -2px !important;
+}
+
+
+.cnr-crop-cancel {
+	background-image: url(../../img/crop-buttons.gif) !important;
+	background-position: 23px -2px !important;
+}
+
+.jcrop-tracker { width: 100%; height: 100%; }
+
+.custom .jcrop-vline,
+.custom .jcrop-hline
+{
+	background: yellow;
+}
+.custom .jcrop-handle
+{
+	border-color: black;
+	background-color: #C7BB00;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
diff --git a/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js b/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js
new file mode 100755
index 0000000000..2cafe34f2a
--- /dev/null
+++ b/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js
@@ -0,0 +1,165 @@
+define(["jquery"], function(jQuery){
+/**
+ * Jcrop v.0.9.8 (minimized)
+ * (c) 2008 Kelly Hallman and DeepLiquid.com
+ * More information: http://deepliquid.com/content/Jcrop.html
+ * Released under MIT License - this header must remain with code
+ */
+
+
+(function($){$.Jcrop=function(obj,opt)
+{var obj=obj,opt=opt;if(typeof(obj)!=='object')obj=$(obj)[0];if(typeof(opt)!=='object')opt={};if(!('trackDocument'in opt))
+{opt.trackDocument=$.browser.msie?false:true;if($.browser.msie&&$.browser.version.split('.')[0]=='8')
+opt.trackDocument=true;}
+if(!('keySupport'in opt))
+opt.keySupport=$.browser.msie?false:true;var defaults={trackDocument:false,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:.6,borderOpacity:.4,handleOpacity:.5,handlePad:5,handleSize:9,handleOffset:5,edgeMargin:14,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,boxWidth:0,boxHeight:0,boundary:8,animationDelay:20,swingSpeed:3,allowSelect:true,allowMove:true,allowResize:true,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){}};var options=defaults;setOptions(opt);var $origimg=$(obj);var $img=$origimg.clone().removeAttr('id').css({position:'absolute'});$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);;if(options.addClass)$div.addClass(options.addClass);var $img2=$('<img />').attr('src',$img.attr('src')).css('position','absolute').width(boundx).height(boundy);var $img_holder=$('<div />').width(pct(100)).height(pct(100)).css({zIndex:310,position:'absolute',overflow:'hidden'}).append($img2);var $hdl_holder=$('<div />').width(pct(100)).height(pct(100)).css('zIndex',320);var $sel=$('<div />').css({position:'absolute',zIndex:300}).insertBefore($img).append($img_holder,$hdl_holder);var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var xlimit,ylimit,xmin,ymin;var xscale,yscale,enabled=true;var docOffset=getPos($img),btndown,lastcurs,dimmed,animating,shift_down;var Coords=function()
+{var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
+{var pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];};function setCurrent(pos)
+{var pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];};function getOffset()
+{return[ox,oy];};function moveOffset(offset)
+{var ox=offset[0],oy=offset[1];if(0>x1+ox)ox-=ox+x1;if(0>y1+oy)oy-=oy+y1;if(boundy<y2+oy)oy+=boundy-(y2+oy);if(boundx<x2+ox)ox+=boundx-(x2+ox);x1+=ox;x2+=ox;y1+=oy;y2+=oy;};function getCorner(ord)
+{var c=getFixed();switch(ord)
+{case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}};function getFixed()
+{if(!options.aspectRatio)return getRect();var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,min_y=options.minSize[1]/yscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy;if(max_x==0){max_x=boundx*10}
+if(max_y==0){max_y=boundy*10}
+if(real_ratio<aspect)
+{yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0)
+{xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}
+else if(xx>boundx)
+{xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}
+else
+{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0)
+{yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}
+else if(yy>boundy)
+{yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
+if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
+if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x}else if(x1-xx>max_x){xx=x1-max_x;}
+if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
+if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
+if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
+return last=makeObj(flipCoords(x1,y1,xx,yy));};function rebound(p)
+{if(p[0]<0)p[0]=0;if(p[1]<0)p[1]=0;if(p[0]>boundx)p[0]=boundx;if(p[1]>boundy)p[1]=boundy;return[p[0],p[1]];};function flipCoords(x1,y1,x2,y2)
+{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1)
+{xa=x2;xb=x1;}
+if(y2<y1)
+{ya=y2;yb=y1;}
+return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];};function getRect()
+{var xsize=x2-x1;var ysize=y2-y1;if(xlimit&&(Math.abs(xsize)>xlimit))
+x2=(xsize>0)?(x1+xlimit):(x1-xlimit);if(ylimit&&(Math.abs(ysize)>ylimit))
+y2=(ysize>0)?(y1+ylimit):(y1-ylimit);if(ymin&&(Math.abs(ysize)<ymin))
+y2=(ysize>0)?(y1+ymin):(y1-ymin);if(xmin&&(Math.abs(xsize)<xmin))
+x2=(xsize>0)?(x1+xmin):(x1-xmin);if(x1<0){x2-=x1;x1-=x1;}
+if(y1<0){y2-=y1;y1-=y1;}
+if(x2<0){x1-=x2;x2-=x2;}
+if(y2<0){y1-=y2;y2-=y2;}
+if(x2>boundx){var delta=x2-boundx;x1-=delta;x2-=delta;}
+if(y2>boundy){var delta=y2-boundy;y1-=delta;y2-=delta;}
+if(x1>boundx){var delta=x1-boundy;y2-=delta;y1-=delta;}
+if(y1>boundy){var delta=y1-boundy;y2-=delta;y1-=delta;}
+return makeObj(flipCoords(x1,y1,x2,y2));};function makeObj(a)
+{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};};return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}();var Selection=function()
+{var start,end,dragmode,awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;if(options.drawBorders){borders={top:insertBorder('hline').css('top',$.browser.msie?px(-1):px(0)),bottom:insertBorder('hline'),left:insertBorder('vline'),right:insertBorder('vline')};}
+if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
+options.sideHandles&&createHandles(['n','s','e','w']);options.cornerHandles&&createHandles(['sw','nw','ne','se']);function insertBorder(type)
+{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;};function dragDiv(ord,zi)
+{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi});$hdl_holder.append(jq);return jq;};function insertHandle(ord)
+{return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).addClass(cssClass('handle'));};function insertDragbar(ord)
+{var s=options.handleSize,o=hhs,h=s,w=s,t=o,l=o;switch(ord)
+{case'n':case's':w=pct(100);break;case'e':case'w':h=pct(100);break;}
+return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});};function createHandles(li)
+{for(i in li)handle[li[i]]=insertHandle(li[i]);};function moveHandles(c)
+{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;'e'in handle&&handle.e.css({top:px(midvert),left:px(east)})&&handle.w.css({top:px(midvert)})&&handle.s.css({top:px(south),left:px(midhoriz)})&&handle.n.css({left:px(midhoriz)});'ne'in handle&&handle.ne.css({left:px(east)})&&handle.se.css({top:px(south),left:px(east)})&&handle.sw.css({top:px(south)});'b'in handle&&handle.b.css({top:px(south)})&&handle.r.css({left:px(east)});};function moveto(x,y)
+{$img2.css({top:px(-y),left:px(-x)});$sel.css({top:px(y),left:px(x)});};function resize(w,h)
+{$sel.width(w).height(h);};function refresh()
+{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();};function updateVisible()
+{if(awake)return update();};function update()
+{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);options.drawBorders&&borders['right'].css({left:px(c.w-1)})&&borders['bottom'].css({top:px(c.h-1)});seehandles&&moveHandles(c);awake||show();options.onChange(unscale(c));};function show()
+{$sel.show();$img.css('opacity',options.bgOpacity);awake=true;};function release()
+{disableHandles();$sel.hide();$img.css('opacity',1);awake=false;};function showHandles()
+{if(seehandles)
+{moveHandles(Coords.getFixed());$hdl_holder.show();}};function enableHandles()
+{seehandles=true;if(options.allowResize)
+{moveHandles(Coords.getFixed());$hdl_holder.show();return true;}};function disableHandles()
+{seehandles=false;$hdl_holder.hide();};function animMode(v)
+{(animating=v)?disableHandles():enableHandles();};function done()
+{animMode(false);refresh();};var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360})
+$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,done:done};}();var Tracker=function()
+{var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;if(!trackDoc)
+{$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
+function toFront()
+{$trk.css({zIndex:450});if(trackDoc)
+{$(document).mousemove(trackMove).mouseup(trackUp);}}
+function toBack()
+{$trk.css({zIndex:290});if(trackDoc)
+{$(document).unbind('mousemove',trackMove).unbind('mouseup',trackUp);}}
+function trackMove(e)
+{onMove(mouseAbs(e));};function trackUp(e)
+{e.preventDefault();e.stopPropagation();if(btndown)
+{btndown=false;onDone(mouseAbs(e));options.onSelect(unscale(Coords.getFixed()));toBack();onMove=function(){};onDone=function(){};}
+return false;};function activateHandlers(move,done)
+{btndown=true;onMove=move;onDone=done;toFront();return false;};function setCursor(t){$trk.css('cursor',t);};$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}();var KeyManager=function()
+{var $keymgr=$('<input type="radio" />').css({position:'absolute',left:'-30px'}).keypress(parseKey).blur(onBlur),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
+{if(options.keySupport)
+{$keymgr.show();$keymgr.focus();}};function onBlur(e)
+{$keymgr.hide();};function doNudge(e,x,y)
+{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible();};e.preventDefault();e.stopPropagation();};function parseKey(e)
+{if(e.ctrlKey)return true;shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode)
+{case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:Selection.release();break;case 9:return true;}
+return nothing(e);};if(options.keySupport)$keywrap.insertBefore($img);return{watchKeys:watchKeys};}();function px(n){return''+parseInt(n)+'px';};function pct(n){return''+parseInt(n)+'%';};function cssClass(cl){return options.baseClass+'-'+cl;};function getPos(obj)
+{var pos=$(obj).offset();return[pos.left,pos.top];};function mouseAbs(e)
+{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];};function myCursor(type)
+{if(type!=lastcurs)
+{Tracker.setCursor(type);lastcurs=type;}};function startDragMode(mode,pos)
+{docOffset=getPos($img);Tracker.setCursor(mode=='move'?mode:mode+'-resize');if(mode=='move')
+return Tracker.activateHandlers(createMover(pos),doneSelect);var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);};function dragmodeHandler(mode,f)
+{return function(pos){if(!options.aspectRatio)switch(mode)
+{case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}
+else switch(mode)
+{case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}
+Coords.setCurrent(pos);Selection.update();};};function createMover(pos)
+{var lloc=pos;KeyManager.watchKeys();return function(pos)
+{Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};};function oppLockCorner(ord)
+{switch(ord)
+{case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';};};function createDragger(ord)
+{return function(e){if(options.disabled)return false;if((ord=='move')&&!options.allowMove)return false;btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};};function presize($obj,w,h)
+{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0)
+{nw=w;nh=(w/$obj.width())*$obj.height();}
+if((nh>h)&&h>0)
+{nh=h;nw=(h/$obj.height())*$obj.width();}
+xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);};function unscale(c)
+{return{x:parseInt(c.x*xscale),y:parseInt(c.y*yscale),x2:parseInt(c.x2*xscale),y2:parseInt(c.y2*yscale),w:parseInt(c.w*xscale),h:parseInt(c.h*yscale)};};function doneSelect(pos)
+{var c=Coords.getFixed();if(c.w>options.minSelect[0]&&c.h>options.minSelect[1])
+{Selection.enableHandles();Selection.done();}
+else
+{Selection.release();}
+Tracker.setCursor(options.allowSelect?'crosshair':'default');};function newSelection(e)
+{if(options.disabled)return false;if(!options.allowSelect)return false;btndown=true;docOffset=getPos($img);Selection.disableHandles();myCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();Selection.update();e.stopPropagation();e.preventDefault();return false;};function selectDrag(pos)
+{Coords.setCurrent(pos);Selection.update();};function newTracker()
+{var trk=$('<div></div>').addClass(cssClass('tracker'));$.browser.msie&&trk.css({opacity:0,backgroundColor:'white'});return trk;};function animateTo(a)
+{var x1=a[0]/xscale,y1=a[1]/yscale,x2=a[2]/xscale,y2=a[3]/yscale;if(animating)return;var animto=Coords.flipCoords(x1,y1,x2,y2);var c=Coords.getFixed();var animat=initcr=[c.x,c.y,c.x2,c.y2];var interv=options.animationDelay;var x=animat[0];var y=animat[1];var x2=animat[2];var y2=animat[3];var ix1=animto[0]-initcr[0];var iy1=animto[1]-initcr[1];var ix2=animto[2]-initcr[2];var iy2=animto[3]-initcr[3];var pcent=0;var velocity=options.swingSpeed;Selection.animMode(true);var animator=function()
+{return function()
+{pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent<100)animateStart();else Selection.done();if(pcent>=99.8)pcent=100;setSelectRaw(animat);};}();function animateStart()
+{window.setTimeout(animator,interv);};animateStart();};function setSelect(rect)
+{setSelectRaw([rect[0]/xscale,rect[1]/yscale,rect[2]/xscale,rect[3]/yscale]);};function setSelectRaw(l)
+{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();};function setOptions(opt)
+{if(typeof(opt)!='object')opt={};options=$.extend(options,opt);if(typeof(options.onChange)!=='function')
+options.onChange=function(){};if(typeof(options.onSelect)!=='function')
+options.onSelect=function(){};};function tellSelect()
+{return unscale(Coords.getFixed());};function tellScaled()
+{return Coords.getFixed();};function setOptionsNew(opt)
+{setOptions(opt);interfaceUpdate();};function disableCrop()
+{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');};function enableCrop()
+{options.disabled=false;interfaceUpdate();};function cancelCrop()
+{Selection.done();Tracker.activateHandlers(null,null);};function destroy()
+{$div.remove();$origimg.show();};function interfaceUpdate(alt)
+{options.allowResize?alt?Selection.enableOnly():Selection.enableHandles():Selection.disableHandles();Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');$div.css('backgroundColor',options.bgColor);if('setSelect'in options){setSelect(opt.setSelect);Selection.done();delete(options.setSelect);}
+if('trueSize'in options){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
+xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if('outerImage'in options)
+{$img.attr('src',options.outerImage);delete(options.outerImage);}
+Selection.refresh();};$hdl_holder.hide();interfaceUpdate(true);var api={animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},release:Selection.release,destroy:destroy};$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options)
+{function attachWhenDone(from)
+{var loadsrc=options.useImg||from.src;var img=new Image();img.onload=function(){$.Jcrop(from,options);};img.src=loadsrc;};if(typeof(options)!=='object')options={};this.each(function()
+{if($(this).data('Jcrop'))
+{if(options=='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
+else attachWhenDone(this);});return this;};})(jQuery);
+});
diff --git a/src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js b/src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js
new file mode 100644
index 0000000000..a79c290099
--- /dev/null
+++ b/src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js
@@ -0,0 +1,85 @@
+/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
+ * Licensed under the MIT License (LICENSE.txt).
+ *
+ * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+ * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+ * Thanks to: Seamus Leahy for adding deltaX and deltaY
+ *
+ * Version: 3.0.6
+ * 
+ * Requires: 1.2.2+
+ */
+define(['jquery'],function(jQuery){
+(function($) {
+
+var types = ['DOMMouseScroll', 'mousewheel'];
+
+if ($.event.fixHooks) {
+    for ( var i=types.length; i; ) {
+        $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
+    }
+}
+
+$.event.special.mousewheel = {
+    setup: function() {
+        if ( this.addEventListener ) {
+            for ( var i=types.length; i; ) {
+                this.addEventListener( types[--i], handler, false );
+            }
+        } else {
+            this.onmousewheel = handler;
+        }
+    },
+    
+    teardown: function() {
+        if ( this.removeEventListener ) {
+            for ( var i=types.length; i; ) {
+                this.removeEventListener( types[--i], handler, false );
+            }
+        } else {
+            this.onmousewheel = null;
+        }
+    }
+};
+
+$.fn.extend({
+    mousewheel: function(fn) {
+        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
+    },
+    
+    unmousewheel: function(fn) {
+        return this.unbind("mousewheel", fn);
+    }
+});
+
+
+function handler(event) {
+    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
+    event = $.event.fix(orgEvent);
+    event.type = "mousewheel";
+    
+    // Old school scrollwheel delta
+    if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
+    if ( orgEvent.detail     ) { delta = -orgEvent.detail/3; }
+    
+    // New school multidimensional scroll (touchpads) deltas
+    deltaY = delta;
+    
+    // Gecko
+    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+        deltaY = 0;
+        deltaX = -1*delta;
+    }
+    
+    // Webkit
+    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
+    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
+    
+    // Add event and delta to the front of the arguments
+    args.unshift(event, delta, deltaX, deltaY);
+    
+    return ($.event.dispatch || $.event.handle).apply(this, args);
+}
+
+})(jQuery);
+});
diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100755
index 0000000000000000000000000000000000000000..954e22dbd99e8c6dd7091335599abf2d10bf8003
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100755
index 0000000000000000000000000000000000000000..64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d
GIT binary patch
literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
new file mode 100755
index 0000000000000000000000000000000000000000..abdc01082bf3534eafecc5819d28c9574d44ea89
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
new file mode 100755
index 0000000000000000000000000000000000000000..9b383f4d2eab09c0f2a739d6b232c32934bc620b
GIT binary patch
literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
new file mode 100755
index 0000000000000000000000000000000000000000..a23baad25b1d1ff36e17361eab24271f2e9b7326
GIT binary patch
literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100755
index 0000000000000000000000000000000000000000..42ccba269b6e91bef12ad0fa18be651b5ef0ee68
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100755
index 0000000000000000000000000000000000000000..39d5824d6af5456f1e89fc7847ea3599ea5fd815
GIT binary patch
literal 3762
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

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100755
index 0000000000000000000000000000000000000000..f1273672d253263b7564e9e21d69d7d9d0b337d9
GIT binary patch
literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
new file mode 100755
index 0000000000000000000000000000000000000000..359397acffdd84bd102f0e8a951c9d744f278db5
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_222222_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_222222_256x240.png
new file mode 100755
index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a
GIT binary patch
literal 4369
zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~Gm<qS
zlCjL7i8RK}U~J#s@6Y%1S9~7lb?$xLU+y{go_o*h`AV=spXY*!!T<mOmxZ~R9RL9Q
zdj+hrf&W^P#f9C!Zpp^V{;aID?ElVL?Rdohw{Ucz9r_YL7=D6<&8F>PmYTG^FX}c%
zl<zAi(m>GE{DS1Q;~I7<vD)$Yj(fd>-6ze&TN@+F-xsI6sd%SwK#*O5K|pDRZqEy<
zJg0Nd8F@!OxqElm`~U#piM22@u@8B<<ecI*S<egUH7}csd8!)jLBD2s`p(8v&--KE
z71^q9MglFywkSt_5FCr2F%o&UR(5j7-O>moyKE%ct`B(jysxK+1m?G)UyIFs1t0}L
zemGR&?jGaM1YQblj?v&@0iXS#fi-VbR9zLEnHLP?xQ|=%Ihrc7^yPWR!tW$yH!zrw
z#I2}_!JnT^(qk)VgJr`NGdPtT^dmQIZc%=6nTAyJDXk+^3}wUOilJuwq>s=T_!9V)
zr1)DT6VQ2~rgd@!Jlrte3}}m~j}juCS`J4(d-5+e-3@EzzTJNCE2z)w(kJ90z*QE)
zBtnV@4mM>jTrZZ*$01SnGov0&=A-JrX5Ge%Pce1Vj}=5YQqBD^W@n4KmFxxpFK`uH
zP;(xKV+6VJ2|g+?_Lct7`uElL<&jzGS8Gfva2+=8A@#V+xsAj9|Dkg)vL5yhX@~B=
zN2KZSAUD%QH`x>H+@Ou(D1~Pyv#0nc&$!1kI?IO01yw3jD0@80qvc?T*Nr8?-%rC8
z@5$|WY?Hqp`ixmEkzeJTz_`_<!oE0dsO`po1=$i_1k<Um_}caMZcrpqA*x-}Rw(fX
z3Qyh8;-4^Fe)UICI@ayzmyV?48GbR;1*s>wsSRi1%Zivd`#+T{Aib6-rf$}M8sz6v
zb6ERbr-SniO2wbOv!M4)nb}6UVzoVZEh5kQWh_5x4rYy3<sHrHJLqL+DcLT5`t$L@
z5_J8#H;PWO1GW@oId1Y>c!871NeaM(_p=4(kbS6U#x<*k8Wg^KHs2ttCz<+pBxQ$Z
zQMv;kVm5_fF_vH`Mzrq$Y&6u?j6~f<juy`C^I0O`4mfXK0lrRY*VoeJX&k$9aL;Hl
zlp63sf~-1z_419)A8^j|LeQSmK&T8R7nA=Ki3^H;YaeL&hF6>tIV0Yg)Nw7JysIN_
z-_n*K_v1c&D}-1{NbBwS2h#m1y0a5RiEcYil+58$8IDh49bPnzE7R8In6P%V{2IZU
z7#clr=V4<zT-gP2u}DD>yyrRe@oXNqbqo^^LvlLE?%8XaI&N(Np90-psU}7kqmbWk
zZ;YBwJNnNs<m6GqjV2(cCX2e+#tSOgIGm~J&Djknhy!e`&p)NTq>$~d!mx9oMGyT(
znaBoj0d}gpQ^aRr?6nW)$4god*`@Uh2e+YpS@0(Mw{|z|6ko3NbTvDiCu3YO+)egL
z>uW(^ahKFj>iJ-JF!^KhKQyPTznJa;xyHYwxJgr16&Wid_9)-%*mEwo{B_|M9t@S1
zf@T@q?b2Qgl!~_(Roe;fdK)y|XG0;ls;ZbT)w-aOVttk#daQcY7$cpY496H*`m@+L
zeP#$&yRbBjFWv}B)|5-1v=(66M_;V1SWv6MHnO}}1=vby&9l+gaP?|pXwp0AFDe#L
z&MRJ^*qX6wgxhA_`*o=LGZ>G_NTX%AKHPz4bO^R72ZYK}ale3lffDgM8H!Wrw{B7A
z{?c_|dh2J*y<H{`M3l!HEtOc{;H{lJx}(C|*lvPQ+RAcV`>8b04c37OmqUw;#;G<*
z@nz@dV`;7&^$)e!B}cd5tl<nF(??uM#|`*5pIKe!DEUl5-&9M=s_3Yn@-P(czyPQ~
zTU3I3bk%z<*w;9V(oQvt^2H`kBAW;=2oA<L1<qVIK(Z{Hk@5&E&_2mS+|}+?g@FBu
zK+e=OWg<)e?RO;llNw00>0{g(Q>5_7H^@bEJi7;fQ4B$NGZerH#Ae1#8WDTH`iB&)
zC6Et3BYY#mcJxh&)b2C^{aLq~psFN)Q1SucCaBaBUr%5PYX{~-q{KGEh)*;n;?75k
z=hq%i^I}rd;z-#YyI`8-OfMpWz5kgJE3<X7ptj0dmPk5UrEf%nVD%<Giiw4wVh!K0
zFjy-VAnpOFJIDm=jqqahP0Wam<9qv4UMIazx8J<YJz>I!3ean6=UZi!BxG7i(YBk?
z02HM7wS0)Wni{dWbQMRtd-A)_Az!t>F;IwWf~!*)-Az4}yryNkz&9)w>ElA80Oc`6
zHo#9H!Y3*Qx9n@Jn)!w6G^hb;e_n8zpIyXCN`JFkPc)^Q?2MsLNFhMgrcZI-<#1ne
zjH;KFf?4eAT9<t<iUSC5BsF-<$q+H@@j%Yk>mQZ}ZfHLGA#d%s;SZK4p0FwZT2S^{
zQ2BG1xJsbK6?yrHTjJi|5C0u=!|r!?*4FL%y%3q#(d+e>b_2I9!*iI!30}42Ia0bq
zUf`Z?LGSEvtz8s``Tg5o_CP(FbR0X$FlE0yCnB7su<mcL>DPmI2=yOg^*2#cY9o`X
z;NY-3VBHZjnVcGS){GZ98{e+l<X|f4%S*+x526SE1mJ%6M<Nt*!}czEQf{?H1U0br
z^Y7cXNxH@=Ve^#j3H@BPU>q~O$u6pEcgd0CrnIsWffN1MbCZDH<7c^hv+Z0Ucf0{w
zSzi^qKuUHD9Dgp0EAGg@@$zr32dQx>N=ws`MESEsmzgT2&L;?MSTo&ky&!-JR3g~1
zPGTt515X)wr+Bx(G9lWd;@Y3^Vl}50Wb&6-Tiy;HPS0drF`rC}qYq22K4)G#AoD0X
zYw$E+Bz@Zr^50MAwu@$?%f9$r4WHH?*2|67&FXFhXBrVFGmg)6?h3^-1?t;UzH0*I
zNVf9wQLNLnG2@q>6CGm>&y|lC`iCFfYd}9i%+xkl^5oBJ?<;aneCfcHqJh7Yl5uLS
z9Fx-(kMdcNyZejXh22N{mCw_rX1O!cOE&3>e(ZH81PR95wQC37En4O{w;{3q9n1<A
zPC{;HRD3#A!@Lk)+k!~onQ0|-U%#uGd$&L?ZhNC&R)V(mb`NhUqrYysoMQ;Z)sq!y
zW_WwV!+jO*nGT8-Hx_JVmFK^=>t&;p)D%&Z%Nw$gSPa!nz8Slh7=ko2am)XARwOWw
zpsz0~K!s{(dM$NB=(A=kkp>T(*yU6<_dwIx>cH4+LWl282hXa6-EUq>R3t?G2623<
z*RwTN%-fgBmD{fu*ejNn)1@KG?Sg<bw3hQ~jCP9_dLp#J9Fi#nX3wGv<cLwQ;8x0`
zA<%pA%E0S;<5FJhw8e#?n&IA5g19Fv!v7YC%Gxqd<x1=+hht1t>*8z3hYtkQJQjB6
zQ|x>wA=o$=O)+nLmgTXW3<g>_6diA;b4EY{*i<HxX2Q~PA|R-tJ=V1~4KO3h7H~CG
ztNFL#J=a@4Q5K7Ogvj-+3N_IJUjc}x34}a7@bDE3!)Kj4s7ME<v)`yP${V~G_J@6l
zp{&i)CGxx1)X`lnwc}#g;g<(rA1#7Ez8@J}tuMD3bB{Wifbe~LWT0zYNjgb_qn|+G
z2TCDZw1rV|wPx@~-H8<4^MGxfR0aLq+_k+{JT<mckxWLsw*J%G%YH0>*R%6dO2EMg
z@6g?M3rpbnfB@hOdUeb9<OD{Zt&T^7p>6=~I?OIA3@BWAGmTwiQ{x5Cqq<8c10L!P
zd@Qk^BseTX%$Q7^s}5n%HB|)gKx}H$d8Sb$bBnq9-AglT2dGR2(+I;_fL|R4p$odJ
zllfb0NqI)7=^z~qAm1V{(PkpxXsQ#4*NH9yYZ`Vf@)?#ueGgtCmGGY|9U#v|hRdg-
zQ%0#cGIfXCd{Y)JB~qykO;KPvHu|5Ck&(Hn%DF~cct@}j+87xhs2ew;fLm5#2+mb|
z8{9e*YI(u|gt|{x1G+U=DA3y)9s2w7@cvQ($ZJIA)x$e~5_3L<r=v~@?aZ+642@!3
z&nTpp8p^rR@IEsq`uhzfD&i>KFV~ASci8W}jF&VeJoPDUy(BB>ExJpck;%;!`0AAo
zAcHgcnT8%OX&UW_n|%{2B|<6Wp2MMGvd5`T2KKv;ltt_~H+w00x6+SlAD`{K4!9zx
z*1?EpQ%Lwiik){3n{-+YNrT;fH_niD_Ng9|58@m8RsKFVF!6pk@qxa{BH-&8tsim0
zdAQ(GyC^9ane7_KW*#^vMIoeQdpJqmPp%%px3GIftbwESu#+vPyI*YTuJ6+4`z{s?
zpkv~0x4c_PFH`-tqafw5)>4AuQ78SkZ!$8}INLK;Egr;2tS18hEO5=t;QDmZ-qu?I
zG+=DN`nR72Xto{{bJp||`k}-2G;5#xg8E~xgz22)^_Z;=K|4@(E&5J)SY2of=olcw
z5)@L)_Ntcm!*5nEy0M9v0`S33;pO4T<mv%0Rx6?c2H~TA%zOO^T2$@D<Cut3{ae}|
zAT@Uzc>N;>4(Z+<j5j2DQ*r;U|6a;YfP1jST$I3mSn3aNn!?<=B-XkzG?hQH;@bu%
zmFYDDgbC%Wt{6LBrs%88L}deF9pse}dmIp4lmp@Tir9q)JKESa=h>19p_0>u#e-vE
zXCU(6gAvu~I7Cw(xd%0e59MNLw^U37ZDbsBrj%eDCexw8a3G`nTcXVNL6{B7Hj@i&
zbVB{;ApEtHk76q08DJ48dSxd$C(;$K6=FpU<~l9pVoT9arW^Vu{%Bcn4`eIpkOVC|
z$)AKYG_`ypM{0@BUb3^9lqi_c?ONH|4UJMJWDowMVjacycX7}9g={O7swOB+{;+?;
zjBo!9?+nd)ie#x5IbFW-zBOo0c4q@9wGVt5;pNt`=-~Zgcw#*`m($6ibxtZ`H=e=}
zF#GZ~5$%AUn};8U#tRem0J(JTR}<qii}wxmUzVwVIg2$uE2;GN{hhT&GE1i;_fi(_
z9KKXP)ds1Q)XnUhr?uXO-HbKE%5f%+-C>d4vR(dgK2ML~lZsPhayJ2h1%sD4FVst|
zKF)+@`iNzLRjg4=K8@**0=5cE>%?FDc({I^+g9USk<8$&^qD~@%W0i4b|yMG*p4`N
zh}I!ltTRI8Ex$+@V{02Br%xq#O?UlhO{r8WsaZnZCZq0MK9%AXU%MDLT;3=0A9(BV
z9VxxxJd7jo$hw3q;3o?yBLmA=azBUrd9>-<_ANs0n3?-Ic*6&ytb@H~?0E(*d>T5n
z-HiH2jsDf6uWhID%#n>SzOqrFCPDfUcu5QPd?<(=w6pv1BE#nsxS{n!UnC9qAha1<
z;3cpZ9A-e$+Y)%b;w@!!YRA9p%Kf9IHGGg^{+p`mh;q8i7}&e@V3EQaMsItEMS&=X
plT@$;k0WcB_jb;cn%_Idz4HO$QU*abf4}+wi?e96N>fbq{{i|W0@(ln

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_228ef1_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_228ef1_256x240.png
new file mode 100755
index 0000000000000000000000000000000000000000..a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f
GIT binary patch
literal 4369
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

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png
new file mode 100755
index 0000000000000000000000000000000000000000..85e63e9f604ce042d59eb06a8428eeb7cb7896c9
GIT binary patch
literal 4369
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

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png
new file mode 100755
index 0000000000000000000000000000000000000000..e117effa3dca24e7978cfc5f8b967f661e81044f
GIT binary patch
literal 4369
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

literal 0
HcmV?d00001

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffffff_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffffff_256x240.png
new file mode 100755
index 0000000000000000000000000000000000000000..42f8f992c727ddaa617da224a522e463df690387
GIT binary patch
literal 4369
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

literal 0
HcmV?d00001


From 4453e6f10a7c5314ae80d445fea518b9ec5e840f Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 11:40:51 -0600
Subject: [PATCH 02/67] push visual changes to editor

---
 oerpub/index.html                        |  1 +
 src/plugins/oerpub/assorted/lib/image.js | 36 ++++++++++++++++++++----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/oerpub/index.html b/oerpub/index.html
index d4afaa5062..5981312890 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -335,6 +335,7 @@
                       <span class="separator"> </span>
                       <div class="btn-group">
                         <button class="btn action insertImage-oer" rel="tooltip" title="Insert Image"><i class="icon-image-insert"></i></button>
+                        <button class="btn action insertVideo-oer" rel="tooltip" title="Insert Video"><i class="icon-image-insert"></i></button>
                         <button class="btn action createTable" rel="tooltip" title="Create Table"><i class="icon-table-insert"></i></button>
                         <button class="btn dropdown-toggle" data-toggle="dropdown" rel="tooltip" title="Table Operations">
                           <span class="caret"></span>
diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
index 179c300953..2014485624 100644
--- a/src/plugins/oerpub/assorted/lib/image.js
+++ b/src/plugins/oerpub/assorted/lib/image.js
@@ -2,10 +2,11 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
+    var VIDEO_DIALOG_HTML, IMAGE_DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage, showModalVideoDialog;
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert image</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <a class="upload-image-link">Choose a file</a> OR <a class="upload-url-link">get file from the Web</a>\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
-    showModalDialog = function($el) {
+    IMAGE_DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert image</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <a class="upload-image-link">Choose a file</a> OR <a class="upload-url-link">get file from the Web</a>\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    VIDEO_DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        Enter a video URL\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    showModalDialog = function($el, DIALOG_HTML) {
       var $placeholder, $submit, $uploadImage, $uploadUrl, deferred, dialog, imageAltText, imageSource, loadLocalFile, root, setImageSource, settings,
         _this = this;
       settings = Aloha.require('assorted/assorted-plugin').settings;
@@ -143,7 +144,7 @@
       $bubble.find('.change').on('click', function() {
         var promise;
         Aloha.activeEditable = editable;
-        promise = showModalDialog($el);
+        promise = showModalDialog($el, IMAGE_DIALOG_HTML);
         promise.done(function(data) {
           if (data.files.length) {
             jQuery(data.target).addClass('aloha-image-uploading');
@@ -200,7 +201,32 @@
         var newEl, promise;
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
         GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
-        promise = showModalDialog(newEl);
+        promise = showModalDialog(newEl, IMAGE_DIALOG_HTML);
+        promise.done(function(data) {
+          if (data.files.length) {
+            newEl.addClass('aloha-image-uploading');
+            return uploadImage(data.files[0], function(url) {
+              jQuery(data.target).attr('src', url);
+              return newEl.removeClass('aloha-image-uploading');
+            });
+          }
+        });
+        promise.fail(function(data) {
+          var $target;
+          $target = jQuery(data.target);
+          if (!$target.is('img')) {
+            return $target.remove();
+          }
+        });
+        return promise.show();
+      }
+    });
+    UI.adopt('insertVideo-oer', null, {
+      click: function() {
+        var newEl, promise;
+        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
+        GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
+        promise = showModalDialog(newEl, VIDEO_DIALOG_HTML);
         promise.done(function(data) {
           if (data.files.length) {
             newEl.addClass('aloha-image-uploading');

From a12590edde0c51d24f6d746e9b8663d675e45790 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 16:44:26 -0600
Subject: [PATCH 03/67] visual portion of the video plugin

---
 src/plugins/oerpub/assorted/lib/image.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
index 2014485624..f3445ca0e5 100644
--- a/src/plugins/oerpub/assorted/lib/image.js
+++ b/src/plugins/oerpub/assorted/lib/image.js
@@ -5,7 +5,7 @@
     var VIDEO_DIALOG_HTML, IMAGE_DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage, showModalVideoDialog;
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
     IMAGE_DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert image</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <a class="upload-image-link">Choose a file</a> OR <a class="upload-url-link">get file from the Web</a>\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
-    VIDEO_DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        Enter a video URL\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    VIDEO_DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     showModalDialog = function($el, DIALOG_HTML) {
       var $placeholder, $submit, $uploadImage, $uploadUrl, deferred, dialog, imageAltText, imageSource, loadLocalFile, root, setImageSource, settings,
         _this = this;
@@ -14,7 +14,7 @@
       dialog = jQuery(DIALOG_HTML);
       $placeholder = dialog.find('.placeholder.preview');
       $uploadImage = dialog.find('.upload-image-input').hide();
-      $uploadUrl = dialog.find('.upload-url-input').hide();
+      $uploadUrl = dialog.find('.upload-url-input');
       $submit = dialog.find('.action.insert');
       if ($el.is('img')) {
         imageSource = $el.attr('src');
@@ -28,6 +28,7 @@
         $uploadUrl.val(imageSource);
         $uploadUrl.show();
       }
+      /*
       (function(img, baseurl) {
         return img.onerror = function() {
           var errimg;
@@ -37,6 +38,7 @@
           }
         };
       })(dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl);
+      */
       setImageSource = function(href) {
         imageSource = href;
         return $submit.removeClass('disabled');

From 2c7147a5e94123c6f27c4393489f9e05ff05045a Mon Sep 17 00:00:00 2001
From: root <gbadipe@gmail.com>
Date: Sat, 2 Feb 2013 16:54:14 -0600
Subject: [PATCH 04/67] Adding js for processing video urls

---
 src/plugins/oerpub/video/js/embed.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/plugins/oerpub/video/js/embed.js

diff --git a/src/plugins/oerpub/video/js/embed.js b/src/plugins/oerpub/video/js/embed.js
new file mode 100644
index 0000000000..c5bcfce202
--- /dev/null
+++ b/src/plugins/oerpub/video/js/embed.js
@@ -0,0 +1,9 @@
+function ytVidId(url) {
+    var p = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
+    return (url.match(p)) ? RegExp.$1 : false;
+}
+
+function test(url) {
+	test_url = http://www.youtube.com/watch?v=_K46OCFPjHU;
+	console.log(ytVidId(url));
+}

From 94cec3c9021e02c1e7534247c9cee076364aaeb4 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 16:56:53 -0600
Subject: [PATCH 05/67] remove unused code from video dialog

---
 src/plugins/oerpub/assorted/lib/image.js | 37 ------------------------
 1 file changed, 37 deletions(-)

diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
index f3445ca0e5..15f8819308 100644
--- a/src/plugins/oerpub/assorted/lib/image.js
+++ b/src/plugins/oerpub/assorted/lib/image.js
@@ -13,7 +13,6 @@
       root = Aloha.activeEditable.obj;
       dialog = jQuery(DIALOG_HTML);
       $placeholder = dialog.find('.placeholder.preview');
-      $uploadImage = dialog.find('.upload-image-input').hide();
       $uploadUrl = dialog.find('.upload-url-input');
       $submit = dialog.find('.action.insert');
       if ($el.is('img')) {
@@ -28,17 +27,6 @@
         $uploadUrl.val(imageSource);
         $uploadUrl.show();
       }
-      /*
-      (function(img, baseurl) {
-        return img.onerror = function() {
-          var errimg;
-          errimg = baseurl + WARNING_IMAGE_PATH;
-          if (img.src !== errimg) {
-            return img.src = errimg;
-          }
-        };
-      })(dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl);
-      */
       setImageSource = function(href) {
         imageSource = href;
         return $submit.removeClass('disabled');
@@ -57,32 +45,11 @@
         };
         return reader.readAsDataURL(file);
       };
-      dialog.find('.upload-image-link').on('click', function(evt) {
-        evt.preventDefault();
-        $placeholder.hide();
-        $uploadUrl.hide();
-        $uploadImage.click();
-        return $uploadImage.show();
-      });
       dialog.find('.upload-url-link').on('click', function(evt) {
         evt.preventDefault();
         $placeholder.hide();
-        $uploadImage.hide();
         return $uploadUrl.show();
       });
-      $uploadImage.on('change', function() {
-        var $previewImg, files;
-        files = $uploadImage[0].files;
-        if (files.length > 0) {
-          if (settings.image.preview) {
-            $previewImg = $placeholder.find('img');
-            loadLocalFile(files[0], $previewImg);
-            return $placeholder.show();
-          } else {
-            return loadLocalFile(files[0]);
-          }
-        }
-      });
       $uploadUrl.on('change', function() {
         var $previewImg, url;
         $previewImg = $placeholder.find('img');
@@ -107,10 +74,6 @@
           $el.replaceWith(img);
           $el = img;
         }
-        deferred.resolve({
-          target: $el[0],
-          files: $uploadImage[0].files
-        });
         return dialog.modal('hide');
       });
       dialog.on('click', '.btn.action.cancel', function(evt) {

From 928c345370cc6cecf46addf4e1903a08fe0e7860 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 17:19:15 -0600
Subject: [PATCH 06/67] add separate video plugin files

---
 src/plugins/oerpub/assorted/lib/image.coffee |   2 +-
 src/plugins/oerpub/assorted/lib/image.js     |  92 ++++---
 src/plugins/oerpub/assorted/lib/video.coffee | 243 +++++++++++++++++++
 src/plugins/oerpub/assorted/lib/video.js     | 195 +++++++++++++++
 4 files changed, 483 insertions(+), 49 deletions(-)
 create mode 100644 src/plugins/oerpub/assorted/lib/video.coffee
 create mode 100644 src/plugins/oerpub/assorted/lib/video.js

diff --git a/src/plugins/oerpub/assorted/lib/image.coffee b/src/plugins/oerpub/assorted/lib/image.coffee
index 84fc4e9391..bb0cb4d307 100644
--- a/src/plugins/oerpub/assorted/lib/image.coffee
+++ b/src/plugins/oerpub/assorted/lib/image.coffee
@@ -11,7 +11,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     <form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Insert image</h3>
+        <h3>Insert image blah</h3>
       </div>
       <div class="modal-body">
         <div class="image-options">
diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
index 15f8819308..22b58a4aad 100644
--- a/src/plugins/oerpub/assorted/lib/image.js
+++ b/src/plugins/oerpub/assorted/lib/image.js
@@ -1,19 +1,18 @@
-// Generated by CoffeeScript 1.3.3
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var VIDEO_DIALOG_HTML, IMAGE_DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage, showModalVideoDialog;
+    var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    IMAGE_DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert image</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <a class="upload-image-link">Choose a file</a> OR <a class="upload-url-link">get file from the Web</a>\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
-    VIDEO_DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
-    showModalDialog = function($el, DIALOG_HTML) {
+    DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert image blah</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <a class="upload-image-link">Choose a file</a> OR <a class="upload-url-link">get file from the Web</a>\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    showModalDialog = function($el) {
       var $placeholder, $submit, $uploadImage, $uploadUrl, deferred, dialog, imageAltText, imageSource, loadLocalFile, root, setImageSource, settings,
         _this = this;
       settings = Aloha.require('assorted/assorted-plugin').settings;
       root = Aloha.activeEditable.obj;
       dialog = jQuery(DIALOG_HTML);
       $placeholder = dialog.find('.placeholder.preview');
-      $uploadUrl = dialog.find('.upload-url-input');
+      $uploadImage = dialog.find('.upload-image-input').hide();
+      $uploadUrl = dialog.find('.upload-url-input').hide();
       $submit = dialog.find('.action.insert');
       if ($el.is('img')) {
         imageSource = $el.attr('src');
@@ -27,6 +26,13 @@
         $uploadUrl.val(imageSource);
         $uploadUrl.show();
       }
+      (function(img, baseurl) {
+        return img.onerror = function() {
+          var errimg;
+          errimg = baseurl + WARNING_IMAGE_PATH;
+          if (img.src !== errimg) return img.src = errimg;
+        };
+      })(dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl);
       setImageSource = function(href) {
         imageSource = href;
         return $submit.removeClass('disabled');
@@ -35,21 +41,38 @@
         var reader;
         reader = new FileReader();
         reader.onloadend = function() {
-          if ($img) {
-            $img.attr('src', reader.result);
-          }
+          if ($img) $img.attr('src', reader.result);
           setImageSource(reader.result);
-          if (callback) {
-            return callback(reader.result);
-          }
+          if (callback) return callback(reader.result);
         };
         return reader.readAsDataURL(file);
       };
+      dialog.find('.upload-image-link').on('click', function(evt) {
+        evt.preventDefault();
+        $placeholder.hide();
+        $uploadUrl.hide();
+        $uploadImage.click();
+        return $uploadImage.show();
+      });
       dialog.find('.upload-url-link').on('click', function(evt) {
         evt.preventDefault();
         $placeholder.hide();
+        $uploadImage.hide();
         return $uploadUrl.show();
       });
+      $uploadImage.on('change', function() {
+        var $previewImg, files;
+        files = $uploadImage[0].files;
+        if (files.length > 0) {
+          if (settings.image.preview) {
+            $previewImg = $placeholder.find('img');
+            loadLocalFile(files[0], $previewImg);
+            return $placeholder.show();
+          } else {
+            return loadLocalFile(files[0]);
+          }
+        }
+      });
       $uploadUrl.on('change', function() {
         var $previewImg, url;
         $previewImg = $placeholder.find('img');
@@ -74,6 +97,10 @@
           $el.replaceWith(img);
           $el = img;
         }
+        deferred.resolve({
+          target: $el[0],
+          files: $uploadImage[0].files
+        });
         return dialog.modal('hide');
       });
       dialog.on('click', '.btn.action.cancel', function(evt) {
@@ -93,9 +120,7 @@
       });
       return jQuery.extend(true, deferred.promise(), {
         show: function(title) {
-          if (title) {
-            dialog.find('.modal-header h3').text(title);
-          }
+          if (title) dialog.find('.modal-header h3').text(title);
           return dialog.modal('show');
         }
       });
@@ -109,7 +134,7 @@
       $bubble.find('.change').on('click', function() {
         var promise;
         Aloha.activeEditable = editable;
-        promise = showModalDialog($el, IMAGE_DIALOG_HTML);
+        promise = showModalDialog($el);
         promise.done(function(data) {
           if (data.files.length) {
             jQuery(data.target).addClass('aloha-image-uploading');
@@ -132,9 +157,7 @@
       settings = Aloha.require('assorted/assorted-plugin').settings;
       xhr = new XMLHttpRequest();
       if (xhr.upload) {
-        if (!settings.image.uploadurl) {
-          throw new Error("uploadurl not defined");
-        }
+        if (!settings.image.uploadurl) throw new Error("uploadurl not defined");
         xhr.onload = function() {
           var url;
           if (settings.image.parseresponse) {
@@ -166,7 +189,7 @@
         var newEl, promise;
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
         GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
-        promise = showModalDialog(newEl, IMAGE_DIALOG_HTML);
+        promise = showModalDialog(newEl);
         promise.done(function(data) {
           if (data.files.length) {
             newEl.addClass('aloha-image-uploading');
@@ -179,34 +202,7 @@
         promise.fail(function(data) {
           var $target;
           $target = jQuery(data.target);
-          if (!$target.is('img')) {
-            return $target.remove();
-          }
-        });
-        return promise.show();
-      }
-    });
-    UI.adopt('insertVideo-oer', null, {
-      click: function() {
-        var newEl, promise;
-        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
-        GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
-        promise = showModalDialog(newEl, VIDEO_DIALOG_HTML);
-        promise.done(function(data) {
-          if (data.files.length) {
-            newEl.addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              jQuery(data.target).attr('src', url);
-              return newEl.removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        promise.fail(function(data) {
-          var $target;
-          $target = jQuery(data.target);
-          if (!$target.is('img')) {
-            return $target.remove();
-          }
+          if (!$target.is('img')) return $target.remove();
         });
         return promise.show();
       }
diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
new file mode 100644
index 0000000000..8ca0b8e9b9
--- /dev/null
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -0,0 +1,243 @@
+# Aloha Video Plugin
+# * -----------------
+# * This plugin handles when the insertVideo button is clicked
+#
+define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
+
+  # This will be prefixed with Aloha.settings.baseUrl
+  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
+
+  DIALOG_HTML = '''
+    <form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>Insert video blah</h3>
+      </div>
+      <div class="modal-body">
+        <div class="image-options">
+            <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>
+        </div>
+        <div class="image-alt">
+          <div class="forminfo">
+            Please provide a description of this video for the visually impaired.
+          </div>
+          <div>
+            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary action insert">Save</button>
+        <button class="btn action cancel">Cancel</button>
+      </div>
+    </form>'''
+
+  showModalDialog = ($el) ->
+      settings = Aloha.require('assorted/assorted-plugin').settings
+      root = Aloha.activeEditable.obj
+      dialog = jQuery(DIALOG_HTML)
+
+      # Find the dynamic modal elements and bind events to the buttons
+      $placeholder = dialog.find('.placeholder.preview')
+      $uploadUrl =   dialog.find('.upload-url-input').hide()
+      $submit = dialog.find('.action.insert')
+
+      # If we're editing an image pull in the src.
+      # It will be undefined if this is a new image.
+      #
+      # This variable is updated when one of the following occurs:
+      # * selects an image from the filesystem
+      # * enters a URL (TODO: Verify it's an image)
+      # * drops an image into the drop div
+
+      # $el might not be an image, it might be a placeholder for a future image
+      if $el.is('img')
+        # On submit $el.attr('src') will point to what is set in this variable
+        # preserve the alt text if editing an image
+        imageSource = $el.attr('src')
+        imageAltText = $el.attr('alt')
+      else
+        imageSource = ''
+        imageAltText = ''
+
+      dialog.find('[name=alt]').val(imageAltText)
+
+      if /^https?:\/\//.test(imageSource)
+        $uploadUrl.val(imageSource)
+        $uploadUrl.show()
+
+      # Set onerror of preview image
+      ((img, baseurl) ->
+        img.onerror = ->
+          errimg = baseurl + WARNING_IMAGE_PATH
+          img.src = errimg unless img.src is errimg
+      ) dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl
+
+      setImageSource = (href) ->
+        imageSource = href
+        $submit.removeClass('disabled')
+
+      # Uses the File API to render a preview of the image
+      # and updates the modal's imageSource
+      loadLocalFile = (file, $img, callback) ->
+        reader = new FileReader()
+        reader.onloadend = () ->
+          if $img
+            $img.attr('src', reader.result)
+          # If we get an image then update the modal's imageSource
+          setImageSource(reader.result)
+          callback(reader.result) if callback
+        reader.readAsDataURL(file)
+
+      # Add click handlers
+      dialog.find('.upload-image-link').on 'click', (evt) ->
+        evt.preventDefault()
+        $placeholder.hide()
+        $uploadUrl.hide()
+
+      dialog.find('.upload-url-link').on 'click', (evt) ->
+        evt.preventDefault()
+        $placeholder.hide()
+        $uploadUrl.show()
+
+      $uploadUrl.on 'change', () ->
+        $previewImg = $placeholder.find('img')
+        url = $uploadUrl.val()
+        setImageSource(url)
+        if settings.image.preview
+          $previewImg.attr 'src', url
+          $placeholder.show()
+
+      # On save update the actual img tag. Use the submit event because this
+      # allows the use of html5 validation.
+      deferred = $.Deferred()
+      dialog.on 'submit', (evt) =>
+        evt.preventDefault() # Don't submit the form
+        if $el.is('img')
+          $el.attr 'src', imageSource
+          $el.attr 'alt', dialog.find('[name=alt]').val()
+        else
+          img = jQuery('<img/>')
+          img.attr 'src', imageSource
+          img.attr 'alt', dialog.find('[name=alt]').val()
+          $el.replaceWith(img)
+          $el = img
+        dialog.modal('hide')
+
+      dialog.on 'click', '.btn.action.cancel', (evt) =>
+        evt.preventDefault() # Don't submit the form
+        deferred.reject(target: $el[0])
+        dialog.modal('hide')
+
+      dialog.on 'hidden', (event) ->
+        # If hidden without being confirmed/cancelled, reject
+        if deferred.state()=='pending'
+          deferred.reject(target: $el[0])
+        # Clean up after dialog was hidden
+        dialog.remove()
+
+      # Return promise, with an added show method
+      jQuery.extend true, deferred.promise(),
+        show: (title) ->
+            if title
+              dialog.find('.modal-header h3').text(title)
+            dialog.modal 'show'
+
+  selector = 'img'
+
+  populator = ($el, pover) ->
+      # When a click occurs, the activeEditable is cleared so squirrel it
+      editable = Aloha.activeEditable
+      $bubble = jQuery '''
+        <div class="link-popover-details">
+            <a class="change">
+              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
+              <span title="Change the image's properties">Edit image...</span>
+            </a>
+            &nbsp; | &nbsp;
+            <a class="remove">
+              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
+              <span title="Delete the image">Delete</span>
+            </a>
+        </div>'''
+
+      href = $el.attr('src')
+      $bubble.find('.change').on 'click', ->
+        # unsquirrel the activeEditable
+        Aloha.activeEditable = editable
+        promise = showModalDialog($el)
+ 
+        promise.done (data)->
+          # Uploading if a local file was chosen
+          if data.files.length
+            jQuery(data.target).addClass('aloha-image-uploading')
+            uploadImage data.files[0], (url) ->
+              jQuery(data.target).attr('src', url).removeClass(
+                'aloha-image-uploading')
+        promise.show('Edit image')
+
+      $bubble.find('.remove').on 'click', ->
+        pover.stopOne($el)
+        $el.remove()
+      $bubble.contents()
+
+
+  uploadImage = (file, callback) ->
+    plugin = @
+    settings = Aloha.require('assorted/assorted-plugin').settings
+    xhr = new XMLHttpRequest()
+    if xhr.upload
+      if not settings.image.uploadurl
+        throw new Error("uploadurl not defined")
+
+      xhr.onload = () ->
+        if settings.image.parseresponse
+          url = parseresponse(xhr)
+        else
+          url = JSON.parse(xhr.response).url
+        callback(url)
+
+      xhr.open("POST", settings.image.uploadurl, true)
+      xhr.setRequestHeader("Cache-Control", "no-cache")
+      f = new FormData()
+      f.append(settings.image.uploadfield or 'upload', file, file.name)
+      xhr.send(f)
+
+
+  Aloha.bind 'aloha-image-selected', (event, target) ->
+      # Hide other tooltips of the same type
+      $el = jQuery(target)
+      nodes = jQuery(Aloha.activeEditable.obj).find(selector)
+      nodes = nodes.not($el)
+      nodes.trigger 'hide'
+      $el.trigger 'show'
+      $el.data('aloha-bubble-selected', true)
+      $el.off('.bubble')
+
+
+  UI.adopt 'insertVideo-oer', null,
+    click: () ->
+      newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
+      GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
+      promise = showModalDialog(newEl)
+
+      promise.done (data)->
+        # Uploading if a local file was chosen
+        if data.files.length
+          newEl.addClass('aloha-image-uploading')
+          uploadImage data.files[0], (url) ->
+            jQuery(data.target).attr('src', url)
+            newEl.removeClass('aloha-image-uploading')
+
+      promise.fail (data) ->
+        # Clean up placeholder if needed
+        $target = jQuery(data.target)
+        if not $target.is('img')
+          $target.remove()
+
+      # Finally show the dialog
+      promise.show()
+
+  # Return config
+  selector: selector
+  populator: populator
diff --git a/src/plugins/oerpub/assorted/lib/video.js b/src/plugins/oerpub/assorted/lib/video.js
new file mode 100644
index 0000000000..3aecb547b4
--- /dev/null
+++ b/src/plugins/oerpub/assorted/lib/video.js
@@ -0,0 +1,195 @@
+(function() {
+
+  define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
+    var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
+    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
+    DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video blah</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    showModalDialog = function($el) {
+      var $placeholder, $submit, $uploadUrl, deferred, dialog, imageAltText, imageSource, loadLocalFile, root, setImageSource, settings,
+        _this = this;
+      settings = Aloha.require('assorted/assorted-plugin').settings;
+      root = Aloha.activeEditable.obj;
+      dialog = jQuery(DIALOG_HTML);
+      $placeholder = dialog.find('.placeholder.preview');
+      $uploadUrl = dialog.find('.upload-url-input').hide();
+      $submit = dialog.find('.action.insert');
+      if ($el.is('img')) {
+        imageSource = $el.attr('src');
+        imageAltText = $el.attr('alt');
+      } else {
+        imageSource = '';
+        imageAltText = '';
+      }
+      dialog.find('[name=alt]').val(imageAltText);
+      if (/^https?:\/\//.test(imageSource)) {
+        $uploadUrl.val(imageSource);
+        $uploadUrl.show();
+      }
+      (function(img, baseurl) {
+        return img.onerror = function() {
+          var errimg;
+          errimg = baseurl + WARNING_IMAGE_PATH;
+          if (img.src !== errimg) return img.src = errimg;
+        };
+      })(dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl);
+      setImageSource = function(href) {
+        imageSource = href;
+        return $submit.removeClass('disabled');
+      };
+      loadLocalFile = function(file, $img, callback) {
+        var reader;
+        reader = new FileReader();
+        reader.onloadend = function() {
+          if ($img) $img.attr('src', reader.result);
+          setImageSource(reader.result);
+          if (callback) return callback(reader.result);
+        };
+        return reader.readAsDataURL(file);
+      };
+      dialog.find('.upload-image-link').on('click', function(evt) {
+        evt.preventDefault();
+        $placeholder.hide();
+        return $uploadUrl.hide();
+      });
+      dialog.find('.upload-url-link').on('click', function(evt) {
+        evt.preventDefault();
+        $placeholder.hide();
+        return $uploadUrl.show();
+      });
+      $uploadUrl.on('change', function() {
+        var $previewImg, url;
+        $previewImg = $placeholder.find('img');
+        url = $uploadUrl.val();
+        setImageSource(url);
+        if (settings.image.preview) {
+          $previewImg.attr('src', url);
+          return $placeholder.show();
+        }
+      });
+      deferred = $.Deferred();
+      dialog.on('submit', function(evt) {
+        var img;
+        evt.preventDefault();
+        if ($el.is('img')) {
+          $el.attr('src', imageSource);
+          $el.attr('alt', dialog.find('[name=alt]').val());
+        } else {
+          img = jQuery('<img/>');
+          img.attr('src', imageSource);
+          img.attr('alt', dialog.find('[name=alt]').val());
+          $el.replaceWith(img);
+          $el = img;
+        }
+        return dialog.modal('hide');
+      });
+      dialog.on('click', '.btn.action.cancel', function(evt) {
+        evt.preventDefault();
+        deferred.reject({
+          target: $el[0]
+        });
+        return dialog.modal('hide');
+      });
+      dialog.on('hidden', function(event) {
+        if (deferred.state() === 'pending') {
+          deferred.reject({
+            target: $el[0]
+          });
+        }
+        return dialog.remove();
+      });
+      return jQuery.extend(true, deferred.promise(), {
+        show: function(title) {
+          if (title) dialog.find('.modal-header h3').text(title);
+          return dialog.modal('show');
+        }
+      });
+    };
+    selector = 'img';
+    populator = function($el, pover) {
+      var $bubble, editable, href;
+      editable = Aloha.activeEditable;
+      $bubble = jQuery('<div class="link-popover-details">\n    <a class="change">\n      <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/edit-link-03.png" />\n  <span title="Change the image\'s properties">Edit image...</span>\n</a>\n&nbsp; | &nbsp;\n<a class="remove">\n  <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/unlink-link-02.png" />\n      <span title="Delete the image">Delete</span>\n    </a>\n</div>');
+      href = $el.attr('src');
+      $bubble.find('.change').on('click', function() {
+        var promise;
+        Aloha.activeEditable = editable;
+        promise = showModalDialog($el);
+        promise.done(function(data) {
+          if (data.files.length) {
+            jQuery(data.target).addClass('aloha-image-uploading');
+            return uploadImage(data.files[0], function(url) {
+              return jQuery(data.target).attr('src', url).removeClass('aloha-image-uploading');
+            });
+          }
+        });
+        return promise.show('Edit image');
+      });
+      $bubble.find('.remove').on('click', function() {
+        pover.stopOne($el);
+        return $el.remove();
+      });
+      return $bubble.contents();
+    };
+    uploadImage = function(file, callback) {
+      var f, plugin, settings, xhr;
+      plugin = this;
+      settings = Aloha.require('assorted/assorted-plugin').settings;
+      xhr = new XMLHttpRequest();
+      if (xhr.upload) {
+        if (!settings.image.uploadurl) throw new Error("uploadurl not defined");
+        xhr.onload = function() {
+          var url;
+          if (settings.image.parseresponse) {
+            url = parseresponse(xhr);
+          } else {
+            url = JSON.parse(xhr.response).url;
+          }
+          return callback(url);
+        };
+        xhr.open("POST", settings.image.uploadurl, true);
+        xhr.setRequestHeader("Cache-Control", "no-cache");
+        f = new FormData();
+        f.append(settings.image.uploadfield || 'upload', file, file.name);
+        return xhr.send(f);
+      }
+    };
+    Aloha.bind('aloha-image-selected', function(event, target) {
+      var $el, nodes;
+      $el = jQuery(target);
+      nodes = jQuery(Aloha.activeEditable.obj).find(selector);
+      nodes = nodes.not($el);
+      nodes.trigger('hide');
+      $el.trigger('show');
+      $el.data('aloha-bubble-selected', true);
+      return $el.off('.bubble');
+    });
+    UI.adopt('insertVideo-oer', null, {
+      click: function() {
+        var newEl, promise;
+        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
+        GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
+        promise = showModalDialog(newEl);
+        promise.done(function(data) {
+          if (data.files.length) {
+            newEl.addClass('aloha-image-uploading');
+            return uploadImage(data.files[0], function(url) {
+              jQuery(data.target).attr('src', url);
+              return newEl.removeClass('aloha-image-uploading');
+            });
+          }
+        });
+        promise.fail(function(data) {
+          var $target;
+          $target = jQuery(data.target);
+          if (!$target.is('img')) return $target.remove();
+        });
+        return promise.show();
+      }
+    });
+    return {
+      selector: selector,
+      populator: populator
+    };
+  });
+
+}).call(this);

From c24ea9f950b2c3650c01c5abdb52101c9700faaa Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 18:12:05 -0600
Subject: [PATCH 07/67] video plugin setup

---
 oerpub/index.html                                 |  2 --
 .../oerpub/assorted/lib/assorted-plugin.coffee    |  3 ++-
 .../oerpub/assorted/lib/assorted-plugin.js        |  7 +++----
 src/plugins/oerpub/assorted/lib/image.coffee      |  1 +
 src/plugins/oerpub/assorted/lib/image.js          |  5 +++--
 src/plugins/oerpub/assorted/lib/video.coffee      | 15 ++++-----------
 src/plugins/oerpub/assorted/lib/video.js          | 12 +++---------
 7 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/oerpub/index.html b/oerpub/index.html
index 5981312890..fae40eb404 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -93,7 +93,6 @@
                 // Search through parent links in the DOM until we find an element whose enclosing tag
                 // is one of the section heading tags
                 function getClosestHeadingParent(ele) {
-                    console.log('starting');
                     while(ele != null) {
                         console.log(ele);
                         if(ele.tagName && possibleHeadings.indexOf(ele.tagName.toUpperCase()) != -1) {
@@ -105,7 +104,6 @@
                         }
                         ele = ele.parentNode;
                     }
-                    console.log('returning');
                     console.log(ele);
                     return ele;
                 }
diff --git a/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee b/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
index e9c473c44b..c581046312 100644
--- a/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
+++ b/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
@@ -1,7 +1,7 @@
 ###
 Register a couple of assorted oer plugins
 ###
-define [ 'aloha/plugin', 'jquery', 'popover', './link', './image', './figure', './title-figcaption', './list' ], (Plugin, $, Popover, linkConfig, imageConfig, figureConfig, figcaptionConfig) ->
+define [ 'aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list' ], (Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) ->
   Plugin.create 'assorted',
     defaultSettings:
         image:
@@ -10,5 +10,6 @@ define [ 'aloha/plugin', 'jquery', 'popover', './link', './image', './figure', '
       @settings = $.extend true, @defaultSettings, @settings
       Popover.register linkConfig
       Popover.register imageConfig
+      Popover.register videoConfig
       #Popover.register figureConfig
       #Popover.register figcaptionConfig
diff --git a/src/plugins/oerpub/assorted/lib/assorted-plugin.js b/src/plugins/oerpub/assorted/lib/assorted-plugin.js
index 98675aae01..dcb45c9cae 100644
--- a/src/plugins/oerpub/assorted/lib/assorted-plugin.js
+++ b/src/plugins/oerpub/assorted/lib/assorted-plugin.js
@@ -1,13 +1,11 @@
-// Generated by CoffeeScript 1.3.3
 
 /*
 Register a couple of assorted oer plugins
 */
 
-
 (function() {
 
-  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, figureConfig, figcaptionConfig) {
+  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) {
     return Plugin.create('assorted', {
       defaultSettings: {
         image: {
@@ -17,7 +15,8 @@ Register a couple of assorted oer plugins
       init: function() {
         this.settings = $.extend(true, this.defaultSettings, this.settings);
         Popover.register(linkConfig);
-        return Popover.register(imageConfig);
+        Popover.register(imageConfig);
+        return Popover.register(videoConfig);
       }
     });
   });
diff --git a/src/plugins/oerpub/assorted/lib/image.coffee b/src/plugins/oerpub/assorted/lib/image.coffee
index bb0cb4d307..76a7f0f904 100644
--- a/src/plugins/oerpub/assorted/lib/image.coffee
+++ b/src/plugins/oerpub/assorted/lib/image.coffee
@@ -239,6 +239,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   UI.adopt 'insertImage-oer', null,
     click: () ->
+      console.log("IMAGE GOT CLICK");
       newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
       GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
       promise = showModalDialog(newEl)
diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
index 22b58a4aad..a8d4d3b408 100644
--- a/src/plugins/oerpub/assorted/lib/image.js
+++ b/src/plugins/oerpub/assorted/lib/image.js
@@ -1,4 +1,4 @@
-(function() {
+console.log('HOWDY '+(function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
     var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
@@ -187,6 +187,7 @@
     UI.adopt('insertImage-oer', null, {
       click: function() {
         var newEl, promise;
+        console.log("IMAGE GOT CLICK");
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
         GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
         promise = showModalDialog(newEl);
@@ -213,4 +214,4 @@
     };
   });
 
-}).call(this);
+}).call(this));
diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
index 8ca0b8e9b9..f511980c59 100644
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -8,10 +8,10 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
 
   DIALOG_HTML = '''
-    <form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
+    <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Insert video blah</h3>
+        <h3>Insert video</h3>
       </div>
       <div class="modal-body">
         <div class="image-options">
@@ -39,7 +39,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       # Find the dynamic modal elements and bind events to the buttons
       $placeholder = dialog.find('.placeholder.preview')
-      $uploadUrl =   dialog.find('.upload-url-input').hide()
+      $uploadUrl =   dialog.find('.upload-url-input')
       $submit = dialog.find('.action.insert')
 
       # If we're editing an image pull in the src.
@@ -66,13 +66,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         $uploadUrl.val(imageSource)
         $uploadUrl.show()
 
-      # Set onerror of preview image
-      ((img, baseurl) ->
-        img.onerror = ->
-          errimg = baseurl + WARNING_IMAGE_PATH
-          img.src = errimg unless img.src is errimg
-      ) dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl
-
       setImageSource = (href) ->
         imageSource = href
         $submit.removeClass('disabled')
@@ -214,9 +207,9 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       $el.data('aloha-bubble-selected', true)
       $el.off('.bubble')
 
-
   UI.adopt 'insertVideo-oer', null,
     click: () ->
+      console.log("VIDEO GOT CLICK");
       newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
       GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
       promise = showModalDialog(newEl)
diff --git a/src/plugins/oerpub/assorted/lib/video.js b/src/plugins/oerpub/assorted/lib/video.js
index 3aecb547b4..26862031b1 100644
--- a/src/plugins/oerpub/assorted/lib/video.js
+++ b/src/plugins/oerpub/assorted/lib/video.js
@@ -3,7 +3,7 @@
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
     var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video blah</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     showModalDialog = function($el) {
       var $placeholder, $submit, $uploadUrl, deferred, dialog, imageAltText, imageSource, loadLocalFile, root, setImageSource, settings,
         _this = this;
@@ -11,7 +11,7 @@
       root = Aloha.activeEditable.obj;
       dialog = jQuery(DIALOG_HTML);
       $placeholder = dialog.find('.placeholder.preview');
-      $uploadUrl = dialog.find('.upload-url-input').hide();
+      $uploadUrl = dialog.find('.upload-url-input');
       $submit = dialog.find('.action.insert');
       if ($el.is('img')) {
         imageSource = $el.attr('src');
@@ -25,13 +25,6 @@
         $uploadUrl.val(imageSource);
         $uploadUrl.show();
       }
-      (function(img, baseurl) {
-        return img.onerror = function() {
-          var errimg;
-          errimg = baseurl + WARNING_IMAGE_PATH;
-          if (img.src !== errimg) return img.src = errimg;
-        };
-      })(dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl);
       setImageSource = function(href) {
         imageSource = href;
         return $submit.removeClass('disabled');
@@ -166,6 +159,7 @@
     UI.adopt('insertVideo-oer', null, {
       click: function() {
         var newEl, promise;
+        console.log("VIDEO GOT CLICK");
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
         GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
         promise = showModalDialog(newEl);

From aa83893b3e5d084223ee3b39c832d2dbf06ec2ab Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 18:16:14 -0600
Subject: [PATCH 08/67] remove badly placed video plugin, probably not what we
 need yet

---
 .../common/image/lib/image-floatingMenu.js    |    3 +-
 src/plugins/oerpub/video/README.md            |   68 -
 src/plugins/oerpub/video/css/image.css        |  133 --
 src/plugins/oerpub/video/demo/crop.html       |   76 -
 src/plugins/oerpub/video/demo/crop.php        |   21 -
 src/plugins/oerpub/video/demo/cropnresize.jpg |  Bin 76312 -> 0 bytes
 src/plugins/oerpub/video/demo/index.html      |  120 --
 src/plugins/oerpub/video/img/blank.jpg        |  Bin 685 -> 0 bytes
 src/plugins/oerpub/video/img/crop-buttons.gif |  Bin 856 -> 0 bytes
 src/plugins/oerpub/video/img/cropnresize.png  |  Bin 1981 -> 0 bytes
 src/plugins/oerpub/video/img/handle-sw.png    |  Bin 728 -> 0 bytes
 .../oerpub/video/img/image-align-left.png     |  Bin 6702 -> 0 bytes
 .../oerpub/video/img/image-align-none.png     |  Bin 6653 -> 0 bytes
 .../oerpub/video/img/image-align-right.png    |  Bin 6719 -> 0 bytes
 src/plugins/oerpub/video/img/image-border.png |  Bin 6233 -> 0 bytes
 src/plugins/oerpub/video/img/image-title.png  |  Bin 6597 -> 0 bytes
 src/plugins/oerpub/video/img/image.gif        |  Bin 621 -> 0 bytes
 .../oerpub/video/img/padding-decrease.gif     |  Bin 359 -> 0 bytes
 .../oerpub/video/img/padding-increase.gif     |  Bin 358 -> 0 bytes
 src/plugins/oerpub/video/img/page.png         |  Bin 635 -> 0 bytes
 .../oerpub/video/img/size-decrease.gif        |  Bin 346 -> 0 bytes
 .../oerpub/video/img/size-increase.gif        |  Bin 345 -> 0 bytes
 .../oerpub/video/lib/image-floatingMenu.js    |  316 ----
 .../oerpub/video/lib/image-plugin-actions.js  |    0
 src/plugins/oerpub/video/lib/image-plugin.js  | 1391 -----------------
 src/plugins/oerpub/video/nls/cz/i18n.js       |   16 -
 src/plugins/oerpub/video/nls/de/i18n.js       |    1 -
 src/plugins/oerpub/video/nls/fr/i18n.js       |    1 -
 src/plugins/oerpub/video/nls/i18n.js          |    7 -
 src/plugins/oerpub/video/nls/ru/i18n.js       |   16 -
 src/plugins/oerpub/video/package.json         |    1 -
 src/plugins/oerpub/video/test/test.css        |   12 -
 src/plugins/oerpub/video/test/test.html       |   40 -
 .../oerpub/video/vendor/jcrop/jcrop.gif       |  Bin 329 -> 0 bytes
 .../video/vendor/jcrop/jquery.jcrop.css       |   46 -
 .../video/vendor/jcrop/jquery.jcrop.min.js    |  165 --
 .../video/vendor/mousewheel/mousewheel.js     |   85 -
 .../ui-bg_diagonals-thick_18_b81900_40x40.png |  Bin 260 -> 0 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png |  Bin 251 -> 0 bytes
 .../images/ui-bg_flat_10_000000_40x100.png    |  Bin 178 -> 0 bytes
 .../images/ui-bg_glass_100_f6f6f6_1x400.png   |  Bin 104 -> 0 bytes
 .../images/ui-bg_glass_100_fdf5ce_1x400.png   |  Bin 125 -> 0 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png    |  Bin 105 -> 0 bytes
 .../ui-bg_gloss-wave_35_f6a828_500x100.png    |  Bin 3762 -> 0 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png |  Bin 90 -> 0 bytes
 .../ui-bg_highlight-soft_75_ffe45c_1x100.png  |  Bin 129 -> 0 bytes
 .../images/ui-icons_222222_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_228ef1_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ef8c08_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ffd27a_256x240.png        |  Bin 4369 -> 0 bytes
 .../images/ui-icons_ffffff_256x240.png        |  Bin 4369 -> 0 bytes
 51 files changed, 2 insertions(+), 2516 deletions(-)
 delete mode 100755 src/plugins/oerpub/video/README.md
 delete mode 100755 src/plugins/oerpub/video/css/image.css
 delete mode 100644 src/plugins/oerpub/video/demo/crop.html
 delete mode 100644 src/plugins/oerpub/video/demo/crop.php
 delete mode 100644 src/plugins/oerpub/video/demo/cropnresize.jpg
 delete mode 100644 src/plugins/oerpub/video/demo/index.html
 delete mode 100755 src/plugins/oerpub/video/img/blank.jpg
 delete mode 100644 src/plugins/oerpub/video/img/crop-buttons.gif
 delete mode 100755 src/plugins/oerpub/video/img/cropnresize.png
 delete mode 100644 src/plugins/oerpub/video/img/handle-sw.png
 delete mode 100755 src/plugins/oerpub/video/img/image-align-left.png
 delete mode 100755 src/plugins/oerpub/video/img/image-align-none.png
 delete mode 100755 src/plugins/oerpub/video/img/image-align-right.png
 delete mode 100755 src/plugins/oerpub/video/img/image-border.png
 delete mode 100755 src/plugins/oerpub/video/img/image-title.png
 delete mode 100755 src/plugins/oerpub/video/img/image.gif
 delete mode 100755 src/plugins/oerpub/video/img/padding-decrease.gif
 delete mode 100755 src/plugins/oerpub/video/img/padding-increase.gif
 delete mode 100755 src/plugins/oerpub/video/img/page.png
 delete mode 100755 src/plugins/oerpub/video/img/size-decrease.gif
 delete mode 100755 src/plugins/oerpub/video/img/size-increase.gif
 delete mode 100644 src/plugins/oerpub/video/lib/image-floatingMenu.js
 delete mode 100644 src/plugins/oerpub/video/lib/image-plugin-actions.js
 delete mode 100755 src/plugins/oerpub/video/lib/image-plugin.js
 delete mode 100755 src/plugins/oerpub/video/nls/cz/i18n.js
 delete mode 100755 src/plugins/oerpub/video/nls/de/i18n.js
 delete mode 100755 src/plugins/oerpub/video/nls/fr/i18n.js
 delete mode 100755 src/plugins/oerpub/video/nls/i18n.js
 delete mode 100755 src/plugins/oerpub/video/nls/ru/i18n.js
 delete mode 100755 src/plugins/oerpub/video/package.json
 delete mode 100644 src/plugins/oerpub/video/test/test.css
 delete mode 100644 src/plugins/oerpub/video/test/test.html
 delete mode 100755 src/plugins/oerpub/video/vendor/jcrop/jcrop.gif
 delete mode 100755 src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css
 delete mode 100755 src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js
 delete mode 100644 src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_222222_256x240.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_228ef1_256x240.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png
 delete mode 100755 src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffffff_256x240.png

diff --git a/src/plugins/common/image/lib/image-floatingMenu.js b/src/plugins/common/image/lib/image-floatingMenu.js
index a14eb6e3e9..a95648e533 100644
--- a/src/plugins/common/image/lib/image-floatingMenu.js
+++ b/src/plugins/common/image/lib/image-floatingMenu.js
@@ -127,7 +127,8 @@ function (
 				}
 			});
 		},
-
+	
+		
         /**
          * Adds the ui meta fields (search, title) to the floating menu. 
          */
diff --git a/src/plugins/oerpub/video/README.md b/src/plugins/oerpub/video/README.md
deleted file mode 100755
index 6b1f2485b0..0000000000
--- a/src/plugins/oerpub/video/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-
-# The AlohaEditor Image Plugin
-
-Image Plugin for enabling basic images manipulations in Aloha Editor
-
-## Features
-
-* Insert image
-* Edit url and title
-* set align
-* Handles [DragnDropFiles Plugin](https://github.com/alohaeditor/Aloha-Plugin-DragAndDropFiles) events for image files dropped in current page.
-* css resize with controlbuttons or mousedrag
-* reset to natural size (DEV)
-* canvas crop (EXPERIMENTAL)
-
-## Example conf
-
-    config: {
-			'img': {
-				'max_width': '50px',
-				'max_height': '50px',
-				//Image manipulation options - ONLY in default config section
-				'ui': {
-					'align': true,       // Menu elements to show/hide in menu
-					'resize': true,		 //resize buttons
-					'meta': true,
-					'margin': true,
-					'crop':true,
-					'resizable': true,   //resizable ui-drag image
-					'aspectRatio': true
-				},
-				/**
-				 * crop callback is triggered after the user clicked accept to accept his crop
-				 * @param image jquery image object reference
-				 * @param props cropping properties
-				 */
-				'onCropped':function (image, props) {},
-				/**
-				 * reset callback is triggered before the internal reset procedure is applied
-				 * if this function returns true, then the reset has been handled by the callback
-				 * which means that no other reset will be applied
-				 * if false is returned the internal reset procedure will be applied
-				 * @param image jquery image object reference
-				 * @return true if a reset has been applied, false otherwise
-				 */
-				'onReset': function (image) { return false; }
-			}
-		}
-
-## TODO
-
-* resize slider
-* canvas resize
-
-Copyright (c) 2010-2011 Gentics Software GmbH, aloha@gentics.com 
-
-Author : [Nicolas Karageuzian](https://github.com/nka11)
-
-Contributors :
-
-* [Nils Dehl](https://github.com/mrsunshine) 
-* [Benjamin Athur Lupton](https://github.com/balupton)
-* [Christopher Hlubek](https://github.com/chlu)
-* [Thomas Lete](https://github.com/bistory)
-* [Haymo Meran](https://github.com/draftkraft)
-* [Clemens Prerovsky](https://github.com/cprerovsky) (base of crop and resize feature is a borrow from cropnresize plugin)
-* [Norbert Pomaroli](https://github.com/npomaroli) (for his patience explaining Selection and Range)
-* [Kirk Austin](http://www.kirkaustin.com/) who gave the impulsion to dive into html5 canvas	
diff --git a/src/plugins/oerpub/video/css/image.css b/src/plugins/oerpub/video/css/image.css
deleted file mode 100755
index c7bbba6aa7..0000000000
--- a/src/plugins/oerpub/video/css/image.css
+++ /dev/null
@@ -1,133 +0,0 @@
-
-/* Images */
-.aloha-image-align-left {
-    background: url(../img/image-align-left.png);
-}
-
-.aloha-image-align-right {
-    background: url(../img/image-align-right.png);
-}
-
-.aloha-image-align-none {
-    background: url(../img/image-align-none.png);
-}
-
-.aloha-img.aloha-image-title {
-    background: url(../img/image-title.png);
-}
-
-.aloha-img.aloha-image-border {
-    background: url(../img/image-border.png);
-}
-
-.aloha-image-insert {
-    background: url(../img/image.gif) !important;
-}
-
-.aloha-img.aloha-image-padding-increase {
-	background: url(../img/padding-increase.gif);
-}
-
-.aloha-img.aloha-image-padding-decrease {
-	background: url(../img/padding-decrease.gif);
-}
-
-.aloha-img.aloha-image-size-increase {
-	background: url(../img/size-increase.gif);
-}
-
-.aloha-img.aloha-image-size-decrease {
-	background: url(../img/size-decrease.gif);
-}
-
-.aloha-default-file-icon {
-	background: url(../img/page.png);
-
-	width: 16px;
-	height:16px;
-	margin: 0;
-	padding:0;
-}
-
-/* Crop and Resize */
-.aloha-icon-cnr-resize, .aloha-icon-cnr-crop, .aloha-icon-cnr-reset {
-	background: url(../img/cropnresize.png);
-}
-
-.aloha-icon-cnr-crop {
-	background-position: -2px -2px !important;
-}
-
-.aloha-icon-cnr-reset {
-	background-position: -42px -2px !important;
-}
-
-.aloha-icon-cnr-ratio {
-	background-image: url(../img/cropnresize.png) !important;
-	background-position: -60px -2px !important;
-}
-
-#aloha-CropNResize-btns {
-	z-index: 10000;
-	width: 70px;
-	display: none;
-	position: absolute;
-}
-
-#aloha-CropNResize-btns button {
-	background: #ededed;
-	border: 1px solid #c6c6c6;
-	cursor: pointer;
-	color: #96ca03;
-	text-shadow: -1px -1px 1px rgba(0,0,0,0.3);
-	font-size: 16px;
-	border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	padding: 0px;
-	width: 23px;
-	height: 23px;
-	margin-right: 3px;
-}
-
-#aloha-CropNResize-btns button.cnr-crop-apply {
-	padding-left: 2px;
-}
-
-#aloha-CropNResize-btns button.cnr-crop-cancel {
-	color: #c92404;
-}
-
-/*
- * fix to use big resize handle for images
- */
-.aloha .ui-resizable-se {
-	width: 16px;
-	height: 16px;
-	background-position: -80px -224px !important;
-}
-
-
-.aloha-image-box-active {
-	-moz-box-shadow:	0px 2px 8px rgba(0, 0, 0, 0.2);
-	-webkit-box-shadow:	0px 2px 8px rgba(0, 0, 0, 0.2);
-	box-shadow:			0px 2px 8px rgba(0, 0, 0, 0.2);
-}
-
-.aloha-image-box-active .ui-resizable-handle.ui-resizable-nw {
-}
-.aloha-image-box-active .ui-resizable-handle.ui-resizable-ne {
-}
-.aloha-image-box-active .ui-resizable-handle.ui-resizable-se {
-}
-.aloha-image-box-active .ui-resizable-handle.ui-resizable-sw {
-}
-
-.aloha.aloha-toolbar .aloha-image-input-label .aloha-ui-label-text {
-	/* give labels a reasonable static width so that the url, title, width,
-	   height labeled input elements will align vertically */
-	display: inline-block;
-	width: 31px;
-}
-
-@import	"../vendor/jcrop/jquery.jcrop.css";
diff --git a/src/plugins/oerpub/video/demo/crop.html b/src/plugins/oerpub/video/demo/crop.html
deleted file mode 100644
index bf7f98ccf0..0000000000
--- a/src/plugins/oerpub/video/demo/crop.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Aloha, World!</title>
-	<script src="../../lib/require.js" data-main="../../lib/aloha.js" id="aloha-script-include" data-plugins="common/format,common/highlighteditables,common/list,common/undo,common/paste,common/image"></script>
-	<link rel="stylesheet" href="../../css/aloha.css" id="aloha-style-include">
-	<link rel="stylesheet" href="../../demo/common/index.css" type="text/css">
-	<script type="text/javascript">
-	if (window.Aloha === undefined || window.Aloha === null)
-		Aloha = {};
-
-		Aloha.settings = {
-		"plugins": {
-		 	"com.gentics.aloha.plugins.Image": {
-				onCropped : function (image, props) {
-					// invoke the image cropper crop.php
-					image
-						.width(props.w) // set width
-						.height(props.h) // and height to new values
-						.attr("src", "crop.php?src=" // and adjust src to the cropped image
-							+ image.attr('src')
-							+ "&x=" + props.x 
-							+ "&y=" + props.y
-							+ "&w=" + props.w
-							+ "&h=" + props.h
-						);
-					jQuery("#info").append("<li>Cropped \"" + image.attr("src") + "\"</li>");
-				},
-				onResized : function (image) {
-					// this is the point where you would add a server-side image-resizer
-					jQuery("#info").append("<li>Resized \"" + image.attr("src") + "\"</li>");
-				},
-				onReset : function (image) {
-					// handle resetting the image
-					jQuery("#info").append("<li>Resetted \"" + image.attr("src") + "\" to it's initial state</li>");
-				},
-				aspectRatio : false, // if set to false the aspectRatio will not be maintained anymore when resizing
-				maxHeight : 500, // supply a maximum height for resizing
-				minHeight : 200, // and a minimum height
-				maxWidth : 700, // maximum image width for resizing
-				minWidth : 200, // and minimum width
-				grid : 100 // snap to an invisible grid when resizing
-			}
-		}
-	};
-
-	require.ready(function() {
-		// Prepare
-		var	$ = window.jQuery,
-			$body = $('body');
-
-		$body.bind('aloha',function(){
-			$('#title').aloha();
-			$('#teaser').aloha();
-			$('#content').aloha();
-		});
-	});
-	</script>
-</head>
-<body>
-<div id="main"> 
-<h1 id="title">Aloha, Images! (Extended Version :)</h1>
-<div id="bodyContent">
-<div id="teaser" class="shorttext">
-<p>This <b>extended example</b> is intended for developers planning to use the the CropNResize plugin found at <a href="https://github.com/alohaeditor/Aloha-Plugin-CropNResize">https://github.com/alohaeditor/Aloha-Plugin-CropNResize</a>. It displays the whole set of configuration options currently available. Well, just take a look at the code.</p>
-</div>
-<div id="content" class="article">
-<p>Click the image to start resizing right away, as a resize handle will appear in it's south-east corner.</p>
-<p><img src="cropnresize.jpg" /></p>
-</div>
-</div>
-<ol id="info"></ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/plugins/oerpub/video/demo/crop.php b/src/plugins/oerpub/video/demo/crop.php
deleted file mode 100644
index 350a35959f..0000000000
--- a/src/plugins/oerpub/video/demo/crop.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Simple, very basic image cropper for CropNResize plugin demonstration
- * @author Clemens Prerovsky
- */
-header('Content-type: image/jpeg');
-
-// load parameters from url
-$src = $_GET["src"];
-$x = intval($_GET["x"]);
-$y = intval($_GET["y"]);
-$w = intval($_GET["w"]);
-$h = intval($_GET["h"]);
-
-// resize image
-$img = imagecreatefromjpeg($src) or die("Error: unknown src");
-$cropped = imagecreatetruecolor($w, $h);
-imagecopyresampled($cropped, $img, 0, 0, $x, $y, $w, $h, $w, $h);
-imagejpeg($cropped);
-imagedestroy($cropped);
-?>
diff --git a/src/plugins/oerpub/video/demo/cropnresize.jpg b/src/plugins/oerpub/video/demo/cropnresize.jpg
deleted file mode 100644
index e0fad22ff479befbe3efdfd08e74d299e46dc72e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76312
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
RIC`t^zyiHne>^Zh|JidpWUBxG

diff --git a/src/plugins/oerpub/video/demo/index.html b/src/plugins/oerpub/video/demo/index.html
deleted file mode 100644
index c0f1800314..0000000000
--- a/src/plugins/oerpub/video/demo/index.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<meta charset="UTF-8">
-	<title>Aloha, Images!</title>
-
-
-<script type="text/javascript">
-	
-	(function(window, undefined) {
-
-		function _onCropped(image, props) {
-
-			var canvas = document.createElement('canvas'),
-			 	context = canvas.getContext("2d"),
-			 	img = image.get(0),
-			 	finalprops = {},
-			 	ratio = {img:{}, disp: {}};
-			
-			ratio.img.h = img.height;// image natural height
-			ratio.img.w = img.width;// image natural width
-			ratio.disp.h = image.height(); // image diplay heigth
-			ratio.disp.w = image.width(); // image diplay width
-			ratio.h = (ratio.img.h / ratio.disp.h);
-			ratio.w = (ratio.img.w / ratio.disp.w);
-			
-			/* 
-			var sourceX = 150;
-	        var sourceY = 0;
-	        var sourceWidth = 150;
-	        var sourceHeight = 150;
-	        var destWidth = sourceWidth;
-	        var destHeight = sourceHeight;
-	        var destX = canvas.width / 2 - destWidth / 2;
-	        var destY = canvas.height / 2 - destHeight / 2;
-			context.drawImage(imageObj, sourceX, sourceY, sourceWidth, sourceHeight, destX, destY, destWidth, destHeight);
-			 */
-			 
-			// props are related to displayed size of image.
-			// apply w/h ratio to props to get fprops which will be related to 'real' image dimensions
-			finalprops.x = props.x * ratio.w;
-			finalprops.y = props.y * ratio.h;
-			finalprops.w = props.w * ratio.w;
-			finalprops.h = props.h * ratio.h;
-			context.drawImage(img,
-					finalprops.x, finalprops.y,
-					finalprops.w, finalprops.h,
-					0,0,
-//					props.x2, props.y2,
-					props.w, props.h);
-			$('body').append(canvas);
-		}
-
-		if (window.Aloha === undefined || window.Aloha === null) {
-			var Aloha = window.Aloha = {};		
-		}
-		
-		Aloha.settings = {
-
-			logLevels: {'error': true, 'warn': true, 'info': true, 'debug': false},
-				
-			'plugins': {
-				'image': {
-					'fixedAspectRatio': false,
-					'maxWidth': 1024,
-					'minWidth': 10,
-					'maxHeight': 786,
-					'minHeight': 10,
-					'globalselector': '.global',
-					'ui': {
-						'oneTab': false
-					}
-				}
-			}
-		};
-    
-    })(window);
-	</script>
-
-	<script src="../../../../lib/aloha.js" data-aloha-plugins="common/format, common/highlighteditables, common/image"></script>
-
-	<link rel="stylesheet" href="../../../../css/aloha.css" id="aloha-style-include" type="text/css">
-	<link rel="stylesheet" href="../../../../demo/common/index.css" type="text/css">
-	
-</head>
-<body>
-  <div id="main">
-  
-		<div id="tree-div"></div>
-		<h1 id="title">Aloha, Images!</h1>
-		<div id="bodyContent">
-			<div id="teaser" class="shorttext">
-				<p>This example will show you how to use the Image plugin found at <a href="https://github.com/alohaeditor/Aloha-Plugin-Image">https://github.com/alohaeditor/Aloha-Plugin-Image</a>.</p>
-			</div>
-			<div id="content" class="article">
-			
-				<p><img src="cropnresize.jpg"></p>
-				<p>Click the image to start resizing right away, as a resize handle will appear in it's south-east corner.</p>
-			
-				<p><em>Note:</em> This is a very simple example, that will not allow subsequent cropping actions, or cropping combined with resizing.</p>
-			</div>
-			
-			Outside of the editable
-			<p><img class="global" src="cropnresize.jpg"></p>
-		</div>
-		
-		
-  </div>
-	
-	
-	<script type="text/javascript">
-	Aloha.ready( function(){
-		var $ = Aloha.jQuery;
-		$('#title').aloha();
-		$('#teaser').aloha();
-		$('#content').aloha();
-	});
-  </script>
-</body>
-</html>
diff --git a/src/plugins/oerpub/video/img/blank.jpg b/src/plugins/oerpub/video/img/blank.jpg
deleted file mode 100755
index f882a38ccbf20bf6b8525f035bfc9b144eec88a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 685
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=TnT3UgnH5N|va+(V^Kh^O0Y5i4CyyY%
zkdPq1prEjrjJU9fl&GMfgrbC$tgO7eys)^Eijtg)jGVk2$Ph-LR(3XaJ`N5(IT1k-
zIg-Ku0}O&33`Pt_%#2D5OoEKef{g!<Fi3!$3Un+IVB=(F2g;}jFfgz(u`wgbF)}f;
zu(7j>n}?T8Rorq(5U5H7RWHaGkf<P%E{M_pZ!z!y&0-Q{7G$tz_;%VbXYH2Xwyx*q
z=4WaKJ-PfruJ-$ejMs%%S6T6T2ldLY3Y<A}=KRUVqBH%o%`Wx4SX{%}d6A31_u;+G
zNoQEnf^VJOve-)FKI4>cn{zeJb(tU7%peF?$_A5WI>V5%^m(Tk>%+AQ2Yb#$OkBnJ
zX2W6KNz$2|6E=AXP5LlpqM)E)g_45o`fb~<&zUUvErvlVHL1j@`Ef=0nj4!1r>VPW
z*qOIio$WRNdqdK+cI&=9PiFLQdcgYa+ON-(lI%`5F#D|W>j<dH=leQaEXnA|i&pky
zAKpi9Oatp+Rzn!Q@7DdeA|Lmg1q_9a#d$s)h7S(z2+fI@ILlkd;GD4{@0OP7j{>Gl
z`p+OVNl8gbpT)&G?dat@yUy>O{EdNewzz-MYrAj$H}H!w`PJ+Ue(o{X%KOsNlcoN4
Yzt2hCDb2FKs_SL11r1XM2KoOt0fZOc5dZ)H

diff --git a/src/plugins/oerpub/video/img/crop-buttons.gif b/src/plugins/oerpub/video/img/crop-buttons.gif
deleted file mode 100644
index b854ca4faf904e713fa939c66039d96888b21209..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 856
zcmV-e1E>5)Nk%w1VK@L80LFU&$s`2HCkM$Z48|=F%PkJZFcZcy6~{Fh!#^g(KPJjQ
zB+ybi(o{UrRXx&HKGIo1yI)P$ab3H4Y}ayM#&~GTcxcOgZOwmg%!+-@i+-_|k+7GN
z+l_s*n3L9&hs~FbxuBb|rK8iJmbR;@sj`on#3HM-k*2wEu&}VEx^I`s36{zOm&ps4
z$_1UoFq+35skwZZ$_lcwvY5*U)2pMiv$LSeDYmw@wYRXI%^KjXqqw-Z*|4a&xw*T$
zyQk4Hy}iA?zPrA@zQDl1tkXcX%yhxQ!Q{KMvDHn+#>VBtyw1tUzuI%Z+i}m&&%@h(
z(9qD%)4|oy&(hM;)YR0~)z#M4*3ICU*Vot9+RWM6+0x>o+uPgU-{0om-QeKh+UC0A
z;^OMz;N#=t<mBY*<KpGz<>uz*=jZ3->eT1y;pph->FMd|>*MO`>g((4>g?s~?C9+5
z?CtFA?CtCA?d<LC?fCfk`T6<${QUj>{Qv*}000000000000000A^8LW3IKlqEC2ui
z05|{{000O6fPaF6goTEOh>41WcT-7^kdcy)RCkJvlbMlJd4qUVZ+4=iq@|*7RCtJ=
zp{A~*sCt5+ueGOCh_tq^sDeqmwn>P;q;6<yt!&3~row;3wQ_7^VQ9>w&W6x-Y+pl5
zW^Zd;KvLGF&fBJPXH-HyS#hM<h0t<gKp_bhUs^XE2Sl(z=PTM7C^BH!Sg~c^uu*cb
zj6eVY0EHSF3IGV8gW$7Qa?ngck)p+lCLXmxJoBMqMF<)zKJci{jhQfHwA47UVg-^q
zDeIAvV+MoEqYTQ>EJeo1jwm}!#8~m8O|yrj&{&ah6u<&8S3i;pgQG+Y5-(QdNaKng
zp>4L~ZfqEEv_iP0q{swOv4X{l8DL(y9b~Udj|~R80=O{Hq1aJtoVe(@;z_N+1x3l>
z0wQrm1xGpHg*B!~Pa<?KW3>~KhJcC<yku}0VKgi?Os>EQwwm=C9t0ee3F!gAggLf>
z1%10tiBi^bjv!C299!?|)*oZfu5!C$b=xs(_nywX<L>6|ICIj<d#^+6)4#t{rG51`
iRV*E%Z(lin{eNJhi6)g?;>duR6u8KO3^sU3AOJhEY1D-P

diff --git a/src/plugins/oerpub/video/img/cropnresize.png b/src/plugins/oerpub/video/img/cropnresize.png
deleted file mode 100755
index ae04f13ac23a73225ebb4676ecc05b5f3452fe17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1981
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
P00000NkvXXu0mjf_b143

diff --git a/src/plugins/oerpub/video/img/handle-sw.png b/src/plugins/oerpub/video/img/handle-sw.png
deleted file mode 100644
index 7c8b686f23f0771d441b4c57f0bee1551891e093..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 728
zcmV;}0w?{6P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipi9
z6E-Gs>Lh>w000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006rNkl<Z
zXx{DE=S~7a6b0b(xVC8Qh`pj>?}f5-gw<VOK@>Gc<9qo6b2hm+uscM4-d}v1nK}1f
zU;uuVC+r%JDBIW>1jM%Sh++jBgMe5w9#MF}it&hi8B3~q)xm)=h+GL#f`}V~$QBVX
zK0mTW%o(2_nF3~v&krk)X;r;c#g;LMbPkh}5PYoRG<1km783-qP7o(yM2wRVTvgR=
z7e`@4j7gH*c5xUwL^6X>lH|+AB)Jb_$(SThS{Nbi$RbJdJyqTHa2-ZORML*P9<BmI
zBrFV*c4R?<a2mKU22r*V3m+nlAxU@38bhanbK?<Db)1C}F)!(ESx@D)kqq)qXhAfd
zk@!daC9!oO>Mh&{iHHahCxIbY7poC*7uY=E6Lwk<&mH7@KH0I}sSCuds^01#*Yg>h
zb+MsDSb0oI<_VVAK_jMxh?o|{E3(=UnF3}dGqw-nG%y5PW3p`rn<sQ3UO!Oj2C*R7
zJF)RJPy~BQ*#@xUU|-UTvz*Y1U>BI}V%fHX4MlxHu(QwdfbE^wc*=Swtq6AZSst)8
zCPT1RoaIDUh*A}sl2^#C;aG|AaM?@5`xjh_@HsYdNvN^CQ@;=~$=PSG5ZeH<8Jl&n
zT_M<$>2vm#uTZUt8-hsn93ee6KCh56)Vvp@RrU583aWbN6IC&ST~wC9?Ci5V=nI1V
zS@y-*v0)du`2tG^;^P}NRsHh^P5NhjzWA-=0<%zSzoDoN0pJ(DI=}pP0$95M0000<
KMNUMnLSTX>aV^yV

diff --git a/src/plugins/oerpub/video/img/image-align-left.png b/src/plugins/oerpub/video/img/image-align-left.png
deleted file mode 100755
index 5436f1760c4fa0879a2ea844a41ba441b88d7634..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6702
zcmV+}8qwv6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000+FX+uL$Nkc;*
zP;zf(X>4Tx0C)k_S!Y-j&9d&9O~A6GCFdMPa+aJVNDhKXTGEnp4oXsjAc%l~pnwP>
zf*1$_B47eUf`AbTq9CYX0tDd>>i2!;KIfc&_s^Z@nVxs6s;hgada9@10f24UEjZX8
zrUM`#Fg(=CP>1)RgCj5QIluuLKnZ98qZ=tKSlhzF6#UoY`vib?m1B~-zW%G(e^$_Y
zc!rSxfGiNTyGIx)0KwM*fOSa0q2U0a))Dz|RCq9g(GL*J7>Y~~!7q2Q_iwzii`{==
z4EmRijg>9{7*+r%sNLK`y#XKyB68kHk~iXqpa%e!A<%;y2mtXQf;C7!ZXN)z6(cr#
z0s?||aUX(3-T%dp_rG8_H}}7Ny19A(jeq|aq$e`49yu)7-!10XkN?Xiz&`@HU%w6p
zq@@n@H`|R3Gjc9?xapZ7S5D;I4)*^QGsFgB_YAbPMr6BqPoTS*`5&y|6>4CGV5Bc(
z5ge|wi;;T<c?E}C*!+<v#`@@*A($GG7kGy0|K;bLubc61%xDmKb7+K>ErJCR+#MEa
zt&d=2ML}<3eQfOi*nIWy)cYfcVK1_Q(Qg}=fgEnMI~F4nbAG=dlifKWW5J5R1o#6_
z5CKAwHV{YxQ=kj<{<M<73%DVgNJJL~{J>iT2OvFykUl{O=KW)*`)?A1U;Vt1e*fDe
zFCZbd5r2>Qdo*5T%)fk+fd_*BlDi>e?CN%B7v@4v{%6d;EO!0<nvHb5^rH0EUvokW
zqh-+wXdSdVS_7>Dc+t#gb|8tCM=PVX(VA#AM5h7_z#GJ~_g{0|^&ime6<Hh<qiW}a
zXm|g+`(IjM_sg36_wRq30U!@8w=DlP0|3H3qmkzT0NtSAm{78}PdKkO^5lB%;WY{*
z?cKvGD=j0vtNwp;?B=ZBll@}#D;Gh`kN=ScGy<SZM%JVAKQi}|0JKXY&wl+sGT}lb
zH~0cDAV`V`jr{Eoy?em`s@+To*Z?;W0HVl!mIaDH4QK&<U<}NG4R8R?$ola?)?g@z
z0`cG|NC#QqBsdL9Kn17*wV(ksgBH*M?tpt>01Sh1@B&POd9Valz<00-K@biiKtzZQ
z;(>%92}l-FhBP33$P}`I93WT78w!LXpm-<+%7XHt66ics2VI5QpgYh*Xasr&%|MIL
zXXpovf~jFfm<tw$rC?=P8#aM$;KQ&t90JF}sc;Tl3|GRJ;hXRscmN)Ur{N{|8w#NC
zC}tENN)n}v(nXo098q4VP*fr+6IF<+L|s9(qwb@|P}8Vo)CL-hCZc)KlE^yUkG4gV
z&>`qVbT+yKU5mbn?n95EXV5F?Z43d!iIKplVvH~cG2WOcOgg3zQ-isIxr-Uc%wxV|
zu~=rT2v!NZAM1ei#l~T?v1hT3*lz3yb`JXuhr_YqByj3DbDSG49G8wegS(8ojT^<y
z<JKwg6g(8N6b2NI6oC}U6onL*D7q*{Dc(_RQqoZhQL0j!Q+iOwQ07urQ?^q+rktnT
zq@t%1p;D)^q4K3VN>xmCh3YQVOR6t;Jf0t~g15wz@kj8*_$K@V{0x4Bnt@uJT9?|1
zI)XZf`XY5V^)u=(1Oh>rpha*bgcEWIb%b8R6k(l)NVAv5h{l5^iKdk1Ce0|#M_Ni+
zAzE!(XWCfWLfUJzk7<|bDCvahbm`pa66s3m+UO?fzR?ruW$4Z61L(8qFVR1wUtqv7
z2s7w2crc_gR5A22%n?yU0irIEL`)%86Ymn|8L^Baj7E&Uj9H8gj6;koObkr&Om<As
zOr=bnOw-ILW?^O{W`E{f=4R#z<{vCvEZQudEEz0USVmdaSUFg=SUp)YSsPi$S%0wc
zvgxz=vE{L~u)ShOvx~D^vPZF(v)^T3=3wMd;~;Tlax`;1=Y%=MIjuP3IIB1ZIlpmn
za~X04bDiPp<yz)u=GNl&<u2gv;$Gw-@@Vjoc?x)L^StL};??H$=Pl;#<6Yt7<lD~|
z!FQf-h;Nf$gx{7wnZJ?$l>n81vVfOBfk2PIiXe~R0l|2|dco&HltRivK0-x8_l4Gk
zMTG5zj|sO3FNm;;7>UG+)Qh|nC5UQ@hKN>*J`ux;DU11uofR7vhs71deZ)(}A4|Xz
ziV|drvl1hFFnd(?1n#NaGbu?esVx~PSuZ)WmwB)0-sHV4dp}AEN;yj9N!^#)mR6AV
zm#&t6A;TbJER!tLF7sJdT$UtTD*Hr^AZH+#B-bjpDlZ}LDPJ!CRDq~)K;f7|kHSwy
zCB;z1D~gLsf=aGRWlEFEjLH_u*~$-8Fe*AKNh%#G8>)(`;i}E5pVTDP{M0U~E$kE7
z=ee(X-<&$Xx|{lW^=S=W4OfkG8q=D5nr@nvnzLF0S{_<8TJN;Qw0*TNYk$;{)(O?Q
zp|hr|s+*wOt%uSx)XUTx(r3`O)i2SXGT=AxHmEmPF;p;&Gwj}v*>AExZ~vqbml4UR
z&S=G0$vDBd&xG2<+N8u})>Pay)U^Eoe8Bj?sRJ*~gv<iXTFimDk@+d}R~8}`Ar`kR
zv6dE=rIv54WUS(??pqVBU92xzf49-G$+dZ5D{32I+ha#-=VVuBw`Q+rpKm{XQ0id9
z!2t($2eLz}BhJyzvBvS+A^k(A56wF%IHfyH92PkoefXg>yR*M@rwgr%o69v<jH|ut
zCD$!CbGJ&jZ|+9!W$r5^T~ZNg$wSMdz+=%<-80|wotL^-zSn}cy7wvXMITL{LZ4-_
zF1duf>bu{!!gtNj-0z~_j=#NsV*o{fYd~8dL!e(^Ul4atbkIn!L~wfWbckxm>5!FB
zlhB$lDC}@pYd9nFayS?v8j%(;6R8nd8o3^27j-R~J~}XZFh)EkBj#PKLF|P%bQ~$J
zC!R0<X#7lqcEb5YDA7H!CrKbFHEI5c;gQ;-R7d@eK1!BO&QJcDVxQ8U%9VN~buP^?
ztv;P5Jv4ptnA)+5<LKk$<3ky88D}!KGd(i<v!t^Mv$nEH+5IPEP86Tm$??h=%2muQ
zKZ!jVcyc07Gp{zEK0h{p?$m)(Hw$<RG7G+*b~*j9P`<FDh^i=}Xu8<6xb=+SnUiO>
zN_<MjOLa;c%Q(w2%GS<$oE<IKD!)>}RgqQk;~e?i)ANSsZ&nId7FJ=aBCFn3+g0Dc
zpnRdOhP@`M=I6!0i_^7MwS9F;b#<3GFXh(5^%3=pmz^#TH|RCAUXi?VzLB{xs|hqk
zG`+v-dUc}Nq`Bvs^0h11g|3&~Al}Hl3Ehmjxzgg(GTrLXI?`s`*3+)me&g2OTNgX{
zI!Zg4I&-_Ix>CD#ZpYsK)*alve8>CFT#rl7i{691Px>tThVGi&eQ?j<UhjSF`?nvc
zKj?U<`mn8ExxZyVap2~l!r+ZZ3Xg6KDGuFytn|2bSY^0<WZy{FsOIRMF}<;SPmG=n
zjGK**OxR95ophR<e(Ldb;hF!l)#s7VH(wliiFuj%itbh66z5dsYq8gj(~8rbGkP<F
zv(~dO=16l(Z^GVe&8NO4ye)jk^R8||cA;a@U~%~Uq4)Dk!AqOV=^yAnlzkNac>R;s
zr@@tjEAy+Nt2>{wzp#C|_*MRE&o_&2Q{Mx=Z?0vov#r-|C~w^VVgKXZX4DpLtN5qb
z&-QJT?Uy?NJ3GN{p>Dt41yD!}dwBuy`6BY3;DFQ)!vIiq|E?*1Ss>*KgxDb14%!PX
z!Dms<Xd(1_OgFX|7ffMAsZXVdm!jTFkf2efHKB8*k6<`WY-5~Zre@J*4P|R!U*Z(w
z^5t&gS?AN^KPfOPBqMxG<dv9$_(_RnN&UT5Qrj|4vhDKh3ek$=%5o|>s>}Nf)z4}C
z(6Z9LptGT8qF-XLuwULN&bZ4II-q41Yu;orXGL$VZsTE_W_Qm1+QHiny^h_7+MF5>
z*EpBCoODfg3vqWQnR+OB@_P}y*1TtY`pM0{C4R~N<N%96g&>xowcxRk`p~2>^KhQ<
zPZ3>_IZ;m0645_m`eRGt$nnYv*o3jfiX{IdI!6VQ8B=Ie>C))a>5dVOQ)Zwub}~1z
zK4&kTn9X^fJ9=^;uP49l)Rls&(`O2Eic*T>&cu`?mll`ZI6GWETd{m@<@`$JO4X<8
zj~71FEL~iveN#7cX|8^?f&PkaV`5Xw)z{7I*Ks$9H+fpbTNT<g+l_8ncer;(cNO2h
z)4kAx?j`oI-{rk0eqZT<&O@Dk(f&^ZnS*SD=O1Z4S{`b696GEr0*yQxEguVcqCd_y
z{&AvrvgoPLGsR~+&%0m5zLa~p{HkFp?Df8B?DXhN*{s)`%-rUid-DZvJ>RJ=Ff6=Z
z?0TQQWWUU}y!hej$JkFgEBKZ1)rQaIU#@>$`|h>&d_(I;!RGW&x$T0TonP@6fSO<j
z6a(r3IvrzzWx~F~U8BgR^ry1L>ru-Q#At+QMd_sI6&MVNc8q~csmxU@eXL9D^c)(T
zWUdnKL7p8xW&Uu1D}wKZB}9BgYsHo%B=>|$-q^b#ttoR<_P#t`!BjCvX+(vnYN3|1
zuU`YJsi_sIU90m#53jFk;BJ_)zusuTc+nI-z+xt1E@z=?scI!>Eoehy^Ue0TUAKMp
z!AyrhN9#jMP8?1<hi9GpTxwj?-8|g2NSvfKj}gy$uQYFGA0;v!dBOL#Uy*-cfPNr*
z;D?~w!8sw0q5PqXVNKyt5vmbCBfFxKqP1esF%M!-#971><Hr+<5)UDnb>&F!(Te1h
zl)zNSG{bcHV|>S{kFRCSW)5cE%szMGcur{U;ghC$n)wQ+_7;eq<}c(dVkxFSLsfz<
z*(&{7wsdy7e6nKX-0=DF%GXs()$28=i!`-tb%K|q>-SwYXfVIx(CFC|c{RJa_FCWd
zsT->;P%B*<U%T8bgN{R;!CmRMOS|jtH1t&Wp6m<1YjaQbKK=dG2TzdPR56e?==aES
zNcl0}Fn)M_WN!4)So4#j@q`J|q{&nHXI#%Q&zE03d3ozq)zpdC@zcRGezO5{;cpV=
z)8FR3D_yv-*z~@AsdxF&hZi5$S5#K3zvz6!fB(9^@MCnVa@*lg{5hc$uqZr$3P5w9
z2QbN44eUCulj0bq1C<<}2ERc4kZ_Hroc07=3Vkd?Br%3DhADwLoh6s`EL$UcAIDS9
zkK6<vL0%m`SN;@%D#5!#iy}0lGGeykaS|1K`Xm>n=%tlp9A)F=%H?k>Oet<FbEv4O
zTB(uuC93CXRB2w->d?Nc)2}<IH=uvt;I`ql{gp<U#(^d#ro5(K58N{=GACQ8SmG=v
ztS(rG*=X5P+fLe5+Xo+1bHF+bJC+>sblU6m{cx9ax{H}B(RI?T1j!RTq-l?Ho~~Xz
zUa!5+`M8pK$Wy*&{T%#>{zCy7f%-vE(5>L`5Rs6lp~u6N!rp}!M(9O+jyxA-7PT2&
z7h@L-$2P_tipRt^B^*k`BsL{EA7MN)a<nknGetR-CUrioGri!L-*N2>mW&UXcd`ny
zy-q0QP~}YLww}z-3(dDarBJ|DuzmVXVSiC$@u@SBB@U&kW$egqIbMFFqV(K}^XZkT
zRcY17E*z^#yO>ZLP<QZ>e!bdd^#+qGZjJFx#aFL4Ke{%5ee))Li*W0{Hp_PJTZtW~
zJ1=#0+`ix4f9GM(-QGKWop)RBUAy1#;NruI{xbvlgV~SLhf*G=4d;#2jy@b)9p{=b
znv8r}`E2O<#!JCh)>FB!r)S7>tZ%-(!z?B)_pY8=7u=2iZ*FOKPrxbyP=oLuc1HlP
zL^QRQ00<Qz6h|8X76brnQ~>Ok24MOn0F{aUy?;Oejj(TYNX01tq<}iYY#c(kghY@J
zYQQZp0v3^aksXqU%ppJM7<2*Zg=S$G7J&7UN-qm;grC4aka})EDg;%6>O*}()}SFe
z0$qh3!=NzoNJUnH8N#BlD%fCbEp`^ii93iZz>QMSQ&>`*q8O)SqjaIHq5MdtOqD`4
zjOWG&;=8FCseP&M5I6`?gmD^0nlm&zwBEF%blP;+=*8)47(^HviE6|_Mi<7fOedJd
znFm;cSy@<n*+SU)*(W$oaPH^Aa^2(3<gw)C<o&?c$6qCoB^WCdAnYOHBI+#WD()!}
zuqQ?`V{f@syY!^Yd)be2Z{(jS^eWy|x}tnZrB3ydTGPH(^*)U;&3Ua29a>#6Jp+Aj
zgDk_V`(GI2Ok_>%4}_YfnCDuQTeeueu%Wcou!}<WyU&jDhoYVCI1^l)T<hGHNn9S9
zp7ve=-p75K$shcb{4)Yx2Pp=h4Ec!cZ_SZRQQ^`3u`F@U@wEv%Nj^trlHF2Xr#YmL
zA9u*u%38?D$va!XUT9n#TvA-tT0V4crt<p*nu}s}CiT$`?M>Xxl{X|>%G-82oVsq^
z;qA@5yYaxMf9#R`<E)XnCkG~mp1Ho*m@1l4o_qZ^bzyUfe|h_3^@`wX#TT}(mESei
z-fa|b>TFGIhyKbR5W+d&0TFNkF`$I-J@$Z%unKwLBIp7W;1fiJa0EJ#3zP_zLtW4`
z5_@6T7!HOD;V$?siVmfU@<ipKZlgY+Inf7@3jHej4TcS4hDpP8BGtDv)*p%cTbvNi
z3s;L<qL8A9py;H;Qd&@+rF>7NN|i<R8ZVE}!oQ)`q&`dili*6YOCw2BM2n$~q+OyT
z(M{94)4ykkA<_~rF&Z*1Fl8~zFh6HWXO(At%T~&6!$HR}%2~|i&Mn0Qc*c1f_%ist
z1&jq{ggAsLgf~ULihdQ_k|696kkr`gDwQGKCi7m7Q{F-$OL0({Ud3MZjM|twq#>+n
zpyj1~T&F>ITpu=&HT2ql)@ag%+0^bpq1l)PjisSgl6AYynw_G3^ubO?%pnV>io>5>
zj9shUev&MaJoVmN&L@F9;K$`35^yhwD>yP_EKEMUC}JzhCAuq?H7+pzUZOx!=8^Se
z-;`Hr7U{jml`<N#__IrLSaK`!RP#R+v=$Z>Czphjxs)59ldt5drn#_l@pIkV`lk&K
z8auAGUAuGRam%Z=rCS?aRNcHis(lCV#XKnOZyy{UdNKTTbnr>X#O0@FpXa?iHkC9T
zGaL0L`fc1o^!vlh%pYn#v8<3+t3Ho^S^LKFU2e@{J#6F5k4Ia$pO)Lzf8vh?1i*qk
z{W3rY;g@_s0w_Q@r2AkN>_A-5KIkwK`}5E}<Sml{R)tCM3Ah!WM-frl2y;_~nm|(`
z>|zA^GI}1vgE@pL#!MiLi#@gkJB1U#`QonOwkeD$iYXQl#^eO$91`;asujFBzKNPh
z9YZ}!Fe7x*NYh-P<)JO3<EE=dc#A#;7b1+r+nx!>bc;EhMVe)W^*UPuyAcN~$1-Oh
z*E#Ma9ulu9p9;UY0G}X_5TCG^h@z;Gn2UIfMA4ph$yq4|X=9mm*<N{!f~8`EGEpT-
zb#)(EeL>S->$^_69;bf0p^FjTxWklehB42w1Xe-TuWZfidXPP-^^l5Fx3ihcj9WB`
z)}zWx-n*M@;ydY23Rn#~8p0IX7=9pPCF)F!aU2xinn+68KAMxlnp&AId8{+TCUZUe
zN>1QO@w~B9z6D<jBZ|JAi7MGDOD|`vs5!4zIaVD|Lv^vXZvUml%h^}t8{b?#f6f1f
zUJHL4x_z-@q^q;Lp{KI1<X*vpy#Cz5+@Y-Dgi+@w(&OJIo1X=|5PSJ{>cX_wtoYpO
ze8;=AMZNc{%f~-_{$#Y0z1s5m)tBY38{g)>KU~XS-?#pDBXwirN8pdS&4Zh_w-~p`
zTU|dHf0BQ8ZBuMpY!`38-Vxae+G*L1f0&n??C$OXAZi_iew^Cb`63JeE+2rOc{@9s
zl{-5>tB_&?`3BPM|NDEzt}zzj+{<q5qW^UK53}f$l7&0)Jpcdz32;bRa{vGf6951U
z69E94oEQKA0*6UNK~y*qg;UK=+dvo`+Z)Fwc5nzPNr|8ehjQW>cvv2WGh7f-)lwR&
zm=NOl-(K6DU85e`m7-Xy-TCHkjgAZdS+bF^Obcz>>XYi<G)<_hLhVFRg#CUG%d(KB
zsXpksu0G^@9$GXA*BcaBhPrJCCUE}c9P#_62PlgI+wB(5&(9jHu4@bi16*8OV7Xkv
zacp?LkJ)TS@CIUFb8m<uO?m)J2*h!WrfJ}DVv-~X!w_d@XK;o?<VA|tO^DrApsp&M
zd|n`rBm8)J>H(ybnt_rt<c0Nmt)<-E-C?m<@OKJf4SU_xZ#xd^vc%WR%N{^Y^+{1p
zwQc*u5ApXqjeR_E+Q=Otj&_iS0p(3q<}g$WT-s43;pXN>U%bA))|!>uWs%dHJvv?#
z%6&3b``Qmh`|<G+_xJZ0kH^^UcBrWH;o$+dx3{>ux<cTO@a_9g1c8s1LpsSg2{4`<
z_6%NLUa(rNAZVs#nW$^285x{7pU-hP_K;?Uj#n@plZ+b<c85+6pjiBCMa=uxYE5v1
ziIhyn!Q^-fhXX}HeVf-e)Usv*HYv8cP%Z0&&ctC5prPoI=OUO)5m06ru65*<VM0^{
zcw>p&0|%vc)qteVqv-^{DXWqVDc5KipX$c}8@eGtUNtzGpTa1LtlMn1FsQ*GqW0jU
z`>G$FKL-8AJI&3r6v5FaIJSkdsv&8%pj${7kxgXqq9k39uG2r}T%sBA;TRp+m9VMZ
zVNZ%8!9Gqg;M*}(?_KJ%>F$92woHQ)4c)}a^cavOlDuRZGtDr~5>A);t#p<kIBBc6
z)U=AUR5^Bhovm_??6NGUVJ$lDM{Hr97y3J+9QCaK0IgDkMLQ#Hi2wiq07*qoM6N<$
Eg3S0G$N&HU

diff --git a/src/plugins/oerpub/video/img/image-align-none.png b/src/plugins/oerpub/video/img/image-align-none.png
deleted file mode 100755
index e11f030bfee037d488b5fc804a2d7ea80285ff66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6653
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
Hu0mjfFgo}B

diff --git a/src/plugins/oerpub/video/img/image-align-right.png b/src/plugins/oerpub/video/img/image-align-right.png
deleted file mode 100755
index c9a8e27028289342ebce59446e35b793948c314a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6719
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
VA>c`+BryO0002ovPDHLkV1nO`7eN33

diff --git a/src/plugins/oerpub/video/img/image-border.png b/src/plugins/oerpub/video/img/image-border.png
deleted file mode 100755
index 9a0e100805d473c08cd23149972a7b9e23a5f39b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6233
zcmV-f7^dfmP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000+FX+uL$Nkc;*
zP;zf(X>4Tx0C)k_S!Y-j&9d&9O~A6GCFdMPa+aJVNDhKXTGEnp4oXsjAc%l~pnwP>
zf*1$_B47eUf`AbTq9CYX0tDd>>i2!;KIfc&_s^Z@nVxs6s;hgada9@10f24UEjZX8
zrUM`#Fg(=CP>1)RgCj5QIluuLKnZ98qZ=tKSlhzF6#UoY`vib?m1B~-zW%G(e^$_Y
zc!rSxfGiNTyGIx)0KwM*fOSa0q2U0a))Dz|RCq9g(GL*J7>Y~~!7q2Q_iwzii`{==
z4EmRijg>9{7*+r%sNLK`y#XKyB68kHk~iXqpa%e!A<%;y2mtXQf;C7!ZXN)z6(cr#
z0s?||aUX(3-T%dp_rG8_H}}7Ny19A(jeq|aq$e`49yu)7-!10XkN?Xiz&`@HU%w6p
zq@@n@H`|R3Gjc9?xapZ7S5D;I4)*^QGsFgB_YAbPMr6BqPoTS*`5&y|6>4CGV5Bc(
z5ge|wi;;T<c?E}C*!+<v#`@@*A($GG7kGy0|K;bLubc61%xDmKb7+K>ErJCR+#MEa
zt&d=2ML}<3eQfOi*nIWy)cYfcVK1_Q(Qg}=fgEnMI~F4nbAG=dlifKWW5J5R1o#6_
z5CKAwHV{YxQ=kj<{<M<73%DVgNJJL~{J>iT2OvFykUl{O=KW)*`)?A1U;Vt1e*fDe
zFCZbd5r2>Qdo*5T%)fk+fd_*BlDi>e?CN%B7v@4v{%6d;EO!0<nvHb5^rH0EUvokW
zqh-+wXdSdVS_7>Dc+t#gb|8tCM=PVX(VA#AM5h7_z#GJ~_g{0|^&ime6<Hh<qiW}a
zXm|g+`(IjM_sg36_wRq30U!@8w=DlP0|3H3qmkzT0NtSAm{78}PdKkO^5lB%;WY{*
z?cKvGD=j0vtNwp;?B=ZBll@}#D;Gh`kN=ScGy<SZM%JVAKQi}|0JKXY&wl+sGT}lb
zH~0cDAV`V`jr{Eoy?em`s@+To*Z?;W0HVl!mIaDH4QK&<U<}NG4R8R?$ola?)?g@z
z0`cG|NC#QqBsdL9Kn17*wV(ksgBH*M?tpt>01Sh1@B&POd9Valz<00-K@biiKtzZQ
z;(>%92}l-FhBP33$P}`I93WT78w!LXpm-<+%7XHt66ics2VI5QpgYh*Xasr&%|MIL
zXXpovf~jFfm<tw$rC?=P8#aM$;KQ&t90JF}sc;Tl3|GRJ;hXRscmN)Ur{N{|8w#NC
zC}tENN)n}v(nXo098q4VP*fr+6IF<+L|s9(qwb@|P}8Vo)CL-hCZc)KlE^yUkG4gV
z&>`qVbT+yKU5mbn?n95EXV5F?Z43d!iIKplVvH~cG2WOcOgg3zQ-isIxr-Uc%wxV|
zu~=rT2v!NZAM1ei#l~T?v1hT3*lz3yb`JXuhr_YqByj3DbDSG49G8wegS(8ojT^<y
z<JKwg6g(8N6b2NI6oC}U6onL*D7q*{Dc(_RQqoZhQL0j!Q+iOwQ07urQ?^q+rktnT
zq@t%1p;D)^q4K3VN>xmCh3YQVOR6t;Jf0t~g15wz@kj8*_$K@V{0x4Bnt@uJT9?|1
zI)XZf`XY5V^)u=(1Oh>rpha*bgcEWIb%b8R6k(l)NVAv5h{l5^iKdk1Ce0|#M_Ni+
zAzE!(XWCfWLfUJzk7<|bDCvahbm`pa66s3m+UO?fzR?ruW$4Z61L(8qFVR1wUtqv7
z2s7w2crc_gR5A22%n?yU0irIEL`)%86Ymn|8L^Baj7E&Uj9H8gj6;koObkr&Om<As
zOr=bnOw-ILW?^O{W`E{f=4R#z<{vCvEZQudEEz0USVmdaSUFg=SUp)YSsPi$S%0wc
zvgxz=vE{L~u)ShOvx~D^vPZF(v)^T3=3wMd;~;Tlax`;1=Y%=MIjuP3IIB1ZIlpmn
za~X04bDiPp<yz)u=GNl&<u2gv;$Gw-@@Vjoc?x)L^StL};??H$=Pl;#<6Yt7<lD~|
z!FQf-h;Nf$gx{7wnZJ?$l>n81vVfOBfk2PIiXe~R0l|2|dco&HltRivK0-x8_l4Gk
zMTG5zj|sO3FNm;;7>UG+)Qh|nC5UQ@hKN>*J`ux;DU11uofR7vhs71deZ)(}A4|Xz
ziV|drvl1hFFnd(?1n#NaGbu?esVx~PSuZ)WmwB)0-sHV4dp}AEN;yj9N!^#)mR6AV
zm#&t6A;TbJER!tLF7sJdT$UtTD*Hr^AZH+#B-bjpDlZ}LDPJ!CRDq~)K;f7|kHSwy
zCB;z1D~gLsf=aGRWlEFEjLH_u*~$-8Fe*AKNh%#G8>)(`;i}E5pVTDP{M0U~E$kE7
z=ee(X-<&$Xx|{lW^=S=W4OfkG8q=D5nr@nvnzLF0S{_<8TJN;Qw0*TNYk$;{)(O?Q
zp|hr|s+*wOt%uSx)XUTx(r3`O)i2SXGT=AxHmEmPF;p;&Gwj}v*>AExZ~vqbml4UR
z&S=G0$vDBd&xG2<+N8u})>Pay)U^Eoe8Bj?sRJ*~gv<iXTFimDk@+d}R~8}`Ar`kR
zv6dE=rIv54WUS(??pqVBU92xzf49-G$+dZ5D{32I+ha#-=VVuBw`Q+rpKm{XQ0id9
z!2t($2eLz}BhJyzvBvS+A^k(A56wF%IHfyH92PkoefXg>yR*M@rwgr%o69v<jH|ut
zCD$!CbGJ&jZ|+9!W$r5^T~ZNg$wSMdz+=%<-80|wotL^-zSn}cy7wvXMITL{LZ4-_
zF1duf>bu{!!gtNj-0z~_j=#NsV*o{fYd~8dL!e(^Ul4atbkIn!L~wfWbckxm>5!FB
zlhB$lDC}@pYd9nFayS?v8j%(;6R8nd8o3^27j-R~J~}XZFh)EkBj#PKLF|P%bQ~$J
zC!R0<X#7lqcEb5YDA7H!CrKbFHEI5c;gQ;-R7d@eK1!BO&QJcDVxQ8U%9VN~buP^?
ztv;P5Jv4ptnA)+5<LKk$<3ky88D}!KGd(i<v!t^Mv$nEH+5IPEP86Tm$??h=%2muQ
zKZ!jVcyc07Gp{zEK0h{p?$m)(Hw$<RG7G+*b~*j9P`<FDh^i=}Xu8<6xb=+SnUiO>
zN_<MjOLa;c%Q(w2%GS<$oE<IKD!)>}RgqQk;~e?i)ANSsZ&nId7FJ=aBCFn3+g0Dc
zpnRdOhP@`M=I6!0i_^7MwS9F;b#<3GFXh(5^%3=pmz^#TH|RCAUXi?VzLB{xs|hqk
zG`+v-dUc}Nq`Bvs^0h11g|3&~Al}Hl3Ehmjxzgg(GTrLXI?`s`*3+)me&g2OTNgX{
zI!Zg4I&-_Ix>CD#ZpYsK)*alve8>CFT#rl7i{691Px>tThVGi&eQ?j<UhjSF`?nvc
zKj?U<`mn8ExxZyVap2~l!r+ZZ3Xg6KDGuFytn|2bSY^0<WZy{FsOIRMF}<;SPmG=n
zjGK**OxR95ophR<e(Ldb;hF!l)#s7VH(wliiFuj%itbh66z5dsYq8gj(~8rbGkP<F
zv(~dO=16l(Z^GVe&8NO4ye)jk^R8||cA;a@U~%~Uq4)Dk!AqOV=^yAnlzkNac>R;s
zr@@tjEAy+Nt2>{wzp#C|_*MRE&o_&2Q{Mx=Z?0vov#r-|C~w^VVgKXZX4DpLtN5qb
z&-QJT?Uy?NJ3GN{p>Dt41yD!}dwBuy`6BY3;DFQ)!vIiq|E?*1Ss>*KgxDb14%!PX
z!Dms<Xd(1_OgFX|7ffMAsZXVdm!jTFkf2efHKB8*k6<`WY-5~Zre@J*4P|R!U*Z(w
z^5t&gS?AN^KPfOPBqMxG<dv9$_(_RnN&UT5Qrj|4vhDKh3ek$=%5o|>s>}Nf)z4}C
z(6Z9LptGT8qF-XLuwULN&bZ4II-q41Yu;orXGL$VZsTE_W_Qm1+QHiny^h_7+MF5>
z*EpBCoODfg3vqWQnR+OB@_P}y*1TtY`pM0{C4R~N<N%96g&>xowcxRk`p~2>^KhQ<
zPZ3>_IZ;m0645_m`eRGt$nnYv*o3jfiX{IdI!6VQ8B=Ie>C))a>5dVOQ)Zwub}~1z
zK4&kTn9X^fJ9=^;uP49l)Rls&(`O2Eic*T>&cu`?mll`ZI6GWETd{m@<@`$JO4X<8
zj~71FEL~iveN#7cX|8^?f&PkaV`5Xw)z{7I*Ks$9H+fpbTNT<g+l_8ncer;(cNO2h
z)4kAx?j`oI-{rk0eqZT<&O@Dk(f&^ZnS*SD=O1Z4S{`b696GEr0*yQxEguVcqCd_y
z{&AvrvgoPLGsR~+&%0m5zLa~p{HkFp?Df8B?DXhN*{s)`%-rUid-DZvJ>RJ=Ff6=Z
z?0TQQWWUU}y!hej$JkFgEBKZ1)rQaIU#@>$`|h>&d_(I;!RGW&x$T0TonP@6fSO<j
z6a(r3IvrzzWx~F~U8BgR^ry1L>ru-Q#At+QMd_sI6&MVNc8q~csmxU@eXL9D^c)(T
zWUdnKL7p8xW&Uu1D}wKZB}9BgYsHo%B=>|$-q^b#ttoR<_P#t`!BjCvX+(vnYN3|1
zuU`YJsi_sIU90m#53jFk;BJ_)zusuTc+nI-z+xt1E@z=?scI!>Eoehy^Ue0TUAKMp
z!AyrhN9#jMP8?1<hi9GpTxwj?-8|g2NSvfKj}gy$uQYFGA0;v!dBOL#Uy*-cfPNr*
z;D?~w!8sw0q5PqXVNKyt5vmbCBfFxKqP1esF%M!-#971><Hr+<5)UDnb>&F!(Te1h
zl)zNSG{bcHV|>S{kFRCSW)5cE%szMGcur{U;ghC$n)wQ+_7;eq<}c(dVkxFSLsfz<
z*(&{7wsdy7e6nKX-0=DF%GXs()$28=i!`-tb%K|q>-SwYXfVIx(CFC|c{RJa_FCWd
zsT->;P%B*<U%T8bgN{R;!CmRMOS|jtH1t&Wp6m<1YjaQbKK=dG2TzdPR56e?==aES
zNcl0}Fn)M_WN!4)So4#j@q`J|q{&nHXI#%Q&zE03d3ozq)zpdC@zcRGezO5{;cpV=
z)8FR3D_yv-*z~@AsdxF&hZi5$S5#K3zvz6!fB(9^@MCnVa@*lg{5hc$uqZr$3P5w9
z2QbN44eUCulj0bq1C<<}2ERc4kZ_Hroc07=3Vkd?Br%3DhADwLoh6s`EL$UcAIDS9
zkK6<vL0%m`SN;@%D#5!#iy}0lGGeykaS|1K`Xm>n=%tlp9A)F=%H?k>Oet<FbEv4O
zTB(uuC93CXRB2w->d?Nc)2}<IH=uvt;I`ql{gp<U#(^d#ro5(K58N{=GACQ8SmG=v
ztS(rG*=X5P+fLe5+Xo+1bHF+bJC+>sblU6m{cx9ax{H}B(RI?T1j!RTq-l?Ho~~Xz
zUa!5+`M8pK$Wy*&{T%#>{zCy7f%-vE(5>L`5Rs6lp~u6N!rp}!M(9O+jyxA-7PT2&
z7h@L-$2P_tipRt^B^*k`BsL{EA7MN)a<nknGetR-CUrioGri!L-*N2>mW&UXcd`ny
zy-q0QP~}YLww}z-3(dDarBJ|DuzmVXVSiC$@u@SBB@U&kW$egqIbMFFqV(K}^XZkT
zRcY17E*z^#yO>ZLP<QZ>e!bdd^#+qGZjJFx#aFL4Ke{%5ee))Li*W0{Hp_PJTZtW~
zJ1=#0+`ix4f9GM(-QGKWop)RBUAy1#;NruI{xbvlgV~SLhf*G=4d;#2jy@b)9p{=b
znv8r}`E2O<#!JCh)>FB!r)S7>tZ%-(!z?B)_pY8=7u=2iZ*FOKPrxbyP=oLuc1HlP
zL^QRQ00<Qz6h|8X76brnQ~>Ok24MOn0F{aUy?;Oejj(TYNX01tq<}iYY#c(kghY@J
zYQQZp0v3^aksXqU%ppJM7<2*Zg=S$G7J&7UN-qm;grC4aka})EDg;%6>O*}()}SFe
z0$qh3!=NzoNJUnH8N#BlD%fCbEp`^ii93iZz>QMSQ&>`*q8O)SqjaIHq5MdtOqD`4
zjOWG&;=8FCseP&M5I6`?gmD^0nlm&zwBEF%blP;+=*8)47(^HviE6|_Mi<7fOedJd
znFm;cSy@<n*+SU)*(W$oaPH^Aa^2(3<gw)C<o&?c$6qCoB^WCdAnYOHBI+#WD()!}
zuqQ?`V{f@syY!^Yd)be2Z{(jS^eWy|x}tnZrB3ydTGPH(^*)U;&3Ua29a>#6Jp+Aj
zgDk_V`(GI2Ok_>%4}_YfnCDuQTeeueu%Wcou!}<WyU&jDhoYVCI1^l)T<hGHNn9S9
zp7ve=-p75K$shcb{4)Yx2Pp=h4Ec!cZ_SZRQQ^`3u`F@U@wEv%Nj^trlHF2Xr#YmL
zA9u*u%38?D$va!XUT9n#TvA-tT0V4crt<p*nu}s}CiT$`?M>Xxl{X|>%G-82oVsq^
z;qA@5yYaxMf9#R`<E)XnCkG~mp1Ho*m@1l4o_qZ^bzyUfe|h_3^@`wX#TT}(mESei
z-fa|b>TFGIhyKbR5W+d&0TFNkF`$I-J@$Z%unKwLBIp7W;1fiJa0EJ#3zP_zLtW4`
z5_@6T7!HOD;V$?siVmfU@<ipKZlgY+Inf7@3jHej4TcS4hDpP8BGtDv)*p%cTbvNi
z3s;L<qL8A9py;H;Qd&@+rF>7NN|i<R8ZVE}!oQ)`q&`dili*6YOCw2BM2n$~q+OyT
z(M{94)4ykkA<_~rF&Z*1Fl8~zFh6HWXO(At%T~&6!$HR}%2~|i&Mn0Qc*c1f_%ist
z1&jq{ggAsLgf~ULihdQ_k|696kkr`gDwQGKCi7m7Q{F-$OL0({Ud3MZjM|twq#>+n
zpyj1~T&F>ITpu=&HT2ql)@ag%+0^bpq1l)PjisSgl6AYynw_G3^ubO?%pnV>io>5>
zj9shUev&MaJoVmN&L@F9;K$`35^yhwD>yP_EKEMUC}JzhCAuq?H7+pzUZOx!=8^Se
z-;`Hr7U{jml`<N#__IrLSaK`!RP#R+v=$Z>Czphjxs)59ldt5drn#_l@pIkV`lk&K
z8auAGUAuGRam%Z=rCS?aRNcHis(lCV#XKnOZyy{UdNKTTbnr>X#O0@FpXa?iHkC9T
zGaL0L`fc1o^!vlh%pYn#v8<3+t3Ho^S^LKFU2e@{J#6F5k4Ia$pO)Lzf8vh?1i*qk
z{W3rY;g@_s0w_Q@r2AkN>_A-5KIkwK`}5E}<Sml{R)tCM3Ah!WM-frl2y;_~nm|(`
z>|zA^GI}1vgE@pL#!MiLi#@gkJB1U#`QonOwkeD$iYXQl#^eO$91`;asujFBzKNPh
z9YZ}!Fe7x*NYh-P<)JO3<EE=dc#A#;7b1+r+nx!>bc;EhMVe)W^*UPuyAcN~$1-Oh
z*E#Ma9ulu9p9;UY0G}X_5TCG^h@z;Gn2UIfMA4ph$yq4|X=9mm*<N{!f~8`EGEpT-
zb#)(EeL>S->$^_69;bf0p^FjTxWklehB42w1Xe-TuWZfidXPP-^^l5Fx3ihcj9WB`
z)}zWx-n*M@;ydY23Rn#~8p0IX7=9pPCF)F!aU2xinn+68KAMxlnp&AId8{+TCUZUe
zN>1QO@w~B9z6D<jBZ|JAi7MGDOD|`vs5!4zIaVD|Lv^vXZvUml%h^}t8{b?#f6f1f
zUJHL4x_z-@q^q;Lp{KI1<X*vpy#Cz5+@Y-Dgi+@w(&OJIo1X=|5PSJ{>cX_wtoYpO
ze8;=AMZNc{%f~-_{$#Y0z1s5m)tBY38{g)>KU~XS-?#pDBXwirN8pdS&4Zh_w-~p`
zTU|dHf0BQ8ZBuMpY!`38-Vxae+G*L1f0&n??C$OXAZi_iew^Cb`63JeE+2rOc{@9s
zl{-5>tB_&?`3BPM|NDEzt}zzj+{<q5qW^UK53}f$l7&0)Jpcdz32;bRa{vGf6951U
z69E94oEQKA0J2F$K~y*q-BLjg10V<k+#~mwePv%&)`BK3G3?-N8WJV6mZCbATr9i5
z2J{aI9!C#UkLgqL+Jm!#`PB3EmhMAZYmwo+2d1u2sK|@BlmuA_&|opkGkDgxNlnmu
z7i}i{Ut8y{`Tu?^*bF5&R3Yb@ZIuL+y5y&9YR?JzY^x*)u)#2zhM<9qaCRW&7ztWy
z$>%-Ju#vk|;K1)BK#Gx+k%OrT%<PLGUrtSq9>6CbxDQ5_mfi}!00000NkvXXu0mjf
D<K-^j

diff --git a/src/plugins/oerpub/video/img/image-title.png b/src/plugins/oerpub/video/img/image-title.png
deleted file mode 100755
index f01b9de3c01362cf0bfb7a3991d4d0ef4ecb6f8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6597
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
D@2K9>

diff --git a/src/plugins/oerpub/video/img/image.gif b/src/plugins/oerpub/video/img/image.gif
deleted file mode 100755
index d5924f4bb36a73a3cd9245b098dba3fd783bd889..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 621
zcmZ?wbhEHb6krfwc*el+;q%v<ufP1g$TI7|wRM-D?0x!w-TnWS>wKSo{`2<<OZ~Rs
z+RcG0@BXjd61e-x|Ay@$Yw!K9+Y)%-+5fGN{<rLjIQ0Dg=7;~cJ^Fw3_LJ(3{>NYb
zUv>7rrlE7qrhvvBp+{c)UwG^PzNi0}-}zs&Ik0krU;WnL?T`LVzxIFq{r?Tyf-Bbh
zHtq~Pedglod;d2)_`mZp(4wHTuYpzsS8w#&bnQ^(dcR$df!v^`onbSt|6g$P|CWdU
zm)!n8|K|Uy4ZfA@eK$V%-?%-bdV~M=NB>W~`oI6_{}p%suetaC{}YC)4SrP{{hN1%
z&%N>g$n*b8Z~t#ybKKE0(kC*%Z0e@a?CyInK0SN$<^TWx3<C!gf3kor*8!2BIALHv
z)ezRy+|t^_$igDc%<SJ6G$A;siG`7aaYo3jS)mfaQ#d?0nba+Pto(S`80Lpbb8s%U
zRj_f>)w2#=%N)wYWTM35t|6wz7aG{KM?ip$%|T4uj8*hRlYgkNu(-26AFGhB)U~i1
ztgMQzLZb3gE{0ETu(O+bO3HHcnhS;oGzEq7{Slay*x19t6=bvE(RnThQI#n@839g?
z0{j*d|Ck>nA7hf>l3Nqu)X3D(7Hq(<;?Sh0Y79CSe`Y%sdrg@gP~`M*!kG!@9UB=K
FtO3mL_vrut

diff --git a/src/plugins/oerpub/video/img/padding-decrease.gif b/src/plugins/oerpub/video/img/padding-decrease.gif
deleted file mode 100755
index ea186d31a61fcb10b496e3e299fcb64fca3195cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmZ?wbhEHb6krfwxXQp_nEhnVj!(0e@3aoee*5vyxjXN-AA5N8^83}>PvlqhKYaS3
zW8vBFfBvsof9dGCN6%k>4~@^6wf6Gbz1Nm)IeGK$`_ngn+<E-PF)Z)c`NtDB-2VRK
z@7{CI=50JZch#<ShaRrpe){IKPv@>Z`Tzg_)5l+*KL7as<JS-0|DU_}{p5`w+fTk&
zyZ!RfYxj;`d$x4TIiMN_(t+Yn7DjdkJq8_+R*;_<*jgMMj=Jhdbuv0^VzLlxbrRqF
zvV?Kbwbf6WUnr@~(Z0G=Xy*ABErCsLv)u$9FF%_wMQ%#BVBxh4Iesn?zA9JQS{4-r
zR#vuFmv$v77Ork~c3oyS*-}*%F;;d73Bg&eOkyI6(wcHwypr6@A{oTDi8JqHPI3tj
Ujdb?$*&pD^xZh2K!I8ll0K6xg!T<mO

diff --git a/src/plugins/oerpub/video/img/padding-increase.gif b/src/plugins/oerpub/video/img/padding-increase.gif
deleted file mode 100755
index 08ead14e6789d24fe548983edbfd931d5d6e33cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 358
zcmZ?wbhEHb6krfwxXQp_9h5zL`=_?W*A26uy#4rR?cQrittW5ZeSiAqkJZ~x96bGO
z*7BW4FTc;P=zsY1gK<dP_dow<t-bvG_4m;DoYmV;uRHYc_@(<3HrzgU=lz|>U*>H*
z?HHE#{m0)m>o3h+wd>}yPs_HPJbLcYxoc0hAA8ub@a+Hp|DQho`t<q7_aDE0`2PRg
zz3)k_r;cBGws!mFrCZJ&JO6n5$rnI13`7IPpDc{*42BFkARQn-F|aisXf$xsk!tm5
zDU@_pVP{mk_)>+7jnyk@HbW+xcJgW$z1h;onr_Z9^6i;o%F;AR#_X8O%)=8sWY`re
zT;-}+)a4~4l$%{zRb^QCI(c;T7~JHFHPj^~c=W{tXSi}pvMX^Ji0aCUt1NM0W0u}3
b&9H-kncsyuB*>6)pXY&K59gyEjttfSIX9a3

diff --git a/src/plugins/oerpub/video/img/page.png b/src/plugins/oerpub/video/img/page.png
deleted file mode 100755
index 03ddd799fa0a3aec561c75d4221f195db65d6eb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 635
zcmV->0)+jEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!4M{{nR2Ufr
z!N0Gba~KEU>;68^d)m`eN0o>(5%D`Q(1;j>g@G;xlf`0VBQ`PFY?6)!N&f?*K}$p;
zB!U=NBn{eB8${1}&-2_L*HuZp@ZP1@clS@cHp)4iM1ewzw59vko7eMM{e9z|%NNdX
z0V;`?KKSzTCvTm5bc{L^CIKLUxc2X{i{ISz$8Sgf{q)1nXTP{`{s?9mQ$4&hPiKC-
zY8q7(Y1Xu5iCf33=O4Vy(+|zQ?rW#gkKB0f%}?+6{G*qT22|DQB-73`YzA{N4W^=s
zq0kQYcbtFfz<m##*q!(HK869IU|<xZ%BV7`j4ER)zyEd1y{C^ocDB6n%$=sq^eW5%
z3G+lLsnTm0WuDl{@XPhs_M&_1+51nZc`PtPLNM155!5J!G?@lFj4s`i7}NkW1dS?6
z34%162~b0=B_kRMFhegSGzv+;80a!jAw`I?HfsYjbVm|G1b_ggRG0^ilN;70V1~6>
zLz)H<&|z(Y4k<R%uxuAFLod;Z_rKdJ(M3`;septAT)b!F_^81Q%d%Qm4)!;mynE=d
zhPCJrBqV%)b&-za!v)N+9Ca_<*{<rVE32-E0v$?p$S9-BJXbGkFEGRL;ri#^&UDwi
zk8k&q450zH@6I4$cT=kLW~zVIrLVvYRr&D6w=ca?RZm1t0SG|^2srHSZ|C76{0~Gp
V9#%DjY7zhd002ovPDHLkV1iYrAH)Cv

diff --git a/src/plugins/oerpub/video/img/size-decrease.gif b/src/plugins/oerpub/video/img/size-decrease.gif
deleted file mode 100755
index 1e1fac4fd5f75bf5ae0ab017d0085fba8b74c90c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 346
zcmZ?wbhEHb6krfwxXQp_;+=fq;fICm4^LjW*)Z$LhmU^`pS%~8+%RSRt1TzqH%~u&
z|G|g<KmIS;bvHi0fARLqQ<fjzf8~2*Y}(OFkCv}I|KP>vhNU<6pM87k%8&I29)0}z
zZ{pH()3$#4|NsBet>+G$|GweG-IJGp0J#jb0g69a7}*(=7<53!gZ#w6R_-vdz(Yr>
z|7iOs#SAOO2?rfsyo^{MvD*2^i6qOG)|OXq1q@owGbxBvn6fw}876k$3HMznq|U-q
z#vE2#Ey~y~*%+o+DB8v-E-cq2$ReKDK9Nnjv4BIAdnOy3!W<{&c40P2NnSY-X)&%w
Sc7|=+cWm?6y~oXw!5RRtg?q37

diff --git a/src/plugins/oerpub/video/img/size-increase.gif b/src/plugins/oerpub/video/img/size-increase.gif
deleted file mode 100755
index e673ee9ffa50d112ffbf31d0cc653571f5ea2226..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 345
zcmZ?wbhEHb6krfwxXQp_;+=fq;fICm4^LjW*)Z$LhmU^`pS%~8+|aw`&6X4Io2MUM
zwCnDJ2Os|b_`i7j<@o&m(^q~>S$;S&Htp!8N6S~9fAHdS!_u1vF1(++_0#$Tj}Dyw
z{_*F(iA&G@|NnpK)^i(9+yyciXbBX5vM{nUC@|=NECKn6fvwD8LV<^lRKIKcCB+OY
z<%tI!Uc8K0AMx7x#fdo1gtnGfTb&LuEIhFLqJU6~r_`2xd0e7QO@anz*uy1QDnuFE
zB<p2a(xpUO8O4R=Iupc2YbFS@$<#|Hu*?u=W0Rlb#N0MZQj%LvL`ICOo}FRqw(VOz
LcI|d^WUvMRr<-=x

diff --git a/src/plugins/oerpub/video/lib/image-floatingMenu.js b/src/plugins/oerpub/video/lib/image-floatingMenu.js
deleted file mode 100644
index a14eb6e3e9..0000000000
--- a/src/plugins/oerpub/video/lib/image-floatingMenu.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/*global documents: true define: true */
-/*!
- * Aloha Editor
- * Author & Copyright (c) 2011 Gentics Software GmbH
- * aloha-sales@gentics.com
- * Licensed under the terms of http://www.aloha-editor.com/license.html
- * 
- * Author : Nicolas Karageuzian - http://nka.me
- */
-define([
-	'jquery',
-    'util/class',
-	'i18n!image/nls/i18n',
-	'i18n!aloha/nls/i18n',
-	'ui/ui',
-	'ui/scopes',
-    'ui/button',
-    'ui/toggleButton',
-    'ui/port-helper-attribute-field'
-],
-function (
-	jQuery,
-	Class,
-	i18n,
-	i18nCore,
-	Ui,
-	Scopes,
-	Button,
-	ToggleButton,
-	AttributeField
-) {
-	'use strict';
-
-	var $ = jQuery;
-	var GENTICS = window.GENTICS;
-	var Aloha = window.Aloha;
-
-	/**
-     * Toolbar elements for Image plugin
-     *
-     * @class MyClass
-     */
-	return Class.extend({
-        /**
-         * Empty constructor
-         *
-         * @method
-         * @constructor
-         */
-		_constructor: function () {
- 
-		},
-
-         /**
-          * Initialize Floating menu buttons according to plugin config
-          */
-        init: function (plugin) {
-			plugin.floatingMenuControl = this;
-			this.plugin = plugin;
-
-			Scopes.createScope(plugin.name, 'Aloha.empty');
-
-			this._addUIInsertButton();
-			this._addUIMetaButtons();
-			this._addUIResetButton();
-			this._addUIAlignButtons();
-			this._addUIMarginButtons();
-			this._addUICropButtons();
-			this._addUIResizeButtons();
-			this._addUIAspectRatioToggleButton();
-
-//			 TODO fix the function and reenable this button 
-//			this._addNaturalSizeButton();
-		},
-
-		/**
-		 * Adds the aspect ratio toggle button to the floating menu
-		 */
-		_addUIAspectRatioToggleButton: function () {
-			var plugin = this.plugin;
-
-			this._imageCnrRatioButton = Ui.adopt("imageCnrRatio", ToggleButton, {
-				tooltip: i18n.t('button.toggle.tooltip'),
-				icon: 'aloha-icon-cnr-ratio',
-				scope: plugin.name,
-				click: function(){
-					plugin.toggleKeepAspectRatio();
-				}
-			});
-
-			// If the setting has been set to a number or false we need to activate the 
-			// toggle button to indicate that the aspect ratio will be preserved.
-			if (plugin.settings.fixedAspectRatio !== false) {
-				this._imageCnrRatioButton.setState(true);
-				plugin.keepAspectRatio = true;
-			}
-		},
-		
-		/**
-		 * Adds the reset button to the floating menu for the given tab 
-		 */
-		_addUIResetButton: function () {
-			var plugin = this.plugin;
-
-			this._imageCnrResetButton = Ui.adopt("imageCnrReset", Button, {
-				tooltip: i18n.t('Reset'),
-				icon: 'aloha-icon-cnr-reset',
-				scope: plugin.name,
-				click: function(){
-					plugin.reset();
-				}
-			});
-		},
-		
-		/**
-		 * Adds the insert button to the floating menu
-		 */
-		_addUIInsertButton: function () {
-			var plugin = this.plugin;
-
-			this._insertImageButton = Ui.adopt("insertImage", Button, {
-				tooltip: i18n.t('button.addimg.tooltip'),
-				icon: 'aloha-button aloha-image-insert',
-				scope: 'Aloha.continuoustext',
-				click: function(){
-					plugin.insertImg();
-				}
-			});
-		},
-
-        /**
-         * Adds the ui meta fields (search, title) to the floating menu. 
-         */
-		_addUIMetaButtons: function () {
-			var plugin = this.plugin;
-			
-			this.imgSrcField = AttributeField({
-				label: i18n.t('field.img.src.label'),
-				labelClass: 'aloha-image-input-label',
-				tooltip: i18n.t('field.img.src.tooltip'),
-				name: 'imageSource',
-				scope: plugin.name
-			});
-			this.imgSrcField.setObjectTypeFilter(plugin.objectTypeFilter);
-			
-			this.imgTitleField = AttributeField({
-				label: i18n.t('field.img.title.label'),
-				labelClass: 'aloha-image-input-label',
-				tooltip: i18n.t('field.img.title.tooltip'),
-				name: 'imageTitle',
-				scope: plugin.name
-			});
-			this.imgTitleField.setObjectTypeFilter();
-
-            this.imgAltField = AttributeField({
-				label: i18n.t('field.img.alt.label'),
-				labelClass: 'aloha-image-input-label',
-				tooltip: i18n.t('field.img.alt.tooltip'),
-				name: 'imageAlt',
-				scope: plugin.name
-            });
-            this.imgTitleField.setObjectTypeFilter();
-		},
-		
-		/**
-		 * Adds the ui align buttons to the floating menu
-		 */
-		_addUIAlignButtons: function () {
-			var plugin = this.plugin;
-		
-			this._imageAlignLeftButton = Ui.adopt("imageAlignLeft", Button, {
-				tooltip: i18n.t('button.img.align.left.tooltip'),
-				icon: 'aloha-img aloha-image-align-left',
-				scope: plugin.name,
-				click : function () {
-					var el = jQuery(plugin.getPluginFocus());
-					el.add(el.parent()).css('float', 'left');
-				}
-			});
-			
-			this._imageAlignRightButton = Ui.adopt("imageAlignRight", Button, {
-				tooltip: i18n.t('button.img.align.right.tooltip'),
-				icon: 'aloha-img aloha-image-align-right',
-				scope: plugin.name,
-				click : function () {
-					var el = jQuery(plugin.getPluginFocus());
-					el.add(el.parent()).css('float', 'right');
-				}
-			});
-
-			this._imageAlignNoneButton = Ui.adopt("imageAlignNone", Button, {
-				tooltip: i18n.t('button.img.align.none.tooltip'),
-				icon: 'aloha-img aloha-image-align-none',
-				scope: plugin.name,
-				click : function () {
-					var el = jQuery(plugin.getPluginFocus());
-					el.add(el.parent()).css({
-						'float': 'none',
-						display: 'inline-block'
-					});
-				}
-			});
-		},
-		
-		/**
-		 * Adds the ui margin buttons to the floating menu
-		 */
-		_addUIMarginButtons: function () {
-			var plugin = this.plugin;
-
-			this._imageIncPaddingButton = Ui.adopt("imageIncPadding", Button, {
-				tooltip: i18n.t('padding.increase'),
-				icon: 'aloha-img aloha-image-padding-increase',
-				scope: plugin.name,
-				click: function () {
-					jQuery(plugin.getPluginFocus()).increase('padding');
-				}
-			});
-			
-			this._imageDecPaddingButton = Ui.adopt("imageDecPadding", Button, {
-				tooltip: i18n.t('padding.decrease'),
-				icon: 'aloha-img aloha-image-padding-decrease',
-				scope: plugin.name,
-				click: function () {
-					jQuery(plugin.getPluginFocus()).decrease('padding');
-				}
-			});
-		},
-		
-		/**
-		 * Adds the crop buttons to the floating menu
-		 */		
-		_addUICropButtons: function () {
-			var plugin = this.plugin;
-
-			Scopes.createScope('Aloha.img', ['Aloha.global']);
-
-			this._imageCropButton = Ui.adopt("imageCropButton", ToggleButton, {
-				tooltip: i18n.t('Crop'),
-				icon: 'aloha-icon-cnr-crop',
-				scope: plugin.name,
-				click: function () {
-					if (this.getState()) {
-						plugin.crop();
-					} else {
-						plugin.endCrop();
-					}
-				}
-			});
-		},
-
-        /**
-         * Adds the resize buttons to the floating menu
-         */	
-		_addUIResizeButtons: function () {
-			var plugin = this.plugin;
-
-			// Manual resize fields
-			this.imgResizeHeightField = AttributeField({
-				label:  i18n.t('height'),
-				labelClass: 'aloha-image-input-label',
-				name: "imageResizeHeight",
-				width: 50,
-				scope: plugin.name
-			});
-			this.imgResizeHeightField.maxValue = plugin.settings.maxHeight;
-			this.imgResizeHeightField.minValue = plugin.settings.minHeight;
-			
-			this.imgResizeWidthField = AttributeField({
-				label:  i18n.t('width'),				
-				labelClass: 'aloha-image-input-label',
-				name: "imageResizeWidth",
-				width: 50,
-				scope: plugin.name
-			});
-			this.imgResizeWidthField.maxValue = plugin.settings.maxWidth;
-			this.imgResizeWidthField.minValue = plugin.settings.minWidth;
- 		},
-
-		/**
-		 * Adds the natural size button to the floating menu
-		 */
-		/*
-		  TODO currently deactivated see TODO at call site above.
-		_addNaturalSizeButton: function () {
-			var plugin = this.plugin;
-
-			this._imageNaturalSizeButton = Ui.adopt("imageNaturalSize", Button, {
-				icon: 'aloha-img aloha-image-size-natural',
-				label: i18n.t('size.natural'),
-				scope: plugin.name,
-				click: function () {
-					plugin.resetSize();
-				}
-			});
-		},
-		*/
-
-		/**
-		 * Sets the scope
-		 */
-		setScope: function () {
-			Scopes.setScope(this.plugin.name);
-		},
-
-		/**
-		 * Redraws UI
-		 */
-		doLayout: function () {
-			// Implementation was removed while porting this plugin to
-			// the jqueryui toolbar because it seems to be a hack that
-			// is not needed with the new implementation.
-		}
-    });
-});
-	
diff --git a/src/plugins/oerpub/video/lib/image-plugin-actions.js b/src/plugins/oerpub/video/lib/image-plugin-actions.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/plugins/oerpub/video/lib/image-plugin.js b/src/plugins/oerpub/video/lib/image-plugin.js
deleted file mode 100755
index d3647e345a..0000000000
--- a/src/plugins/oerpub/video/lib/image-plugin.js
+++ /dev/null
@@ -1,1391 +0,0 @@
-/*global documents: true define: true*/
-/*
-* Aloha Image Plugin - Allow image manipulation in Aloha Editor
-* 
-* Author & Copyright (c) 2011 Gentics Software GmbH
-* aloha-sales@gentics.com
-* Contributors 
-*		Johannes Schüth - http://jotschi.de
-*		Nicolas karageuzian - http://nka.me/
-*		Benjamin Athur Lupton - http://www.balupton.com/
-*		Thomas Lete
-*		Nils Dehl
-*		Christopher Hlubek
-*		Edward Tsech
-*		Haymo Meran
-*
-* Licensed under the terms of http://www.aloha-editor.com/license.html
-*/
-
-define([
-	// js
-	'jquery',
-	'aloha/plugin',
-	'video/image-floatingMenu',
-	'i18n!aloha/nls/i18n',
-	'i18n!image/nls/i18n',
-	'jqueryui',
-	'video/vendor/jcrop/jquery.jcrop.min',
-	'video/vendor/mousewheel/mousewheel'
-], function AlohaImagePlugin(
-	aQuery,
-	Plugin,
-	ImageFloatingMenu,
-	i18nCore,
-	i18n
-){
-	
-	'use strict';
-	
-	var jQuery = aQuery;
-	var $ = aQuery;
-	var GENTICS = window.GENTICS;
-	var Aloha = window.Aloha;
-	
-	// Attributes manipulation utilities
-	// Aloha team may want to factorize, it could be useful for other plugins
-	// Prototypes
-	String.prototype.toInteger = String.prototype.toInteger || function () {
-		return parseInt(String(this).replace(/px$/, '') || 0, 10);
-	};
-	String.prototype.toFloat = String.prototype.toInteger || function () {
-		return parseFloat(String(this).replace(/px$/, '') || 0, 10);
-	};
-	Number.prototype.toInteger = Number.prototype.toInteger || String.prototype.toInteger;
-	Number.prototype.toFloat = Number.prototype.toFloat || String.prototype.toFloat;
-
-	// Insert jQuery Prototypes	
-	jQuery.extend(true, jQuery.fn, {
-		increase: jQuery.fn.increase || function (attr) {
-			var	obj = jQuery(this), value, newValue;
-			if (!obj.length) {
-				return obj;
-			}
-			value = obj.css(attr).toFloat();
-			newValue = Math.round((value || 1) * 1.2);
-			// when value is 2, won't increase
-			if (value === newValue) {
-				newValue++;
-			}
-			obj.css(attr, newValue);
-			return obj;
-		},
-		decrease: jQuery.fn.decrease || function (attr) {
-			var	obj = jQuery(this), value, newValue;
-			// Check
-			if (!obj.length) {
-				return obj;
-			}
-			// Calculate
-			value = obj.css(attr).toFloat();
-			newValue = Math.round((value || 0) * 0.8);
-			// Apply
-			if (value === newValue && newValue > 0) {
-				// when value is 2, won't increase
-				newValue--;
-			}
-			obj.css(attr, newValue);
-			// Chain
-			return obj;
-		}
-	});
-
-	// Create and register Image Plugin
-	return Plugin.create('video', {
-
-		languages: ['en', 'fr', 'de', 'ru', 'cz'],
-
-		defaultSettings: {
-			'maxWidth': 1600,
-			'minWidth': 3,
-			'maxHeight': 1200,
-			'minHeight': 3,
-			// This setting will correct manually values that are out of bounds
-			'autoCorrectManualInput': true,	 
-			// This setting will define a fixed aspect ratio for all resize actions
-			'fixedAspectRatio' : false, 
-			// When enabled this setting will order the plugin to automatically resize images to given bounds
-			'autoResize': false,
-			//Image manipulation options - ONLY in default config section
-			ui: {
-				oneTab		: false, //Place all ui components within one tab
-				insert      : true, // Shows an insert button on std floatingMenu scope
-				reset		: true, // Reset to default size
-				aspectRatioToggle: true, // Toggle button for the aspect ratio 
-				align		: true,	// Menu elements to show/hide in menu
-				resize		: true,	// Resize buttons
-				meta		: true, // Shows field for changing src and title attributes of an image
-				margin		: true, // shows button to increase/decrease image margin properties
-				crop		: true, // enable/show crop actions on a image
-				resizable	: true,	// Resizable ui-drag image
-				handles     : 'ne, se, sw, nw'   // set handles for resize
-			},
-			
-			/**
-			 * Crop callback is triggered after the user clicked accept to accept his crop
-			 * @param image jquery image object reference
-			 * @param props cropping properties
-			 */
-			onCropped: function ($image, props) {
-				Aloha.Log.info('Default onCropped invoked', $image, props);
-			},
-			
-			/**
-			 * Reset callback is triggered before the internal reset procedure is applied
-			 * if this function returns true, then the reset has been handled by the callback
-			 * which means that no other reset will be applied
-			 * if false is returned the internal reset procedure will be applied
-			 * @param image jquery image object reference
-			 * @return true if a reset has been applied, false otherwise
-			 */
-			onReset: function ($image) {
-				Aloha.Log.info('Default onReset invoked', $image);
-				return false;
-			},
-			
-			/**
-			 * Example callback method which gets called while the resize process is beeing executed.
-			 */
-			onResize: function ($image) {
-				Aloha.Log.info('Default onResize invoked', $image);
-			},
-			
-			/**
-			 * Resize callback is triggered after the internal resize procedure is applied.  
-			 */
-			onResized: function ($image) {
-				Aloha.Log.info('Default onResized invoked', $image);
-			},
-
-			/**
-			 * Upload callback is triggered after an image was uploaded
-			 * to determine the server-side URI of the uploaded image.
-			 * The default expects a json-formatted message.
-			 */
-			onUploadSuccess: function(xhr) {
-				return xhr.response;
-			},
-
-			/**
-			 * Upload callback is triggered after an image failed to upload.
-			 */
-			onUploadFail: function(xhr) {
-				Aloha.Log.info('Default onUploadFail invoked');
-			}
-		},
-		
-		/**
-		 * Internal callback hook which gets invoked when cropping has been finished
-		 */
-		_onCropped: function ($image, props) {
-			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
-			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
-			
-			
-			$('body').trigger('aloha-image-cropped', [$image, props]);
-			
-			// Call the custom onCropped function
-			this.onCropped($image, props);
-		},
-
-		/**
-		 * Internal callback hook which gets invoked when resetting images
-		 */
-		_onReset: function ($image) {
-			
-			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
-			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
-			
-			// No default behaviour defined besides event triggering
-			$('body').trigger('aloha-image-reset', $image);
-			
-			// Call the custom resize function
-			return this.onReset($image);
-		},
-		
-		/**
-		 * Internal callback hook which gets invoked while the image is beeing resized
-		 */
-		_onResize: function ($image) {
-
-			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
-			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
-			
-			// No default behaviour defined besides event triggering
-			$('body').trigger('aloha-image-resize', $image);
-			
-			// Call the custom resize function
-			this.onResize($image);
-		},
-
-		/**
-		 * Internal callback hook which gets invoked when the current resizing action has stopped
-		 */
-		_onResized: function ($image) {
-			
-			$('#' + this.ui.imgResizeHeightField.getInputId()).val($image.height());
-			$('#' + this.ui.imgResizeWidthField.getInputId()).val($image.width());
-
-			$('body').trigger('aloha-image-resized', $image);
-			
-			// Call the custom resize function
-			this.onResized($image);
-		},
-		
-		/**
-		 * The image that is currently edited
-		 */
-		imageObj: null,
-		
-		/**
-		 * The Jcrop API reference
-		 * this is needed to be able to destroy the cropping frame later on
-		 * the variable is linked to the api object whilst cropping, or set to null otherwise
-		 * strange, but done as documented http://deepliquid.com/content/Jcrop_API.html
-		 */
-		jcAPI: null,
-		
-		
-		/**
-		 * State variable for the aspect ratio toggle feature 
-		 */
-		keepAspectRatio: false,
-		
-		/**
-		 * Variable that will hold the start aspect ratio. This ratio will be used once starResize will be called.  
-		 */
-		startAspectRatio: false, 
-		
-		/**
-		 * This will contain an image's original properties to be able to undo previous settings
-		 *
-		 * when an image is clicked for the first time, a new object will be added to the array
-		 * {
-		 *		obj : [the image object reference],
-		 *		src : [the original src url],
-		 *		width : [initial width],
-		 *		height : [initial height]
-		 * }
-		 *
-		 * when an image is clicked the second time, the array will be checked for the image object
-		 * referenct, to prevent for double entries
-		 */
-		restoreProps: [],
-
-		objectTypeFilter: [],
-
-		/**
-		 * Plugin initialization method
-		 */
-		init: function () {
-
-			var plugin = this;
-			
-			var imagePluginUrl = Aloha.getPluginUrl('image');
-			
-			
-			
-			// Extend the default settings with the custom ones (done by default)
-			plugin.startAspectRatio = plugin.settings.fixedAspectRatio; 
-			plugin.config = plugin.defaultSettings;
-			plugin.settings = jQuery.extend(true, plugin.defaultSettings, plugin.settings);
-			
-			plugin.initializeUI();
-			plugin.bindInteractions();
-			plugin.subscribeEvents();
-
-		},
-
-		/**
-		* Create buttons
-		*/
-		initializeUI: function () {
-			
-			var that = this;
-
-			this.ui = new ImageFloatingMenu();
-			this.ui.init(this);
-		},
-		/**
-		 * Bind plugin interactions
-		 */
-		bindInteractions: function () {
-			var	plugin = this;
-			
-			if (plugin.settings.ui.resizable) {
-				try {
-					// this will disable mozillas image resizing facilities
-					document.execCommand('enableObjectResizing', false, false);
-				} catch (e) {
-					Aloha.Log.info(e, 'Could not disable enableObjectResizing');
-					// this is just for internet explorer, who will not support disabling enableObjectResizing
-				}
-			}
-
-			if (plugin.settings.ui.meta) {
-				// update image object when src changes
-				plugin.ui.imgSrcField.addListener('keyup', function (event) {
-					plugin.srcChange();
-				});
-
-				plugin.ui.imgSrcField.addListener('blur', function (event) {
-					// TODO remove image or do something usefull if the user leaves the
-					// image without defining a valid image src.
-					var img = jQuery(plugin.ui.imgSrcField.getTargetObject());
-					if (img.attr('src') === '') {
-						img.remove();
-					} // image removal when src field is blank
-				});
-			}
-			
-			// Override the default method by using the given one
-			if (plugin.settings.onCropped && typeof plugin.settings.onCropped === "function") {
-				plugin.onCropped = plugin.settings.onCropped;
-			}
-			
-			// Override the default method by using the given one
-			if (plugin.settings.onReset && typeof plugin.settings.onReset === "function") {
-				plugin.onReset = plugin.settings.onReset;
-			}
-
-			// Override the default method by using the given one
-			if (plugin.settings.onResized && typeof plugin.settings.onResized === "function") {
-				plugin.onResized = plugin.settings.onResized;
-			}
-			
-			// Override the default method by using the given one
-			if (plugin.settings.onResize && typeof plugin.settings.onResize === "function") {
-				plugin.onResize = this.settings.onResize;
-			}
-			
-		},
-
-		/**
-		 * Subscribe to Aloha events and DragAndDropPlugin Event
-		 */
-		subscribeEvents: function () {
-			var	plugin = this;
-			var config = this.settings;
-			
-			jQuery('img').filter(config.globalselector).unbind();
-			jQuery('img').filter(config.globalselector).click(function (event) {
-				plugin.clickImage(event);
-			});
-
-			Aloha.bind('aloha-drop-files-in-editable', function (event, data) {
-				var img, len = data.filesObjs.length, fileObj, config;
-
-				while (--len >= 0) {
-					fileObj = data.filesObjs[len];
-					if (fileObj.file.type.match(/image\//)) {
-						config = plugin.getEditableConfig(data.editable);
-						// Prepare
-						// If the user is dropping onto an existing image change the existing img tag
-						if (data.range.startContainer === data.range.endContainer && data.range.startContainer.tagName && data.range.startContainer.tagName.toLowerCase() == 'img') {
-						  img = jQuery(data.range.startContainer);
-						  img.attr('src', fileObj.file.objectURL);
-						} else {
-							img = jQuery('<img/>');
-							img.css({
-								"max-width": plugin.maxWidth,
-								"max-height": plugin.maxHeight
-							});
-							img.attr('id', fileObj.id);
-							img.attr('src', fileObj.file.dataURI);
-
-							var start = jQuery(data.range.startContainer).parents('.aloha-image-upload-drop-box');
-							if (start.length != 0) {
-								// Replace the box with the image tag.
-								start.replaceWith(img);
-							} else {
-								GENTICS.Utils.Dom.insertIntoDOM(img, data.range, jQuery(Aloha.activeEditable.obj));
-							}
-						}
-					}
-				}
-			});
-
-            /* Event handlers for successful/failed uploads */
-			Aloha.bind('aloha-upload-success', function (event, data) {
-                // Get the server-side url from the response, set it
-                // as the src for the image.
-                var url = plugin.settings.onUploadSuccess(data.xhr);
-                if ( url !== null && data.file.droptarget) {
-                    var $target = jQuery(data.file.droptarget);
-                    if ($target.is('img')){
-                        jQuery(data.file.droptarget).attr('src', url);
-                    } else {
-                        var $img = jQuery('<img/>');
-                        $img.css({
-                            "max-width": plugin.maxWidth,
-                            "max-height": plugin.maxHeight
-                        });
-                        $img.attr('src', url);
-                        var range = Aloha.Selection.getRangeObject();
-                        GENTICS.Utils.Dom.insertIntoDOM($img, range, $target);
-                    }
-                }
-            });
-
-			Aloha.bind('aloha-upload-failure', function (event, data) {
-                plugin.settings.onUploadFail(data.xhr);
-            });
-
-			/*
-			 * Add the event handler for selection change
-			 */
-			Aloha.bind('aloha-selection-changed', function (event, rangeObject, originalEvent) {
-				var config, foundMarkup;
-				if (originalEvent && originalEvent.target) {
-					// Check if the element is currently beeing resized
-					if (plugin.settings.ui.resizable && !jQuery(originalEvent.target).hasClass('ui-resizable-handle')) {
-						plugin.endResize();
-						plugin.imageObj = null;
-						Aloha.trigger('aloha-image-unselected', originalEvent.target);
-					}
-				}
-
-				if (Aloha.activeEditable !== null) {
-					foundMarkup = plugin.findImgMarkup(rangeObject);
-					config = plugin.getEditableConfig(Aloha.activeEditable.obj);
-
-					if (typeof config !== 'undefined') {
-						plugin.ui._insertImageButton.show();
-					} else {
-						plugin.ui._insertImageButton.hide();
-						return;
-					}
-
-					// Enable image specific ui components if the element is an image
-					if (foundMarkup) { // TODO : this is always null (below is dead code, moving it to clickImage)
-						plugin.ui._insertImageButton.show();
-						plugin.ui.setScope();
-						if (plugin.settings.ui.meta) {
-							plugin.ui.imgSrcField.setTargetObject(foundMarkup, 'src');
-							plugin.ui.imgTitleField.setTargetObject(foundMarkup, 'title');
-							plugin.ui.imgAltField.setTargetObject(foundMarkup, 'alt');
-						}
-						plugin.ui.imgSrcField.foreground();
-						plugin.ui.imgSrcField.focus();
-					} else {
-						if (plugin.settings.ui.meta) {
-							plugin.ui.imgSrcField.setTargetObject(null);
-						}
-					}
-					// TODO this should not be necessary here!
-					plugin.ui.doLayout();
-				}
-
-			});
-			
-			Aloha.bind('aloha-editable-created', function (event, editable) {
-
-				try {
-					// this will disable mozillas image resizing facilities
-					document.execCommand('enableObjectResizing', false, false);
-				} catch (e) {
-					Aloha.Log.info(e, 'Could not disable enableObjectResizing');
-					// this is just for others, who will not support disabling enableObjectResizing
-				}
-
-				// Inital click on images will be handled here
-				// editable.obj.find('img').attr('_moz_resizing', false);
-				// editable.obj.find('img').contentEditable(false);
-				editable.obj.delegate('img', 'mouseup', function (event) {
-					plugin.clickImage(event);
-					event.stopPropagation();
-				});
-			});
-
-			plugin._subscribeToResizeFieldEvents();
-
-		},
-		
-		
-		/**
-		 * Automatically resize the image to fit into defined bounds.
-		 */
-		autoResize: function() {
-			// @todo add an option to do just down scaling and not upscale when image is too small
-			// @todo handle ratio mismatches (eg 4:3 is set but image is 16:9 --> image need to be cut)
-
-			var that = this;
-
-			var width = that.imageObj.width();
-			var height = that.imageObj.height();
-			var resize = false;
-
-			// Only normalize the field values when the image exeeds the definded bounds
-			if (width < that.settings.minWidth || 
-				width > that.settings.maxWidth || 
-				height < that.settings.minHeight || 
-				height > that.settings.maxHeight) {
-				resize = true;
-			}
-
-			if ( resize && width >= height ) {
-				that._setNormalizedFieldValues('width');
-				that.setSizeByFieldValue();
-				return true;
-			} else if ( resize && width < height ) {
-				that._setNormalizedFieldValues('height');
-				that.setSizeByFieldValue();
-				return true;
-			} else {
-				return false;
-			}
-		},
-
-		/**
-		 * Toggle the keep aspect ratio functionallity
-		 */
-		toggleKeepAspectRatio: function() {
-
-			this.keepAspectRatio = !this.keepAspectRatio;
-
-			this.endResize();
-			if (!this.keepAspectRatio) {
-				this.startAspectRatio = false;
-			} else {
-				// If no fixed aspect ratio was given we will calculate a new start 
-				// aspect ratio that will be used for the next starResize action.
-				if ( typeof this.settings.fixedAspectRatio !== 'number' ) {
-					var currentRatio = this.imageObj.width() / this.imageObj.height();
-					this.startAspectRatio = currentRatio;
-				} else {
-					this.startAspectRatio = this.settings.fixedAspectRatio;
-				}
-			}
-			this.startResize();
-		},
-
-		/**
-		 * Bind interaction events that are invoked on the resize fields
-		 */
-		_subscribeToResizeFieldEvents: function () {
-			var plugin = this;
-
-			/**
-			 * Helper function that will update the fields
-			 */
-			function updateField($field, delta, maxValue, minValue) {
-
-				if (typeof minValue === 'undefined') {
-					minValue = 0;
-				}
-
-				if (typeof maxValue === 'undefined') {
-					maxValue = 8000;
-				}
-
-				// If the current value of the field can't be parsed we don't update it
-				var oldValue = parseInt($field.val(), 10);
-				if (isNaN(oldValue)) {
-					$field.css('background-color', 'red');
-					return false;
-				}
-
-				var newValue = oldValue + delta;
-				// Exit if the newValue is above the maxValue limit (only if the user tries to increment) 
-				if (delta >= 0 && newValue > maxValue) {
-
-					// Auto correct out of bounds values
-					if (plugin.settings.autoCorrectManualInput) {
-						$field.val(maxValue);
-						return true;
-					} else {
-						$field.css('background-color', 'red');
-						return false;
-					}
-				 // Exit if the newValue is below the minValue (only if the user tries to decrement)
-				 } else if (delta <= 0 && newValue < minValue) {
-					
-					// Auto correct out of bounds values
-					if (plugin.settings.autoCorrectManualInput) {
-						$field.val(minValue);
-						return true;
-					} else {
-						$field.css('background-color', 'red');
-						return false;
-					}
-				} else {
-					$field.css('background-color', '');
-				}
-				$field.val(oldValue + delta);
-				return true;
-			};
-
-			/**
-			 * Handle the keyup event on the field
-			 */
-			function handleKeyUpEventOnField(e) {
-				
-				// Load the max/min from the data properties of this event
-				var minValue = e.data.minValue;
-				var maxValue = e.data.maxValue;
-				var fieldName = e.data.fieldName;
-				
-				// Allow backspace and delete
-				if (e.keyCode === 8 || e.keyCode === 46) {
-					if($(this).val() >= minValue) {
-						
-						// Check if we are currently in cropping mode
-						if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
-							plugin.setCropAreaByFieldValue();
-						} else {
-							// 1. Normalize the size
-							plugin._setNormalizedFieldValues(fieldName);
-							// 2. Set the final size to the image
-							plugin.setSizeByFieldValue();
-						}
-					}
-				// 0-9 keys
-				} else if (e.keyCode <= 57 && e.keyCode >= 48 || e.keyCode <= 105 && e.keyCode >= 96 ) {
-					if ($(this).val() >= minValue) {
-						
-						// Check if we are currently in cropping mode
-						if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
-							plugin.setCropAreaByFieldValue();
-						} else {
-							// 1. Normalize the size
-							plugin._setNormalizedFieldValues(fieldName);
-							// 2. Set the final size to the image
-							plugin.setSizeByFieldValue();
-						}
-					}
-				} else {
-					var delta = 0;
-					if (e.keyCode === 38 || e.keyCode === 107) {
-						delta = +1;
-					} else if (e.keyCode === 40 || e.keyCode === 109) {
-						delta = -1;
-					}
-					// Handle key combinations 
-					if (e.shiftKey || e.metaKey || e.ctrlKey) {
-						delta = delta * 10;
-					}
-					
-					// Only resize when field values are ok
-					if (updateField($(this), delta, maxValue, minValue)) {
-						// Check if we are currently in cropping mode
-						if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
-							plugin.setCropAreaByFieldValue();
-						} else {
-							// 1. Normalize the size
-							plugin._setNormalizedFieldValues(fieldName);
-							// 2. Set the final size to the image
-							plugin.setSizeByFieldValue();
-						}
-					}
-				}
-				
-				e.preventDefault();
-				return false;
-			}
-
-			/**
-			 * Handle the mouse wheel event on the field
-			 */
-			function handleMouseWheelEventOnField(e, delta) {
-				var minValue = e.data.minValue;
-				var maxValue = e.data.maxValue;
-				var fieldName = e.data.fieldName;
-
-				// Handle key combinations 
-				if (e.shiftKey || e.metaKey || e.ctrlKey) {
-					delta = delta * 10;
-				}
-
-				// Only resize when field values are ok
-				if (updateField($(this), delta, maxValue, minValue)) {
-
-					// Check if we are currently in cropping mode
-					if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
-						plugin.setCropAreaByFieldValue();
-					} else {
-						// 1. Normalize the size
-						plugin._setNormalizedFieldValues(fieldName);
-						// 2. Set the final size to the image
-						plugin.setSizeByFieldValue();
-					}
-				}
-		        return false;
-			}
-
-			/**
-			 * Handle mousewheel,keyup actions on both fields
-			 */
-			var $heightField = $('#' + plugin.ui.imgResizeHeightField.getInputId());
-			var heightEventData = {fieldName: 'height', maxValue: plugin.ui.imgResizeHeightField.maxValue, minValue: plugin.ui.imgResizeHeightField.minValue };
-			$heightField.live('keyup', heightEventData, handleKeyUpEventOnField);
-			$heightField.live('mousewheel', heightEventData, handleMouseWheelEventOnField);
-			
-			var $widthField = $('#' + plugin.ui.imgResizeWidthField.getInputId());
-			var widthEventData = {fieldName: 'width', maxValue: plugin.ui.imgResizeWidthField.maxValue, minValue: plugin.ui.imgResizeWidthField.minValue};
-			$widthField.live('keyup', widthEventData, handleKeyUpEventOnField);
-			$widthField.live('mousewheel', widthEventData, handleMouseWheelEventOnField);
-			
-		},
-
-		
-		/**
-		 * This helper function will keep the aspect ratio for the field with the given name.
-		 *
-		 * @param {string} primaryFieldName What should be used as primary option to calculate (can be 'width' or 'height')
-		 */
-		_setNormalizedFieldValues: function (primaryFieldName) {
-
-			var plugin = this;
-			var widthField = jQuery("#" + plugin.ui.imgResizeWidthField.getInputId());
-			var heightField = jQuery("#" + plugin.ui.imgResizeHeightField.getInputId());
-			var width = widthField.val();
-			var height = heightField.val();
-
-			var size = plugin._normalizeSize(width, height, primaryFieldName);
-
-			widthField.val(size.width);
-			heightField.val(size.height);
-			
-		},
-
-		/**
-		 * Manually set the given size for the current image
-		 */
-		setSize: function (width, height) {
-			
-			var plugin = this;
-			plugin.imageObj.width(width);
-			plugin.imageObj.height(height);
-			var $wrapper = plugin.imageObj.closest('.Aloha_Image_Resize');
-			$wrapper.height(height);
-			$wrapper.width(width);
-
-			plugin._onResize(plugin.imageObj);
-			plugin._onResized(plugin.imageObj);
-		},
-
-		/**
-		 * This method will handle the mouseUp event on images (eg. within editables). 
-		 * It will if enabled activate the resizing action.
-		 */
-		clickImage: function (e) {
-
-			var plugin = this;
-			plugin.endResize(); // removes previous resize handler
-			plugin.imageObj = jQuery(e.target);
-			var currentImage = plugin.imageObj;
-			
-			// Ignore any images that are part of the ui (e.g. block edit and delete icons)
-			if (currentImage.hasClass('aloha-ui')) {
-				return;
-			}
-
-			plugin.ui.setScope();
-			
-			var editable = currentImage.closest('.aloha-editable');
-			
-			// Disabling the content editable. This will disable the resizeHandles in internet explorer
-			// already done in resize on a smaller scope, this block next aloha-selection-change event
-			// to be thrown
-			// editable.contentEditable(false);
-			
-			//Store the current props of the image
-			this.restoreProps.push({
-				obj : e.srcElement,
-				src : plugin.imageObj.attr('src'),
-				width : plugin.imageObj.width(),
-				height : plugin.imageObj.height()
-			});
-
-			// Update the resize input fields with the new width and height
-			$('#' + plugin.ui.imgResizeHeightField.getInputId()).val(plugin.imageObj.height());
-			$('#' + plugin.ui.imgResizeWidthField.getInputId()).val(plugin.imageObj.width());
-			
-			if (plugin.settings.ui.meta) {
-				plugin.ui.imgSrcField.setTargetObject(plugin.imageObj, 'src');
-				plugin.ui.imgTitleField.setTargetObject(plugin.imageObj, 'title');
-				plugin.ui.imgAltField.setTargetObject(plugin.imageObj, 'alt');
-			}
-			Aloha.Selection.preventSelectionChanged();
-			try {
-				plugin.ui.imgSrcField.focus();
-			} catch(e) {
-				// FIXME for some reason execution breaks at this point
-			}
-
-			if (plugin.settings.ui.resizable) {
-				plugin.startResize();
-			}
-			
-			if (plugin.settings.autoResize) {
-				plugin.autoResize();
-			}
-			
-			Aloha.Selection.preventSelectionChangedFlag = false;
-			Aloha.trigger('aloha-image-selected', e.target);
-		},
-
-		/**
-		 * This method extracts determins if the range selection contains an image
-		 * 
-		 * UNUSED as long as clickImage don't change the selection
-		 * @see getPluginFocus instead
-		 */
-		findImgMarkup: function (range) {
-
-			var plugin = this;
-			var config = this.config;
-			var result, targetObj;
-
-			if (typeof range === 'undefined') {
-				range = Aloha.Selection.getRangeObject();
-			}
-
-			targetObj = jQuery(range.startContainer);
-
-			try {
-				if (Aloha.activeEditable) {
-					if ((typeof range.startContainer !== 'undefined' &&
-						typeof range.startContainer.childNodes !== 'undefined' &&
-						typeof range.startOffset !== 'undefined' &&
-						typeof range.startContainer.childNodes[range.startOffset] !== 'undefined' &&
-						range.startContainer.childNodes[range.startOffset].nodeName.toLowerCase() === 'img' &&
-						range.startOffset + 1 === range.endOffset) ||
-						(targetObj.hasClass('Aloha_Image_Resize')))
-					{
-						result = targetObj.find('img')[0];
-						if (! result.css) {
-							result.css = '';
-						}
-						
-						if (! result.title) {
-							result.title = '';
-						}
-						
-						if (! result.src) {
-							result.src = ''; 
-						}
-
-                        if (!result.alt) {
-                            result.alt = '';
-                        }
-						return result;
-					}
-					else {
-						return null;
-					}
-				}
-			} catch (e) {
-				Aloha.Log.debug(e, "Error finding img markup.");
-			}
-			return null;
-		},
-		/**
-		 * Gets the plugin focus target
-		 */
-		getPluginFocus: function () {
-			return this.imageObj;
-		},
-
-		/**
-		 * This helper function will calculate the new width and height while keeping 
-		 * the aspect ratio when the keepAspectRatio flag is set to true. The primarySize 
-		 * can be 'width' or 'height'. The function will first try to normalize the opposite size.
-		 *
-		 * @param {integer} width Target width for the new image size
-		 * @param {integer} height Target height for the new image size
-		 * @param {integer} primarySize can be 'width' or 'height'
-		 * @return Image width and height.
-		 */
-		_normalizeSize: function( width, height, primarySize ) {
-			var that = this;
-			// Convert string values to numbers
-			width = parseInt(width); 
-			height = parseInt(height);
-
-			/**
-			 * Inner function that calculates the new height by examining the width 
-			 */
-			function handleHeight( callHandleWidth ) {
-				// Check whether the value is within bounds 
-				if ( height > that.settings.maxHeight ) {
-					// Throw a notification event
-					var eventProps = { 'org': height, 'new': that.settings.maxHeight};
-					$('body').trigger('aloha-image-resize-outofbounds', ["height", "max", eventProps]);
-					height = that.settings.maxHeight;
-				} else if ( height < that.settings.minHeight ) {
-					// Throw a notification event
-					var eventProps = { 'org': height, 'new': that.settings.minHeight};
-					$('body').trigger('aloha-image-resize-outofbounds', ["height", "min", eventProps]);
-					height = that.settings.minHeight;
-				}
-
-				if ( that.keepAspectRatio ) {
-					width = height * aspectRatio;
-
-					// We don't want to invoke handleWidth again. This would mess up our previously calculated width
-					if ( callHandleWidth ) {
-						handleWidth( false );
-					}
-				}
-			}
-
-			/**
-			 * Inner function that calculates the new width by examining the width
-			 */
-			function handleWidth( callHandleHeight ) {
-
-				// Check whether the value is within bounds 
-				if (width > that.settings.maxWidth) {
-				
-					// Throw a notification event
-					var eventProps = { 'org': width, 'new': that.settings.maxWidth};
-					$('body').trigger('aloha-image-resize-outofbounds', ["width", "max", eventProps]);
-				
-					width = that.settings.maxWidth;
-				} else if ( width < that.settings.minWidth ) {
-					// Throw a notification event
-					var eventProps = { 'org': width, 'new': that.settings.minWidth};
-					$('body').trigger('aloha-image-resize-outofbounds', ["width", "min", eventProps]);
-
-					width = that.settings.minWidth;
-				}
-
-				// Calculate the new height
-				if ( that.keepAspectRatio ) {
-					height = width / aspectRatio;
-				
-					// We don't want to invoke handleHeight again. This would mess up our previously calculated height
-					if ( callHandleHeight ) {
-						handleHeight( false );
-					}
-				
-				}
-			
-			}
-
-			// use the 4:3 ratio as default value.
-			var aspectRatio = 1.33333;
-
-			// if keepAspectRatio is set to true, calculate it from the image size
-			if ( that.keepAspectRatio ) {
-				aspectRatio = width / height;
-			}
-
-			if ( typeof that.startAspectRatio === 'number' ) {
-				aspectRatio = that.startAspectRatio;
-			}  
-
-			// Determin which size should be handled
-			if ( primarySize == 'width' ) {
-				handleWidth( true );
-			}
-
-			if ( primarySize == 'height' ) {
-				handleHeight( true );
-			}
-
-			// Floor the values return them
-			return { 'width': Math.floor( width ), 'height': Math.floor( height ) };
-		},
-
-		/**
-		 * Helper function that will set the new image size using the field values
-		 */
-		setSizeByFieldValue: function () {
-			var plugin = this;
-			var width =  $('#' + plugin.ui.imgResizeWidthField.getInputId()).val();
-			var height = $('#' + plugin.ui.imgResizeHeightField.getInputId()).val();
-			plugin.setSize(width, height);
-		},
-		
-		/**
-		 * Helper function that will set the new crop area width and height using the field values
-		 */
-		setCropAreaByFieldValue: function () {
-			var plugin = this;
-			var currentCropArea = plugin.jcAPI.tellSelect();
-
-			var width =  $('#' + plugin.ui.imgResizeWidthField.getInputId()).val();
-			width = parseInt(width, 10);
-			var height = $('#' + plugin.ui.imgResizeHeightField.getInputId()).val();
-			height = parseInt(height, 10);
-
-			var selection = [currentCropArea['x'], currentCropArea['y'], currentCropArea['x'] + width,currentCropArea['y'] + height];
-			plugin.jcAPI.setSelect(selection);
-		},
-
-		/**
-		* This method will insert a new image dom element into the dom tree
-		*/		
-		insertImg: function () {
-				var range = Aloha.Selection.getRangeObject(),
-				config = this.getEditableConfig(Aloha.activeEditable.obj),
-				imagePluginUrl = Aloha.getPluginUrl('image'),
-				imagestyle, imagetag, newImg;
-
-				if (range.isCollapsed()) {
-					// TODO I would suggest to call the srcChange method. So all image src
-					// changes are on one single point.
-					
-					// Create a div that allows the user to drop an image, upload, or provide a URL
-					var uploadBox = jQuery('<div></div>');
-					uploadBox.addClass('aloha-image-upload-drop-box aloha-ephemera-wrapper');
-					uploadBox.attr('contentEditable', false);
-					uploadBox.append('<span class="aloha-ephemera">Click to upload an image or drop one here</span>');
-
-
-                    // Create upload form and add upload code for it
-                    var $form = $(
-                        '<form />', {method: 'POST',
-                            enctype: 'multipart/form-data'});
-                    var $input = $('<input />', {type: 'file', name: 'upload'});
-                    $form.hide().append($input).addClass('aloha-ephemera');
-                    uploadBox.append($form);
-                    uploadBox.on('click', function(evt){
-                        uploadBox.find('span').remove();
-                        uploadBox.off('click');
-                        $form.show();
-                    });
-                    $input.on('change', function(evt){
-                        // Turn this into a drop event and let the relevant
-                        // plugin handle it
-                        Aloha.trigger('aloha-upload-file', {target: uploadBox[0], files: evt.target.files});
-                    });
-
-					GENTICS.Utils.Dom.insertIntoDOM(uploadBox, range, jQuery(Aloha.activeEditable.obj));
-
-			} else {
-				Aloha.Log.error('img cannot markup a selection');
-				// TODO the desired behavior could be me the selected content is
-				// replaced by an image.
-				// TODO it should be editor's choice, with an NON-Ext Dialog instead of alert
-
-			}
-		},
-
-		srcChange: function () {
-			// TODO the src changed. I suggest :
-			// 1. set an loading image (I suggest set src base64 enc) to show the user
-			// we are trying to load an image
-			// 2. start a request to get the image
-			// 3a. the image is ok change the src
-			// 3b. the image is not availbable show an error.
-			 this.imageObj.attr('src', this.ui.imgSrcField.getValue()); // (the img tag)
-//			 jQuery(img).attr('src', this.imgSrcField.getQueryValue()); // (the query value in the inputfield)
-//			 this.imgSrcField.getItem(); // (optinal a selected resource item)
-			// TODO additionally implement an srcChange Handler to let implementer
-			// customize
-		},
-
-		/**
-		 * Reposition the crop buttons below the crop area
-		 */
-		positionCropButtons: function() {
-		
-			var jt = jQuery('.jcrop-tracker:first'),
-				off = jt.offset(),
-				jtt = off.top,
-				jtl = off.left,
-				jth = jt.height(),
-				jtw = jt.width();
-
-			var oldLeft = 0,
-				oldTop = 0;
-
-			var btns = jQuery('#aloha-CropNResize-btns');
-			
-			// Hack to hide the buttons when the user just clicked into the image
-			if (jtt === 0 && jtl === 0) {
-				btns.hide();
-			}
-			
-			// move the icons to the bottom right side
-			jtt = parseInt(jtt + jth + 3, 10);
-			jtl = parseInt(jtl + (jtw / 2) - (btns.width() / 2) + 10, 10);
-
-			// comparison to old values hinders flickering bug in FF
-			if (oldLeft != jtl || oldTop != jtt) {
-				btns.offset({top: jtt, left: jtl});
-			}
-
-			oldLeft = jtl;
-			oldTop = jtt;
-		},
-
-		/**
-		 * Code imported from CropnResize Plugin
-		 *
-		 */
-		initCropButtons: function() {
-			var that = this,
-				btns;
-
-			jQuery('body').append(
-				'<div id="aloha-CropNResize-btns" display="none">' +
-					'<button class="cnr-crop-apply" title="' + i18n.t('Accept') + '"></button>' +
-					'<button class="cnr-crop-cancel" title="' + i18n.t('Cancel') + '"></button>' +
-				'</div>'
-			);
-
-			btns = jQuery('#aloha-CropNResize-btns');
-			
-			btns.find('.cnr-crop-apply').click(function () {
-				that.acceptCrop();
-			});
-			
-			btns.find('.cnr-crop-cancel').click(function () {
-				that.endCrop();
-			});
-
-			this.interval = setInterval(function () {
-				that.positionCropButtons();
-			}, 10);
-		},
-
-		/**
-		 * Destroy crop confirm and cancel buttons
-		 */
-		destroyCropButtons: function () {
-			jQuery('#aloha-CropNResize-btns').remove();
-			clearInterval(this.interval);
-		},
-
-		/**
-		 * Helper function that will disable selectability of elements
-		 */
-		_disableSelection: function (el) {
-			el.find('*').attr('unselectable', 'on')
-			       .css({
-			        '-moz-user-select':'none',
-			        '-webkit-user-select':'none',
-			        'user-select':'none'
-			       });
-			  /*
-			       .each(function() {
-			        this.onselectstart = function () { return false; };
-			       });
-			       */
-			  
-		},
-
-		/**
-		 * Initiate a crop action
-		 */
-		crop: function () {
-			var plugin = this;
-			var config = this.config;
-
-			plugin.initCropButtons();
-			if (plugin.settings.ui.resizable) {
-				plugin.endResize();
-			}
-			
-			plugin.jcAPI = jQuery.Jcrop(plugin.imageObj, {
-				onSelect : function () {
-					plugin._onCropSelect();
-					// ugly hack to keep scope :(
-					window.setTimeout(function () {
-						plugin.ui.setScope();
-					}, 10);
-				}
-			});
-			
-			plugin._disableSelection($('.jcrop-holder'));
-			plugin._disableSelection($('#imageContainer'));
-			plugin._disableSelection($('#aloha-CropNResize-btns'));
-			$('body').trigger('aloha-image-crop-start', [plugin.imageObj]);
-		},
-
-		/**
-		 * Internal on crop select method
-		 */
-		_onCropSelect: function () {
-			var plugin = this;
-
-			jQuery('#aloha-CropNResize-btns').fadeIn('slow');
-
-			// Hide the crop buttons when the one of the handles is clicked
-			jQuery('.jcrop-handle').mousedown(function () {
-				jQuery('#aloha-CropNResize-btns').hide();
-			});
-
-			jQuery('.jcrop-tracker').mousedown(function () {
-				jQuery('#aloha-CropNResize-btns').hide();
-			});
-
-			// Update the width and height field using the intiial active crop area values
-			if (typeof plugin.jcAPI !== 'undefined' && plugin.jcAPI !== null) {
-
-				plugin.positionCropButtons();
-				var currentCropArea = plugin.jcAPI.tellSelect();
-				
-				var widthField = jQuery("#" + plugin.ui.imgResizeWidthField.getInputId()).val(currentCropArea['w']);
-				var heightField = jQuery("#" + plugin.ui.imgResizeHeightField.getInputId()).val(currentCropArea['h']);
-			}
-			
-		},
-
-
-		/**
-		 * Terminates a crop
-		 */
-		endCrop: function () {
-			if (this.jcAPI) {
-				this.jcAPI.destroy();
-				this.jcAPI = null;
-			}
-
-			this.destroyCropButtons();
-			this.ui._imageCropButton.setState(false);
-
-			if (this.settings.ui.resizable) {
-				this.startResize();
-			}
-
-			if (this.keepAspectRatio) {
-				var currentRatio = this.imageObj.width() / this.imageObj.height();
-				this.startAspectRatio = currentRatio;
-			}
-			
-			$('body').trigger('aloha-image-crop-stop', [this.imageObj]);
-		},
-
-		/**
-		 * Accept the current cropping area and apply the crop
-		 */
-		acceptCrop: function () {
-			this._onCropped(this.imageObj, this.jcAPI.tellSelect());
-			this.endCrop();
-		},
-
-		/**
-		 * This method will activate the jquery-ui resize functionality for the current image
-		 */
-		startResize: function () {
-			var plugin = this;
-			var currentImageObj = this.imageObj;
-
-			currentImageObj = this.imageObj.css({
-				height		: this.imageObj.height(),
-				width		: this.imageObj.width(),
-				position	: 'relative',
-				'max-height': '',
-				'max-width'	: ''
-			});
-
-			currentImageObj.resizable({
-				maxHeight : plugin.settings.maxHeight,
-				minHeight : plugin.settings.minHeight,
-				maxWidth  : plugin.settings.maxWidth,
-				minWidth  : plugin.settings.minWidth,
-				aspectRatio : plugin.startAspectRatio,
-				handles: plugin.settings.handles,
-				grid : plugin.settings.grid,
-				resize: function (event, ui) { 
-					plugin._onResize(plugin.imageObj);
-				},
-				stop : function (event, ui) {
-					plugin._onResized(plugin.imageObj);
-					
-					// Workaround to finish cropping
-					if (this.enableCrop) {
-						window.setTimeout(function () {
-							plugin.ui.setScope();
-							that.done(event);
-						}, 10);
-					}
-				}
-
-			});
-
-			currentImageObj.css('display', 'inline-block');
-
-			// this will prevent the user from resizing an image
-			// using IE's resize handles
-			// however I could not manage to hide them completely
-			jQuery('.ui-wrapper')
-				.attr('contentEditable', false)
-				.addClass('aloha-ephemera-wrapper aloha-image-box-active Aloha_Image_Resize aloha')
-				.css({
-					position: 'relative',
-					display: 'inline-block',
-					'float': plugin.imageObj.css('float')
-				})
-				.bind('resizestart', function (e) {
-					e.preventDefault();
-				})
-				.bind('mouseup', function (e) {
-					e.originalEvent.stopSelectionUpdate = true;
-				});
-		},
-
-		/**
-		 * This method will end resizing and toggle buttons accordingly and remove all markup that has been added for cropping
-		 */
-		endResize: function () {
-			// Find the nearest contenteditable and reenable it since resizing is finished
-			if (this.imageObj) {
-				var editable = this.imageObj.closest('.aloha-editable');
-				//this.imageObj.contentEditable(true);
-			}
-			
-			if (this.imageObj && this.imageObj.is(":ui-resizable")) {
-				this.imageObj
-					.resizable('destroy')
-					.css({
-						top	 : 0,
-						left : 0
-					});
-			}
-		},
-		resetSize: function () {
-			var	plugin = this,
-				img = new Image();
-			img.onload = function () {
-				var myimage = plugin.getPluginFocus();
-				if (plugin.settings.ui.resizable) {
-					plugin.endResize();
-				}
-				jQuery(myimage).add(myimage.parent()).css({
-						'width': img.width + 'px',
-						'height': img.height + 'px',
-						'max-width': '',
-						'max-height': ''
-					});
-				if (plugin.settings.ui.resizable) {
-					plugin.resize();
-				}
-			};
-			img.src = plugin.getPluginFocus().attr('src');
-		},
-		/**
-		 * Reset the image to it's original properties
-		 */
-		reset: function () {
-			if (this.settings.ui.crop) {
-				this.endCrop();
-			}
-			
-			if (this.settings.ui.resizable) {
-				this.endResize();
-			}
-
-			if (this._onReset(this.imageObj)) {
-				// the external reset procedure has already performed a reset, so there is no need to apply an internal reset
-				return;
-			}
-
-			for (var i = 0;i < this.restoreProps.length;i++) {
-				// restore from restoreProps if there is a match
-				if (this.imageObj.get(0) === this.restoreProps[i].obj) {
-					this.imageObj.attr('src', this.restoreProps[i].src);
-					this.imageObj.width(this.restoreProps[i].width);
-					this.imageObj.height(this.restoreProps[i].height);
-					return;
-				}
-			}
-		}
-	});
-
-});
diff --git a/src/plugins/oerpub/video/nls/cz/i18n.js b/src/plugins/oerpub/video/nls/cz/i18n.js
deleted file mode 100755
index 9e0937fc7d..0000000000
--- a/src/plugins/oerpub/video/nls/cz/i18n.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define({"button.addimg.tooltip":"Přidat obrázek",
-"floatingmenu.tab.img":"Obrázek",
-"button.uploadimg.tooltip":"Upload obrázek",
-"button.uploadimg.label":"Upload",
-"button.img.align.left.tooltip":"Zarovnat doleva",
-"button.img.align.right.tooltip":"Zarovnání vpravo",
-"button.img.align.none.tooltip":"Žádné vyrovnání",
-"field.img.title.label":"",
-"field.img.title.tooltip":"",
-"field.img.src.label":"",
-"field.img.src.tooltip":"",
-"border ":" Přidat rámeček na obrázek",
-"padding.increase ":" Zvětšit pole",
-"padding.decrease ":" Omezují pole",
-"size.increase ":" Zvětšit velikost",
-"size.decrease ":" Zmenšit velikost"});
diff --git a/src/plugins/oerpub/video/nls/de/i18n.js b/src/plugins/oerpub/video/nls/de/i18n.js
deleted file mode 100755
index 82b0948d44..0000000000
--- a/src/plugins/oerpub/video/nls/de/i18n.js
+++ /dev/null
@@ -1 +0,0 @@
-define({"button.addimg.tooltip":"Bild hinzuf\u00fcgen","floatingmenu.tab.img":"Bild","button.uploadimg.tooltip":"Bild hochladen","button.uploadimg.label":"Hochladen","button.img.align.left.tooltip":"Linksb\u00fcndig","button.img.align.right.tooltip":"Rechtsb\u00fcndig","button.img.align.none.tooltip":"Keine Ausrichtung","field.img.title.label":"Titel","field.img.title.tooltip":"Titel","field.img.src.label":"URL","field.img.src.tooltip":"URL","border":"Rahmen hinzuf\u00fcgen","padding.increase":"Abstand vergr\u00f6\u00dfern","padding.decrease":"Abstand verkleinern","size.increase":"Bild vergr\u00f6\u00dfern","size.decrease":"Bild verkleinern","height":"H\u00f6he","width":"Breite","button.toggle.tooltip": "Seitenverhältnis beibehalten aktivieren/deaktivieren"});
diff --git a/src/plugins/oerpub/video/nls/fr/i18n.js b/src/plugins/oerpub/video/nls/fr/i18n.js
deleted file mode 100755
index f79273b239..0000000000
--- a/src/plugins/oerpub/video/nls/fr/i18n.js
+++ /dev/null
@@ -1 +0,0 @@
-define({"size.natural": "Taille originale", "button.addimg.tooltip":"Ajouter une image","floatingmenu.tab.img":"Image","button.uploadimg.tooltip":"Envoyer une image","button.uploadimg.label":"Upload","button.img.align.left.tooltip":"Aligner \u00e0 gauche","button.img.align.right.tooltip":"Aligner \u00e0 droite","button.img.align.none.tooltip":"Sans alignement","field.img.title.label":"titre","field.img.title.tooltip":"Titre de l'image","field.img.src.label":"src","field.img.src.tooltip":"Adresse d'origine","border":"Add Border to Image","padding.increase":"Augmenter l'espace","padding.decrease":"Reduire l'espace","size.increase":"Augmenter la taille","size.decrease":"Reduire la taille","cnr.crop":"D\u00e9couper","Resize":"Redimensionner","Crop":"D\u00e9couper","Reset":"R\u00e9initialiser","Accept":"Valider","Cancel":"Annuler"});
diff --git a/src/plugins/oerpub/video/nls/i18n.js b/src/plugins/oerpub/video/nls/i18n.js
deleted file mode 100755
index 0a7c86421a..0000000000
--- a/src/plugins/oerpub/video/nls/i18n.js
+++ /dev/null
@@ -1,7 +0,0 @@
-define({
-	root: {"size.natural": "Original size","button.addimg.tooltip":"add image ref","floatingmenu.tab.img":"Image","floatingmenu.tab.formatting":"Formatting","floatingmenu.tab.resize":"Resize","floatingmenu.tab.crop":"Crop","button.uploadimg.tooltip":"Upload img","button.uploadimg.label":"Upload","button.img.align.left.tooltip":"Left align","button.img.align.right.tooltip":"Right Align","button.img.align.none.tooltip":"No alignment","field.img.title.label":"Title","field.img.title.tooltip":"Title","field.img.src.label":"URL","field.img.src.tooltip":"Source","border":"Add Border to Image","padding.increase":"Increase Padding","padding.decrease":"Decrease Padding","size.increase":"Increase Size","size.decrease":"Decrease Size","Resize":"Resize","Crop":"Crop","Reset":"Reset","Accept":"Accept","Cancel":"Cancel","height":"Height","width":"Width","button.toggle.tooltip": "Toggle keep aspect ratio","field.img.alt.label": "Alternate text", "field.img.alt.tooltip": "Alternate text"},
-	cz: true,
-	de: true,
-	fr: true,
-	ru: true
-});
diff --git a/src/plugins/oerpub/video/nls/ru/i18n.js b/src/plugins/oerpub/video/nls/ru/i18n.js
deleted file mode 100755
index aa5837fc2c..0000000000
--- a/src/plugins/oerpub/video/nls/ru/i18n.js
+++ /dev/null
@@ -1,16 +0,0 @@
-define({"button.addimg.tooltip":"Добавить изображение",
-"floatingmenu.tab.img":"Изображение",
-"button.uploadimg.tooltip":"Загрузить изображение",
-"button.uploadimg.label":"Загрузка",
-"button.img.align.left.tooltip":"Выравнивание по левому краю",
-"button.img.align.right.tooltip":"Выравнивание по правому краю",
-"button.img.align.none.tooltip":"Нет выравнивания",
-"field.img.title.label":"",
-"field.img.title.tooltip":"",
-"field.img.src.label":"",
-"field.img.src.tooltip":"",
-"border ":"Добавить рамку к изображению",
-"padding.increase ":"Увеличить поля",
-"padding.decrease ":"Уменьшить поля",
-"size.increase ":"Увеличить размер",
-"size.decrease ":"Уменьшить размер"});
diff --git a/src/plugins/oerpub/video/package.json b/src/plugins/oerpub/video/package.json
deleted file mode 100755
index 0967ef424b..0000000000
--- a/src/plugins/oerpub/video/package.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/src/plugins/oerpub/video/test/test.css b/src/plugins/oerpub/video/test/test.css
deleted file mode 100644
index edf6d5d0cf..0000000000
--- a/src/plugins/oerpub/video/test/test.css
+++ /dev/null
@@ -1,12 +0,0 @@
-#content {
-	margin-left:  auto;
-    margin-right: auto;
-    position: relative; 
-}
-
-.ui-wrapper {
-	margin-left:  auto  !important;
-    margin-right: auto  !important;
-    position: relative  !important;
- 
-}
\ No newline at end of file
diff --git a/src/plugins/oerpub/video/test/test.html b/src/plugins/oerpub/video/test/test.html
deleted file mode 100644
index 3ad19e1cbc..0000000000
--- a/src/plugins/oerpub/video/test/test.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="UTF-8">
-	<title>Aloha, Images!</title>
-
-	<script type="text/javascript" src="../../../../lib/vendor/jquery-1.6.1.js"></script>
-	<script type="text/javascript" src="../vendor/ui/jquery-ui-1.8.10.custom.min.js"></script>
-	<link href="../vendor/ui/ui-lightness/jquery-ui-1.8.10.cropnresize.css" rel="stylesheet" type="text/css" />
-	<link rel="stylesheet" href="../../../../demo/common/index.css"	type="text/css">
-	<link rel="stylesheet" href="test.css"	type="text/css">
-
-</head>
-<body>
-<script type="text/javascript">
-		$(document).ready(function() {
-			
-			$("#myimg").resizable({
-				grid: 10,
-				minHeight: 10,
-				minWidth: 10,
-				maxHeight: 800,
-				maxWidth: 900, 
-				handles: 'ne, se, sw, nw',
-					stop : function (event, ui) {
-						console.log("stop");
-					}
-				
-				});
-			
-		});
-	</script>
-
-<div id="main">
-<div id="content">
-<img id="myimg" src="../demo/cropnresize.jpg" width="200px"	height="135px">
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/plugins/oerpub/video/vendor/jcrop/jcrop.gif b/src/plugins/oerpub/video/vendor/jcrop/jcrop.gif
deleted file mode 100755
index 72ea7ccb5321d5384d70437cfaac73011237901e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

diff --git a/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css b/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css
deleted file mode 100755
index 06af882ded..0000000000
--- a/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
-.jcrop-holder { text-align: left; }
-
-.jcrop-vline, .jcrop-hline
-{
-	font-size: 0;
-	position: absolute;
-	background: white url('jcrop.gif') top left repeat;
-}
-.jcrop-vline { height: 100%; width: 1px !important; }
-.jcrop-hline { width: 100%; height: 1px !important; }
-.jcrop-handle {
-	font-size: 1px;
-	width: 7px !important;
-	height: 7px !important;
-	border: 1px #eee solid;
-	background-color: #333;
-	*width: 9px;
-	*height: 9px;
-}
-
-.cnr-crop-apply {
-	background-image: url(../../img/crop-buttons.gif) !important;
-	background-position: -2px -2px !important;
-}
-
-
-.cnr-crop-cancel {
-	background-image: url(../../img/crop-buttons.gif) !important;
-	background-position: 23px -2px !important;
-}
-
-.jcrop-tracker { width: 100%; height: 100%; }
-
-.custom .jcrop-vline,
-.custom .jcrop-hline
-{
-	background: yellow;
-}
-.custom .jcrop-handle
-{
-	border-color: black;
-	background-color: #C7BB00;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
diff --git a/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js b/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js
deleted file mode 100755
index 2cafe34f2a..0000000000
--- a/src/plugins/oerpub/video/vendor/jcrop/jquery.jcrop.min.js
+++ /dev/null
@@ -1,165 +0,0 @@
-define(["jquery"], function(jQuery){
-/**
- * Jcrop v.0.9.8 (minimized)
- * (c) 2008 Kelly Hallman and DeepLiquid.com
- * More information: http://deepliquid.com/content/Jcrop.html
- * Released under MIT License - this header must remain with code
- */
-
-
-(function($){$.Jcrop=function(obj,opt)
-{var obj=obj,opt=opt;if(typeof(obj)!=='object')obj=$(obj)[0];if(typeof(opt)!=='object')opt={};if(!('trackDocument'in opt))
-{opt.trackDocument=$.browser.msie?false:true;if($.browser.msie&&$.browser.version.split('.')[0]=='8')
-opt.trackDocument=true;}
-if(!('keySupport'in opt))
-opt.keySupport=$.browser.msie?false:true;var defaults={trackDocument:false,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:.6,borderOpacity:.4,handleOpacity:.5,handlePad:5,handleSize:9,handleOffset:5,edgeMargin:14,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,boxWidth:0,boxHeight:0,boundary:8,animationDelay:20,swingSpeed:3,allowSelect:true,allowMove:true,allowResize:true,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){}};var options=defaults;setOptions(opt);var $origimg=$(obj);var $img=$origimg.clone().removeAttr('id').css({position:'absolute'});$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);;if(options.addClass)$div.addClass(options.addClass);var $img2=$('<img />').attr('src',$img.attr('src')).css('position','absolute').width(boundx).height(boundy);var $img_holder=$('<div />').width(pct(100)).height(pct(100)).css({zIndex:310,position:'absolute',overflow:'hidden'}).append($img2);var $hdl_holder=$('<div />').width(pct(100)).height(pct(100)).css('zIndex',320);var $sel=$('<div />').css({position:'absolute',zIndex:300}).insertBefore($img).append($img_holder,$hdl_holder);var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var xlimit,ylimit,xmin,ymin;var xscale,yscale,enabled=true;var docOffset=getPos($img),btndown,lastcurs,dimmed,animating,shift_down;var Coords=function()
-{var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
-{var pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];};function setCurrent(pos)
-{var pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];};function getOffset()
-{return[ox,oy];};function moveOffset(offset)
-{var ox=offset[0],oy=offset[1];if(0>x1+ox)ox-=ox+x1;if(0>y1+oy)oy-=oy+y1;if(boundy<y2+oy)oy+=boundy-(y2+oy);if(boundx<x2+ox)ox+=boundx-(x2+ox);x1+=ox;x2+=ox;y1+=oy;y2+=oy;};function getCorner(ord)
-{var c=getFixed();switch(ord)
-{case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}};function getFixed()
-{if(!options.aspectRatio)return getRect();var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,min_y=options.minSize[1]/yscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy;if(max_x==0){max_x=boundx*10}
-if(max_y==0){max_y=boundy*10}
-if(real_ratio<aspect)
-{yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0)
-{xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}
-else if(xx>boundx)
-{xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}
-else
-{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0)
-{yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}
-else if(yy>boundy)
-{yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
-if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
-if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x}else if(x1-xx>max_x){xx=x1-max_x;}
-if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
-if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
-if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
-return last=makeObj(flipCoords(x1,y1,xx,yy));};function rebound(p)
-{if(p[0]<0)p[0]=0;if(p[1]<0)p[1]=0;if(p[0]>boundx)p[0]=boundx;if(p[1]>boundy)p[1]=boundy;return[p[0],p[1]];};function flipCoords(x1,y1,x2,y2)
-{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1)
-{xa=x2;xb=x1;}
-if(y2<y1)
-{ya=y2;yb=y1;}
-return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];};function getRect()
-{var xsize=x2-x1;var ysize=y2-y1;if(xlimit&&(Math.abs(xsize)>xlimit))
-x2=(xsize>0)?(x1+xlimit):(x1-xlimit);if(ylimit&&(Math.abs(ysize)>ylimit))
-y2=(ysize>0)?(y1+ylimit):(y1-ylimit);if(ymin&&(Math.abs(ysize)<ymin))
-y2=(ysize>0)?(y1+ymin):(y1-ymin);if(xmin&&(Math.abs(xsize)<xmin))
-x2=(xsize>0)?(x1+xmin):(x1-xmin);if(x1<0){x2-=x1;x1-=x1;}
-if(y1<0){y2-=y1;y1-=y1;}
-if(x2<0){x1-=x2;x2-=x2;}
-if(y2<0){y1-=y2;y2-=y2;}
-if(x2>boundx){var delta=x2-boundx;x1-=delta;x2-=delta;}
-if(y2>boundy){var delta=y2-boundy;y1-=delta;y2-=delta;}
-if(x1>boundx){var delta=x1-boundy;y2-=delta;y1-=delta;}
-if(y1>boundy){var delta=y1-boundy;y2-=delta;y1-=delta;}
-return makeObj(flipCoords(x1,y1,x2,y2));};function makeObj(a)
-{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};};return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}();var Selection=function()
-{var start,end,dragmode,awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;if(options.drawBorders){borders={top:insertBorder('hline').css('top',$.browser.msie?px(-1):px(0)),bottom:insertBorder('hline'),left:insertBorder('vline'),right:insertBorder('vline')};}
-if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
-options.sideHandles&&createHandles(['n','s','e','w']);options.cornerHandles&&createHandles(['sw','nw','ne','se']);function insertBorder(type)
-{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;};function dragDiv(ord,zi)
-{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi});$hdl_holder.append(jq);return jq;};function insertHandle(ord)
-{return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).addClass(cssClass('handle'));};function insertDragbar(ord)
-{var s=options.handleSize,o=hhs,h=s,w=s,t=o,l=o;switch(ord)
-{case'n':case's':w=pct(100);break;case'e':case'w':h=pct(100);break;}
-return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});};function createHandles(li)
-{for(i in li)handle[li[i]]=insertHandle(li[i]);};function moveHandles(c)
-{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;'e'in handle&&handle.e.css({top:px(midvert),left:px(east)})&&handle.w.css({top:px(midvert)})&&handle.s.css({top:px(south),left:px(midhoriz)})&&handle.n.css({left:px(midhoriz)});'ne'in handle&&handle.ne.css({left:px(east)})&&handle.se.css({top:px(south),left:px(east)})&&handle.sw.css({top:px(south)});'b'in handle&&handle.b.css({top:px(south)})&&handle.r.css({left:px(east)});};function moveto(x,y)
-{$img2.css({top:px(-y),left:px(-x)});$sel.css({top:px(y),left:px(x)});};function resize(w,h)
-{$sel.width(w).height(h);};function refresh()
-{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();};function updateVisible()
-{if(awake)return update();};function update()
-{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);options.drawBorders&&borders['right'].css({left:px(c.w-1)})&&borders['bottom'].css({top:px(c.h-1)});seehandles&&moveHandles(c);awake||show();options.onChange(unscale(c));};function show()
-{$sel.show();$img.css('opacity',options.bgOpacity);awake=true;};function release()
-{disableHandles();$sel.hide();$img.css('opacity',1);awake=false;};function showHandles()
-{if(seehandles)
-{moveHandles(Coords.getFixed());$hdl_holder.show();}};function enableHandles()
-{seehandles=true;if(options.allowResize)
-{moveHandles(Coords.getFixed());$hdl_holder.show();return true;}};function disableHandles()
-{seehandles=false;$hdl_holder.hide();};function animMode(v)
-{(animating=v)?disableHandles():enableHandles();};function done()
-{animMode(false);refresh();};var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360})
-$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,done:done};}();var Tracker=function()
-{var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;if(!trackDoc)
-{$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
-function toFront()
-{$trk.css({zIndex:450});if(trackDoc)
-{$(document).mousemove(trackMove).mouseup(trackUp);}}
-function toBack()
-{$trk.css({zIndex:290});if(trackDoc)
-{$(document).unbind('mousemove',trackMove).unbind('mouseup',trackUp);}}
-function trackMove(e)
-{onMove(mouseAbs(e));};function trackUp(e)
-{e.preventDefault();e.stopPropagation();if(btndown)
-{btndown=false;onDone(mouseAbs(e));options.onSelect(unscale(Coords.getFixed()));toBack();onMove=function(){};onDone=function(){};}
-return false;};function activateHandlers(move,done)
-{btndown=true;onMove=move;onDone=done;toFront();return false;};function setCursor(t){$trk.css('cursor',t);};$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}();var KeyManager=function()
-{var $keymgr=$('<input type="radio" />').css({position:'absolute',left:'-30px'}).keypress(parseKey).blur(onBlur),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
-{if(options.keySupport)
-{$keymgr.show();$keymgr.focus();}};function onBlur(e)
-{$keymgr.hide();};function doNudge(e,x,y)
-{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible();};e.preventDefault();e.stopPropagation();};function parseKey(e)
-{if(e.ctrlKey)return true;shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode)
-{case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:Selection.release();break;case 9:return true;}
-return nothing(e);};if(options.keySupport)$keywrap.insertBefore($img);return{watchKeys:watchKeys};}();function px(n){return''+parseInt(n)+'px';};function pct(n){return''+parseInt(n)+'%';};function cssClass(cl){return options.baseClass+'-'+cl;};function getPos(obj)
-{var pos=$(obj).offset();return[pos.left,pos.top];};function mouseAbs(e)
-{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];};function myCursor(type)
-{if(type!=lastcurs)
-{Tracker.setCursor(type);lastcurs=type;}};function startDragMode(mode,pos)
-{docOffset=getPos($img);Tracker.setCursor(mode=='move'?mode:mode+'-resize');if(mode=='move')
-return Tracker.activateHandlers(createMover(pos),doneSelect);var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);};function dragmodeHandler(mode,f)
-{return function(pos){if(!options.aspectRatio)switch(mode)
-{case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}
-else switch(mode)
-{case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}
-Coords.setCurrent(pos);Selection.update();};};function createMover(pos)
-{var lloc=pos;KeyManager.watchKeys();return function(pos)
-{Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};};function oppLockCorner(ord)
-{switch(ord)
-{case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';};};function createDragger(ord)
-{return function(e){if(options.disabled)return false;if((ord=='move')&&!options.allowMove)return false;btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};};function presize($obj,w,h)
-{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0)
-{nw=w;nh=(w/$obj.width())*$obj.height();}
-if((nh>h)&&h>0)
-{nh=h;nw=(h/$obj.height())*$obj.width();}
-xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);};function unscale(c)
-{return{x:parseInt(c.x*xscale),y:parseInt(c.y*yscale),x2:parseInt(c.x2*xscale),y2:parseInt(c.y2*yscale),w:parseInt(c.w*xscale),h:parseInt(c.h*yscale)};};function doneSelect(pos)
-{var c=Coords.getFixed();if(c.w>options.minSelect[0]&&c.h>options.minSelect[1])
-{Selection.enableHandles();Selection.done();}
-else
-{Selection.release();}
-Tracker.setCursor(options.allowSelect?'crosshair':'default');};function newSelection(e)
-{if(options.disabled)return false;if(!options.allowSelect)return false;btndown=true;docOffset=getPos($img);Selection.disableHandles();myCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();Selection.update();e.stopPropagation();e.preventDefault();return false;};function selectDrag(pos)
-{Coords.setCurrent(pos);Selection.update();};function newTracker()
-{var trk=$('<div></div>').addClass(cssClass('tracker'));$.browser.msie&&trk.css({opacity:0,backgroundColor:'white'});return trk;};function animateTo(a)
-{var x1=a[0]/xscale,y1=a[1]/yscale,x2=a[2]/xscale,y2=a[3]/yscale;if(animating)return;var animto=Coords.flipCoords(x1,y1,x2,y2);var c=Coords.getFixed();var animat=initcr=[c.x,c.y,c.x2,c.y2];var interv=options.animationDelay;var x=animat[0];var y=animat[1];var x2=animat[2];var y2=animat[3];var ix1=animto[0]-initcr[0];var iy1=animto[1]-initcr[1];var ix2=animto[2]-initcr[2];var iy2=animto[3]-initcr[3];var pcent=0;var velocity=options.swingSpeed;Selection.animMode(true);var animator=function()
-{return function()
-{pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent<100)animateStart();else Selection.done();if(pcent>=99.8)pcent=100;setSelectRaw(animat);};}();function animateStart()
-{window.setTimeout(animator,interv);};animateStart();};function setSelect(rect)
-{setSelectRaw([rect[0]/xscale,rect[1]/yscale,rect[2]/xscale,rect[3]/yscale]);};function setSelectRaw(l)
-{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();};function setOptions(opt)
-{if(typeof(opt)!='object')opt={};options=$.extend(options,opt);if(typeof(options.onChange)!=='function')
-options.onChange=function(){};if(typeof(options.onSelect)!=='function')
-options.onSelect=function(){};};function tellSelect()
-{return unscale(Coords.getFixed());};function tellScaled()
-{return Coords.getFixed();};function setOptionsNew(opt)
-{setOptions(opt);interfaceUpdate();};function disableCrop()
-{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');};function enableCrop()
-{options.disabled=false;interfaceUpdate();};function cancelCrop()
-{Selection.done();Tracker.activateHandlers(null,null);};function destroy()
-{$div.remove();$origimg.show();};function interfaceUpdate(alt)
-{options.allowResize?alt?Selection.enableOnly():Selection.enableHandles():Selection.disableHandles();Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');$div.css('backgroundColor',options.bgColor);if('setSelect'in options){setSelect(opt.setSelect);Selection.done();delete(options.setSelect);}
-if('trueSize'in options){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
-xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if('outerImage'in options)
-{$img.attr('src',options.outerImage);delete(options.outerImage);}
-Selection.refresh();};$hdl_holder.hide();interfaceUpdate(true);var api={animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},release:Selection.release,destroy:destroy};$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options)
-{function attachWhenDone(from)
-{var loadsrc=options.useImg||from.src;var img=new Image();img.onload=function(){$.Jcrop(from,options);};img.src=loadsrc;};if(typeof(options)!=='object')options={};this.each(function()
-{if($(this).data('Jcrop'))
-{if(options=='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
-else attachWhenDone(this);});return this;};})(jQuery);
-});
diff --git a/src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js b/src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js
deleted file mode 100644
index a79c290099..0000000000
--- a/src/plugins/oerpub/video/vendor/mousewheel/mousewheel.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
- * Thanks to: Seamus Leahy for adding deltaX and deltaY
- *
- * Version: 3.0.6
- * 
- * Requires: 1.2.2+
- */
-define(['jquery'],function(jQuery){
-(function($) {
-
-var types = ['DOMMouseScroll', 'mousewheel'];
-
-if ($.event.fixHooks) {
-    for ( var i=types.length; i; ) {
-        $.event.fixHooks[ types[--i] ] = $.event.mouseHooks;
-    }
-}
-
-$.event.special.mousewheel = {
-    setup: function() {
-        if ( this.addEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.addEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = handler;
-        }
-    },
-    
-    teardown: function() {
-        if ( this.removeEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.removeEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = null;
-        }
-    }
-};
-
-$.fn.extend({
-    mousewheel: function(fn) {
-        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
-    },
-    
-    unmousewheel: function(fn) {
-        return this.unbind("mousewheel", fn);
-    }
-});
-
-
-function handler(event) {
-    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
-    event = $.event.fix(orgEvent);
-    event.type = "mousewheel";
-    
-    // Old school scrollwheel delta
-    if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta/120; }
-    if ( orgEvent.detail     ) { delta = -orgEvent.detail/3; }
-    
-    // New school multidimensional scroll (touchpads) deltas
-    deltaY = delta;
-    
-    // Gecko
-    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-        deltaY = 0;
-        deltaX = -1*delta;
-    }
-    
-    // Webkit
-    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
-    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
-    
-    // Add event and delta to the front of the arguments
-    args.unshift(event, delta, deltaX, deltaY);
-    
-    return ($.event.dispatch || $.event.handle).apply(this, args);
-}
-
-})(jQuery);
-});
diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
deleted file mode 100755
index 954e22dbd99e8c6dd7091335599abf2d10bf8003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEr#)R9Ln2z=UU%d=WFXS=@V?HT
z#xG*`>Yvsgk=}99w^d^D^d*@m74oMo<%#FcopJf?u00-~YVKV2wzrI*_R6;UORMea
zBFVSEnN~eiVA6V&z`E)YLz5Aok^D)In}Yn=OzDpgR5Wv0XfT8pOkmV{sKAJ-PO9#T
zZK}IXj&Q-V!U)!LcB_3K<j6=ku*!%uXjy#leKdQ?`ZvP&RiaPVOzxQ$`O)`M(6sLS
yN%J;Y?DO0<r7?ff#!c6LsA*2U`f2*?C%gsKpMo6zvorv`#o+1c=d#Wzp$Py>0&C*{

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
deleted file mode 100755
index 64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 251
zcmV<X00jSuP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T70002ONkl<ZScUD^
zT?&IR7(~(AY#^)6!n1<<Vj)fQYm^M-n@5r1C}@~h2;ohZ7-N3vC*J$+J$LlEJIhL0
z?fU|%;UEDj;@||T;sBg74hkR1O4$<++XU{$LE{Z7;GhCj!9fA2go6yIhJysCh=UWT
ziUV-UI2ia*&y+p!utUI|$6*(^`>bvPcjKS|RKP(6sDcCAB(_QB%0978a<$Ah$!b|E
zwn;|HO0i8cQ<lay$(1s&O|n)t8rvkbvR?jjlN@>j@~)s!ajF0S002ovPDHLkV1oEp
BYH0uf

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
deleted file mode 100755
index abdc01082bf3534eafecc5819d28c9574d44ea89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQY-ImG
zFPf9b{J;c_6SHRK%WcbN_hZpM=(Ry;4Rxv2@@2Y=$K57eF$X$=!PC{xWt~$(69B)$
BI)4BF

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
deleted file mode 100755
index 9b383f4d2eab09c0f2a739d6b232c32934bc620b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour1U*q978O6-yYw{%b*}|_(02F
z@qbE9)0CJMo;*v*PWv`Vh2h6EmG8IS-Cm{3U~`<YvxSSFU3)<QP%DF{tDnm{r-UW|
Dvd<uf

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
deleted file mode 100755
index a23baad25b1d1ff36e17361eab24271f2e9b7326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq+C2*978O6lYjjF{IFh)jg74>
zFlmZ}YMcJY=eo?o%*@I?2`NblNeMudl#t?<YIry`QK*OGr~otD9plAEGz`5G6d9zp
Wa55e{GUW=;JO)o!KbLh*2~7a@&m@!p

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
deleted file mode 100755
index 42ccba269b6e91bef12ad0fa18be651b5ef0ee68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf=
z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst
E0O<Z9>;M1&

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
deleted file mode 100755
index 39d5824d6af5456f1e89fc7847ea3599ea5fd815..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3762
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

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
deleted file mode 100755
index f1273672d253263b7564e9e21d69d7d9d0b337d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l%l7LV~E7m<R2d&AFo$qV`FPm
oboulDzr6KyA+fs7hb{~ZQx+&qVC9&67pR!Q)78&qol`;+0H8b=ng9R*

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
deleted file mode 100755
index 359397acffdd84bd102f0e8a951c9d744f278db5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l!vE_V~E7mtNjN#8yp0f)nD%C
z{k^&2ZZH4W#qke67#j$%IepV*`yn{#P|600IVRJjChwXe(ssyZ>xPQ=F85a&M@g_{
d|GeK{$Y5lo%PMu^>wln`44$rjF6*2UngE4^EGqy2

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_222222_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_222222_256x240.png
deleted file mode 100755
index b273ff111d219c9b9a8b96d57683d0075fb7871a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_228ef1_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_228ef1_256x240.png
deleted file mode 100755
index a641a371afa0fbb08ba599dc7ddf14b9bfc3c84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png
deleted file mode 100755
index 85e63e9f604ce042d59eb06a8428eeb7cb7896c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png
deleted file mode 100755
index e117effa3dca24e7978cfc5f8b967f661e81044f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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

diff --git a/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffffff_256x240.png b/src/plugins/oerpub/video/vendor/ui/ui-lightness/images/ui-icons_ffffff_256x240.png
deleted file mode 100755
index 42f8f992c727ddaa617da224a522e463df690387..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4369
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


From 4ae23bb2c93ed43253e8332a45ebe1ce900738a2 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 2 Feb 2013 18:18:27 -0600
Subject: [PATCH 09/67] remove a couple of console prints

---
 src/plugins/oerpub/assorted/lib/image.coffee | 1 -
 src/plugins/oerpub/assorted/lib/image.js     | 4 ++--
 src/plugins/oerpub/assorted/lib/video.coffee | 1 -
 src/plugins/oerpub/assorted/lib/video.js     | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/plugins/oerpub/assorted/lib/image.coffee b/src/plugins/oerpub/assorted/lib/image.coffee
index 76a7f0f904..bb0cb4d307 100644
--- a/src/plugins/oerpub/assorted/lib/image.coffee
+++ b/src/plugins/oerpub/assorted/lib/image.coffee
@@ -239,7 +239,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   UI.adopt 'insertImage-oer', null,
     click: () ->
-      console.log("IMAGE GOT CLICK");
       newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
       GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
       promise = showModalDialog(newEl)
diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
index a8d4d3b408..560f527b42 100644
--- a/src/plugins/oerpub/assorted/lib/image.js
+++ b/src/plugins/oerpub/assorted/lib/image.js
@@ -1,4 +1,4 @@
-console.log('HOWDY '+(function() {
+(function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
     var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
@@ -214,4 +214,4 @@ console.log('HOWDY '+(function() {
     };
   });
 
-}).call(this));
+}).call(this);
diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
index f511980c59..b0429c35c5 100644
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -209,7 +209,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   UI.adopt 'insertVideo-oer', null,
     click: () ->
-      console.log("VIDEO GOT CLICK");
       newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
       GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
       promise = showModalDialog(newEl)
diff --git a/src/plugins/oerpub/assorted/lib/video.js b/src/plugins/oerpub/assorted/lib/video.js
index 26862031b1..bca406dfea 100644
--- a/src/plugins/oerpub/assorted/lib/video.js
+++ b/src/plugins/oerpub/assorted/lib/video.js
@@ -159,7 +159,6 @@
     UI.adopt('insertVideo-oer', null, {
       click: function() {
         var newEl, promise;
-        console.log("VIDEO GOT CLICK");
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
         GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
         promise = showModalDialog(newEl);

From ed34c32a6f09c82b018895a4393f553ac4c9064b Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Sun, 3 Feb 2013 00:36:14 -0600
Subject: [PATCH 10/67] Updated the js to support rudimentary video inserts

---
 src/plugins/oerpub/assorted/css/image.css    |   6 ++
 src/plugins/oerpub/assorted/lib/video.coffee | 107 +++++++++++++++----
 2 files changed, 91 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 src/plugins/oerpub/assorted/css/image.css
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/video.coffee

diff --git a/src/plugins/oerpub/assorted/css/image.css b/src/plugins/oerpub/assorted/css/image.css
old mode 100644
new mode 100755
index 85981a2070..94f54e5230
--- a/src/plugins/oerpub/assorted/css/image.css
+++ b/src/plugins/oerpub/assorted/css/image.css
@@ -24,6 +24,12 @@ form#linkModal:focus {
     outline: none;
 }
 
+.multimedia-video{
+    /*border: 10px solid #0000FF;*/
+    width: 500px;
+    height: 500px;
+}
+
 .placeholder.preview {
     border: 1px solid #dddddd;
     border-radius: 5px;
diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
old mode 100644
new mode 100755
index b0429c35c5..50aa4ea1ca
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -31,7 +31,43 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         <button class="btn action cancel">Cancel</button>
       </div>
     </form>'''
-
+  # Defines a template for an embedder object which is responsible for generating embed html and validating a url
+  embedder = (url_validator, embed_code_generator) ->
+    this.embed_code_gen = embed_code_generator
+    this.url_validator = url_validator
+    embed_code_generator = (url) ->
+      # Generates embed html -- this function should be replaced
+      embed_html = '<p> Hello World </p>'
+      '''
+      Validates a URL. Returns video id if URL is valide. Else returns false.
+      Should be replaced with actual function. The default validates youtube URLs
+      '''
+    url_validator = (url) ->
+      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
+      result = if(url.match(regexp)) then RegExp.$1 else false
+    set_embed_code_generator = (url) ->
+      this.embed_code_gen = embed_code_generator
+    set_url_validator = (url) ->
+      this.url_validator = url_validator
+    result = this
+
+  # Creates a youtube embedder
+  youtube_url_validator = (url) ->
+    regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
+    result = if(url.match(regexp)) then RegExp.$1 else false
+  
+  youtube_embed_code_generator = (url) ->
+    video_id = youtube_url_validator(url)
+    embed_html = ''
+    if (video_id)
+      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '" frameborder="0" allowfullscreen></iframe></div>'
+    return embed_html
+  youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
+
+  # Adds the youtube embedders to the list of embedders
+  embedders = []
+  embedders[0] = youtube_embedder
+  console.debug 'initializing'
   showModalDialog = ($el) ->
       settings = Aloha.require('assorted/assorted-plugin').settings
       root = Aloha.activeEditable.obj
@@ -54,31 +90,54 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       if $el.is('img')
         # On submit $el.attr('src') will point to what is set in this variable
         # preserve the alt text if editing an image
-        imageSource = $el.attr('src')
+        videoSource = $el.attr('src')
         imageAltText = $el.attr('alt')
       else
-        imageSource = ''
+        videoSource = ''
         imageAltText = ''
 
       dialog.find('[name=alt]').val(imageAltText)
-
-      if /^https?:\/\//.test(imageSource)
-        $uploadUrl.val(imageSource)
+      # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
+      checkURL = (url) ->
+        for embedder in embedders
+          if (embedder.url_validator(url)) 
+            return true
+        return false
+      console.debug 'Checking'
+      # /^https?:\/\// - old regex
+      if checkURL(videoSource)
+        console.debug 'Checked'
+        $uploadUrl.val(videoSource)
         $uploadUrl.show()
-
-      setImageSource = (href) ->
-        imageSource = href
+      # Retrieves embedder which can matches the format of the URL
+      getEmbedder = (url) ->
+        for embedder in embedders
+          if (embedder.url_validator(url)) 
+            return embedder
+        return false
+      setvideoSource = (href) ->
+        videoSource = href
         $submit.removeClass('disabled')
-
+      getEmbedEle = (url) ->
+        # Retrieves the embedder for this type of video
+        if(!(embedder = getEmbedder(url)))
+          console.debug("Error: URL not supported")
+          # TODO - ADD HELPFUL MESSAGE TO USER
+          dialog.modal('hide')
+
+        video = jQuery(embedder.embed_code_gen(url));
+          # video.attr 'src', "http://www.youtube.com/embed/_kbd6troMgA?feature=player_detailpage" #--May need to do this for some types of videos
+        video.attr 'alt', dialog.find('[name=alt]').val()
+        return video
       # Uses the File API to render a preview of the image
-      # and updates the modal's imageSource
+      # and updates the modal's videoSource
       loadLocalFile = (file, $img, callback) ->
         reader = new FileReader()
         reader.onloadend = () ->
           if $img
             $img.attr('src', reader.result)
-          # If we get an image then update the modal's imageSource
-          setImageSource(reader.result)
+          # If we get an image then update the modal's videoSource
+          setvideoSource(reader.result)
           callback(reader.result) if callback
         reader.readAsDataURL(file)
 
@@ -87,6 +146,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         evt.preventDefault()
         $placeholder.hide()
         $uploadUrl.hide()
+        console.debug 'Hiding placeholder url'
 
       dialog.find('.upload-url-link').on 'click', (evt) ->
         evt.preventDefault()
@@ -96,26 +156,29 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       $uploadUrl.on 'change', () ->
         $previewImg = $placeholder.find('img')
         url = $uploadUrl.val()
-        setImageSource(url)
+        setvideoSource(url)
+        console.debug 'changing'
         if settings.image.preview
           $previewImg.attr 'src', url
           $placeholder.show()
 
-      # On save update the actual img tag. Use the submit event because this
+      # On save update the actual video element. Use the submit event because this
       # allows the use of html5 validation.
       deferred = $.Deferred()
       dialog.on 'submit', (evt) =>
         evt.preventDefault() # Don't submit the form
         if $el.is('img')
-          $el.attr 'src', imageSource
+          $el.attr 'src', videoSource
           $el.attr 'alt', dialog.find('[name=alt]').val()
         else
-          img = jQuery('<img/>')
-          img.attr 'src', imageSource
-          img.attr 'alt', dialog.find('[name=alt]').val()
-          $el.replaceWith(img)
-          $el = img
-        dialog.modal('hide')
+          console.debug("Embedding the video")
+          # Embeds the video into the page
+          video = getEmbedEle(videoSource)
+          console.debug($el)
+          console.debug(video)
+          $el.replaceWith(video)
+          # $el = video
+          dialog.modal('hide')
 
       dialog.on 'click', '.btn.action.cancel', (evt) =>
         evt.preventDefault() # Don't submit the form

From bb773931cec87a3669e56ec0d60ee427b7608cd0 Mon Sep 17 00:00:00 2001
From: root <gbadipe@gmail.com>
Date: Sun, 3 Feb 2013 00:52:57 -0600
Subject: [PATCH 11/67] Removed debugging code

---
 .../assorted/lib/assorted-plugin.coffee       |   0
 .../oerpub/assorted/lib/assorted-plugin.js    |   0
 src/plugins/oerpub/assorted/lib/figure.coffee |   0
 src/plugins/oerpub/assorted/lib/figure.js     |   0
 src/plugins/oerpub/assorted/lib/image.coffee  |   0
 src/plugins/oerpub/assorted/lib/image.js      |   0
 src/plugins/oerpub/assorted/lib/link.coffee   |   0
 src/plugins/oerpub/assorted/lib/link.js       |   0
 src/plugins/oerpub/assorted/lib/list.coffee   |   0
 src/plugins/oerpub/assorted/lib/list.js       |   0
 .../assorted/lib/title-figcaption.coffee      |   0
 .../oerpub/assorted/lib/title-figcaption.css  |   0
 .../oerpub/assorted/lib/title-figcaption.js   |   0
 src/plugins/oerpub/assorted/lib/video.coffee  |   5 +-
 src/plugins/oerpub/assorted/lib/video.js      | 108 ++++++++++++++----
 15 files changed, 89 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/assorted-plugin.js
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/figure.coffee
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/figure.js
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/image.coffee
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/image.js
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/link.coffee
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/link.js
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/list.coffee
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/list.js
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/title-figcaption.coffee
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/title-figcaption.css
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/title-figcaption.js
 mode change 100644 => 100755 src/plugins/oerpub/assorted/lib/video.js

diff --git a/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee b/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/assorted-plugin.js b/src/plugins/oerpub/assorted/lib/assorted-plugin.js
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/figure.coffee b/src/plugins/oerpub/assorted/lib/figure.coffee
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/figure.js b/src/plugins/oerpub/assorted/lib/figure.js
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/image.coffee b/src/plugins/oerpub/assorted/lib/image.coffee
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/link.coffee b/src/plugins/oerpub/assorted/lib/link.coffee
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/link.js b/src/plugins/oerpub/assorted/lib/link.js
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/list.coffee b/src/plugins/oerpub/assorted/lib/list.coffee
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/list.js b/src/plugins/oerpub/assorted/lib/list.js
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/title-figcaption.coffee b/src/plugins/oerpub/assorted/lib/title-figcaption.coffee
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/title-figcaption.css b/src/plugins/oerpub/assorted/lib/title-figcaption.css
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/title-figcaption.js b/src/plugins/oerpub/assorted/lib/title-figcaption.js
old mode 100644
new mode 100755
diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
index 50aa4ea1ca..c042eb8743 100755
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -126,7 +126,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
           dialog.modal('hide')
 
         video = jQuery(embedder.embed_code_gen(url));
-          # video.attr 'src', "http://www.youtube.com/embed/_kbd6troMgA?feature=player_detailpage" #--May need to do this for some types of videos
         video.attr 'alt', dialog.find('[name=alt]').val()
         return video
       # Uses the File API to render a preview of the image
@@ -174,10 +173,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
           console.debug("Embedding the video")
           # Embeds the video into the page
           video = getEmbedEle(videoSource)
-          console.debug($el)
-          console.debug(video)
           $el.replaceWith(video)
-          # $el = video
+          # $el = video -- not sure why this is necessary
           dialog.modal('hide')
 
       dialog.on 'click', '.btn.action.cancel', (evt) =>
diff --git a/src/plugins/oerpub/assorted/lib/video.js b/src/plugins/oerpub/assorted/lib/video.js
old mode 100644
new mode 100755
index bca406dfea..b22400a64c
--- a/src/plugins/oerpub/assorted/lib/video.js
+++ b/src/plugins/oerpub/assorted/lib/video.js
@@ -1,11 +1,51 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
+    var DIALOG_HTML, WARNING_IMAGE_PATH, embedder, embedders, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
     DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    embedder = function(url_validator, embed_code_generator) {
+      var result, set_embed_code_generator, set_url_validator;
+      this.embed_code_gen = embed_code_generator;
+      this.url_validator = url_validator;
+      embed_code_generator = function(url) {
+        var embed_html;
+        embed_html = '<p> Hello World </p>';
+        return 'Validates a URL. Returns video id if URL is valide. Else returns false.\nShould be replaced with actual function. The default validates youtube URLs';
+      };
+      url_validator = function(url) {
+        var regexp, result;
+        regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
+        return result = url.match(regexp) ? RegExp.$1 : false;
+      };
+      set_embed_code_generator = function(url) {
+        return this.embed_code_gen = embed_code_generator;
+      };
+      set_url_validator = function(url) {
+        return this.url_validator = url_validator;
+      };
+      return result = this;
+    };
+    youtube_url_validator = function(url) {
+      var regexp, result;
+      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
+      return result = url.match(regexp) ? RegExp.$1 : false;
+    };
+    youtube_embed_code_generator = function(url) {
+      var embed_html, video_id;
+      video_id = youtube_url_validator(url);
+      embed_html = '';
+      if (video_id) {
+        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '" frameborder="0" allowfullscreen></iframe></div>';
+      }
+      return embed_html;
+    };
+    youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator);
+    embedders = [];
+    embedders[0] = youtube_embedder;
+    console.debug('initializing');
     showModalDialog = function($el) {
-      var $placeholder, $submit, $uploadUrl, deferred, dialog, imageAltText, imageSource, loadLocalFile, root, setImageSource, settings,
+      var $placeholder, $submit, $uploadUrl, checkURL, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
         _this = this;
       settings = Aloha.require('assorted/assorted-plugin').settings;
       root = Aloha.activeEditable.obj;
@@ -14,27 +54,55 @@
       $uploadUrl = dialog.find('.upload-url-input');
       $submit = dialog.find('.action.insert');
       if ($el.is('img')) {
-        imageSource = $el.attr('src');
+        videoSource = $el.attr('src');
         imageAltText = $el.attr('alt');
       } else {
-        imageSource = '';
+        videoSource = '';
         imageAltText = '';
       }
       dialog.find('[name=alt]').val(imageAltText);
-      if (/^https?:\/\//.test(imageSource)) {
-        $uploadUrl.val(imageSource);
+      checkURL = function(url) {
+        var embedder, _i, _len;
+        for (_i = 0, _len = embedders.length; _i < _len; _i++) {
+          embedder = embedders[_i];
+          if (embedder.url_validator(url)) return true;
+        }
+        return false;
+      };
+      console.debug('Checking');
+      if (checkURL(videoSource)) {
+        console.debug('Checked');
+        $uploadUrl.val(videoSource);
         $uploadUrl.show();
       }
-      setImageSource = function(href) {
-        imageSource = href;
+      getEmbedder = function(url) {
+        var embedder, _i, _len;
+        for (_i = 0, _len = embedders.length; _i < _len; _i++) {
+          embedder = embedders[_i];
+          if (embedder.url_validator(url)) return embedder;
+        }
+        return false;
+      };
+      setvideoSource = function(href) {
+        videoSource = href;
         return $submit.removeClass('disabled');
       };
+      getEmbedEle = function(url) {
+        var video;
+        if (!(embedder = getEmbedder(url))) {
+          console.debug("Error: URL not supported");
+          dialog.modal('hide');
+        }
+        video = jQuery(embedder.embed_code_gen(url));
+        video.attr('alt', dialog.find('[name=alt]').val());
+        return video;
+      };
       loadLocalFile = function(file, $img, callback) {
         var reader;
         reader = new FileReader();
         reader.onloadend = function() {
           if ($img) $img.attr('src', reader.result);
-          setImageSource(reader.result);
+          setvideoSource(reader.result);
           if (callback) return callback(reader.result);
         };
         return reader.readAsDataURL(file);
@@ -42,7 +110,8 @@
       dialog.find('.upload-image-link').on('click', function(evt) {
         evt.preventDefault();
         $placeholder.hide();
-        return $uploadUrl.hide();
+        $uploadUrl.hide();
+        return console.debug('Hiding placeholder url');
       });
       dialog.find('.upload-url-link').on('click', function(evt) {
         evt.preventDefault();
@@ -53,7 +122,8 @@
         var $previewImg, url;
         $previewImg = $placeholder.find('img');
         url = $uploadUrl.val();
-        setImageSource(url);
+        setvideoSource(url);
+        console.debug('changing');
         if (settings.image.preview) {
           $previewImg.attr('src', url);
           return $placeholder.show();
@@ -61,19 +131,17 @@
       });
       deferred = $.Deferred();
       dialog.on('submit', function(evt) {
-        var img;
+        var video;
         evt.preventDefault();
         if ($el.is('img')) {
-          $el.attr('src', imageSource);
-          $el.attr('alt', dialog.find('[name=alt]').val());
+          $el.attr('src', videoSource);
+          return $el.attr('alt', dialog.find('[name=alt]').val());
         } else {
-          img = jQuery('<img/>');
-          img.attr('src', imageSource);
-          img.attr('alt', dialog.find('[name=alt]').val());
-          $el.replaceWith(img);
-          $el = img;
+          console.debug("Embedding the video");
+          video = getEmbedEle(videoSource);
+          $el.replaceWith(video);
+          return dialog.modal('hide');
         }
-        return dialog.modal('hide');
       });
       dialog.on('click', '.btn.action.cancel', function(evt) {
         evt.preventDefault();

From f4d4116b5aae868712414329d4837be66f6444ba Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 6 Feb 2013 17:16:33 -0600
Subject: [PATCH 12/67] Gbenga's fix for youtube iframes covering toolbar

---
 src/plugins/oerpub/assorted/lib/video.coffee | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
index c042eb8743..0746e9c4cb 100755
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -15,7 +15,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       </div>
       <div class="modal-body">
         <div class="image-options">
-            <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>
+            <input type="text" onkeyup="validateURLInput" class="upload-url-input" placeholder="Enter URL of video ..."/>
         </div>
         <div class="image-alt">
           <div class="forminfo">
@@ -60,7 +60,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     video_id = youtube_url_validator(url)
     embed_html = ''
     if (video_id)
-      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '" frameborder="0" allowfullscreen></iframe></div>'
+      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
     return embed_html
   youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
 
@@ -68,6 +68,16 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   embedders = []
   embedders[0] = youtube_embedder
   console.debug 'initializing'
+
+  checkURL = (url) ->
+    for embedder in embedders
+      if (embedder.url_validator(url)) 
+        return true
+    return false
+
+  validateURLInput = (ele) ->
+    console.log('In validateURLInput')
+
   showModalDialog = ($el) ->
       settings = Aloha.require('assorted/assorted-plugin').settings
       root = Aloha.activeEditable.obj
@@ -98,11 +108,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.find('[name=alt]').val(imageAltText)
       # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
-      checkURL = (url) ->
-        for embedder in embedders
-          if (embedder.url_validator(url)) 
-            return true
-        return false
       console.debug 'Checking'
       # /^https?:\/\// - old regex
       if checkURL(videoSource)

From b79c846ab22b8f3284eb9c836f77486dd9904287 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 6 Feb 2013 17:48:50 -0600
Subject: [PATCH 13/67] input validation on url field while inserting video

---
 src/plugins/oerpub/assorted/lib/video.coffee | 68 +++++++++++---------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
index 0746e9c4cb..1d13751fda 100755
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -4,34 +4,6 @@
 #
 define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
 
-  # This will be prefixed with Aloha.settings.baseUrl
-  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
-
-  DIALOG_HTML = '''
-    <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Insert video</h3>
-      </div>
-      <div class="modal-body">
-        <div class="image-options">
-            <input type="text" onkeyup="validateURLInput" class="upload-url-input" placeholder="Enter URL of video ..."/>
-        </div>
-        <div class="image-alt">
-          <div class="forminfo">
-            Please provide a description of this video for the visually impaired.
-          </div>
-          <div>
-            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="btn btn-primary action insert">Save</button>
-        <button class="btn action cancel">Cancel</button>
-      </div>
-    </form>'''
-  # Defines a template for an embedder object which is responsible for generating embed html and validating a url
   embedder = (url_validator, embed_code_generator) ->
     this.embed_code_gen = embed_code_generator
     this.url_validator = url_validator
@@ -75,9 +47,35 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         return true
     return false
 
-  validateURLInput = (ele) ->
-    console.log('In validateURLInput')
+  # This will be prefixed with Aloha.settings.baseUrl
+  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
 
+  DIALOG_HTML = '''
+    <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>Insert video</h3>
+      </div>
+      <div class="modal-body">
+        <div class="image-options">
+            <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>
+        </div>
+        <div class="image-alt">
+          <div class="forminfo">
+            Please provide a description of this video for the visually impaired.
+          </div>
+          <div>
+            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary action insert">Save</button>
+        <button class="btn action cancel">Cancel</button>
+      </div>
+    </form>'''
+
+  # Defines a template for an embedder object which is responsible for generating embed html and validating a url
   showModalDialog = ($el) ->
       settings = Aloha.require('assorted/assorted-plugin').settings
       root = Aloha.activeEditable.obj
@@ -87,6 +85,16 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       $placeholder = dialog.find('.placeholder.preview')
       $uploadUrl =   dialog.find('.upload-url-input')
       $submit = dialog.find('.action.insert')
+      dialog.find("#video-url-input")[0].onkeyup = (event) -> 
+        target = event.currentTarget
+        currentVal = target.value
+        valid = checkURL(currentVal)
+        if(valid) 
+            target.style.borderColor='green'
+            target.style.borderWidth='medium'
+        else
+            target.style.borderColor='red'
+            target.style.borderWidth='medium'
 
       # If we're editing an image pull in the src.
       # It will be undefined if this is a new image.

From 822602d2e00f76370060155d5ef03a9dd40666e4 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Fri, 8 Feb 2013 09:18:18 -0600
Subject: [PATCH 14/67] changes to video plugin, not sure what

---
 src/plugins/oerpub/assorted/lib/video.js | 39 ++++++++++++++++--------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/plugins/oerpub/assorted/lib/video.js b/src/plugins/oerpub/assorted/lib/video.js
index b22400a64c..244354b762 100755
--- a/src/plugins/oerpub/assorted/lib/video.js
+++ b/src/plugins/oerpub/assorted/lib/video.js
@@ -1,9 +1,7 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, embedder, embedders, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
-    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="url" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    var DIALOG_HTML, WARNING_IMAGE_PATH, checkURL, embedder, embedders, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
     embedder = function(url_validator, embed_code_generator) {
       var result, set_embed_code_generator, set_url_validator;
       this.embed_code_gen = embed_code_generator;
@@ -36,7 +34,7 @@
       video_id = youtube_url_validator(url);
       embed_html = '';
       if (video_id) {
-        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '" frameborder="0" allowfullscreen></iframe></div>';
+        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>';
       }
       return embed_html;
     };
@@ -44,8 +42,18 @@
     embedders = [];
     embedders[0] = youtube_embedder;
     console.debug('initializing');
+    checkURL = function(url) {
+      var embedder, _i, _len;
+      for (_i = 0, _len = embedders.length; _i < _len; _i++) {
+        embedder = embedders[_i];
+        if (embedder.url_validator(url)) return true;
+      }
+      return false;
+    };
+    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     showModalDialog = function($el) {
-      var $placeholder, $submit, $uploadUrl, checkURL, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
+      var $placeholder, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
         _this = this;
       settings = Aloha.require('assorted/assorted-plugin').settings;
       root = Aloha.activeEditable.obj;
@@ -53,6 +61,19 @@
       $placeholder = dialog.find('.placeholder.preview');
       $uploadUrl = dialog.find('.upload-url-input');
       $submit = dialog.find('.action.insert');
+      dialog.find("#video-url-input")[0].onkeyup = function(event) {
+        var currentVal, target, valid;
+        target = event.currentTarget;
+        currentVal = target.value;
+        valid = checkURL(currentVal);
+        if (valid) {
+          target.style.borderColor = 'green';
+          return target.style.borderWidth = 'medium';
+        } else {
+          target.style.borderColor = 'red';
+          return target.style.borderWidth = 'medium';
+        }
+      };
       if ($el.is('img')) {
         videoSource = $el.attr('src');
         imageAltText = $el.attr('alt');
@@ -61,14 +82,6 @@
         imageAltText = '';
       }
       dialog.find('[name=alt]').val(imageAltText);
-      checkURL = function(url) {
-        var embedder, _i, _len;
-        for (_i = 0, _len = embedders.length; _i < _len; _i++) {
-          embedder = embedders[_i];
-          if (embedder.url_validator(url)) return true;
-        }
-        return false;
-      };
       console.debug('Checking');
       if (checkURL(videoSource)) {
         console.debug('Checked');

From 3efe96e7c49a21de5741501dc53880628762f020 Mon Sep 17 00:00:00 2001
From: root <gbadipe@gmail.com>
Date: Fri, 8 Feb 2013 10:40:00 -0600
Subject: [PATCH 15/67] Stashing local changes( which the most recent version
 is a superset of mine)

---
 src/plugins/oerpub/assorted/lib/video.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
index c042eb8743..0072851e7c 100755
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ b/src/plugins/oerpub/assorted/lib/video.coffee
@@ -60,7 +60,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     video_id = youtube_url_validator(url)
     embed_html = ''
     if (video_id)
-      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '" frameborder="0" allowfullscreen></iframe></div>'
+      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
     return embed_html
   youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
 

From ef1287b875ffeadc40a4204afb5a76285cc54964 Mon Sep 17 00:00:00 2001
From: root <gbadipe@gmail.com>
Date: Fri, 8 Feb 2013 10:41:04 -0600
Subject: [PATCH 16/67] Stashin changes

---
 src/plugins/oerpub/assorted/lib/video.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/oerpub/assorted/lib/video.js b/src/plugins/oerpub/assorted/lib/video.js
index b22400a64c..17bec53f8c 100755
--- a/src/plugins/oerpub/assorted/lib/video.js
+++ b/src/plugins/oerpub/assorted/lib/video.js
@@ -36,7 +36,7 @@
       video_id = youtube_url_validator(url);
       embed_html = '';
       if (video_id) {
-        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '" frameborder="0" allowfullscreen></iframe></div>';
+        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>';
       }
       return embed_html;
     };

From a93794ee47288d14d50198a3b2b3263a5eefa0c9 Mon Sep 17 00:00:00 2001
From: root <gbadipe@gmail.com>
Date: Fri, 8 Feb 2013 10:45:15 -0600
Subject: [PATCH 17/67] Added marvin's google picker code

---
 .../oerpub/assorted/lib/gpickerdialog.js      | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/plugins/oerpub/assorted/lib/gpickerdialog.js

diff --git a/src/plugins/oerpub/assorted/lib/gpickerdialog.js b/src/plugins/oerpub/assorted/lib/gpickerdialog.js
new file mode 100644
index 0000000000..6df9011563
--- /dev/null
+++ b/src/plugins/oerpub/assorted/lib/gpickerdialog.js
@@ -0,0 +1,67 @@
+// Google Picker for uploading images
+function newImagePicker() {
+    google.load('picker', '1', {"callback" : createImagePicker});
+}       
+
+// Create and render a Picker object for selecting documents
+function createImagePicker() {
+    var picker = new google.picker.PickerBuilder().
+        addView(new google.picker.ImageSearchView().
+                setLicense(google.picker.ImageSearchView.License.REUSE)
+            ).
+        addView(google.picker.ViewId.PHOTO_UPLOAD).
+        /*
+        addViewGroup(
+        new google.picker.ViewGroup(google.picker.ViewId.PHOTOS).
+            addView(new google.picker.PhotosView().
+                setType(google.picker.PhotosView.Type.UPLOADED)).
+            addView(new google.picker.PhotosView().
+                setType(google.picker.PhotosView.Type.FEATURED))).
+        */        
+        addView(google.picker.ViewId.PHOTOS).
+        addView(new google.picker.WebCamView(google.picker.WebCamViewType.STANDARD)).
+        setCallback(ImagePickerCallback).
+        build();
+    picker.setVisible(true);
+}
+
+// A simple callback implementation for Picker.
+function ImagePickerCallback(data) {
+    if(data.action == google.picker.Action.PICKED){
+        var doc = data[google.picker.Response.DOCUMENTS][0];
+        site_url = doc[google.picker.Document.URL]; // only shows website url :(
+        image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url;
+
+        var img = Aloha.jQuery("<img />").attr("src", image_url);
+        AlohaInsertIntoDom(img);
+    }
+}
+
+// Google Picker for uploading videos
+function newVideoPicker() {
+    google.load('picker', '1', {"callback" : createVideoPicker});
+}
+
+function createVideoPicker() {
+    var picker = new google.picker.PickerBuilder().
+        addView(new google.picker.VideoSearchView().
+            setSite(google.picker.VideoSearchView.YOUTUBE)).
+        addView(google.picker.ViewId.YOUTUBE).
+        addView(new google.picker.WebCamView()).
+        setCallback(VideoPickerCallback).
+        build();
+    picker.setVisible(true);
+}
+
+// A simple callback implementation for Picker.
+function VideoPickerCallback(data) {
+    if(data.action == google.picker.Action.PICKED){
+        var doc = data[google.picker.Response.DOCUMENTS][0];
+        site_url = doc[google.picker.Document.URL]; // only shows website url :(
+        // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
+        embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
+        var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true"></embed></object>');
+        var embed_code = Aloha.jQuery(embed_code_template).find('embed').attr('src', embed_url);
+        AlohaInsertIntoDom(embed_code);
+    }
+}

From 4fc87f3560a3dd6f15bec6103c212c71861f93ff Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Mon, 25 Mar 2013 16:10:14 -0500
Subject: [PATCH 18/67] Added video plugin file to the newly created
 media-plugin branch

---
 src/plugins/oer/assorted/lib/video.coffee | 308 ++++++++++++++++++++++
 1 file changed, 308 insertions(+)
 create mode 100644 src/plugins/oer/assorted/lib/video.coffee

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
new file mode 100644
index 0000000000..1d13751fda
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -0,0 +1,308 @@
+# Aloha Video Plugin
+# * -----------------
+# * This plugin handles when the insertVideo button is clicked
+#
+define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
+
+  embedder = (url_validator, embed_code_generator) ->
+    this.embed_code_gen = embed_code_generator
+    this.url_validator = url_validator
+    embed_code_generator = (url) ->
+      # Generates embed html -- this function should be replaced
+      embed_html = '<p> Hello World </p>'
+      '''
+      Validates a URL. Returns video id if URL is valide. Else returns false.
+      Should be replaced with actual function. The default validates youtube URLs
+      '''
+    url_validator = (url) ->
+      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
+      result = if(url.match(regexp)) then RegExp.$1 else false
+    set_embed_code_generator = (url) ->
+      this.embed_code_gen = embed_code_generator
+    set_url_validator = (url) ->
+      this.url_validator = url_validator
+    result = this
+
+  # Creates a youtube embedder
+  youtube_url_validator = (url) ->
+    regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
+    result = if(url.match(regexp)) then RegExp.$1 else false
+  
+  youtube_embed_code_generator = (url) ->
+    video_id = youtube_url_validator(url)
+    embed_html = ''
+    if (video_id)
+      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
+    return embed_html
+  youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
+
+  # Adds the youtube embedders to the list of embedders
+  embedders = []
+  embedders[0] = youtube_embedder
+  console.debug 'initializing'
+
+  checkURL = (url) ->
+    for embedder in embedders
+      if (embedder.url_validator(url)) 
+        return true
+    return false
+
+  # This will be prefixed with Aloha.settings.baseUrl
+  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
+
+  DIALOG_HTML = '''
+    <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>Insert video</h3>
+      </div>
+      <div class="modal-body">
+        <div class="image-options">
+            <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>
+        </div>
+        <div class="image-alt">
+          <div class="forminfo">
+            Please provide a description of this video for the visually impaired.
+          </div>
+          <div>
+            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary action insert">Save</button>
+        <button class="btn action cancel">Cancel</button>
+      </div>
+    </form>'''
+
+  # Defines a template for an embedder object which is responsible for generating embed html and validating a url
+  showModalDialog = ($el) ->
+      settings = Aloha.require('assorted/assorted-plugin').settings
+      root = Aloha.activeEditable.obj
+      dialog = jQuery(DIALOG_HTML)
+
+      # Find the dynamic modal elements and bind events to the buttons
+      $placeholder = dialog.find('.placeholder.preview')
+      $uploadUrl =   dialog.find('.upload-url-input')
+      $submit = dialog.find('.action.insert')
+      dialog.find("#video-url-input")[0].onkeyup = (event) -> 
+        target = event.currentTarget
+        currentVal = target.value
+        valid = checkURL(currentVal)
+        if(valid) 
+            target.style.borderColor='green'
+            target.style.borderWidth='medium'
+        else
+            target.style.borderColor='red'
+            target.style.borderWidth='medium'
+
+      # If we're editing an image pull in the src.
+      # It will be undefined if this is a new image.
+      #
+      # This variable is updated when one of the following occurs:
+      # * selects an image from the filesystem
+      # * enters a URL (TODO: Verify it's an image)
+      # * drops an image into the drop div
+
+      # $el might not be an image, it might be a placeholder for a future image
+      if $el.is('img')
+        # On submit $el.attr('src') will point to what is set in this variable
+        # preserve the alt text if editing an image
+        videoSource = $el.attr('src')
+        imageAltText = $el.attr('alt')
+      else
+        videoSource = ''
+        imageAltText = ''
+
+      dialog.find('[name=alt]').val(imageAltText)
+      # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
+      console.debug 'Checking'
+      # /^https?:\/\// - old regex
+      if checkURL(videoSource)
+        console.debug 'Checked'
+        $uploadUrl.val(videoSource)
+        $uploadUrl.show()
+      # Retrieves embedder which can matches the format of the URL
+      getEmbedder = (url) ->
+        for embedder in embedders
+          if (embedder.url_validator(url)) 
+            return embedder
+        return false
+      setvideoSource = (href) ->
+        videoSource = href
+        $submit.removeClass('disabled')
+      getEmbedEle = (url) ->
+        # Retrieves the embedder for this type of video
+        if(!(embedder = getEmbedder(url)))
+          console.debug("Error: URL not supported")
+          # TODO - ADD HELPFUL MESSAGE TO USER
+          dialog.modal('hide')
+
+        video = jQuery(embedder.embed_code_gen(url));
+        video.attr 'alt', dialog.find('[name=alt]').val()
+        return video
+      # Uses the File API to render a preview of the image
+      # and updates the modal's videoSource
+      loadLocalFile = (file, $img, callback) ->
+        reader = new FileReader()
+        reader.onloadend = () ->
+          if $img
+            $img.attr('src', reader.result)
+          # If we get an image then update the modal's videoSource
+          setvideoSource(reader.result)
+          callback(reader.result) if callback
+        reader.readAsDataURL(file)
+
+      # Add click handlers
+      dialog.find('.upload-image-link').on 'click', (evt) ->
+        evt.preventDefault()
+        $placeholder.hide()
+        $uploadUrl.hide()
+        console.debug 'Hiding placeholder url'
+
+      dialog.find('.upload-url-link').on 'click', (evt) ->
+        evt.preventDefault()
+        $placeholder.hide()
+        $uploadUrl.show()
+
+      $uploadUrl.on 'change', () ->
+        $previewImg = $placeholder.find('img')
+        url = $uploadUrl.val()
+        setvideoSource(url)
+        console.debug 'changing'
+        if settings.image.preview
+          $previewImg.attr 'src', url
+          $placeholder.show()
+
+      # On save update the actual video element. Use the submit event because this
+      # allows the use of html5 validation.
+      deferred = $.Deferred()
+      dialog.on 'submit', (evt) =>
+        evt.preventDefault() # Don't submit the form
+        if $el.is('img')
+          $el.attr 'src', videoSource
+          $el.attr 'alt', dialog.find('[name=alt]').val()
+        else
+          console.debug("Embedding the video")
+          # Embeds the video into the page
+          video = getEmbedEle(videoSource)
+          $el.replaceWith(video)
+          # $el = video -- not sure why this is necessary
+          dialog.modal('hide')
+
+      dialog.on 'click', '.btn.action.cancel', (evt) =>
+        evt.preventDefault() # Don't submit the form
+        deferred.reject(target: $el[0])
+        dialog.modal('hide')
+
+      dialog.on 'hidden', (event) ->
+        # If hidden without being confirmed/cancelled, reject
+        if deferred.state()=='pending'
+          deferred.reject(target: $el[0])
+        # Clean up after dialog was hidden
+        dialog.remove()
+
+      # Return promise, with an added show method
+      jQuery.extend true, deferred.promise(),
+        show: (title) ->
+            if title
+              dialog.find('.modal-header h3').text(title)
+            dialog.modal 'show'
+
+  selector = 'img'
+
+  populator = ($el, pover) ->
+      # When a click occurs, the activeEditable is cleared so squirrel it
+      editable = Aloha.activeEditable
+      $bubble = jQuery '''
+        <div class="link-popover-details">
+            <a class="change">
+              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
+              <span title="Change the image's properties">Edit image...</span>
+            </a>
+            &nbsp; | &nbsp;
+            <a class="remove">
+              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
+              <span title="Delete the image">Delete</span>
+            </a>
+        </div>'''
+
+      href = $el.attr('src')
+      $bubble.find('.change').on 'click', ->
+        # unsquirrel the activeEditable
+        Aloha.activeEditable = editable
+        promise = showModalDialog($el)
+ 
+        promise.done (data)->
+          # Uploading if a local file was chosen
+          if data.files.length
+            jQuery(data.target).addClass('aloha-image-uploading')
+            uploadImage data.files[0], (url) ->
+              jQuery(data.target).attr('src', url).removeClass(
+                'aloha-image-uploading')
+        promise.show('Edit image')
+
+      $bubble.find('.remove').on 'click', ->
+        pover.stopOne($el)
+        $el.remove()
+      $bubble.contents()
+
+
+  uploadImage = (file, callback) ->
+    plugin = @
+    settings = Aloha.require('assorted/assorted-plugin').settings
+    xhr = new XMLHttpRequest()
+    if xhr.upload
+      if not settings.image.uploadurl
+        throw new Error("uploadurl not defined")
+
+      xhr.onload = () ->
+        if settings.image.parseresponse
+          url = parseresponse(xhr)
+        else
+          url = JSON.parse(xhr.response).url
+        callback(url)
+
+      xhr.open("POST", settings.image.uploadurl, true)
+      xhr.setRequestHeader("Cache-Control", "no-cache")
+      f = new FormData()
+      f.append(settings.image.uploadfield or 'upload', file, file.name)
+      xhr.send(f)
+
+
+  Aloha.bind 'aloha-image-selected', (event, target) ->
+      # Hide other tooltips of the same type
+      $el = jQuery(target)
+      nodes = jQuery(Aloha.activeEditable.obj).find(selector)
+      nodes = nodes.not($el)
+      nodes.trigger 'hide'
+      $el.trigger 'show'
+      $el.data('aloha-bubble-selected', true)
+      $el.off('.bubble')
+
+  UI.adopt 'insertVideo-oer', null,
+    click: () ->
+      newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
+      GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
+      promise = showModalDialog(newEl)
+
+      promise.done (data)->
+        # Uploading if a local file was chosen
+        if data.files.length
+          newEl.addClass('aloha-image-uploading')
+          uploadImage data.files[0], (url) ->
+            jQuery(data.target).attr('src', url)
+            newEl.removeClass('aloha-image-uploading')
+
+      promise.fail (data) ->
+        # Clean up placeholder if needed
+        $target = jQuery(data.target)
+        if not $target.is('img')
+          $target.remove()
+
+      # Finally show the dialog
+      promise.show()
+
+  # Return config
+  selector: selector
+  populator: populator

From 460bb2562e27a4ec40cfc49f04ec3cfa43363107 Mon Sep 17 00:00:00 2001
From: Max <jmg3@jmg3-HP-ProBook-6475b.(none)>
Date: Mon, 25 Mar 2013 16:31:22 -0500
Subject: [PATCH 19/67] update assorted-plugin with info on video plugin

---
 src/plugins/oer/assorted/lib/assorted-plugin.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/oer/assorted/lib/assorted-plugin.coffee b/src/plugins/oer/assorted/lib/assorted-plugin.coffee
index e9c473c44b..65b3a2f256 100644
--- a/src/plugins/oer/assorted/lib/assorted-plugin.coffee
+++ b/src/plugins/oer/assorted/lib/assorted-plugin.coffee
@@ -1,7 +1,7 @@
 ###
 Register a couple of assorted oer plugins
 ###
-define [ 'aloha/plugin', 'jquery', 'popover', './link', './image', './figure', './title-figcaption', './list' ], (Plugin, $, Popover, linkConfig, imageConfig, figureConfig, figcaptionConfig) ->
+define [ 'aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list' ], (Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) ->
   Plugin.create 'assorted',
     defaultSettings:
         image:

From 962bee1247e75daa399b4ee236dbdfb53a50aeb7 Mon Sep 17 00:00:00 2001
From: Max <jmg3@jmg3-HP-ProBook-6475b.(none)>
Date: Mon, 25 Mar 2013 16:33:37 -0500
Subject: [PATCH 20/67] some CSS additions for the media plugin

---
 src/plugins/oer/assorted/css/image.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 85981a2070..94f54e5230 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -24,6 +24,12 @@ form#linkModal:focus {
     outline: none;
 }
 
+.multimedia-video{
+    /*border: 10px solid #0000FF;*/
+    width: 500px;
+    height: 500px;
+}
+
 .placeholder.preview {
     border: 1px solid #dddddd;
     border-radius: 5px;

From 9c6c1b9db641085424a686de38af3618a3e32736 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Mon, 25 Mar 2013 16:34:47 -0500
Subject: [PATCH 21/67] Added video button to new branch

---
 oerpub/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/oerpub/index.html b/oerpub/index.html
index 5d28ffa15e..c41880e2b5 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -333,6 +333,7 @@
                       <span class="separator"> </span>
                       <div class="btn-group">
                         <button class="btn action insertImage-oer" rel="tooltip" title="Insert Image"><i class="icon-image-insert"></i></button>
+                        <button class="btn action insertVideo-oer" rel="tooltip" title="Insert Video"><i class="icon-image-insert"></i></button>
                         <button class="btn action createTable" rel="tooltip" title="Create Table"><i class="icon-table-insert"></i></button>
                         <button class="btn dropdown-toggle" data-toggle="dropdown" rel="tooltip" title="Table Operations">
                           <span class="caret"></span>

From d2c7c749bb6563d1625a73e15a6c8bdb69167b94 Mon Sep 17 00:00:00 2001
From: Max <jmg3@jmg3-HP-ProBook-6475b.(none)>
Date: Mon, 25 Mar 2013 16:53:11 -0500
Subject: [PATCH 22/67] video plugin working in new media-plugin branch

---
 .../oer/assorted/lib/assorted-plugin.js       |   2 +-
 src/plugins/oer/assorted/lib/video.js         | 284 ++++++++++++++++++
 2 files changed, 285 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/oer/assorted/lib/video.js

diff --git a/src/plugins/oer/assorted/lib/assorted-plugin.js b/src/plugins/oer/assorted/lib/assorted-plugin.js
index 98675aae01..9c2751fe63 100644
--- a/src/plugins/oer/assorted/lib/assorted-plugin.js
+++ b/src/plugins/oer/assorted/lib/assorted-plugin.js
@@ -7,7 +7,7 @@ Register a couple of assorted oer plugins
 
 (function() {
 
-  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, figureConfig, figcaptionConfig) {
+  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) {
     return Plugin.create('assorted', {
       defaultSettings: {
         image: {
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
new file mode 100644
index 0000000000..af6fd6f7bf
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -0,0 +1,284 @@
+// Generated by CoffeeScript 1.3.3
+(function() {
+
+  define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
+    var DIALOG_HTML, WARNING_IMAGE_PATH, checkURL, embedder, embedders, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
+    embedder = function(url_validator, embed_code_generator) {
+      var result, set_embed_code_generator, set_url_validator;
+      this.embed_code_gen = embed_code_generator;
+      this.url_validator = url_validator;
+      embed_code_generator = function(url) {
+        var embed_html;
+        embed_html = '<p> Hello World </p>';
+        return 'Validates a URL. Returns video id if URL is valide. Else returns false.\nShould be replaced with actual function. The default validates youtube URLs';
+      };
+      url_validator = function(url) {
+        var regexp, result;
+        regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
+        return result = url.match(regexp) ? RegExp.$1 : false;
+      };
+      set_embed_code_generator = function(url) {
+        return this.embed_code_gen = embed_code_generator;
+      };
+      set_url_validator = function(url) {
+        return this.url_validator = url_validator;
+      };
+      return result = this;
+    };
+    youtube_url_validator = function(url) {
+      var regexp, result;
+      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
+      return result = url.match(regexp) ? RegExp.$1 : false;
+    };
+    youtube_embed_code_generator = function(url) {
+      var embed_html, video_id;
+      video_id = youtube_url_validator(url);
+      embed_html = '';
+      if (video_id) {
+        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>';
+      }
+      return embed_html;
+    };
+    youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator);
+    embedders = [];
+    embedders[0] = youtube_embedder;
+    console.debug('initializing');
+    checkURL = function(url) {
+      var _i, _len;
+      for (_i = 0, _len = embedders.length; _i < _len; _i++) {
+        embedder = embedders[_i];
+        if (embedder.url_validator(url)) {
+          return true;
+        }
+      }
+      return false;
+    };
+    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    showModalDialog = function($el) {
+      var $placeholder, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
+        _this = this;
+      settings = Aloha.require('assorted/assorted-plugin').settings;
+      root = Aloha.activeEditable.obj;
+      dialog = jQuery(DIALOG_HTML);
+      $placeholder = dialog.find('.placeholder.preview');
+      $uploadUrl = dialog.find('.upload-url-input');
+      $submit = dialog.find('.action.insert');
+      dialog.find("#video-url-input")[0].onkeyup = function(event) {
+        var currentVal, target, valid;
+        target = event.currentTarget;
+        currentVal = target.value;
+        valid = checkURL(currentVal);
+        if (valid) {
+          target.style.borderColor = 'green';
+          return target.style.borderWidth = 'medium';
+        } else {
+          target.style.borderColor = 'red';
+          return target.style.borderWidth = 'medium';
+        }
+      };
+      if ($el.is('img')) {
+        videoSource = $el.attr('src');
+        imageAltText = $el.attr('alt');
+      } else {
+        videoSource = '';
+        imageAltText = '';
+      }
+      dialog.find('[name=alt]').val(imageAltText);
+      console.debug('Checking');
+      if (checkURL(videoSource)) {
+        console.debug('Checked');
+        $uploadUrl.val(videoSource);
+        $uploadUrl.show();
+      }
+      getEmbedder = function(url) {
+        var _i, _len;
+        for (_i = 0, _len = embedders.length; _i < _len; _i++) {
+          embedder = embedders[_i];
+          if (embedder.url_validator(url)) {
+            return embedder;
+          }
+        }
+        return false;
+      };
+      setvideoSource = function(href) {
+        videoSource = href;
+        return $submit.removeClass('disabled');
+      };
+      getEmbedEle = function(url) {
+        var video;
+        if (!(embedder = getEmbedder(url))) {
+          console.debug("Error: URL not supported");
+          dialog.modal('hide');
+        }
+        video = jQuery(embedder.embed_code_gen(url));
+        video.attr('alt', dialog.find('[name=alt]').val());
+        return video;
+      };
+      loadLocalFile = function(file, $img, callback) {
+        var reader;
+        reader = new FileReader();
+        reader.onloadend = function() {
+          if ($img) {
+            $img.attr('src', reader.result);
+          }
+          setvideoSource(reader.result);
+          if (callback) {
+            return callback(reader.result);
+          }
+        };
+        return reader.readAsDataURL(file);
+      };
+      dialog.find('.upload-image-link').on('click', function(evt) {
+        evt.preventDefault();
+        $placeholder.hide();
+        $uploadUrl.hide();
+        return console.debug('Hiding placeholder url');
+      });
+      dialog.find('.upload-url-link').on('click', function(evt) {
+        evt.preventDefault();
+        $placeholder.hide();
+        return $uploadUrl.show();
+      });
+      $uploadUrl.on('change', function() {
+        var $previewImg, url;
+        $previewImg = $placeholder.find('img');
+        url = $uploadUrl.val();
+        setvideoSource(url);
+        console.debug('changing');
+        if (settings.image.preview) {
+          $previewImg.attr('src', url);
+          return $placeholder.show();
+        }
+      });
+      deferred = $.Deferred();
+      dialog.on('submit', function(evt) {
+        var video;
+        evt.preventDefault();
+        if ($el.is('img')) {
+          $el.attr('src', videoSource);
+          return $el.attr('alt', dialog.find('[name=alt]').val());
+        } else {
+          console.debug("Embedding the video");
+          video = getEmbedEle(videoSource);
+          $el.replaceWith(video);
+          return dialog.modal('hide');
+        }
+      });
+      dialog.on('click', '.btn.action.cancel', function(evt) {
+        evt.preventDefault();
+        deferred.reject({
+          target: $el[0]
+        });
+        return dialog.modal('hide');
+      });
+      dialog.on('hidden', function(event) {
+        if (deferred.state() === 'pending') {
+          deferred.reject({
+            target: $el[0]
+          });
+        }
+        return dialog.remove();
+      });
+      return jQuery.extend(true, deferred.promise(), {
+        show: function(title) {
+          if (title) {
+            dialog.find('.modal-header h3').text(title);
+          }
+          return dialog.modal('show');
+        }
+      });
+    };
+    selector = 'img';
+    populator = function($el, pover) {
+      var $bubble, editable, href;
+      editable = Aloha.activeEditable;
+      $bubble = jQuery('<div class="link-popover-details">\n    <a class="change">\n      <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/edit-link-03.png" />\n  <span title="Change the image\'s properties">Edit image...</span>\n</a>\n&nbsp; | &nbsp;\n<a class="remove">\n  <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/unlink-link-02.png" />\n      <span title="Delete the image">Delete</span>\n    </a>\n</div>');
+      href = $el.attr('src');
+      $bubble.find('.change').on('click', function() {
+        var promise;
+        Aloha.activeEditable = editable;
+        promise = showModalDialog($el);
+        promise.done(function(data) {
+          if (data.files.length) {
+            jQuery(data.target).addClass('aloha-image-uploading');
+            return uploadImage(data.files[0], function(url) {
+              return jQuery(data.target).attr('src', url).removeClass('aloha-image-uploading');
+            });
+          }
+        });
+        return promise.show('Edit image');
+      });
+      $bubble.find('.remove').on('click', function() {
+        pover.stopOne($el);
+        return $el.remove();
+      });
+      return $bubble.contents();
+    };
+    uploadImage = function(file, callback) {
+      var f, plugin, settings, xhr;
+      plugin = this;
+      settings = Aloha.require('assorted/assorted-plugin').settings;
+      xhr = new XMLHttpRequest();
+      if (xhr.upload) {
+        if (!settings.image.uploadurl) {
+          throw new Error("uploadurl not defined");
+        }
+        xhr.onload = function() {
+          var url;
+          if (settings.image.parseresponse) {
+            url = parseresponse(xhr);
+          } else {
+            url = JSON.parse(xhr.response).url;
+          }
+          return callback(url);
+        };
+        xhr.open("POST", settings.image.uploadurl, true);
+        xhr.setRequestHeader("Cache-Control", "no-cache");
+        f = new FormData();
+        f.append(settings.image.uploadfield || 'upload', file, file.name);
+        return xhr.send(f);
+      }
+    };
+    Aloha.bind('aloha-image-selected', function(event, target) {
+      var $el, nodes;
+      $el = jQuery(target);
+      nodes = jQuery(Aloha.activeEditable.obj).find(selector);
+      nodes = nodes.not($el);
+      nodes.trigger('hide');
+      $el.trigger('show');
+      $el.data('aloha-bubble-selected', true);
+      return $el.off('.bubble');
+    });
+    UI.adopt('insertVideo-oer', null, {
+      click: function() {
+        var newEl, promise;
+        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
+        GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
+        promise = showModalDialog(newEl);
+        promise.done(function(data) {
+          if (data.files.length) {
+            newEl.addClass('aloha-image-uploading');
+            return uploadImage(data.files[0], function(url) {
+              jQuery(data.target).attr('src', url);
+              return newEl.removeClass('aloha-image-uploading');
+            });
+          }
+        });
+        promise.fail(function(data) {
+          var $target;
+          $target = jQuery(data.target);
+          if (!$target.is('img')) {
+            return $target.remove();
+          }
+        });
+        return promise.show();
+      }
+    });
+    return {
+      selector: selector,
+      populator: populator
+    };
+  });
+
+}).call(this);

From e795066636388106a09e54972fed6dfa7a1b48b3 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Mon, 25 Mar 2013 17:43:26 -0500
Subject: [PATCH 23/67] Adding coffeescript which uses gpicker

---
 ...ideo.coffee => video_custom_plugin.coffee} |   0
 .../assorted/lib/video_google_plugin.coffee   | 309 ++++++++++++++++++
 2 files changed, 309 insertions(+)
 rename src/plugins/oer/assorted/lib/{video.coffee => video_custom_plugin.coffee} (100%)
 create mode 100644 src/plugins/oer/assorted/lib/video_google_plugin.coffee

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video_custom_plugin.coffee
similarity index 100%
rename from src/plugins/oer/assorted/lib/video.coffee
rename to src/plugins/oer/assorted/lib/video_custom_plugin.coffee
diff --git a/src/plugins/oer/assorted/lib/video_google_plugin.coffee b/src/plugins/oer/assorted/lib/video_google_plugin.coffee
new file mode 100644
index 0000000000..42c93869d3
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/video_google_plugin.coffee
@@ -0,0 +1,309 @@
+ # Aloha Video Plugin
+# * -----------------
+# * This plugin handles when the insertVideo button is clicked
+#
+define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
+
+  embedder = (url_validator, embed_code_generator) ->
+    this.embed_code_gen = embed_code_generator
+    this.url_validator = url_validator
+    embed_code_generator = (url) ->
+      # Generates embed html -- this function should be replaced
+      embed_html = '<p> Hello World </p>'
+      '''
+      Validates a URL. Returns video id if URL is valide. Else returns false.
+      Should be replaced with actual function. The default validates youtube URLs
+      '''
+    url_validator = (url) ->
+      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
+      result = if(url.match(regexp)) then RegExp.$1 else false
+    set_embed_code_generator = (url) ->
+      this.embed_code_gen = embed_code_generator
+    set_url_validator = (url) ->
+      this.url_validator = url_validator
+    result = this
+
+  # Creates a youtube embedder
+  youtube_url_validator = (url) ->
+    regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
+    result = if(url.match(regexp)) then RegExp.$1 else false
+  
+  youtube_embed_code_generator = (url) ->
+    video_id = youtube_url_validator(url)
+    embed_html = ''
+    if (video_id)
+      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
+    return embed_html
+  youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
+
+  # Adds the youtube embedders to the list of embedders
+  embedders = []
+  embedders[0] = youtube_embedder
+  console.debug 'initializing'
+
+  checkURL = (url) ->
+    for embedder in embedders
+      if (embedder.url_validator(url)) 
+        return true
+    return false
+
+  # This will be prefixed with Aloha.settings.baseUrl
+  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
+
+  DIALOG_HTML = '''
+    <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h3>Insert video</h3>
+      </div>
+      <div class="modal-body">
+        <div class="image-options">
+            <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>
+        </div>
+        <div class="image-alt">
+          <div class="forminfo">
+            Please provide a description of this video for the visually impaired.
+          </div>
+          <div>
+            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary action insert">Save</button>
+        <button class="btn action cancel">Cancel</button>
+      </div>
+    </form>'''
+
+  # Defines a template for an embedder object which is responsible for generating embed html and validating a url
+  showModalDialog = ($el) ->
+      settings = Aloha.require('assorted/assorted-plugin').settings
+      root = Aloha.activeEditable.obj
+      dialog = jQuery(DIALOG_HTML)
+
+      # Find the dynamic modal elements and bind events to the buttons
+      $placeholder = dialog.find('.placeholder.preview')
+      $uploadUrl =   dialog.find('.upload-url-input')
+      $submit = dialog.find('.action.insert')
+      dialog.find("#video-url-input")[0].onkeyup = (event) -> 
+        target = event.currentTarget
+        currentVal = target.value
+        valid = checkURL(currentVal)
+        if(valid) 
+            target.style.borderColor='green'
+            target.style.borderWidth='medium'
+        else
+            target.style.borderColor='red'
+            target.style.borderWidth='medium'
+
+      # If we're editing an image pull in the src.
+      # It will be undefined if this is a new image.
+      #
+      # This variable is updated when one of the following occurs:
+      # * selects an image from the filesystem
+      # * enters a URL (TODO: Verify it's an image)
+      # * drops an image into the drop div
+
+      # $el might not be an image, it might be a placeholder for a future image
+      if $el.is('img')
+        # On submit $el.attr('src') will point to what is set in this variable
+        # preserve the alt text if editing an image
+        videoSource = $el.attr('src')
+        imageAltText = $el.attr('alt')
+      else
+        videoSource = ''
+        imageAltText = ''
+
+      dialog.find('[name=alt]').val(imageAltText)
+      # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
+      console.debug 'Checking'
+      # /^https?:\/\// - old regex
+      if checkURL(videoSource)
+        console.debug 'Checked'
+        $uploadUrl.val(videoSource)
+        $uploadUrl.show()
+      # Retrieves embedder which can matches the format of the URL
+      getEmbedder = (url) ->
+        for embedder in embedders
+          if (embedder.url_validator(url)) 
+            return embedder
+        return false
+      setvideoSource = (href) ->
+        videoSource = href
+        $submit.removeClass('disabled')
+      getEmbedEle = (url) ->
+        # Retrieves the embedder for this type of video
+        if(!(embedder = getEmbedder(url)))
+          console.debug("Error: URL not supported")
+          # TODO - ADD HELPFUL MESSAGE TO USER
+          dialog.modal('hide')
+
+        video = jQuery(embedder.embed_code_gen(url));
+        video.attr 'alt', dialog.find('[name=alt]').val()
+        return video
+      # Uses the File API to render a preview of the image
+      # and updates the modal's videoSource
+      loadLocalFile = (file, $img, callback) ->
+        reader = new FileReader()
+        reader.onloadend = () ->
+          if $img
+            $img.attr('src', reader.result)
+          # If we get an image then update the modal's videoSource
+          setvideoSource(reader.result)
+          callback(reader.result) if callback
+        reader.readAsDataURL(file)
+
+      # Add click handlers
+      dialog.find('.upload-image-link').on 'click', (evt) ->
+        evt.preventDefault()
+        $placeholder.hide()
+        $uploadUrl.hide()
+        console.debug 'Hiding placeholder url'
+
+      dialog.find('.upload-url-link').on 'click', (evt) ->
+        evt.preventDefault()
+        $placeholder.hide()
+        $uploadUrl.show()
+
+      $uploadUrl.on 'change', () ->
+        $previewImg = $placeholder.find('img')
+        url = $uploadUrl.val()
+        setvideoSource(url)
+        console.debug 'changing'
+        if settings.image.preview
+          $previewImg.attr 'src', url
+          $placeholder.show()
+
+      # On save update the actual video element. Use the submit event because this
+      # allows the use of html5 validation.
+      deferred = $.Deferred()
+      dialog.on 'submit', (evt) =>
+        evt.preventDefault() # Don't submit the form
+        if $el.is('img')
+          $el.attr 'src', videoSource
+          $el.attr 'alt', dialog.find('[name=alt]').val()
+        else
+          console.debug("Embedding the video")
+          # Embeds the video into the page
+          video = getEmbedEle(videoSource)
+          $el.replaceWith(video)
+          dialog.modal('hide')
+
+      dialog.on 'click', '.btn.action.cancel', (evt) =>
+        evt.preventDefault() # Don't submit the form
+        deferred.reject(target: $el[0])
+        dialog.modal('hide')
+
+      dialog.on 'hidden', (event) ->
+        # If hidden without being confirmed/cancelled, reject
+        if deferred.state()=='pending'
+          deferred.reject(target: $el[0])
+        # Clean up after dialog was hidden
+        dialog.remove()
+
+      # Return promise, with an added show method
+      jQuery.extend true, deferred.promise(),
+        show: (title) ->
+            if title
+              dialog.find('.modal-header h3').text(title)
+            dialog.modal 'show'
+
+  selector = 'img'
+
+  populator = ($el, pover) ->
+      # When a click occurs, the activeEditable is cleared so squirrel it
+      editable = Aloha.activeEditable
+      $bubble = jQuery '''
+        <div class="link-popover-details">
+            <a class="change">
+              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
+              <span title="Change the image's properties">Edit image...</span>
+            </a>
+            &nbsp; | &nbsp;
+            <a class="remove">
+              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
+              <span title="Delete the image">Delete</span>
+            </a>
+        </div>'''
+
+      href = $el.attr('src')
+      $bubble.find('.change').on 'click', ->
+        # unsquirrel the activeEditable
+        Aloha.activeEditable = editable
+        promise = showModalDialog($el)
+ 
+        promise.done (data)->
+          # Uploading if a local file was chosen
+          if data.files.length
+            jQuery(data.target).addClass('aloha-image-uploading')
+            uploadImage data.files[0], (url) ->
+              jQuery(data.target).attr('src', url).removeClass(
+                'aloha-image-uploading')
+        promise.show('Edit image')
+
+      $bubble.find('.remove').on 'click', ->
+        pover.stopOne($el)
+        $el.remove()
+      $bubble.contents()
+
+
+  uploadImage = (file, callback) ->
+    plugin = @
+    settings = Aloha.require('assorted/assorted-plugin').settings
+    xhr = new XMLHttpRequest()
+    if xhr.upload
+      if not settings.image.uploadurl
+        throw new Error("uploadurl not defined")
+
+      xhr.onload = () ->
+        if settings.image.parseresponse
+          url = parseresponse(xhr)
+        else
+          url = JSON.parse(xhr.response).url
+        callback(url)
+
+      xhr.open("POST", settings.image.uploadurl, true)
+      xhr.setRequestHeader("Cache-Control", "no-cache")
+      f = new FormData()
+      f.append(settings.image.uploadfield or 'upload', file, file.name)
+      xhr.send(f)
+
+
+  Aloha.bind 'aloha-image-selected', (event, target) ->
+      # Hide other tooltips of the same type
+      $el = jQuery(target)
+      nodes = jQuery(Aloha.activeEditable.obj).find(selector)
+      nodes = nodes.not($el)
+      nodes.trigger 'hide'
+      $el.trigger 'show'
+      $el.data('aloha-bubble-selected', true)
+      $el.off('.bubble')
+
+  UI.adopt 'insertVideo-oer', null,
+    click: () ->
+      newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
+      # Inserts Google Picker into the DOM
+      newVideoPicker()        
+      # GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
+      # promise = showModalDialog(newEl)
+
+      # promise.done (data)->
+      #   # Uploading if a local file was chosen
+      #   if data.files.length
+      #     newEl.addClass('aloha-image-uploading')
+      #     uploadImage data.files[0], (url) ->
+      #       jQuery(data.target).attr('src', url)
+      #       newEl.removeClass('aloha-image-uploading')
+
+      # promise.fail (data) ->
+      #   # Clean up placeholder if needed
+      #   $target = jQuery(data.target)
+      #   if not $target.is('img')
+      #     $target.remove()
+
+      # # Finally show the dialog
+      # promise.show()
+
+  # Return config
+  selector: selector
+  populator: populator

From f577cfc0d8e2b6d9a1f9d7febed9aa55d5dc345a Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Mon, 25 Mar 2013 18:58:15 -0500
Subject: [PATCH 24/67] The Google picker now pops up, however has incorrect
 z-index b/c of the aloha toolbar

---
 oerpub/index.html                                           | 6 +++++-
 .../lib/{video_google_plugin.coffee => video.coffee}        | 0
 src/plugins/oer/assorted/lib/video_custom_plugin.coffee     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename src/plugins/oer/assorted/lib/{video_google_plugin.coffee => video.coffee} (100%)

diff --git a/oerpub/index.html b/oerpub/index.html
index c41880e2b5..e8af3a2e09 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -55,6 +55,11 @@
                     tal:attributes="src string:${request.static_url('oerpub.rhaptoslabs.swordpushweb:static/aloha-settings.js')}"> <!-- xhtml workaround --></script>
             <script type="text/javascript" src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/js/bootstrap.min.js"
                     tal:attributes="src string:${request.application_url}/bootstrap/docs/assets/js/bootstrap.js"> <!-- xhtml workaround --></script>
+                    
+            <!--Google Picker Includes -->
+            <script src="http://www.google.com/jsapi"></script> 
+            <script src="/Aloha-Editor/src/plugins/oer/assorted/lib/gpickerdialog.js"> </script>
+
             <script type="text/javascript" src="/Aloha-Editor/src/lib/aloha.js"
                     tal:attributes="src string:${request.application_url}/aloha/src/lib/aloha.js"
                 data-aloha-plugins="common/ui,
@@ -73,7 +78,6 @@
                                     common/undo,
                                     oer/undobutton,
                                     oer/genericbutton"> <!-- xhtml workaround --></script>
-
             <script type="text/javascript"
                     tal:content="string:var body_url = '${body_url}';">
                     var body_url = '/Aloha-Editor/oerpub/sandbox/index.html';</script>
diff --git a/src/plugins/oer/assorted/lib/video_google_plugin.coffee b/src/plugins/oer/assorted/lib/video.coffee
similarity index 100%
rename from src/plugins/oer/assorted/lib/video_google_plugin.coffee
rename to src/plugins/oer/assorted/lib/video.coffee
diff --git a/src/plugins/oer/assorted/lib/video_custom_plugin.coffee b/src/plugins/oer/assorted/lib/video_custom_plugin.coffee
index 1d13751fda..5310a36864 100644
--- a/src/plugins/oer/assorted/lib/video_custom_plugin.coffee
+++ b/src/plugins/oer/assorted/lib/video_custom_plugin.coffee
@@ -1,4 +1,4 @@
-# Aloha Video Plugin
+ # Aloha Video Plugin
 # * -----------------
 # * This plugin handles when the insertVideo button is clicked
 #

From 47ac2d38aeb529daa26a75abb286661ab60431ad Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Thu, 28 Mar 2013 14:15:04 -0500
Subject: [PATCH 25/67] Google picker now inserting videos into Aloha

---
 oerpub/index.html                             | 10 +--
 src/plugins/oer/assorted/lib/gpickerdialog.js | 67 +++++++++++++++++++
 2 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 src/plugins/oer/assorted/lib/gpickerdialog.js

diff --git a/oerpub/index.html b/oerpub/index.html
index e8af3a2e09..7c9b74dd5a 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -55,10 +55,6 @@
                     tal:attributes="src string:${request.static_url('oerpub.rhaptoslabs.swordpushweb:static/aloha-settings.js')}"> <!-- xhtml workaround --></script>
             <script type="text/javascript" src="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/js/bootstrap.min.js"
                     tal:attributes="src string:${request.application_url}/bootstrap/docs/assets/js/bootstrap.js"> <!-- xhtml workaround --></script>
-                    
-            <!--Google Picker Includes -->
-            <script src="http://www.google.com/jsapi"></script> 
-            <script src="/Aloha-Editor/src/plugins/oer/assorted/lib/gpickerdialog.js"> </script>
 
             <script type="text/javascript" src="/Aloha-Editor/src/lib/aloha.js"
                     tal:attributes="src string:${request.application_url}/aloha/src/lib/aloha.js"
@@ -84,8 +80,14 @@
             <script type="text/javascript"
                     tal:content="string:var save_url = '${request.route_url('preview_save')}';">
                     var save_url = null;</script>
+            <!--Google Picker Includes -->
+            <script src="http://www.google.com/jsapi"></script> 
+            <script type="text/javascript" src="/Aloha-Editor/src/plugins/oer/assorted/lib/image-dialog.js" tal:attributes="src string:${request.application_url}/aloha/src/plugins/oer/assorted/lib/image-dialog.js"></script>
+            <script type="text/javascript" src="/Aloha-Editor/src/plugins/oer/assorted/lib/aloha-helper.js" tal:attributes="src string:${request.application_url}/aloha/src/plugins/oer/assorted/lib/aloha-helper.js"></script>
+            <!--<script type="text/javascript" src="/Aloha-Editor/src/plugins/oer/assorted/lib/gpickerdialog.js"></script>-->
             <script type="text/javascript">
 
+
                 // HTML elements which are the options in the heading drop down
                 var headingChoices = null;
                 // Element tags which are generated as headings 
diff --git a/src/plugins/oer/assorted/lib/gpickerdialog.js b/src/plugins/oer/assorted/lib/gpickerdialog.js
new file mode 100644
index 0000000000..c0a6b6d1b1
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/gpickerdialog.js
@@ -0,0 +1,67 @@
+// Google Picker for uploading images
+function newImagePicker() {
+    google.load('picker', '1', {"callback" : createImagePicker});
+}       
+
+// Create and render a Picker object for selecting documents
+function createImagePicker() {
+    var picker = new google.picker.PickerBuilder().
+        addView(new google.picker.ImageSearchView().
+                setLicense(google.picker.ImageSearchView.License.REUSE)
+            ).
+        addView(google.picker.ViewId.PHOTO_UPLOAD).
+        /*
+        addViewGroup(
+        new google.picker.ViewGroup(google.picker.ViewId.PHOTOS).
+            addView(new google.picker.PhotosView().
+                setType(google.picker.PhotosView.Type.UPLOADED)).
+            addView(new google.picker.PhotosView().
+                setType(google.picker.PhotosView.Type.FEATURED))).
+        */        
+        addView(google.picker.ViewId.PHOTOS).
+        addView(new google.picker.WebCamView(google.picker.WebCamViewType.STANDARD)).
+        setCallback(ImagePickerCallback).
+        build();
+    picker.setVisible(true);
+}
+
+// A simple callback implementation for Picker.
+function ImagePickerCallback(data) {
+    if(data.action == google.picker.Action.PICKED){
+        var doc = data[google.picker.Response.DOCUMENTS][0];
+        site_url = doc[google.picker.Document.URL]; // only shows website url :(
+        image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url;
+
+        var img = Aloha.jQuery("<img />").attr("src", image_url);
+        AlohaInsertIntoDom(img);
+    }
+}
+
+// Google Picker for uploading videos
+function newVideoPicker() {
+    google.load('picker', '1', {"callback" : createVideoPicker});
+}
+
+function createVideoPicker() {
+    var picker = new google.picker.PickerBuilder().
+        addView(new google.picker.VideoSearchView().
+            setSite(google.picker.VideoSearchView.YOUTUBE)).
+        addView(google.picker.ViewId.YOUTUBE).
+        addView(new google.picker.WebCamView()).
+        setCallback(VideoPickerCallback).
+        build();
+    picker.setVisible(true);
+}
+
+// A simple callback implementation for Picker.
+function VideoPickerCallback(data) {
+    if(data.action == google.picker.Action.PICKED){
+        var doc = data[google.picker.Response.DOCUMENTS][0];
+        site_url = doc[google.picker.Document.URL]; // only shows website url :(
+        // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
+        embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
+        var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></embed></object>');
+        var embed_code = Aloha.jQuery(embed_code_template).find('embed').attr('src', embed_url);
+        AlohaInsertIntoDom(embed_code);
+    }
+}

From 4b8d32342f43b367ff3023123f32f0f07f1b60d6 Mon Sep 17 00:00:00 2001
From: Max <jmg3@jmg3-HP-ProBook-6475b.(none)>
Date: Thu, 28 Mar 2013 16:56:56 -0500
Subject: [PATCH 26/67] Revert "Merge branch 'video-plugin' of
 github.com:wysiwhat/Aloha-Editor into media-plugin"

This reverts commit c902bea66d1c90c22efcf9d68235f932bb0eeb79, reversing
changes made to 47ac2d38aeb529daa26a75abb286661ab60431ad.
---
 dev-workflow.md                               |  27 +-
 oerpub/index.html                             |  20 +-
 .../common/image/lib/image-floatingMenu.js    |   3 +-
 src/plugins/oerpub/assorted/css/image.css     |  42 ---
 .../assorted/lib/assorted-plugin.coffee       |  15 -
 .../oerpub/assorted/lib/assorted-plugin.js    |  24 --
 .../oerpub/assorted/lib/gpickerdialog.js      |  67 ----
 src/plugins/oerpub/assorted/lib/image.coffee  | 265 ---------------
 src/plugins/oerpub/assorted/lib/image.js      | 217 ------------
 src/plugins/oerpub/assorted/lib/video.coffee  | 308 ------------------
 src/plugins/oerpub/assorted/lib/video.js      | 269 ---------------
 src/plugins/oerpub/video/js/embed.js          |   9 -
 12 files changed, 15 insertions(+), 1251 deletions(-)
 delete mode 100755 src/plugins/oerpub/assorted/css/image.css
 delete mode 100755 src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
 delete mode 100755 src/plugins/oerpub/assorted/lib/assorted-plugin.js
 delete mode 100644 src/plugins/oerpub/assorted/lib/gpickerdialog.js
 delete mode 100755 src/plugins/oerpub/assorted/lib/image.coffee
 delete mode 100755 src/plugins/oerpub/assorted/lib/image.js
 delete mode 100755 src/plugins/oerpub/assorted/lib/video.coffee
 delete mode 100755 src/plugins/oerpub/assorted/lib/video.js
 delete mode 100644 src/plugins/oerpub/video/js/embed.js

diff --git a/dev-workflow.md b/dev-workflow.md
index 822bac93ce..f4d94468fd 100644
--- a/dev-workflow.md
+++ b/dev-workflow.md
@@ -1,25 +1,11 @@
-# How we use branches and pull requests and redmine tickets:
-## Branches
+# How we use branches:
 * We have two long lived branches -- master and dev. 
-* Dev is for integration testing. Feature and fix branches get merged here for immediate testing. 
-Dev can be deleted and rebuilt from master if needed.
+* Pull requests go from feature and fix branches to master.
 * Releases and gh-pages will run off of master.
 * New features or bug fixes branch from master.
-  * Bug fix branches should use the redmine.oerpub.org ticket number in their name.
-
-## Releases
-* oerpub releases to remix.oerpub.org as close to immediately after new things are merged to master. 
-* Each release will be tagged. Major releases will get release branches. 
-* For releases that accumulate multiple features and fixes, a branch from master should be used to collect all the 
-changes that will be released together.
-
-## Pull requests
-* Pull requests go from feature and fix branches to master.
-* Before merging to master, the pull request must be code reviewed and tested. When each is approved (code review, test)
-a comment on the pull request should indicate the approval. When both approval comments are there, the pull request can
-merged to master
+* Dev is for integration testing. Feature and fix branches get merged here for immediate testing.  
 
-## Integration with redmine
+# Integration with redmine
 OERPUB is using [redmine.oerpub.org](http://redmine.oerpub.org) for tracking issues to the editor. When developers
 are fixing bugs or adding ticketed features, they should reference the ticket in the commits as explained here:
 [Referencing-issues-in-commit-messages](http://www.redmine.org/projects/redmine/wiki/RedmineSettings#Referencing-issues-in-commit-messages)
@@ -28,9 +14,8 @@ are fixing bugs or adding ticketed features, they should reference the ticket in
 1. Make a feature-or-fix branch off of master.
 2. Develop and test on the branch.
 3. Merge to dev and build on testing.oerpub.org
-4. Issue a pull request from the feature-or-fix branch to master. This can be after testing or simultaneous. If after 
-testing, be sure to indicate in a comment on the pull request that testing already passed.
-5. Someone not-affiliated with the branch will review the request and ensure testing passes.
+4. When testing passes, issue a pull request from the feature-or-fix branch to master.
+5. Someone not-affiliated with the branch will review the request.
    * 5A. Pull request is accepted
      * merge pull-request into master
      * merge master to gh-pages
diff --git a/oerpub/index.html b/oerpub/index.html
index 805cc5f676..7c9b74dd5a 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -96,6 +96,7 @@
                 // Search through parent links in the DOM until we find an element whose enclosing tag
                 // is one of the section heading tags
                 function getClosestHeadingParent(ele) {
+                    console.log('starting');
                     while(ele != null) {
                         console.log(ele);
                         if(ele.tagName && possibleHeadings.indexOf(ele.tagName.toUpperCase()) != -1) {
@@ -107,6 +108,7 @@
                         }
                         ele = ele.parentNode;
                     }
+                    console.log('returning');
                     console.log(ele);
                     return ele;
                 }
@@ -204,13 +206,6 @@
                                         }
                                         PubSub.pub('swordpushweb.saved');
                                     });
-                                } else {
-                                    $('#statusmessage').data('message')('Saved');
-                                    GenericButton.getButtons()["save"].enable(false);
-                                    $('.btn.save').html('Saved');
-                                    if (callback_function) {
-                                        callback_function();
-                                    }
                                 }
                             }
                         }
@@ -262,14 +257,15 @@
                             // editor.isModified().
                             window.setInterval(savePreview, 30000);
 
-                            setInterval(function() {
-                                var editor = Aloha.getEditableById('canvas');
-                                if (editor.isModified()) {
+
+                            // Bind a handler for the changed event
+                            var editor = Aloha.getEditableById('canvas');
+                            Aloha.bind('aloha-smart-content-changed', function(){
+                                if(editor.isModified()){
                                     $('.btn.save').html('Save');
                                     GenericButton.getButtons()["save"].enable(true);
                                 }
-                            }, 250);
-
+                            });
                             // Binds the function to all headers, paragraphs, and pre tags
                             Aloha.jQuery(":header, p, pre").bind('click', headingFunc);
                             Aloha.jQuery('#canvas').bind('keyup', recursiveHeadingFunc);
diff --git a/src/plugins/common/image/lib/image-floatingMenu.js b/src/plugins/common/image/lib/image-floatingMenu.js
index a95648e533..a14eb6e3e9 100644
--- a/src/plugins/common/image/lib/image-floatingMenu.js
+++ b/src/plugins/common/image/lib/image-floatingMenu.js
@@ -127,8 +127,7 @@ function (
 				}
 			});
 		},
-	
-		
+
         /**
          * Adds the ui meta fields (search, title) to the floating menu. 
          */
diff --git a/src/plugins/oerpub/assorted/css/image.css b/src/plugins/oerpub/assorted/css/image.css
deleted file mode 100755
index 94f54e5230..0000000000
--- a/src/plugins/oerpub/assorted/css/image.css
+++ /dev/null
@@ -1,42 +0,0 @@
-.image-placeholder {
-    background-color: #1B86D2;
-    border: 1px dotted #1B86D2;
-    border-radius: 10px 10px 10px 10px;
-    display: inline-block;
-    height: 20px;
-    margin-left: -8px;
-    opacity: 0.25;
-    position: absolute;
-    width: 20px;
-}
-
-form.plugin.image textarea {
-    width: 99%;
-    padding: 0.25em;
-}
-
-form.plugin.image .upload-url-input,
-form.plugin.image .upload-image-input {
-    width: 98%;
-}
-
-form#linkModal:focus {
-    outline: none;
-}
-
-.multimedia-video{
-    /*border: 10px solid #0000FF;*/
-    width: 500px;
-    height: 500px;
-}
-
-.placeholder.preview {
-    border: 1px solid #dddddd;
-    border-radius: 5px;
-    margin: 1em 0;
-    padding: 0.5em;
-}
-
-.placeholder.preview h4 {
-    margin: 0 0 1em 0;
-}
diff --git a/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee b/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
deleted file mode 100755
index c581046312..0000000000
--- a/src/plugins/oerpub/assorted/lib/assorted-plugin.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-###
-Register a couple of assorted oer plugins
-###
-define [ 'aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list' ], (Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) ->
-  Plugin.create 'assorted',
-    defaultSettings:
-        image:
-            preview: true
-    init: () ->
-      @settings = $.extend true, @defaultSettings, @settings
-      Popover.register linkConfig
-      Popover.register imageConfig
-      Popover.register videoConfig
-      #Popover.register figureConfig
-      #Popover.register figcaptionConfig
diff --git a/src/plugins/oerpub/assorted/lib/assorted-plugin.js b/src/plugins/oerpub/assorted/lib/assorted-plugin.js
deleted file mode 100755
index dcb45c9cae..0000000000
--- a/src/plugins/oerpub/assorted/lib/assorted-plugin.js
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
-Register a couple of assorted oer plugins
-*/
-
-(function() {
-
-  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) {
-    return Plugin.create('assorted', {
-      defaultSettings: {
-        image: {
-          preview: true
-        }
-      },
-      init: function() {
-        this.settings = $.extend(true, this.defaultSettings, this.settings);
-        Popover.register(linkConfig);
-        Popover.register(imageConfig);
-        return Popover.register(videoConfig);
-      }
-    });
-  });
-
-}).call(this);
diff --git a/src/plugins/oerpub/assorted/lib/gpickerdialog.js b/src/plugins/oerpub/assorted/lib/gpickerdialog.js
deleted file mode 100644
index 6df9011563..0000000000
--- a/src/plugins/oerpub/assorted/lib/gpickerdialog.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Google Picker for uploading images
-function newImagePicker() {
-    google.load('picker', '1', {"callback" : createImagePicker});
-}       
-
-// Create and render a Picker object for selecting documents
-function createImagePicker() {
-    var picker = new google.picker.PickerBuilder().
-        addView(new google.picker.ImageSearchView().
-                setLicense(google.picker.ImageSearchView.License.REUSE)
-            ).
-        addView(google.picker.ViewId.PHOTO_UPLOAD).
-        /*
-        addViewGroup(
-        new google.picker.ViewGroup(google.picker.ViewId.PHOTOS).
-            addView(new google.picker.PhotosView().
-                setType(google.picker.PhotosView.Type.UPLOADED)).
-            addView(new google.picker.PhotosView().
-                setType(google.picker.PhotosView.Type.FEATURED))).
-        */        
-        addView(google.picker.ViewId.PHOTOS).
-        addView(new google.picker.WebCamView(google.picker.WebCamViewType.STANDARD)).
-        setCallback(ImagePickerCallback).
-        build();
-    picker.setVisible(true);
-}
-
-// A simple callback implementation for Picker.
-function ImagePickerCallback(data) {
-    if(data.action == google.picker.Action.PICKED){
-        var doc = data[google.picker.Response.DOCUMENTS][0];
-        site_url = doc[google.picker.Document.URL]; // only shows website url :(
-        image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url;
-
-        var img = Aloha.jQuery("<img />").attr("src", image_url);
-        AlohaInsertIntoDom(img);
-    }
-}
-
-// Google Picker for uploading videos
-function newVideoPicker() {
-    google.load('picker', '1', {"callback" : createVideoPicker});
-}
-
-function createVideoPicker() {
-    var picker = new google.picker.PickerBuilder().
-        addView(new google.picker.VideoSearchView().
-            setSite(google.picker.VideoSearchView.YOUTUBE)).
-        addView(google.picker.ViewId.YOUTUBE).
-        addView(new google.picker.WebCamView()).
-        setCallback(VideoPickerCallback).
-        build();
-    picker.setVisible(true);
-}
-
-// A simple callback implementation for Picker.
-function VideoPickerCallback(data) {
-    if(data.action == google.picker.Action.PICKED){
-        var doc = data[google.picker.Response.DOCUMENTS][0];
-        site_url = doc[google.picker.Document.URL]; // only shows website url :(
-        // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
-        embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
-        var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true"></embed></object>');
-        var embed_code = Aloha.jQuery(embed_code_template).find('embed').attr('src', embed_url);
-        AlohaInsertIntoDom(embed_code);
-    }
-}
diff --git a/src/plugins/oerpub/assorted/lib/image.coffee b/src/plugins/oerpub/assorted/lib/image.coffee
deleted file mode 100755
index bb0cb4d307..0000000000
--- a/src/plugins/oerpub/assorted/lib/image.coffee
+++ /dev/null
@@ -1,265 +0,0 @@
-# Aloha Image Plugin
-# * -----------------
-# * This plugin handles when the insertImage button is clicked and provides a bubble next to an image when it is selected
-#
-define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
-
-  # This will be prefixed with Aloha.settings.baseUrl
-  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
-
-  DIALOG_HTML = '''
-    <form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Insert image blah</h3>
-      </div>
-      <div class="modal-body">
-        <div class="image-options">
-            <a class="upload-image-link">Choose a file</a> OR <a class="upload-url-link">get file from the Web</a>
-            <div class="placeholder preview hide">
-              <h4>Preview</h4>
-              <img class="preview-image"/>
-            </div>
-            <input type="file" class="upload-image-input" />
-            <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>
-        </div>
-        <div class="image-alt">
-          <div class="forminfo">
-            Please provide a description of this image for the visually impaired.
-          </div>
-          <div>
-            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="btn btn-primary action insert">Save</button>
-        <button class="btn action cancel">Cancel</button>
-      </div>
-    </form>'''
-
-  showModalDialog = ($el) ->
-      settings = Aloha.require('assorted/assorted-plugin').settings
-      root = Aloha.activeEditable.obj
-      dialog = jQuery(DIALOG_HTML)
-
-      # Find the dynamic modal elements and bind events to the buttons
-      $placeholder = dialog.find('.placeholder.preview')
-      $uploadImage = dialog.find('.upload-image-input').hide()
-      $uploadUrl =   dialog.find('.upload-url-input').hide()
-      $submit = dialog.find('.action.insert')
-
-      # If we're editing an image pull in the src.
-      # It will be undefined if this is a new image.
-      #
-      # This variable is updated when one of the following occurs:
-      # * selects an image from the filesystem
-      # * enters a URL (TODO: Verify it's an image)
-      # * drops an image into the drop div
-
-      # $el might not be an image, it might be a placeholder for a future image
-      if $el.is('img')
-        # On submit $el.attr('src') will point to what is set in this variable
-        # preserve the alt text if editing an image
-        imageSource = $el.attr('src')
-        imageAltText = $el.attr('alt')
-      else
-        imageSource = ''
-        imageAltText = ''
-
-      dialog.find('[name=alt]').val(imageAltText)
-
-      if /^https?:\/\//.test(imageSource)
-        $uploadUrl.val(imageSource)
-        $uploadUrl.show()
-
-      # Set onerror of preview image
-      ((img, baseurl) ->
-        img.onerror = ->
-          errimg = baseurl + WARNING_IMAGE_PATH
-          img.src = errimg unless img.src is errimg
-      ) dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl
-
-      setImageSource = (href) ->
-        imageSource = href
-        $submit.removeClass('disabled')
-
-      # Uses the File API to render a preview of the image
-      # and updates the modal's imageSource
-      loadLocalFile = (file, $img, callback) ->
-        reader = new FileReader()
-        reader.onloadend = () ->
-          if $img
-            $img.attr('src', reader.result)
-          # If we get an image then update the modal's imageSource
-          setImageSource(reader.result)
-          callback(reader.result) if callback
-        reader.readAsDataURL(file)
-
-      # Add click handlers
-      dialog.find('.upload-image-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadUrl.hide()
-        $uploadImage.click()
-        $uploadImage.show()
-
-      dialog.find('.upload-url-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadImage.hide()
-        $uploadUrl.show()
-
-      $uploadImage.on 'change', () ->
-        files = $uploadImage[0].files
-        # Parse the file and if it's an image set the imageSource
-        if files.length > 0
-          if settings.image.preview
-            $previewImg = $placeholder.find('img')
-            loadLocalFile files[0], $previewImg
-            $placeholder.show()
-          else
-            loadLocalFile files[0]
-
-      $uploadUrl.on 'change', () ->
-        $previewImg = $placeholder.find('img')
-        url = $uploadUrl.val()
-        setImageSource(url)
-        if settings.image.preview
-          $previewImg.attr 'src', url
-          $placeholder.show()
-
-      # On save update the actual img tag. Use the submit event because this
-      # allows the use of html5 validation.
-      deferred = $.Deferred()
-      dialog.on 'submit', (evt) =>
-        evt.preventDefault() # Don't submit the form
-        if $el.is('img')
-          $el.attr 'src', imageSource
-          $el.attr 'alt', dialog.find('[name=alt]').val()
-        else
-          img = jQuery('<img/>')
-          img.attr 'src', imageSource
-          img.attr 'alt', dialog.find('[name=alt]').val()
-          $el.replaceWith(img)
-          $el = img
-        deferred.resolve(target: $el[0], files: $uploadImage[0].files)
-        dialog.modal('hide')
-
-      dialog.on 'click', '.btn.action.cancel', (evt) =>
-        evt.preventDefault() # Don't submit the form
-        deferred.reject(target: $el[0])
-        dialog.modal('hide')
-
-      dialog.on 'hidden', (event) ->
-        # If hidden without being confirmed/cancelled, reject
-        if deferred.state()=='pending'
-          deferred.reject(target: $el[0])
-        # Clean up after dialog was hidden
-        dialog.remove()
-
-      # Return promise, with an added show method
-      jQuery.extend true, deferred.promise(),
-        show: (title) ->
-            if title
-              dialog.find('.modal-header h3').text(title)
-            dialog.modal 'show'
-
-  selector = 'img'
-
-  populator = ($el, pover) ->
-      # When a click occurs, the activeEditable is cleared so squirrel it
-      editable = Aloha.activeEditable
-      $bubble = jQuery '''
-        <div class="link-popover-details">
-            <a class="change">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
-              <span title="Change the image's properties">Edit image...</span>
-            </a>
-            &nbsp; | &nbsp;
-            <a class="remove">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
-              <span title="Delete the image">Delete</span>
-            </a>
-        </div>'''
-
-      href = $el.attr('src')
-      $bubble.find('.change').on 'click', ->
-        # unsquirrel the activeEditable
-        Aloha.activeEditable = editable
-        promise = showModalDialog($el)
- 
-        promise.done (data)->
-          # Uploading if a local file was chosen
-          if data.files.length
-            jQuery(data.target).addClass('aloha-image-uploading')
-            uploadImage data.files[0], (url) ->
-              jQuery(data.target).attr('src', url).removeClass(
-                'aloha-image-uploading')
-        promise.show('Edit image')
-
-      $bubble.find('.remove').on 'click', ->
-        pover.stopOne($el)
-        $el.remove()
-      $bubble.contents()
-
-
-  uploadImage = (file, callback) ->
-    plugin = @
-    settings = Aloha.require('assorted/assorted-plugin').settings
-    xhr = new XMLHttpRequest()
-    if xhr.upload
-      if not settings.image.uploadurl
-        throw new Error("uploadurl not defined")
-
-      xhr.onload = () ->
-        if settings.image.parseresponse
-          url = parseresponse(xhr)
-        else
-          url = JSON.parse(xhr.response).url
-        callback(url)
-
-      xhr.open("POST", settings.image.uploadurl, true)
-      xhr.setRequestHeader("Cache-Control", "no-cache")
-      f = new FormData()
-      f.append(settings.image.uploadfield or 'upload', file, file.name)
-      xhr.send(f)
-
-
-  Aloha.bind 'aloha-image-selected', (event, target) ->
-      # Hide other tooltips of the same type
-      $el = jQuery(target)
-      nodes = jQuery(Aloha.activeEditable.obj).find(selector)
-      nodes = nodes.not($el)
-      nodes.trigger 'hide'
-      $el.trigger 'show'
-      $el.data('aloha-bubble-selected', true)
-      $el.off('.bubble')
-
-
-  UI.adopt 'insertImage-oer', null,
-    click: () ->
-      newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
-      GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
-      promise = showModalDialog(newEl)
-
-      promise.done (data)->
-        # Uploading if a local file was chosen
-        if data.files.length
-          newEl.addClass('aloha-image-uploading')
-          uploadImage data.files[0], (url) ->
-            jQuery(data.target).attr('src', url)
-            newEl.removeClass('aloha-image-uploading')
-
-      promise.fail (data) ->
-        # Clean up placeholder if needed
-        $target = jQuery(data.target)
-        if not $target.is('img')
-          $target.remove()
-
-      # Finally show the dialog
-      promise.show()
-
-  # Return config
-  selector: selector
-  populator: populator
diff --git a/src/plugins/oerpub/assorted/lib/image.js b/src/plugins/oerpub/assorted/lib/image.js
deleted file mode 100755
index 560f527b42..0000000000
--- a/src/plugins/oerpub/assorted/lib/image.js
+++ /dev/null
@@ -1,217 +0,0 @@
-(function() {
-
-  define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, populator, selector, showModalDialog, uploadImage;
-    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin image modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert image blah</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <a class="upload-image-link">Choose a file</a> OR <a class="upload-url-link">get file from the Web</a>\n        <div class="placeholder preview hide">\n          <h4>Preview</h4>\n          <img class="preview-image"/>\n        </div>\n        <input type="file" class="upload-image-input" />\n        <input type="url" class="upload-url-input" placeholder="Enter URL of image ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this image for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
-    showModalDialog = function($el) {
-      var $placeholder, $submit, $uploadImage, $uploadUrl, deferred, dialog, imageAltText, imageSource, loadLocalFile, root, setImageSource, settings,
-        _this = this;
-      settings = Aloha.require('assorted/assorted-plugin').settings;
-      root = Aloha.activeEditable.obj;
-      dialog = jQuery(DIALOG_HTML);
-      $placeholder = dialog.find('.placeholder.preview');
-      $uploadImage = dialog.find('.upload-image-input').hide();
-      $uploadUrl = dialog.find('.upload-url-input').hide();
-      $submit = dialog.find('.action.insert');
-      if ($el.is('img')) {
-        imageSource = $el.attr('src');
-        imageAltText = $el.attr('alt');
-      } else {
-        imageSource = '';
-        imageAltText = '';
-      }
-      dialog.find('[name=alt]').val(imageAltText);
-      if (/^https?:\/\//.test(imageSource)) {
-        $uploadUrl.val(imageSource);
-        $uploadUrl.show();
-      }
-      (function(img, baseurl) {
-        return img.onerror = function() {
-          var errimg;
-          errimg = baseurl + WARNING_IMAGE_PATH;
-          if (img.src !== errimg) return img.src = errimg;
-        };
-      })(dialog.find('.placeholder.preview img')[0], Aloha.settings.baseUrl);
-      setImageSource = function(href) {
-        imageSource = href;
-        return $submit.removeClass('disabled');
-      };
-      loadLocalFile = function(file, $img, callback) {
-        var reader;
-        reader = new FileReader();
-        reader.onloadend = function() {
-          if ($img) $img.attr('src', reader.result);
-          setImageSource(reader.result);
-          if (callback) return callback(reader.result);
-        };
-        return reader.readAsDataURL(file);
-      };
-      dialog.find('.upload-image-link').on('click', function(evt) {
-        evt.preventDefault();
-        $placeholder.hide();
-        $uploadUrl.hide();
-        $uploadImage.click();
-        return $uploadImage.show();
-      });
-      dialog.find('.upload-url-link').on('click', function(evt) {
-        evt.preventDefault();
-        $placeholder.hide();
-        $uploadImage.hide();
-        return $uploadUrl.show();
-      });
-      $uploadImage.on('change', function() {
-        var $previewImg, files;
-        files = $uploadImage[0].files;
-        if (files.length > 0) {
-          if (settings.image.preview) {
-            $previewImg = $placeholder.find('img');
-            loadLocalFile(files[0], $previewImg);
-            return $placeholder.show();
-          } else {
-            return loadLocalFile(files[0]);
-          }
-        }
-      });
-      $uploadUrl.on('change', function() {
-        var $previewImg, url;
-        $previewImg = $placeholder.find('img');
-        url = $uploadUrl.val();
-        setImageSource(url);
-        if (settings.image.preview) {
-          $previewImg.attr('src', url);
-          return $placeholder.show();
-        }
-      });
-      deferred = $.Deferred();
-      dialog.on('submit', function(evt) {
-        var img;
-        evt.preventDefault();
-        if ($el.is('img')) {
-          $el.attr('src', imageSource);
-          $el.attr('alt', dialog.find('[name=alt]').val());
-        } else {
-          img = jQuery('<img/>');
-          img.attr('src', imageSource);
-          img.attr('alt', dialog.find('[name=alt]').val());
-          $el.replaceWith(img);
-          $el = img;
-        }
-        deferred.resolve({
-          target: $el[0],
-          files: $uploadImage[0].files
-        });
-        return dialog.modal('hide');
-      });
-      dialog.on('click', '.btn.action.cancel', function(evt) {
-        evt.preventDefault();
-        deferred.reject({
-          target: $el[0]
-        });
-        return dialog.modal('hide');
-      });
-      dialog.on('hidden', function(event) {
-        if (deferred.state() === 'pending') {
-          deferred.reject({
-            target: $el[0]
-          });
-        }
-        return dialog.remove();
-      });
-      return jQuery.extend(true, deferred.promise(), {
-        show: function(title) {
-          if (title) dialog.find('.modal-header h3').text(title);
-          return dialog.modal('show');
-        }
-      });
-    };
-    selector = 'img';
-    populator = function($el, pover) {
-      var $bubble, editable, href;
-      editable = Aloha.activeEditable;
-      $bubble = jQuery('<div class="link-popover-details">\n    <a class="change">\n      <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/edit-link-03.png" />\n  <span title="Change the image\'s properties">Edit image...</span>\n</a>\n&nbsp; | &nbsp;\n<a class="remove">\n  <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/unlink-link-02.png" />\n      <span title="Delete the image">Delete</span>\n    </a>\n</div>');
-      href = $el.attr('src');
-      $bubble.find('.change').on('click', function() {
-        var promise;
-        Aloha.activeEditable = editable;
-        promise = showModalDialog($el);
-        promise.done(function(data) {
-          if (data.files.length) {
-            jQuery(data.target).addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              return jQuery(data.target).attr('src', url).removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        return promise.show('Edit image');
-      });
-      $bubble.find('.remove').on('click', function() {
-        pover.stopOne($el);
-        return $el.remove();
-      });
-      return $bubble.contents();
-    };
-    uploadImage = function(file, callback) {
-      var f, plugin, settings, xhr;
-      plugin = this;
-      settings = Aloha.require('assorted/assorted-plugin').settings;
-      xhr = new XMLHttpRequest();
-      if (xhr.upload) {
-        if (!settings.image.uploadurl) throw new Error("uploadurl not defined");
-        xhr.onload = function() {
-          var url;
-          if (settings.image.parseresponse) {
-            url = parseresponse(xhr);
-          } else {
-            url = JSON.parse(xhr.response).url;
-          }
-          return callback(url);
-        };
-        xhr.open("POST", settings.image.uploadurl, true);
-        xhr.setRequestHeader("Cache-Control", "no-cache");
-        f = new FormData();
-        f.append(settings.image.uploadfield || 'upload', file, file.name);
-        return xhr.send(f);
-      }
-    };
-    Aloha.bind('aloha-image-selected', function(event, target) {
-      var $el, nodes;
-      $el = jQuery(target);
-      nodes = jQuery(Aloha.activeEditable.obj).find(selector);
-      nodes = nodes.not($el);
-      nodes.trigger('hide');
-      $el.trigger('show');
-      $el.data('aloha-bubble-selected', true);
-      return $el.off('.bubble');
-    });
-    UI.adopt('insertImage-oer', null, {
-      click: function() {
-        var newEl, promise;
-        console.log("IMAGE GOT CLICK");
-        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
-        GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
-        promise = showModalDialog(newEl);
-        promise.done(function(data) {
-          if (data.files.length) {
-            newEl.addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              jQuery(data.target).attr('src', url);
-              return newEl.removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        promise.fail(function(data) {
-          var $target;
-          $target = jQuery(data.target);
-          if (!$target.is('img')) return $target.remove();
-        });
-        return promise.show();
-      }
-    });
-    return {
-      selector: selector,
-      populator: populator
-    };
-  });
-
-}).call(this);
diff --git a/src/plugins/oerpub/assorted/lib/video.coffee b/src/plugins/oerpub/assorted/lib/video.coffee
deleted file mode 100755
index 1d13751fda..0000000000
--- a/src/plugins/oerpub/assorted/lib/video.coffee
+++ /dev/null
@@ -1,308 +0,0 @@
-# Aloha Video Plugin
-# * -----------------
-# * This plugin handles when the insertVideo button is clicked
-#
-define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
-
-  embedder = (url_validator, embed_code_generator) ->
-    this.embed_code_gen = embed_code_generator
-    this.url_validator = url_validator
-    embed_code_generator = (url) ->
-      # Generates embed html -- this function should be replaced
-      embed_html = '<p> Hello World </p>'
-      '''
-      Validates a URL. Returns video id if URL is valide. Else returns false.
-      Should be replaced with actual function. The default validates youtube URLs
-      '''
-    url_validator = (url) ->
-      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
-      result = if(url.match(regexp)) then RegExp.$1 else false
-    set_embed_code_generator = (url) ->
-      this.embed_code_gen = embed_code_generator
-    set_url_validator = (url) ->
-      this.url_validator = url_validator
-    result = this
-
-  # Creates a youtube embedder
-  youtube_url_validator = (url) ->
-    regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
-    result = if(url.match(regexp)) then RegExp.$1 else false
-  
-  youtube_embed_code_generator = (url) ->
-    video_id = youtube_url_validator(url)
-    embed_html = ''
-    if (video_id)
-      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
-    return embed_html
-  youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
-
-  # Adds the youtube embedders to the list of embedders
-  embedders = []
-  embedders[0] = youtube_embedder
-  console.debug 'initializing'
-
-  checkURL = (url) ->
-    for embedder in embedders
-      if (embedder.url_validator(url)) 
-        return true
-    return false
-
-  # This will be prefixed with Aloha.settings.baseUrl
-  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
-
-  DIALOG_HTML = '''
-    <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Insert video</h3>
-      </div>
-      <div class="modal-body">
-        <div class="image-options">
-            <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>
-        </div>
-        <div class="image-alt">
-          <div class="forminfo">
-            Please provide a description of this video for the visually impaired.
-          </div>
-          <div>
-            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="btn btn-primary action insert">Save</button>
-        <button class="btn action cancel">Cancel</button>
-      </div>
-    </form>'''
-
-  # Defines a template for an embedder object which is responsible for generating embed html and validating a url
-  showModalDialog = ($el) ->
-      settings = Aloha.require('assorted/assorted-plugin').settings
-      root = Aloha.activeEditable.obj
-      dialog = jQuery(DIALOG_HTML)
-
-      # Find the dynamic modal elements and bind events to the buttons
-      $placeholder = dialog.find('.placeholder.preview')
-      $uploadUrl =   dialog.find('.upload-url-input')
-      $submit = dialog.find('.action.insert')
-      dialog.find("#video-url-input")[0].onkeyup = (event) -> 
-        target = event.currentTarget
-        currentVal = target.value
-        valid = checkURL(currentVal)
-        if(valid) 
-            target.style.borderColor='green'
-            target.style.borderWidth='medium'
-        else
-            target.style.borderColor='red'
-            target.style.borderWidth='medium'
-
-      # If we're editing an image pull in the src.
-      # It will be undefined if this is a new image.
-      #
-      # This variable is updated when one of the following occurs:
-      # * selects an image from the filesystem
-      # * enters a URL (TODO: Verify it's an image)
-      # * drops an image into the drop div
-
-      # $el might not be an image, it might be a placeholder for a future image
-      if $el.is('img')
-        # On submit $el.attr('src') will point to what is set in this variable
-        # preserve the alt text if editing an image
-        videoSource = $el.attr('src')
-        imageAltText = $el.attr('alt')
-      else
-        videoSource = ''
-        imageAltText = ''
-
-      dialog.find('[name=alt]').val(imageAltText)
-      # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
-      console.debug 'Checking'
-      # /^https?:\/\// - old regex
-      if checkURL(videoSource)
-        console.debug 'Checked'
-        $uploadUrl.val(videoSource)
-        $uploadUrl.show()
-      # Retrieves embedder which can matches the format of the URL
-      getEmbedder = (url) ->
-        for embedder in embedders
-          if (embedder.url_validator(url)) 
-            return embedder
-        return false
-      setvideoSource = (href) ->
-        videoSource = href
-        $submit.removeClass('disabled')
-      getEmbedEle = (url) ->
-        # Retrieves the embedder for this type of video
-        if(!(embedder = getEmbedder(url)))
-          console.debug("Error: URL not supported")
-          # TODO - ADD HELPFUL MESSAGE TO USER
-          dialog.modal('hide')
-
-        video = jQuery(embedder.embed_code_gen(url));
-        video.attr 'alt', dialog.find('[name=alt]').val()
-        return video
-      # Uses the File API to render a preview of the image
-      # and updates the modal's videoSource
-      loadLocalFile = (file, $img, callback) ->
-        reader = new FileReader()
-        reader.onloadend = () ->
-          if $img
-            $img.attr('src', reader.result)
-          # If we get an image then update the modal's videoSource
-          setvideoSource(reader.result)
-          callback(reader.result) if callback
-        reader.readAsDataURL(file)
-
-      # Add click handlers
-      dialog.find('.upload-image-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadUrl.hide()
-        console.debug 'Hiding placeholder url'
-
-      dialog.find('.upload-url-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadUrl.show()
-
-      $uploadUrl.on 'change', () ->
-        $previewImg = $placeholder.find('img')
-        url = $uploadUrl.val()
-        setvideoSource(url)
-        console.debug 'changing'
-        if settings.image.preview
-          $previewImg.attr 'src', url
-          $placeholder.show()
-
-      # On save update the actual video element. Use the submit event because this
-      # allows the use of html5 validation.
-      deferred = $.Deferred()
-      dialog.on 'submit', (evt) =>
-        evt.preventDefault() # Don't submit the form
-        if $el.is('img')
-          $el.attr 'src', videoSource
-          $el.attr 'alt', dialog.find('[name=alt]').val()
-        else
-          console.debug("Embedding the video")
-          # Embeds the video into the page
-          video = getEmbedEle(videoSource)
-          $el.replaceWith(video)
-          # $el = video -- not sure why this is necessary
-          dialog.modal('hide')
-
-      dialog.on 'click', '.btn.action.cancel', (evt) =>
-        evt.preventDefault() # Don't submit the form
-        deferred.reject(target: $el[0])
-        dialog.modal('hide')
-
-      dialog.on 'hidden', (event) ->
-        # If hidden without being confirmed/cancelled, reject
-        if deferred.state()=='pending'
-          deferred.reject(target: $el[0])
-        # Clean up after dialog was hidden
-        dialog.remove()
-
-      # Return promise, with an added show method
-      jQuery.extend true, deferred.promise(),
-        show: (title) ->
-            if title
-              dialog.find('.modal-header h3').text(title)
-            dialog.modal 'show'
-
-  selector = 'img'
-
-  populator = ($el, pover) ->
-      # When a click occurs, the activeEditable is cleared so squirrel it
-      editable = Aloha.activeEditable
-      $bubble = jQuery '''
-        <div class="link-popover-details">
-            <a class="change">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
-              <span title="Change the image's properties">Edit image...</span>
-            </a>
-            &nbsp; | &nbsp;
-            <a class="remove">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
-              <span title="Delete the image">Delete</span>
-            </a>
-        </div>'''
-
-      href = $el.attr('src')
-      $bubble.find('.change').on 'click', ->
-        # unsquirrel the activeEditable
-        Aloha.activeEditable = editable
-        promise = showModalDialog($el)
- 
-        promise.done (data)->
-          # Uploading if a local file was chosen
-          if data.files.length
-            jQuery(data.target).addClass('aloha-image-uploading')
-            uploadImage data.files[0], (url) ->
-              jQuery(data.target).attr('src', url).removeClass(
-                'aloha-image-uploading')
-        promise.show('Edit image')
-
-      $bubble.find('.remove').on 'click', ->
-        pover.stopOne($el)
-        $el.remove()
-      $bubble.contents()
-
-
-  uploadImage = (file, callback) ->
-    plugin = @
-    settings = Aloha.require('assorted/assorted-plugin').settings
-    xhr = new XMLHttpRequest()
-    if xhr.upload
-      if not settings.image.uploadurl
-        throw new Error("uploadurl not defined")
-
-      xhr.onload = () ->
-        if settings.image.parseresponse
-          url = parseresponse(xhr)
-        else
-          url = JSON.parse(xhr.response).url
-        callback(url)
-
-      xhr.open("POST", settings.image.uploadurl, true)
-      xhr.setRequestHeader("Cache-Control", "no-cache")
-      f = new FormData()
-      f.append(settings.image.uploadfield or 'upload', file, file.name)
-      xhr.send(f)
-
-
-  Aloha.bind 'aloha-image-selected', (event, target) ->
-      # Hide other tooltips of the same type
-      $el = jQuery(target)
-      nodes = jQuery(Aloha.activeEditable.obj).find(selector)
-      nodes = nodes.not($el)
-      nodes.trigger 'hide'
-      $el.trigger 'show'
-      $el.data('aloha-bubble-selected', true)
-      $el.off('.bubble')
-
-  UI.adopt 'insertVideo-oer', null,
-    click: () ->
-      newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
-      GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
-      promise = showModalDialog(newEl)
-
-      promise.done (data)->
-        # Uploading if a local file was chosen
-        if data.files.length
-          newEl.addClass('aloha-image-uploading')
-          uploadImage data.files[0], (url) ->
-            jQuery(data.target).attr('src', url)
-            newEl.removeClass('aloha-image-uploading')
-
-      promise.fail (data) ->
-        # Clean up placeholder if needed
-        $target = jQuery(data.target)
-        if not $target.is('img')
-          $target.remove()
-
-      # Finally show the dialog
-      promise.show()
-
-  # Return config
-  selector: selector
-  populator: populator
diff --git a/src/plugins/oerpub/assorted/lib/video.js b/src/plugins/oerpub/assorted/lib/video.js
deleted file mode 100755
index 244354b762..0000000000
--- a/src/plugins/oerpub/assorted/lib/video.js
+++ /dev/null
@@ -1,269 +0,0 @@
-(function() {
-
-  define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, checkURL, embedder, embedders, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
-    embedder = function(url_validator, embed_code_generator) {
-      var result, set_embed_code_generator, set_url_validator;
-      this.embed_code_gen = embed_code_generator;
-      this.url_validator = url_validator;
-      embed_code_generator = function(url) {
-        var embed_html;
-        embed_html = '<p> Hello World </p>';
-        return 'Validates a URL. Returns video id if URL is valide. Else returns false.\nShould be replaced with actual function. The default validates youtube URLs';
-      };
-      url_validator = function(url) {
-        var regexp, result;
-        regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
-        return result = url.match(regexp) ? RegExp.$1 : false;
-      };
-      set_embed_code_generator = function(url) {
-        return this.embed_code_gen = embed_code_generator;
-      };
-      set_url_validator = function(url) {
-        return this.url_validator = url_validator;
-      };
-      return result = this;
-    };
-    youtube_url_validator = function(url) {
-      var regexp, result;
-      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
-      return result = url.match(regexp) ? RegExp.$1 : false;
-    };
-    youtube_embed_code_generator = function(url) {
-      var embed_html, video_id;
-      video_id = youtube_url_validator(url);
-      embed_html = '';
-      if (video_id) {
-        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>';
-      }
-      return embed_html;
-    };
-    youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator);
-    embedders = [];
-    embedders[0] = youtube_embedder;
-    console.debug('initializing');
-    checkURL = function(url) {
-      var embedder, _i, _len;
-      for (_i = 0, _len = embedders.length; _i < _len; _i++) {
-        embedder = embedders[_i];
-        if (embedder.url_validator(url)) return true;
-      }
-      return false;
-    };
-    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
-    showModalDialog = function($el) {
-      var $placeholder, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
-        _this = this;
-      settings = Aloha.require('assorted/assorted-plugin').settings;
-      root = Aloha.activeEditable.obj;
-      dialog = jQuery(DIALOG_HTML);
-      $placeholder = dialog.find('.placeholder.preview');
-      $uploadUrl = dialog.find('.upload-url-input');
-      $submit = dialog.find('.action.insert');
-      dialog.find("#video-url-input")[0].onkeyup = function(event) {
-        var currentVal, target, valid;
-        target = event.currentTarget;
-        currentVal = target.value;
-        valid = checkURL(currentVal);
-        if (valid) {
-          target.style.borderColor = 'green';
-          return target.style.borderWidth = 'medium';
-        } else {
-          target.style.borderColor = 'red';
-          return target.style.borderWidth = 'medium';
-        }
-      };
-      if ($el.is('img')) {
-        videoSource = $el.attr('src');
-        imageAltText = $el.attr('alt');
-      } else {
-        videoSource = '';
-        imageAltText = '';
-      }
-      dialog.find('[name=alt]').val(imageAltText);
-      console.debug('Checking');
-      if (checkURL(videoSource)) {
-        console.debug('Checked');
-        $uploadUrl.val(videoSource);
-        $uploadUrl.show();
-      }
-      getEmbedder = function(url) {
-        var embedder, _i, _len;
-        for (_i = 0, _len = embedders.length; _i < _len; _i++) {
-          embedder = embedders[_i];
-          if (embedder.url_validator(url)) return embedder;
-        }
-        return false;
-      };
-      setvideoSource = function(href) {
-        videoSource = href;
-        return $submit.removeClass('disabled');
-      };
-      getEmbedEle = function(url) {
-        var video;
-        if (!(embedder = getEmbedder(url))) {
-          console.debug("Error: URL not supported");
-          dialog.modal('hide');
-        }
-        video = jQuery(embedder.embed_code_gen(url));
-        video.attr('alt', dialog.find('[name=alt]').val());
-        return video;
-      };
-      loadLocalFile = function(file, $img, callback) {
-        var reader;
-        reader = new FileReader();
-        reader.onloadend = function() {
-          if ($img) $img.attr('src', reader.result);
-          setvideoSource(reader.result);
-          if (callback) return callback(reader.result);
-        };
-        return reader.readAsDataURL(file);
-      };
-      dialog.find('.upload-image-link').on('click', function(evt) {
-        evt.preventDefault();
-        $placeholder.hide();
-        $uploadUrl.hide();
-        return console.debug('Hiding placeholder url');
-      });
-      dialog.find('.upload-url-link').on('click', function(evt) {
-        evt.preventDefault();
-        $placeholder.hide();
-        return $uploadUrl.show();
-      });
-      $uploadUrl.on('change', function() {
-        var $previewImg, url;
-        $previewImg = $placeholder.find('img');
-        url = $uploadUrl.val();
-        setvideoSource(url);
-        console.debug('changing');
-        if (settings.image.preview) {
-          $previewImg.attr('src', url);
-          return $placeholder.show();
-        }
-      });
-      deferred = $.Deferred();
-      dialog.on('submit', function(evt) {
-        var video;
-        evt.preventDefault();
-        if ($el.is('img')) {
-          $el.attr('src', videoSource);
-          return $el.attr('alt', dialog.find('[name=alt]').val());
-        } else {
-          console.debug("Embedding the video");
-          video = getEmbedEle(videoSource);
-          $el.replaceWith(video);
-          return dialog.modal('hide');
-        }
-      });
-      dialog.on('click', '.btn.action.cancel', function(evt) {
-        evt.preventDefault();
-        deferred.reject({
-          target: $el[0]
-        });
-        return dialog.modal('hide');
-      });
-      dialog.on('hidden', function(event) {
-        if (deferred.state() === 'pending') {
-          deferred.reject({
-            target: $el[0]
-          });
-        }
-        return dialog.remove();
-      });
-      return jQuery.extend(true, deferred.promise(), {
-        show: function(title) {
-          if (title) dialog.find('.modal-header h3').text(title);
-          return dialog.modal('show');
-        }
-      });
-    };
-    selector = 'img';
-    populator = function($el, pover) {
-      var $bubble, editable, href;
-      editable = Aloha.activeEditable;
-      $bubble = jQuery('<div class="link-popover-details">\n    <a class="change">\n      <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/edit-link-03.png" />\n  <span title="Change the image\'s properties">Edit image...</span>\n</a>\n&nbsp; | &nbsp;\n<a class="remove">\n  <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/unlink-link-02.png" />\n      <span title="Delete the image">Delete</span>\n    </a>\n</div>');
-      href = $el.attr('src');
-      $bubble.find('.change').on('click', function() {
-        var promise;
-        Aloha.activeEditable = editable;
-        promise = showModalDialog($el);
-        promise.done(function(data) {
-          if (data.files.length) {
-            jQuery(data.target).addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              return jQuery(data.target).attr('src', url).removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        return promise.show('Edit image');
-      });
-      $bubble.find('.remove').on('click', function() {
-        pover.stopOne($el);
-        return $el.remove();
-      });
-      return $bubble.contents();
-    };
-    uploadImage = function(file, callback) {
-      var f, plugin, settings, xhr;
-      plugin = this;
-      settings = Aloha.require('assorted/assorted-plugin').settings;
-      xhr = new XMLHttpRequest();
-      if (xhr.upload) {
-        if (!settings.image.uploadurl) throw new Error("uploadurl not defined");
-        xhr.onload = function() {
-          var url;
-          if (settings.image.parseresponse) {
-            url = parseresponse(xhr);
-          } else {
-            url = JSON.parse(xhr.response).url;
-          }
-          return callback(url);
-        };
-        xhr.open("POST", settings.image.uploadurl, true);
-        xhr.setRequestHeader("Cache-Control", "no-cache");
-        f = new FormData();
-        f.append(settings.image.uploadfield || 'upload', file, file.name);
-        return xhr.send(f);
-      }
-    };
-    Aloha.bind('aloha-image-selected', function(event, target) {
-      var $el, nodes;
-      $el = jQuery(target);
-      nodes = jQuery(Aloha.activeEditable.obj).find(selector);
-      nodes = nodes.not($el);
-      nodes.trigger('hide');
-      $el.trigger('show');
-      $el.data('aloha-bubble-selected', true);
-      return $el.off('.bubble');
-    });
-    UI.adopt('insertVideo-oer', null, {
-      click: function() {
-        var newEl, promise;
-        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
-        GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
-        promise = showModalDialog(newEl);
-        promise.done(function(data) {
-          if (data.files.length) {
-            newEl.addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              jQuery(data.target).attr('src', url);
-              return newEl.removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        promise.fail(function(data) {
-          var $target;
-          $target = jQuery(data.target);
-          if (!$target.is('img')) return $target.remove();
-        });
-        return promise.show();
-      }
-    });
-    return {
-      selector: selector,
-      populator: populator
-    };
-  });
-
-}).call(this);
diff --git a/src/plugins/oerpub/video/js/embed.js b/src/plugins/oerpub/video/js/embed.js
deleted file mode 100644
index c5bcfce202..0000000000
--- a/src/plugins/oerpub/video/js/embed.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function ytVidId(url) {
-    var p = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
-    return (url.match(p)) ? RegExp.$1 : false;
-}
-
-function test(url) {
-	test_url = http://www.youtube.com/watch?v=_K46OCFPjHU;
-	console.log(ytVidId(url));
-}

From 873fc863c6822c6f0c4826dae9621100509dfa27 Mon Sep 17 00:00:00 2001
From: Max <jmg3@jmg3-HP-ProBook-6475b.(none)>
Date: Wed, 3 Apr 2013 15:46:16 -0500
Subject: [PATCH 27/67] Correct image for video button

---
 oerpub/css/toolbar.css | 10 ++++++++++
 oerpub/index.html      |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/oerpub/css/toolbar.css b/oerpub/css/toolbar.css
index 8ec451e7a0..eefc59bd7d 100644
--- a/oerpub/css/toolbar.css
+++ b/oerpub/css/toolbar.css
@@ -113,6 +113,9 @@ figure figcaption::before {
 .toolbar .icon-image-insert {
   background-position: -122px 0;
 }
+.toolbar .icon-video-insert {
+  background-position: -617px 0;
+}
 .toolbar .icon-link-insert {
   background-position: -188px 0;
 }
@@ -204,6 +207,13 @@ figure figcaption::before {
 .toolbar .btn-group > .btn.active .icon-image-insert {
   background-position: -122px -66px;
 }
+.toolbar .btn-group > .btn:hover .icon-video-insert,
+.toolbar .btn-group > .btn:focus .icon-video-insert,
+.toolbar .btn-group > .btn:active .icon-video-insert,
+.toolbar .btn-group > .btn.active .icon-video-insert {
+  background-position: -617px -66px;
+}
+
 .toolbar .btn-group > .btn:hover .icon-link-insert,
 .toolbar .btn-group > .btn:focus .icon-link-insert,
 .toolbar .btn-group > .btn:active .icon-link-insert,
diff --git a/oerpub/index.html b/oerpub/index.html
index 7c9b74dd5a..6b6ae19728 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -339,7 +339,7 @@
                       <span class="separator"> </span>
                       <div class="btn-group">
                         <button class="btn action insertImage-oer" rel="tooltip" title="Insert Image"><i class="icon-image-insert"></i></button>
-                        <button class="btn action insertVideo-oer" rel="tooltip" title="Insert Video"><i class="icon-image-insert"></i></button>
+                        <button class="btn action insertVideo-oer" rel="tooltip" title="Insert Video"><i class="icon-video-insert"></i></button>
                         <button class="btn action createTable" rel="tooltip" title="Create Table"><i class="icon-table-insert"></i></button>
                         <button class="btn dropdown-toggle" data-toggle="dropdown" rel="tooltip" title="Table Operations">
                           <span class="caret"></span>

From f5d307eb4187e16749d21bf8a71eeea823e8bf68 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 3 Apr 2013 16:01:13 -0500
Subject: [PATCH 28/67] CHECK: Committing current changes, Max doesn't see the
 changes

---
 src/demo/imageribbon/aloha-helper.js          |   1 +
 src/demo/imageribbon/gpickerdialog.js         |  29 +-
 src/plugins/oer/assorted/lib/aloha-helper.js  |  14 +
 .../oer/assorted/lib/assorted-plugin.js       |   4 +-
 .../oer/assorted/lib/gpicker_index.html       | 303 ++++++++++++++++++
 src/plugins/oer/assorted/lib/gpickerdialog.js |   3 +
 src/plugins/oer/assorted/lib/image-dialog.js  |  24 ++
 .../oer/assorted/lib/lib/assorted-plugin.js   |  23 ++
 src/plugins/oer/assorted/lib/lib/image.js     |   0
 src/plugins/oer/assorted/lib/lib/video.js     | 253 +++++++++++++++
 src/plugins/oer/assorted/lib/trash.js         | 227 +++++++++++++
 src/plugins/oer/assorted/lib/video.coffee     |   1 +
 src/plugins/oer/assorted/lib/video.js         |  52 +--
 13 files changed, 878 insertions(+), 56 deletions(-)
 create mode 100644 src/plugins/oer/assorted/lib/aloha-helper.js
 create mode 100755 src/plugins/oer/assorted/lib/gpicker_index.html
 create mode 100644 src/plugins/oer/assorted/lib/image-dialog.js
 create mode 100644 src/plugins/oer/assorted/lib/lib/assorted-plugin.js
 create mode 100644 src/plugins/oer/assorted/lib/lib/image.js
 create mode 100644 src/plugins/oer/assorted/lib/lib/video.js
 create mode 100644 src/plugins/oer/assorted/lib/trash.js

diff --git a/src/demo/imageribbon/aloha-helper.js b/src/demo/imageribbon/aloha-helper.js
index 05afa74dfe..308446f9c5 100644
--- a/src/demo/imageribbon/aloha-helper.js
+++ b/src/demo/imageribbon/aloha-helper.js
@@ -1,6 +1,7 @@
 // Insert custom HTML into dom tree at the current cursor position of Aloha editor
 // used this as template: https://github.com/michaelperrin/sfAlohaPlugin/blob/cc320dcc984bcf7a2b54bb0191276679eb951742/web/js/aloha-plugins/image-upload/lib/image-upload-plugin.js#L106
 function AlohaInsertIntoDom(code) {
+	console.log("Trying to insert into the DOM");
     var range = Aloha.Selection.getRangeObject();
 
         GENTICS.Utils.Dom.insertIntoDOM(
diff --git a/src/demo/imageribbon/gpickerdialog.js b/src/demo/imageribbon/gpickerdialog.js
index 6df9011563..b2adf4bda9 100644
--- a/src/demo/imageribbon/gpickerdialog.js
+++ b/src/demo/imageribbon/gpickerdialog.js
@@ -1,5 +1,6 @@
 // Google Picker for uploading images
 function newImagePicker() {
+    console.log("Creating new image Picker");
     google.load('picker', '1', {"callback" : createImagePicker});
 }       
 
@@ -34,25 +35,15 @@ function ImagePickerCallback(data) {
 
         var img = Aloha.jQuery("<img />").attr("src", image_url);
         AlohaInsertIntoDom(img);
+        console.log("Inserting into Dom from ImagePickerCallback");
     }
 }
 
 // Google Picker for uploading videos
 function newVideoPicker() {
+    console.log("Creating new video Picker in newVideoPicker");
     google.load('picker', '1', {"callback" : createVideoPicker});
 }
-
-function createVideoPicker() {
-    var picker = new google.picker.PickerBuilder().
-        addView(new google.picker.VideoSearchView().
-            setSite(google.picker.VideoSearchView.YOUTUBE)).
-        addView(google.picker.ViewId.YOUTUBE).
-        addView(new google.picker.WebCamView()).
-        setCallback(VideoPickerCallback).
-        build();
-    picker.setVisible(true);
-}
-
 // A simple callback implementation for Picker.
 function VideoPickerCallback(data) {
     if(data.action == google.picker.Action.PICKED){
@@ -62,6 +53,20 @@ function VideoPickerCallback(data) {
         embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
         var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true"></embed></object>');
         var embed_code = Aloha.jQuery(embed_code_template).find('embed').attr('src', embed_url);
+        console.log("Inserting into Dom from VideoPickerCallback");
         AlohaInsertIntoDom(embed_code);
     }
 }
+
+function createVideoPicker() {
+    console.log("Creating new video Picker");
+    var picker = new google.picker.PickerBuilder().
+        addView(new google.picker.VideoSearchView().
+            setSite(google.picker.VideoSearchView.YOUTUBE)).
+        addView(google.picker.ViewId.YOUTUBE).
+        addView(new google.picker.WebCamView()).
+        setCallback(VideoPickerCallback).
+        build();
+        console.log("Created video Picker and set call back");
+    picker.setVisible(true);
+}
\ No newline at end of file
diff --git a/src/plugins/oer/assorted/lib/aloha-helper.js b/src/plugins/oer/assorted/lib/aloha-helper.js
new file mode 100644
index 0000000000..308446f9c5
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/aloha-helper.js
@@ -0,0 +1,14 @@
+// Insert custom HTML into dom tree at the current cursor position of Aloha editor
+// used this as template: https://github.com/michaelperrin/sfAlohaPlugin/blob/cc320dcc984bcf7a2b54bb0191276679eb951742/web/js/aloha-plugins/image-upload/lib/image-upload-plugin.js#L106
+function AlohaInsertIntoDom(code) {
+	console.log("Trying to insert into the DOM");
+    var range = Aloha.Selection.getRangeObject();
+
+        GENTICS.Utils.Dom.insertIntoDOM(
+            code,
+            range,
+            Aloha,
+            true
+        );
+        range.select();
+}
\ No newline at end of file
diff --git a/src/plugins/oer/assorted/lib/assorted-plugin.js b/src/plugins/oer/assorted/lib/assorted-plugin.js
index 9c2751fe63..5f8e0e7b15 100644
--- a/src/plugins/oer/assorted/lib/assorted-plugin.js
+++ b/src/plugins/oer/assorted/lib/assorted-plugin.js
@@ -1,13 +1,11 @@
-// Generated by CoffeeScript 1.3.3
 
 /*
 Register a couple of assorted oer plugins
 */
 
-
 (function() {
 
-  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) {
+  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './video', './gpickerdialog', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, videoConfig, gpickerConfig, figureConfig, figcaptionConfig) {
     return Plugin.create('assorted', {
       defaultSettings: {
         image: {
diff --git a/src/plugins/oer/assorted/lib/gpicker_index.html b/src/plugins/oer/assorted/lib/gpicker_index.html
new file mode 100755
index 0000000000..da2c71482c
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/gpicker_index.html
@@ -0,0 +1,303 @@
+<!doctype html>
+<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
+<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"> <![endif]-->
+<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"> <![endif]-->
+<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"> <![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" class="no-js"> <!--<![endif]-->
+<head>
+	<title>The Aloha Editor Boilerplate - Just another demo page</title>
+
+	<meta charset="UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="description" content="The Aloha Editor Boilerplate - Just another demo page">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel="shortcut icon" href="/favicon.ico">
+	<link rel="apple-touch-icon" href="/apple-touch-icon.png">
+
+	<!--
+		Load the CSS styles for Aloha Editor
+	-->
+	<link rel="stylesheet" href="../../css/aloha.css" type="text/css">
+
+	<link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css" type="text/css">
+
+	<style>
+		/* Basic Styling for Sidebar */
+		.aloha-sidebar {
+		  position: fixed;
+		  right: 0;
+		  top: 0;
+		  width: 250px;
+		  height: 100%;
+		  border: 1px solid #000;
+		  border-width: 0 0 0 1px;
+		  background-color: #fff;
+		  padding: 10px;
+		}
+
+		.aloha-panel {
+		  border: 1px solid #000;
+		}
+
+		.aloha-panel-title {
+		  background-color: #000;
+		  color: #fff;
+		  padding: 5px 10px;
+		}
+
+		.aloha-panel-content {
+		 padding: 5px 10px;
+		}
+	</style>
+
+	<!--
+		All configuration for Aloha Editor for this demo is stored in js/aloha-config.js
+		It can also be placed inline here before loading Aloha Editor itself.
+	-->
+	<script src="js/aloha-config.js"></script>
+	<script src="../../lib/vendor/jquery-1.7.2.js"></script>
+	<script src="../../lib/require.js"></script>
+    <script>
+		Aloha.settings.jQuery = $.noConflict(true);
+    </script>
+	<!--
+		Load the Aloha Editor library.
+		The plugin list could also be added to the configuration.
+	-->
+	<script src="../../lib/aloha.js"
+	        data-aloha-plugins="common/ui,
+	                            common/format,
+	                            common/table,
+	                            common/list,
+	                            common/link,
+	                            common/highlighteditables,
+	                            common/undo,
+	                            common/contenthandler,
+	                            common/paste,
+	                            common/characterpicker,
+	                            common/commands,
+	                            common/block,
+	                            common/image,
+	                            common/abbr,
+	                            common/horizontalruler,
+	                            common/align,
+	                            extra/formatlesspaste,
+	                            extra/toc,
+	                            extra/headerids,
+	                            extra/listenforcer,
+	                            extra/metaview,
+	                            extra/numerated-headers,
+	                            extra/ribbon,
+	                            extra/wai-lang,
+	                            extra/flag-icons,
+	                            extra/linkbrowser,
+	                            extra/imagebrowser,
+	                            extra/cite"></script>
+	<!--
+		Application specific code
+	-->
+	<script src="http://www.google.com/jsapi"></script>
+	<script src="gpickerdialog.js"></script>
+	<script src="image-dialog.js"></script>
+	<script src="aloha-helper.js"></script>
+
+    <script src="ribbon-example.js"></script>
+	<link rel="stylesheet" href="css/style.css">
+	<script src="js/aloha-boilerplate.js"></script>
+</head>
+<body>
+	<div id="whole-site">
+		<div id="aloha-loading"><span>Loading Aloha Editor</span> <img src="img/loading1.gif" title="Loading Aloha Editor ..."/></div>
+		<div id="container">
+			<div id="header">
+				<a id="editor-logo" href="#"><img src="img/aloha-editor-logo.png" alt="Aloha Editor" /></a>
+				<p id="top-text">The Aloha Boilerplate.</p>
+			</div>
+			<div id="navigation">
+				<ul>
+					<li><a href="#">formatting</a></li>
+					<li><a href="#">images</a></li>
+					<li><a href="#">tables</a></li>
+					<li><a href="#">boxes</a></li>
+					<li><a href="#">comments</a></li>
+				</ul>
+			</div>
+			<div id="main" role="main">
+			<!-- Stage area start -->
+				<div class="stage-area">
+					<ul class="stage-switcher">
+						<li class="stage">
+							<span class="stage-icon" style="background-image: url(img/stage-icon-formats.png);"></span>
+							<h2>Formatting</h2>
+							<p>Bold, headlines, ...</p>
+							<div class="small-image stage-item">
+								<img src="img/stage-bg-formats.png" alt="" />
+								<div class="area-content">
+									<div class="aloha-textbox">
+									<p><b>Bold or headlines, whatever you might want</b></p>
+									<h2>Formatting content</h2>
+									<p>Editing any content with Aloha Editor is similar to editing with state of the art word processors on your desktop. No need to learn any HTML, Wiki or other markup language. The option dialogs have been designed for users not for techies. Writing content has never been that easy.</p>
+									<p><a href="#">More about content formatting</a></p>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li class="stage">
+							<span class="stage-icon" style="background-image: url(img/stage-icon-images.png);"></span>
+							<h2>Images</h2>
+							<p>Placing, scaling ...</p>
+							<div class="full-image stage-item">
+								<img src="img/stage-bg-images.png" alt="" />
+								<div class="area-content">
+									<h3>Place and edit images with Aloha</h3>
+									<h2>Image-Editing</h2>
+									<p><img src="http://aloha-editor.org/logo/Aloha%20Editor%20HTML5%20sticker%20transparent%20128.png" title="Aloha Editor" alt="Aloha Editor" /> Editing any content with Aloha Editor is similar to editing with state of the art word processors on your desktop. No need to learn any HTML, Wiki or other markup language. The option dialogs have been designed for users not for techies. Writing content has never been that easy.</p>
+									<p><a href="#">Digg into placing/editing of images</a></p>
+								</div>
+							</div>
+						</li>
+						<li class="stage">
+							<span class="stage-icon" style="background-image: url(img/stage-icon-tables.png);"></span>
+							<h2>Tables</h2>
+							<p>All you might put into tables</p>
+							<div class="full-image stage-item">
+								<img src="img/stage-bg-tables.png" alt="" />
+								<div class="area-content">
+									<h3>Create and edit tables the way you want them to be</h3>
+									<h2>Table Stuff</h2>
+									<p>Editing any content with Aloha Editor is similar to editing with state of the art word processors on your desktop. No need to learn any HTML, Wiki or other markup language. The option dialogs have been designed for users not for techies. Writing content has never been that easy.</p>
+									<p><a href="#">Try out table editing</a></p>
+								</div>
+							</div>
+						</li>
+						<li class="stage">
+							<span class="stage-icon" style="background-image: url(img/stage-icon-boxes.png);"></span>
+							<h2>Boxes</h2>
+							<p>You may edit dynamic boxes</p>
+							<div class="full-image stage-item">
+								<img src="img/stage-bg-boxes.png" alt="" />
+								<div class="area-content">
+									<h3>You can edit dynamic content</h3>
+									<h2>Edit jQuery stuff</h2>
+									<p>Your imagination ist the limit. Edit every content even if it is dynamic.</p>
+									<p><a href="#">Try out jQuery boxes</a></p>
+								</div>
+							</div>
+						</li>
+						<li class="stage">
+							<span class="stage-icon" style="background-image: url(img/stage-icon-comments.png);"></span>
+							<h2>Comments</h2>
+							<p>threaded inline comments</p>
+							<div class="full-image stage-item">
+								<img src="img/stage-bg-comments.png" alt="" />
+								<div class="area-content">
+									<h3>Threaded inline enterprise commenting</h3>
+									<h2>Increase collaboration</h2>
+									<p>Your imagination ist the limit. Does more content fill the box and move it to the right?</p>
+									<p><a href="#">Try out jQuery boxes</a></p>
+								</div>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<!-- Stage area end -->
+				<div id="content">
+					<p>Here you'll find some <b>example content</b> to show Aloha's <i>possibilities</i> regarding any kind of formatting.</p>
+					<h1>Headline 1</h1>
+					<h2>Headline 2</h2>
+					<h3>Headline 3</h3>
+					<h4>Headline 4</h4>
+					<h5>Headline 5</h5>
+					<h6>Headline 6</h6>
+					<p>Here we test, a <a title="" href="http://aloha-editor.org">link</a> and other formattings such as 
+					<b>bold</b>, <i>italic</i> or <del>deleted text</del>. You may also use formattings for maths 2
+					<sup>2</sup> = 4 or chemical formulas like CO<sub>2</sub>.
+					Or you may edit tables as you do in office products.</p>
+					<table summary="demo content for aloha tables">
+						<tbody>
+							<tr><td >This</td><td >is</td><td>a</td><td>demo</td></tr>
+							<tr><td>table</td><td colspan=2 rowspan=2>with</td><td>an</td></tr>
+							<tr><td>awesome</td><td>column</td></tr>
+							<tr><td>and</td><td>row</td><td>span</td><td>!</td></tr>
+						</tbody>
+						<caption>describe the table</caption>
+					</table>
+					<p>To describe code you would use fixed style <i>pre</i></p>
+					<pre>
+&lt;script&gt;
+	// make content editable
+	$('#content').aloha();
+	$('.top-text').aloha();
+&lt;/script&gt;
+					</pre>
+					<ul>
+						<li>List entry
+							<ul>
+								<li>List entry</li>
+								<li>List entry
+									<ul>
+										<li>List entry</li>
+										<li>List entry</li>
+									</ul>
+								</li>
+							</ul>
+						</li>
+						<li>List entry</li>
+						<li>List entry</li>
+						<li>List entry</li>
+					</ul>
+					<p><br/></p>
+					<ol>
+						<li>List entry
+							<ol>
+								<li>List entry</li>
+								<li>List entry
+									<ol>
+										<li>List entry</li>
+										<li>List entry</li>
+									</ol>
+								</li>
+							</ol>
+						</li>
+						<li>List entry</li>
+						<li>List entry</li>
+						<li>List entry</li>
+					</ol>
+					<p>For better sematical understanding and <abbr title="Web Accessibility Initiative">WAI</abbr> compatibility you can describe abbreviations
+					like <abbr title="Hyper Text Markup Language">HTML</abbr> and 
+					<abbr title="Cascading Style Sheets">CSS</abbr>.
+					</p>
+					<p><img class="inline-image" src="http://aloha-editor.org/logo/Aloha%20Editor%20HTML5%20technology%20128.png" alt="Aloha Editor" title="Aloha Editor" /></p>
+					<p>More Demos: <a href="http://aloha-editor.org/demos/" title="Aloha Editor Demos"> http://aloha-editor.org/demos/</a></p>
+				</div>
+				
+				<div id="references">
+					<img src="http://aloha-editor.org/logo/Aloha%20Editor%20logo%20text%20128.png" alt="Aloha Editor" title="Aloha Editor" /><br />
+					&middot; Ask a <a href="http://getsatisfaction.com/aloha_editor">question</a><br />
+					&middot; Read the <a href="http://aloha-editor.org/guides">guides</a><br />
+					&middot; Report an <a href="https://github.com/alohaeditor/Aloha-Editor/issues">issue</a><br />
+					<br />
+					Aloha Editor <a href="http://aloha-editor.org">website</a><br />
+				</div>
+			</div>
+		</div>
+		
+		<script type="text/javascript">
+			Aloha.ready( function(){
+				var $ = Aloha.jQuery;
+				// register all editable areas
+				$('#top-text').aloha();
+				$('#content').aloha();
+				$('.area-content').aloha();
+				// hide loading div
+				$('#aloha-loading').hide();
+				$('#aloha-loading span').html('Loading Plugins');
+			});
+		</script>
+	</div>
+	<!--[if lt IE 7 ]>
+	<script src="js/libs/dd_belatedpng.js"></script>
+	<script> DD_belatedPNG.fix('img, .png_bg');</script>
+	<![endif]-->
+</body>
+</html>
diff --git a/src/plugins/oer/assorted/lib/gpickerdialog.js b/src/plugins/oer/assorted/lib/gpickerdialog.js
index c0a6b6d1b1..0182298c21 100644
--- a/src/plugins/oer/assorted/lib/gpickerdialog.js
+++ b/src/plugins/oer/assorted/lib/gpickerdialog.js
@@ -61,6 +61,9 @@ function VideoPickerCallback(data) {
         // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
         embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
         var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></embed></object>');
+        // var embed_code_template = Aloha.jQuery('<div class="multimedia-video"><iframe width="640" height="360" src="" wmode="transparent" frameborder="0" allowfullscreen></iframe></div>');
+        // var embed_code_template = Aloha.jQuery('<object width="420" height="360"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><iframe src="" type="application/x-shockwave-flash" width="560" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></iframe></object>');
+        //TODO Replace this to ensure only the specific video is changed
         var embed_code = Aloha.jQuery(embed_code_template).find('embed').attr('src', embed_url);
         AlohaInsertIntoDom(embed_code);
     }
diff --git a/src/plugins/oer/assorted/lib/image-dialog.js b/src/plugins/oer/assorted/lib/image-dialog.js
new file mode 100644
index 0000000000..2e6a493bf1
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/image-dialog.js
@@ -0,0 +1,24 @@
+function createWysiwhatImagePicker() {
+    var $dialog = Aloha.jQuery('<div></div')
+            .html('<p>Insert a URL</p><form><fieldset><label>URL: </label><input type="text" id="url" class="text ui-widget-content ui-corner-all"/></fieldset></form>')
+            .dialog({
+                autoOpen: false,
+                title: 'WYSIWHAT Image Picker',
+                buttons : {
+                    "Ok" : function() {
+                        Aloha.jQuery(this).dialog("close");
+                        var img = Aloha.jQuery("<img />").attr("src", Aloha.jQuery(this).find("#url").val());
+                        AlohaInsertIntoDom(img);
+                    },
+                    "Cancel" : Aloha.jQuery.extend(function() {
+                        Aloha.jQuery(this).dialog("close");
+                    }, {
+                        classes : 'dismiss'
+                    })
+                }                
+            });
+
+    $dialog.dialog('open');
+    // prevent the default action, e.g., following a link
+    return false;
+}
\ No newline at end of file
diff --git a/src/plugins/oer/assorted/lib/lib/assorted-plugin.js b/src/plugins/oer/assorted/lib/lib/assorted-plugin.js
new file mode 100644
index 0000000000..7259a9bf99
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/lib/assorted-plugin.js
@@ -0,0 +1,23 @@
+
+/*
+Register a couple of assorted oer plugins
+*/
+
+(function() {
+
+  define(['aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) {
+    return Plugin.create('assorted', {
+      defaultSettings: {
+        image: {
+          preview: true
+        }
+      },
+      init: function() {
+        this.settings = $.extend(true, this.defaultSettings, this.settings);
+        Popover.register(linkConfig);
+        return Popover.register(imageConfig);
+      }
+    });
+  });
+
+}).call(this);
diff --git a/src/plugins/oer/assorted/lib/lib/image.js b/src/plugins/oer/assorted/lib/lib/image.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/plugins/oer/assorted/lib/lib/video.js b/src/plugins/oer/assorted/lib/lib/video.js
new file mode 100644
index 0000000000..34e216c5fe
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/lib/video.js
@@ -0,0 +1,253 @@
+(function() {
+
+  define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
+    var DIALOG_HTML, WARNING_IMAGE_PATH, checkURL, embedder, embedders, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
+    embedder = function(url_validator, embed_code_generator) {
+      var result, set_embed_code_generator, set_url_validator;
+      this.embed_code_gen = embed_code_generator;
+      this.url_validator = url_validator;
+      embed_code_generator = function(url) {
+        var embed_html;
+        embed_html = '<p> Hello World </p>';
+        return 'Validates a URL. Returns video id if URL is valide. Else returns false.\nShould be replaced with actual function. The default validates youtube URLs';
+      };
+      url_validator = function(url) {
+        var regexp, result;
+        regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
+        return result = url.match(regexp) ? RegExp.$1 : false;
+      };
+      set_embed_code_generator = function(url) {
+        return this.embed_code_gen = embed_code_generator;
+      };
+      set_url_validator = function(url) {
+        return this.url_validator = url_validator;
+      };
+      return result = this;
+    };
+    youtube_url_validator = function(url) {
+      var regexp, result;
+      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
+      return result = url.match(regexp) ? RegExp.$1 : false;
+    };
+    youtube_embed_code_generator = function(url) {
+      var embed_html, video_id;
+      video_id = youtube_url_validator(url);
+      embed_html = '';
+      if (video_id) {
+        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>';
+      }
+      return embed_html;
+    };
+    youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator);
+    embedders = [];
+    embedders[0] = youtube_embedder;
+    console.debug('initializing');
+    checkURL = function(url) {
+      var embedder, _i, _len;
+      for (_i = 0, _len = embedders.length; _i < _len; _i++) {
+        embedder = embedders[_i];
+        if (embedder.url_validator(url)) return true;
+      }
+      return false;
+    };
+    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    showModalDialog = function($el) {
+      var $placeholder, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
+        _this = this;
+      settings = Aloha.require('assorted/assorted-plugin').settings;
+      root = Aloha.activeEditable.obj;
+      dialog = jQuery(DIALOG_HTML);
+      $placeholder = dialog.find('.placeholder.preview');
+      $uploadUrl = dialog.find('.upload-url-input');
+      $submit = dialog.find('.action.insert');
+      dialog.find("#video-url-input")[0].onkeyup = function(event) {
+        var currentVal, target, valid;
+        target = event.currentTarget;
+        currentVal = target.value;
+        valid = checkURL(currentVal);
+        if (valid) {
+          target.style.borderColor = 'green';
+          return target.style.borderWidth = 'medium';
+        } else {
+          target.style.borderColor = 'red';
+          return target.style.borderWidth = 'medium';
+        }
+      };
+      if ($el.is('img')) {
+        videoSource = $el.attr('src');
+        imageAltText = $el.attr('alt');
+      } else {
+        videoSource = '';
+        imageAltText = '';
+      }
+      dialog.find('[name=alt]').val(imageAltText);
+      console.debug('Checking');
+      if (checkURL(videoSource)) {
+        console.debug('Checked');
+        $uploadUrl.val(videoSource);
+        $uploadUrl.show();
+      }
+      getEmbedder = function(url) {
+        var embedder, _i, _len;
+        for (_i = 0, _len = embedders.length; _i < _len; _i++) {
+          embedder = embedders[_i];
+          if (embedder.url_validator(url)) return embedder;
+        }
+        return false;
+      };
+      setvideoSource = function(href) {
+        videoSource = href;
+        return $submit.removeClass('disabled');
+      };
+      getEmbedEle = function(url) {
+        var video;
+        if (!(embedder = getEmbedder(url))) {
+          console.debug("Error: URL not supported");
+          dialog.modal('hide');
+        }
+        video = jQuery(embedder.embed_code_gen(url));
+        video.attr('alt', dialog.find('[name=alt]').val());
+        return video;
+      };
+      loadLocalFile = function(file, $img, callback) {
+        var reader;
+        reader = new FileReader();
+        reader.onloadend = function() {
+          if ($img) $img.attr('src', reader.result);
+          setvideoSource(reader.result);
+          if (callback) return callback(reader.result);
+        };
+        return reader.readAsDataURL(file);
+      };
+      dialog.find('.upload-image-link').on('click', function(evt) {
+        evt.preventDefault();
+        $placeholder.hide();
+        $uploadUrl.hide();
+        return console.debug('Hiding placeholder url');
+      });
+      dialog.find('.upload-url-link').on('click', function(evt) {
+        evt.preventDefault();
+        $placeholder.hide();
+        return $uploadUrl.show();
+      });
+      $uploadUrl.on('change', function() {
+        var $previewImg, url;
+        $previewImg = $placeholder.find('img');
+        url = $uploadUrl.val();
+        setvideoSource(url);
+        console.debug('changing');
+        if (settings.image.preview) {
+          $previewImg.attr('src', url);
+          return $placeholder.show();
+        }
+      });
+      deferred = $.Deferred();
+      dialog.on('submit', function(evt) {
+        var video;
+        evt.preventDefault();
+        if ($el.is('img')) {
+          $el.attr('src', videoSource);
+          return $el.attr('alt', dialog.find('[name=alt]').val());
+        } else {
+          console.debug("Embedding the video");
+          video = getEmbedEle(videoSource);
+          $el.replaceWith(video);
+          return dialog.modal('hide');
+        }
+      });
+      dialog.on('click', '.btn.action.cancel', function(evt) {
+        evt.preventDefault();
+        deferred.reject({
+          target: $el[0]
+        });
+        return dialog.modal('hide');
+      });
+      dialog.on('hidden', function(event) {
+        if (deferred.state() === 'pending') {
+          deferred.reject({
+            target: $el[0]
+          });
+        }
+        return dialog.remove();
+      });
+      return jQuery.extend(true, deferred.promise(), {
+        show: function(title) {
+          if (title) dialog.find('.modal-header h3').text(title);
+          return dialog.modal('show');
+        }
+      });
+    };
+    selector = 'img';
+    populator = function($el, pover) {
+      var $bubble, editable, href;
+      editable = Aloha.activeEditable;
+      $bubble = jQuery('<div class="link-popover-details">\n    <a class="change">\n      <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/edit-link-03.png" />\n  <span title="Change the image\'s properties">Edit image...</span>\n</a>\n&nbsp; | &nbsp;\n<a class="remove">\n  <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/unlink-link-02.png" />\n      <span title="Delete the image">Delete</span>\n    </a>\n</div>');
+      href = $el.attr('src');
+      $bubble.find('.change').on('click', function() {
+        var promise;
+        Aloha.activeEditable = editable;
+        promise = showModalDialog($el);
+        promise.done(function(data) {
+          if (data.files.length) {
+            jQuery(data.target).addClass('aloha-image-uploading');
+            return uploadImage(data.files[0], function(url) {
+              return jQuery(data.target).attr('src', url).removeClass('aloha-image-uploading');
+            });
+          }
+        });
+        return promise.show('Edit image');
+      });
+      $bubble.find('.remove').on('click', function() {
+        pover.stopOne($el);
+        return $el.remove();
+      });
+      return $bubble.contents();
+    };
+    uploadImage = function(file, callback) {
+      var f, plugin, settings, xhr;
+      plugin = this;
+      settings = Aloha.require('assorted/assorted-plugin').settings;
+      xhr = new XMLHttpRequest();
+      if (xhr.upload) {
+        if (!settings.image.uploadurl) throw new Error("uploadurl not defined");
+        xhr.onload = function() {
+          var url;
+          if (settings.image.parseresponse) {
+            url = parseresponse(xhr);
+          } else {
+            url = JSON.parse(xhr.response).url;
+          }
+          return callback(url);
+        };
+        xhr.open("POST", settings.image.uploadurl, true);
+        xhr.setRequestHeader("Cache-Control", "no-cache");
+        f = new FormData();
+        f.append(settings.image.uploadfield || 'upload', file, file.name);
+        return xhr.send(f);
+      }
+    };
+    Aloha.bind('aloha-image-selected', function(event, target) {
+      var $el, nodes;
+      $el = jQuery(target);
+      nodes = jQuery(Aloha.activeEditable.obj).find(selector);
+      nodes = nodes.not($el);
+      nodes.trigger('hide');
+      $el.trigger('show');
+      $el.data('aloha-bubble-selected', true);
+      return $el.off('.bubble');
+    });
+    UI.adopt('insertVideo-oer', null, {
+      click: function() {
+        var newEl;
+        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
+        return newVideoPicker();
+      }
+    });
+    return {
+      selector: selector,
+      populator: populator
+    };
+  });
+
+}).call(this);
diff --git a/src/plugins/oer/assorted/lib/trash.js b/src/plugins/oer/assorted/lib/trash.js
new file mode 100644
index 0000000000..302c583880
--- /dev/null
+++ b/src/plugins/oer/assorted/lib/trash.js
@@ -0,0 +1,227 @@
+Aloha.ready(function(){
+	if (!Aloha.isPluginLoaded('ribbon')) {
+		return;
+	}
+    Aloha.require(["ribbon/ribbon-plugin", "ui/ui", "ui/menuButton", 'ui/dialog'], function(Ribbon, Ui, MenuButton, Dialog){
+
+		Ui.adopt("insertTag", MenuButton, {
+			text: "X",
+			menu: [
+				{ text: "Z",
+				  menu: [ { text: "one two", click: function(){console.log("Q");}, iconUrl: '../../plugins/extra/wai-lang/img/button.png' },
+						  { text: "three four five", click: function(){console.log("W");} } ],
+				  iconUrl: '../../plugins/extra/wai-lang/img/button.png'},
+				{ text: "V sdf asdf as fasd fasfd asfasf asf",
+				  menu: [ { text: "Q asd fas fasf as faw awe ftasf asd sad f", click: function(){console.log("Q");} },
+						  { text: "W", click: function(){console.log("W");} } ] }
+			],
+			iconUrl: '../../plugins/extra/wai-lang/img/button.png'
+		});
+
+		Ribbon.addButton({
+			text: 'Image',
+			menu: [
+				{
+					text: "Insert Image... (own dialog)",
+					click: function() {
+						createWysiwhatImagePicker();
+					}
+				},
+				{
+					text: "Insert Image... (Google Picker)",
+					click: function() {
+						newImagePicker();
+						/*
+						Dialog.alert({
+							text: "Google Picker should show up!"
+						});
+						*/
+					}
+				},
+				{
+					text: "Insert Image... (Flickr)",
+					click: function() {
+						Dialog.alert({
+							text: "Import from Flickr?!"
+						});						
+					}
+				},
+				{
+					text: "Foobar!",
+					click: function() {
+						var img = Aloha.jQuery("<img />").attr("src", "http://a0.twimg.com/profile_images/1262048739/You-Made-it__2__normal.png");
+						AlohaInsertIntoDom(img);
+					}
+				}
+			],
+		});
+
+		Ribbon.addButton({
+			text: 'Video',
+			menu: [
+				{
+					text: "Insert Video... (Google Picker)",
+					click: function() {
+						newVideoPicker();
+					}
+				},
+			],
+		});
+
+		Ribbon.show();
+
+
+		Ribbon.show();
+
+		// Comment Boilerplate example buttons out. Just kept in source for examples of new buttons
+		/*
+
+		Ribbon.addButton({
+			text: "split button",
+			menu: [
+				{
+					text: "action with submenu",
+					menu: [
+						{
+							text: "submenu only",
+							menu: [{ text: "action only", click: function(){ console.log("action only"); } }]
+						},
+						{
+							text: "action only",
+							click: function() {
+								console.log("action only");
+							}
+						}
+					],	
+					click: function(){
+						console.log("action with submenu");
+					}
+				}
+			],
+			click: function(){
+				console.log("split button");
+			},
+			iconUrl: '../../plugins/extra/wai-lang/img/button.png'
+		});
+		Ribbon.addButton({
+			text: "menu button",
+			menu: [
+				{
+					text: "action with submenu",
+					menu: [
+						{
+							text: "submenu only",
+							menu: [{
+								text: "action only",
+								click: function(){ console.log("action only"); }
+							}]
+						},
+						{
+							text: "action only  x x x x  x x",
+							click: function() {
+								console.log("action only");
+							}
+						}
+					],	
+					click: function(){
+						console.log("action with submenu");
+					}
+				}
+			]
+		});
+		Ribbon.addButton({
+			menu: [
+				{
+					text: "action with submenu",
+					menu: [
+						{
+							text: "submenu only",
+							menu: [{
+								text: "action only",
+								click: function(){ console.log("action only"); },
+								iconUrl: '../../plugins/extra/wai-lang/img/button.png'
+							}],
+							iconUrl: '../../plugins/extra/wai-lang/img/button.png'
+						},
+						{
+							text: "action only",
+							click: function() {
+								console.log("action only");
+							},
+							iconUrl: '../../plugins/extra/wai-lang/img/button.png'
+						}
+					],	
+					click: function(){
+						console.log("action with submenu");
+					},
+					iconUrl: '../../plugins/extra/wai-lang/img/button.png'
+				}
+			],
+			iconUrl: '../../plugins/extra/wai-lang/img/button.png'
+		});
+		Ribbon.addButton({
+			text: "split button2",
+			menu: [
+				{
+					text: "action with submenu",
+					menu: [
+						{
+							text: "submenu only",
+							menu: [{ text: "action only", click: function(){ console.log("action only"); } }]
+						},
+						{
+							text: "action only",
+							click: function() {
+								console.log("action only");
+							}
+						}
+					],	
+					click: function(){
+						console.log("action with submenu");
+					}
+				}
+			],
+			click: function(){
+				console.log("split button");
+			}
+		});
+
+		Ribbon.addButton({
+			text: 'confirm',
+			click: function() {
+				Dialog.confirm({
+					text: "Do you want to X?"
+				});
+			}
+		});
+
+		Ribbon.addButton({
+			text: 'alert',
+			click: function() {
+				Dialog.alert({
+					text: "X happened!"
+				});
+			}
+		});
+
+		Ribbon.addButton({
+			text: 'progress',
+			click: function() {
+				var progress = Dialog.progress({
+					text: "X is in progress...",
+					value: 0
+				});
+				var percent = 0;
+				var interval = setInterval(function() {
+					percent += 10;
+					progress(percent);
+					if (percent == 100) {
+						clearInterval(interval);
+					}
+				}, 1000);
+			}
+		});
+
+		*/
+    });
+});
diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 42c93869d3..ec96decb4a 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -281,6 +281,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   UI.adopt 'insertVideo-oer', null,
     click: () ->
+      console.debug 'Inserting video..'
       newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
       # Inserts Google Picker into the DOM
       newVideoPicker()        
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index af6fd6f7bf..39b0d7c155 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 1.3.3
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
@@ -44,12 +43,10 @@
     embedders[0] = youtube_embedder;
     console.debug('initializing');
     checkURL = function(url) {
-      var _i, _len;
+      var embedder, _i, _len;
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
-        if (embedder.url_validator(url)) {
-          return true;
-        }
+        if (embedder.url_validator(url)) return true;
       }
       return false;
     };
@@ -92,12 +89,10 @@
         $uploadUrl.show();
       }
       getEmbedder = function(url) {
-        var _i, _len;
+        var embedder, _i, _len;
         for (_i = 0, _len = embedders.length; _i < _len; _i++) {
           embedder = embedders[_i];
-          if (embedder.url_validator(url)) {
-            return embedder;
-          }
+          if (embedder.url_validator(url)) return embedder;
         }
         return false;
       };
@@ -119,13 +114,9 @@
         var reader;
         reader = new FileReader();
         reader.onloadend = function() {
-          if ($img) {
-            $img.attr('src', reader.result);
-          }
+          if ($img) $img.attr('src', reader.result);
           setvideoSource(reader.result);
-          if (callback) {
-            return callback(reader.result);
-          }
+          if (callback) return callback(reader.result);
         };
         return reader.readAsDataURL(file);
       };
@@ -182,9 +173,7 @@
       });
       return jQuery.extend(true, deferred.promise(), {
         show: function(title) {
-          if (title) {
-            dialog.find('.modal-header h3').text(title);
-          }
+          if (title) dialog.find('.modal-header h3').text(title);
           return dialog.modal('show');
         }
       });
@@ -221,9 +210,7 @@
       settings = Aloha.require('assorted/assorted-plugin').settings;
       xhr = new XMLHttpRequest();
       if (xhr.upload) {
-        if (!settings.image.uploadurl) {
-          throw new Error("uploadurl not defined");
-        }
+        if (!settings.image.uploadurl) throw new Error("uploadurl not defined");
         xhr.onload = function() {
           var url;
           if (settings.image.parseresponse) {
@@ -252,27 +239,10 @@
     });
     UI.adopt('insertVideo-oer', null, {
       click: function() {
-        var newEl, promise;
+        var newEl;
+        console.debug('Inserting video..');
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
-        GENTICS.Utils.Dom.insertIntoDOM(newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj);
-        promise = showModalDialog(newEl);
-        promise.done(function(data) {
-          if (data.files.length) {
-            newEl.addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              jQuery(data.target).attr('src', url);
-              return newEl.removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        promise.fail(function(data) {
-          var $target;
-          $target = jQuery(data.target);
-          if (!$target.is('img')) {
-            return $target.remove();
-          }
-        });
-        return promise.show();
+        return newVideoPicker();
       }
     });
     return {

From d892a3d4d3d8cc20358d9de4c031f7e0a6329bdd Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 3 Apr 2013 16:27:26 -0500
Subject: [PATCH 29/67] decrease toolbar z-index un poco to keep it behind
 google picker

---
 oerpub/css/toolbar.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/oerpub/css/toolbar.css b/oerpub/css/toolbar.css
index eefc59bd7d..95eb55a445 100644
--- a/oerpub/css/toolbar.css
+++ b/oerpub/css/toolbar.css
@@ -59,7 +59,7 @@ figure figcaption::before {
   width: 100%;
   padding-left: 1em;
   box-shadow: 0 2px 3px 0 #CCC;
-  z-index: 1010;
+  z-index: 900;
 }
 .toolbar [class^="icon-"] {
   margin: 0;
@@ -266,3 +266,4 @@ figure figcaption::before {
   word-spacing: normal;
   vertical-align: middle;
 }
+

From 80c10d8aa9ddc34a4332b5f427c2ff7322beb81a Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 3 Apr 2013 16:46:25 -0500
Subject: [PATCH 30/67] Attempting to use iframe

---
 src/plugins/oer/assorted/lib/gpickerdialog.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/gpickerdialog.js b/src/plugins/oer/assorted/lib/gpickerdialog.js
index 0182298c21..c5a8f75feb 100644
--- a/src/plugins/oer/assorted/lib/gpickerdialog.js
+++ b/src/plugins/oer/assorted/lib/gpickerdialog.js
@@ -60,11 +60,11 @@ function VideoPickerCallback(data) {
         site_url = doc[google.picker.Document.URL]; // only shows website url :(
         // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
         embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
-        var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></embed></object>');
-        // var embed_code_template = Aloha.jQuery('<div class="multimedia-video"><iframe width="640" height="360" src="" wmode="transparent" frameborder="0" allowfullscreen></iframe></div>');
+        // var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></embed></object>');
+        var embed_code_template = Aloha.jQuery('<div style="width:640; height=360" class="multimedia-video"><iframe width="640" height="360" src="" wmode="transparent" frameborder="0" allowfullscreen></iframe></div>');
         // var embed_code_template = Aloha.jQuery('<object width="420" height="360"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><iframe src="" type="application/x-shockwave-flash" width="560" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></iframe></object>');
         //TODO Replace this to ensure only the specific video is changed
-        var embed_code = Aloha.jQuery(embed_code_template).find('embed').attr('src', embed_url);
+        var embed_code = Aloha.jQuery(embed_code_template).find('iframe').attr('src', embed_url);
         AlohaInsertIntoDom(embed_code);
     }
 }

From 7cec7ae457ee272b819e01857b614f9f170910b0 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 3 Apr 2013 16:57:41 -0500
Subject: [PATCH 31/67] Video now the correct size

---
 src/plugins/oer/assorted/lib/gpickerdialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/oer/assorted/lib/gpickerdialog.js b/src/plugins/oer/assorted/lib/gpickerdialog.js
index c5a8f75feb..48fc8272c8 100644
--- a/src/plugins/oer/assorted/lib/gpickerdialog.js
+++ b/src/plugins/oer/assorted/lib/gpickerdialog.js
@@ -61,7 +61,7 @@ function VideoPickerCallback(data) {
         // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
         embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
         // var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></embed></object>');
-        var embed_code_template = Aloha.jQuery('<div style="width:640; height=360" class="multimedia-video"><iframe width="640" height="360" src="" wmode="transparent" frameborder="0" allowfullscreen></iframe></div>');
+        var embed_code_template = Aloha.jQuery('<div class="multimedia-video"><iframe style="width:640px; height:360px" width="640" height="360" src="" wmode="transparent" frameborder="0" allowfullscreen></iframe></div>');
         // var embed_code_template = Aloha.jQuery('<object width="420" height="360"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><iframe src="" type="application/x-shockwave-flash" width="560" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></iframe></object>');
         //TODO Replace this to ensure only the specific video is changed
         var embed_code = Aloha.jQuery(embed_code_template).find('iframe').attr('src', embed_url);

From 6e50e573467bab9688078fe3bbd698390ca917c2 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 3 Apr 2013 17:44:23 -0500
Subject: [PATCH 32/67] make video transparent

---
 src/plugins/oer/assorted/lib/gpickerdialog.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/oer/assorted/lib/gpickerdialog.js b/src/plugins/oer/assorted/lib/gpickerdialog.js
index 48fc8272c8..3d674c24f2 100644
--- a/src/plugins/oer/assorted/lib/gpickerdialog.js
+++ b/src/plugins/oer/assorted/lib/gpickerdialog.js
@@ -56,15 +56,17 @@ function createVideoPicker() {
 // A simple callback implementation for Picker.
 function VideoPickerCallback(data) {
     if(data.action == google.picker.Action.PICKED){
+        console.log(data);
         var doc = data[google.picker.Response.DOCUMENTS][0];
         site_url = doc[google.picker.Document.URL]; // only shows website url :(
         // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
         embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
+        video_id = doc[google.picker.Document.ID];
         // var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></embed></object>');
         var embed_code_template = Aloha.jQuery('<div class="multimedia-video"><iframe style="width:640px; height:360px" width="640" height="360" src="" wmode="transparent" frameborder="0" allowfullscreen></iframe></div>');
         // var embed_code_template = Aloha.jQuery('<object width="420" height="360"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><iframe src="" type="application/x-shockwave-flash" width="560" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></iframe></object>');
         //TODO Replace this to ensure only the specific video is changed
-        var embed_code = Aloha.jQuery(embed_code_template).find('iframe').attr('src', embed_url);
+        var embed_code = Aloha.jQuery(embed_code_template).find('iframe').attr('src', "http://www.youtube.com/embed/"+video_id+"?wmode=transparent");
         AlohaInsertIntoDom(embed_code);
     }
 }

From 29a7534fe916b6d59214085e9742a633a63aff32 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Fri, 5 Apr 2013 21:38:10 -0500
Subject: [PATCH 33/67] Stashing changes which will be overwritten

---
 src/plugins/oer/assorted/lib/gpickerdialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/oer/assorted/lib/gpickerdialog.js b/src/plugins/oer/assorted/lib/gpickerdialog.js
index 48fc8272c8..a878d71655 100644
--- a/src/plugins/oer/assorted/lib/gpickerdialog.js
+++ b/src/plugins/oer/assorted/lib/gpickerdialog.js
@@ -61,7 +61,7 @@ function VideoPickerCallback(data) {
         // image_url = data.docs[0].thumbnails[data.docs[0].thumbnails.length - 1].url; // we only get a image preview with this
         embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
         // var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></embed></object>');
-        var embed_code_template = Aloha.jQuery('<div class="multimedia-video"><iframe style="width:640px; height:360px" width="640" height="360" src="" wmode="transparent" frameborder="0" allowfullscreen></iframe></div>');
+        var embed_code_template = Aloha.jQuery('<div class="multimedia-video"><iframe style="width:420px; height:360px" width="640" height="360" src="" frameborder="0"></iframe></div>');
         // var embed_code_template = Aloha.jQuery('<object width="420" height="360"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><iframe src="" type="application/x-shockwave-flash" width="560" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent" frameborder="0"></iframe></object>');
         //TODO Replace this to ensure only the specific video is changed
         var embed_code = Aloha.jQuery(embed_code_template).find('iframe').attr('src', embed_url);

From ed875e8b334244134e72f1e450f2e1d4067d0e2a Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 6 Apr 2013 16:50:32 -0500
Subject: [PATCH 34/67] switch back to older picker

---
 src/plugins/oer/assorted/lib/video.coffee | 52 +++++++++++---------
 src/plugins/oer/assorted/lib/video.js     | 58 ++++++++++++++++++-----
 2 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index ec96decb4a..ceb4c8d7fa 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -1,4 +1,4 @@
- # Aloha Video Plugin
+# Aloha Video Plugin
 # * -----------------
 # * This plugin handles when the insertVideo button is clicked
 #
@@ -32,7 +32,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     video_id = youtube_url_validator(url)
     embed_html = ''
     if (video_id)
-      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
+#embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
+      embed_html = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>'
     return embed_html
   youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
 
@@ -77,6 +78,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   # Defines a template for an embedder object which is responsible for generating embed html and validating a url
   showModalDialog = ($el) ->
+      console.debug 'Inside showModalDialog'
       settings = Aloha.require('assorted/assorted-plugin').settings
       root = Aloha.activeEditable.obj
       dialog = jQuery(DIALOG_HTML)
@@ -178,15 +180,19 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       # allows the use of html5 validation.
       deferred = $.Deferred()
       dialog.on 'submit', (evt) =>
+        console.debug 'Submit pressed'
+        console.debug $el.is('img')
         evt.preventDefault() # Don't submit the form
         if $el.is('img')
           $el.attr 'src', videoSource
           $el.attr 'alt', dialog.find('[name=alt]').val()
         else
-          console.debug("Embedding the video")
+          console.debug "Embedding the video"
           # Embeds the video into the page
           video = getEmbedEle(videoSource)
-          $el.replaceWith(video)
+          console.debug video
+          AlohaInsertIntoDom(video);
+          #$el.replaceWith(video)
           dialog.modal('hide')
 
       dialog.on 'click', '.btn.action.cancel', (evt) =>
@@ -284,26 +290,26 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       console.debug 'Inserting video..'
       newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
       # Inserts Google Picker into the DOM
-      newVideoPicker()        
+# newVideoPicker()        
       # GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
-      # promise = showModalDialog(newEl)
-
-      # promise.done (data)->
-      #   # Uploading if a local file was chosen
-      #   if data.files.length
-      #     newEl.addClass('aloha-image-uploading')
-      #     uploadImage data.files[0], (url) ->
-      #       jQuery(data.target).attr('src', url)
-      #       newEl.removeClass('aloha-image-uploading')
-
-      # promise.fail (data) ->
-      #   # Clean up placeholder if needed
-      #   $target = jQuery(data.target)
-      #   if not $target.is('img')
-      #     $target.remove()
-
-      # # Finally show the dialog
-      # promise.show()
+      promise = showModalDialog(newEl)
+
+      promise.done (data)->
+        # Uploading if a local file was chosen
+        if data.files.length
+          newEl.addClass('aloha-image-uploading')
+          uploadImage data.files[0], (url) ->
+            jQuery(data.target).attr('src', url)
+            newEl.removeClass('aloha-image-uploading')
+
+      promise.fail (data) ->
+        # Clean up placeholder if needed
+        $target = jQuery(data.target)
+        if not $target.is('img')
+          $target.remove()
+
+      # Finally show the dialog
+      promise.show()
 
   # Return config
   selector: selector
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 39b0d7c155..553df77b21 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -1,3 +1,4 @@
+// Generated by CoffeeScript 1.3.3
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
@@ -34,7 +35,7 @@
       video_id = youtube_url_validator(url);
       embed_html = '';
       if (video_id) {
-        embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>';
+        embed_html = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>';
       }
       return embed_html;
     };
@@ -43,10 +44,12 @@
     embedders[0] = youtube_embedder;
     console.debug('initializing');
     checkURL = function(url) {
-      var embedder, _i, _len;
+      var _i, _len;
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
-        if (embedder.url_validator(url)) return true;
+        if (embedder.url_validator(url)) {
+          return true;
+        }
       }
       return false;
     };
@@ -55,6 +58,7 @@
     showModalDialog = function($el) {
       var $placeholder, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
         _this = this;
+      console.debug('Inside showModalDialog');
       settings = Aloha.require('assorted/assorted-plugin').settings;
       root = Aloha.activeEditable.obj;
       dialog = jQuery(DIALOG_HTML);
@@ -89,10 +93,12 @@
         $uploadUrl.show();
       }
       getEmbedder = function(url) {
-        var embedder, _i, _len;
+        var _i, _len;
         for (_i = 0, _len = embedders.length; _i < _len; _i++) {
           embedder = embedders[_i];
-          if (embedder.url_validator(url)) return embedder;
+          if (embedder.url_validator(url)) {
+            return embedder;
+          }
         }
         return false;
       };
@@ -114,9 +120,13 @@
         var reader;
         reader = new FileReader();
         reader.onloadend = function() {
-          if ($img) $img.attr('src', reader.result);
+          if ($img) {
+            $img.attr('src', reader.result);
+          }
           setvideoSource(reader.result);
-          if (callback) return callback(reader.result);
+          if (callback) {
+            return callback(reader.result);
+          }
         };
         return reader.readAsDataURL(file);
       };
@@ -145,6 +155,8 @@
       deferred = $.Deferred();
       dialog.on('submit', function(evt) {
         var video;
+        console.debug('Submit pressed');
+        console.debug($el.is('img'));
         evt.preventDefault();
         if ($el.is('img')) {
           $el.attr('src', videoSource);
@@ -152,7 +164,8 @@
         } else {
           console.debug("Embedding the video");
           video = getEmbedEle(videoSource);
-          $el.replaceWith(video);
+          console.debug(video);
+          AlohaInsertIntoDom(video);
           return dialog.modal('hide');
         }
       });
@@ -173,7 +186,9 @@
       });
       return jQuery.extend(true, deferred.promise(), {
         show: function(title) {
-          if (title) dialog.find('.modal-header h3').text(title);
+          if (title) {
+            dialog.find('.modal-header h3').text(title);
+          }
           return dialog.modal('show');
         }
       });
@@ -210,7 +225,9 @@
       settings = Aloha.require('assorted/assorted-plugin').settings;
       xhr = new XMLHttpRequest();
       if (xhr.upload) {
-        if (!settings.image.uploadurl) throw new Error("uploadurl not defined");
+        if (!settings.image.uploadurl) {
+          throw new Error("uploadurl not defined");
+        }
         xhr.onload = function() {
           var url;
           if (settings.image.parseresponse) {
@@ -239,10 +256,27 @@
     });
     UI.adopt('insertVideo-oer', null, {
       click: function() {
-        var newEl;
+        var newEl, promise;
         console.debug('Inserting video..');
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
-        return newVideoPicker();
+        promise = showModalDialog(newEl);
+        promise.done(function(data) {
+          if (data.files.length) {
+            newEl.addClass('aloha-image-uploading');
+            return uploadImage(data.files[0], function(url) {
+              jQuery(data.target).attr('src', url);
+              return newEl.removeClass('aloha-image-uploading');
+            });
+          }
+        });
+        promise.fail(function(data) {
+          var $target;
+          $target = jQuery(data.target);
+          if (!$target.is('img')) {
+            return $target.remove();
+          }
+        });
+        return promise.show();
       }
     });
     return {

From b55b9fb10e426f0d40446b49c54f0536546cb704 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 6 Apr 2013 17:15:31 -0500
Subject: [PATCH 35/67] pretty dialog for video

---
 src/plugins/oer/assorted/lib/video.coffee | 17 +++++++++--------
 src/plugins/oer/assorted/lib/video.js     |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index ceb4c8d7fa..b42f2c5e07 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -59,15 +59,16 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       </div>
       <div class="modal-body">
         <div class="image-options">
-            <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>
+            <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>
         </div>
-        <div class="image-alt">
-          <div class="forminfo">
-            Please provide a description of this video for the visually impaired.
-          </div>
-          <div>
-            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
-          </div>
+        <center>OR</center>
+        <div class="modal-body" >
+            <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>
+            <center><button type="search" class="btn btn-primary action insert">Search</button></center>
+        </div>
+        <div class="modal-body" >
+            <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;">
+            </div>
         </div>
       </div>
       <div class="modal-footer">
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 553df77b21..1990293105 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -54,7 +54,7 @@
       return false;
     };
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>\n    </div>\n    <div class="image-alt">\n      <div class="forminfo">\n        Please provide a description of this video for the visually impaired.\n      </div>\n      <div>\n        <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>\n      </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><button type="search" class="btn btn-primary action insert">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     showModalDialog = function($el) {
       var $placeholder, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
         _this = this;

From a265609c3a3a98e88e4f0106ea711ed99fc2f7f0 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Sat, 6 Apr 2013 19:04:07 -0500
Subject: [PATCH 36/67] working video insertion by search and selection

---
 src/plugins/oer/assorted/lib/video.coffee | 56 ++++++++++++++----
 src/plugins/oer/assorted/lib/video.js     | 69 ++++++++++++++++++++---
 2 files changed, 106 insertions(+), 19 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index b42f2c5e07..02e907d5f6 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -64,15 +64,15 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         <center>OR</center>
         <div class="modal-body" >
             <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>
-            <center><button type="search" class="btn btn-primary action insert">Search</button></center>
+            <center><button type="search" class="btn btn-primary action search">Search</button></center>
         </div>
         <div class="modal-body" >
-            <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;">
+            <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">
             </div>
         </div>
       </div>
       <div class="modal-footer">
-        <button type="submit" class="btn btn-primary action insert">Save</button>
+        <button type="submit" class="btn btn-primary action insert">Insert</button>
         <button class="btn action cancel">Cancel</button>
       </div>
     </form>'''
@@ -87,6 +87,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       # Find the dynamic modal elements and bind events to the buttons
       $placeholder = dialog.find('.placeholder.preview')
       $uploadUrl =   dialog.find('.upload-url-input')
+      $searchTerms = dialog.find('#video-search-input')
+      $searchResults = dialog.find('#search-results')
       $submit = dialog.find('.action.insert')
       dialog.find("#video-url-input")[0].onkeyup = (event) -> 
         target = event.currentTarget
@@ -180,22 +182,56 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       # On save update the actual video element. Use the submit event because this
       # allows the use of html5 validation.
       deferred = $.Deferred()
-      dialog.on 'submit', (evt) =>
+
+      dialog.on 'click', '.btn.btn-primary.action.insert', (evt) =>
         console.debug 'Submit pressed'
-        console.debug $el.is('img')
         evt.preventDefault() # Don't submit the form
         if $el.is('img')
           $el.attr 'src', videoSource
           $el.attr 'alt', dialog.find('[name=alt]').val()
         else
-          console.debug "Embedding the video"
           # Embeds the video into the page
-          video = getEmbedEle(videoSource)
-          console.debug video
-          AlohaInsertIntoDom(video);
-          #$el.replaceWith(video)
+          if videoSource.length == 0
+            # Use search results
+            for child in $searchResults.children()
+              if child.className == 'search-result-selected'
+                video_id = child.id
+                embedHtml = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>'
+                AlohaInsertIntoDom(jQuery(embedHtml))
+          else
+            # Use url
+            video = getEmbedEle(videoSource)
+            AlohaInsertIntoDom(video);
           dialog.modal('hide')
 
+      dialog.on 'click', '.btn.btn-primary.action.search', (evt) =>
+        evt.preventDefault() # Don't submit the form
+        console.debug 'Search pressed'
+        terms = $searchTerms[0].value.split(' ')
+        console.debug terms
+        queryUrl='https://gdata.youtube.com/feeds/api/videos?q='+terms.join('+')+'&alt=json&v=2'
+        console.debug queryUrl
+        jQuery.get(queryUrl, (data) => 
+                responseObj = jQuery.parseJSON(data)
+                videoList = responseObj.feed.entry
+                $searchResults.empty()
+                for video in videoList
+                  videoTitle = video.title.$t
+                  idTokens = video.id.$t.split(':')
+                  videoId = idTokens[idTokens.length-1]
+                  newEntry = jQuery('<div style="width:100%" class="search-result" id='+videoId+'>'+videoTitle+'</div>')
+                  newEntry[0].onclick = (evt) => 
+                    targetId = evt.target.id
+                    for child in $searchResults.children()
+                      if child.id == targetId
+                        child.className = 'search-result-selected'
+                      else
+                        child.className = 'search-result'
+                        
+                  $searchResults.append(newEntry)
+                )
+#response = jQuery.parseXML(text)
+
       dialog.on 'click', '.btn.action.cancel', (evt) =>
         evt.preventDefault() # Don't submit the form
         deferred.reject(target: $el[0])
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 1990293105..224eba0ab3 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -54,9 +54,9 @@
       return false;
     };
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><button type="search" class="btn btn-primary action insert">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Save</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     showModalDialog = function($el) {
-      var $placeholder, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
+      var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
         _this = this;
       console.debug('Inside showModalDialog');
       settings = Aloha.require('assorted/assorted-plugin').settings;
@@ -64,6 +64,8 @@
       dialog = jQuery(DIALOG_HTML);
       $placeholder = dialog.find('.placeholder.preview');
       $uploadUrl = dialog.find('.upload-url-input');
+      $searchTerms = dialog.find('#video-search-input');
+      $searchResults = dialog.find('#search-results');
       $submit = dialog.find('.action.insert');
       dialog.find("#video-url-input")[0].onkeyup = function(event) {
         var currentVal, target, valid;
@@ -153,22 +155,71 @@
         }
       });
       deferred = $.Deferred();
-      dialog.on('submit', function(evt) {
-        var video;
+      dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
+        var child, embedHtml, video, video_id, _i, _len, _ref;
         console.debug('Submit pressed');
-        console.debug($el.is('img'));
         evt.preventDefault();
         if ($el.is('img')) {
           $el.attr('src', videoSource);
           return $el.attr('alt', dialog.find('[name=alt]').val());
         } else {
-          console.debug("Embedding the video");
-          video = getEmbedEle(videoSource);
-          console.debug(video);
-          AlohaInsertIntoDom(video);
+          if (videoSource.length === 0) {
+            _ref = $searchResults.children();
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+              child = _ref[_i];
+              if (child.className === 'search-result-selected') {
+                video_id = child.id;
+                embedHtml = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>';
+                AlohaInsertIntoDom(jQuery(embedHtml));
+              }
+            }
+          } else {
+            video = getEmbedEle(videoSource);
+            AlohaInsertIntoDom(video);
+          }
           return dialog.modal('hide');
         }
       });
+      dialog.on('click', '.btn.btn-primary.action.search', function(evt) {
+        var queryUrl, terms;
+        evt.preventDefault();
+        console.debug('Search pressed');
+        terms = $searchTerms[0].value.split(' ');
+        console.debug(terms);
+        queryUrl = 'https://gdata.youtube.com/feeds/api/videos?q=' + terms.join('+') + '&alt=json&v=2';
+        console.debug(queryUrl);
+        return jQuery.get(queryUrl, function(data) {
+          var idTokens, newEntry, responseObj, video, videoId, videoList, videoTitle, _i, _len, _results;
+          responseObj = jQuery.parseJSON(data);
+          videoList = responseObj.feed.entry;
+          $searchResults.empty();
+          _results = [];
+          for (_i = 0, _len = videoList.length; _i < _len; _i++) {
+            video = videoList[_i];
+            videoTitle = video.title.$t;
+            idTokens = video.id.$t.split(':');
+            videoId = idTokens[idTokens.length - 1];
+            newEntry = jQuery('<div style="width:100%" class="search-result" id=' + videoId + '>' + videoTitle + '</div>');
+            newEntry[0].onclick = function(evt) {
+              var child, targetId, _j, _len1, _ref, _results1;
+              targetId = evt.target.id;
+              _ref = $searchResults.children();
+              _results1 = [];
+              for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+                child = _ref[_j];
+                if (child.id === targetId) {
+                  _results1.push(child.className = 'search-result-selected');
+                } else {
+                  _results1.push(child.className = 'search-result');
+                }
+              }
+              return _results1;
+            };
+            _results.push($searchResults.append(newEntry));
+          }
+          return _results;
+        });
+      });
       dialog.on('click', '.btn.action.cancel', function(evt) {
         evt.preventDefault();
         deferred.reject({

From f1583f9fe068f5aefac605d7ffdc4f0af95caebf Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 9 Apr 2013 17:57:23 -0500
Subject: [PATCH 37/67] some highlighting in search results

---
 src/plugins/oer/assorted/css/image.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 94f54e5230..9bfcf4e2bd 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -40,3 +40,16 @@ form#linkModal:focus {
 .placeholder.preview h4 {
     margin: 0 0 1em 0;
 }
+
+.search-result {
+    background: #fff;
+    width:100%;
+}
+
+.search-result:hover {
+    background: #999;
+}
+
+.search-result-selected {
+    background:#888;
+}

From 4378ff8ad7b84125150590ef84d83af990b14729 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 9 Apr 2013 21:16:53 -0500
Subject: [PATCH 38/67] add more information to videos in search results

---
 src/plugins/oer/assorted/css/image.css    |  2 ++
 src/plugins/oer/assorted/lib/video.coffee | 20 +++++++++++-----
 src/plugins/oer/assorted/lib/video.js     | 28 +++++++++++++++--------
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 9bfcf4e2bd..e16e34b0f8 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -44,6 +44,8 @@ form#linkModal:focus {
 .search-result {
     background: #fff;
     width:100%;
+    border-bottom: 2px solid white;
+    cursor:pointer;
 }
 
 .search-result:hover {
diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 02e907d5f6..cc9ce5fd67 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -77,6 +77,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       </div>
     </form>'''
 
+  getTimeString = (timeInSeconds) ->
+    return timeInSeconds+' secs'
   # Defines a template for an embedder object which is responsible for generating embed html and validating a url
   showModalDialog = ($el) ->
       console.debug 'Inside showModalDialog'
@@ -184,7 +186,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       deferred = $.Deferred()
 
       dialog.on 'click', '.btn.btn-primary.action.insert', (evt) =>
-        console.debug 'Submit pressed'
         evt.preventDefault() # Don't submit the form
         if $el.is('img')
           $el.attr 'src', videoSource
@@ -206,22 +207,29 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.on 'click', '.btn.btn-primary.action.search', (evt) =>
         evt.preventDefault() # Don't submit the form
-        console.debug 'Search pressed'
         terms = $searchTerms[0].value.split(' ')
-        console.debug terms
         queryUrl='https://gdata.youtube.com/feeds/api/videos?q='+terms.join('+')+'&alt=json&v=2'
-        console.debug queryUrl
+        $searchResults.empty()
+        $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'))
         jQuery.get(queryUrl, (data) => 
                 responseObj = jQuery.parseJSON(data)
                 videoList = responseObj.feed.entry
                 $searchResults.empty()
                 for video in videoList
+                  thumbnailUrl = video.media$group.media$thumbnail[0].url
+                  thumbnailHeight = video.media$group.media$thumbnail[0].height
+                  thumbnailWidth = video.media$group.media$thumbnail[0].width
                   videoTitle = video.title.$t
+                  videoDescription = video.media$group.media$description.$t
+                  videoLengthString = getTimeString(video.media$group.yt$duration.seconds)
                   idTokens = video.id.$t.split(':')
                   videoId = idTokens[idTokens.length-1]
-                  newEntry = jQuery('<div style="width:100%" class="search-result" id='+videoId+'>'+videoTitle+'</div>')
+                  newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
                   newEntry[0].onclick = (evt) => 
-                    targetId = evt.target.id
+                    target = evt.target
+                    while target.tagName != 'DIV'
+                      target = target.parentNode
+                    targetId = target.id
                     for child in $searchResults.children()
                       if child.id == targetId
                         child.className = 'search-result-selected'
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 224eba0ab3..9bff7a3367 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -2,7 +2,7 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, checkURL, embedder, embedders, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
+    var DIALOG_HTML, WARNING_IMAGE_PATH, checkURL, embedder, embedders, getTimeString, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
     embedder = function(url_validator, embed_code_generator) {
       var result, set_embed_code_generator, set_url_validator;
       this.embed_code_gen = embed_code_generator;
@@ -55,6 +55,9 @@
     };
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
     DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    getTimeString = function(timeInSeconds) {
+      return timeInSeconds + ' secs';
+    };
     showModalDialog = function($el) {
       var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
         _this = this;
@@ -157,7 +160,6 @@
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
         var child, embedHtml, video, video_id, _i, _len, _ref;
-        console.debug('Submit pressed');
         evt.preventDefault();
         if ($el.is('img')) {
           $el.attr('src', videoSource);
@@ -183,26 +185,34 @@
       dialog.on('click', '.btn.btn-primary.action.search', function(evt) {
         var queryUrl, terms;
         evt.preventDefault();
-        console.debug('Search pressed');
         terms = $searchTerms[0].value.split(' ');
-        console.debug(terms);
         queryUrl = 'https://gdata.youtube.com/feeds/api/videos?q=' + terms.join('+') + '&alt=json&v=2';
-        console.debug(queryUrl);
+        $searchResults.empty();
+        $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'));
         return jQuery.get(queryUrl, function(data) {
-          var idTokens, newEntry, responseObj, video, videoId, videoList, videoTitle, _i, _len, _results;
+          var idTokens, newEntry, responseObj, thumbnailHeight, thumbnailUrl, thumbnailWidth, video, videoDescription, videoId, videoLengthString, videoList, videoTitle, _i, _len, _results;
           responseObj = jQuery.parseJSON(data);
           videoList = responseObj.feed.entry;
           $searchResults.empty();
           _results = [];
           for (_i = 0, _len = videoList.length; _i < _len; _i++) {
             video = videoList[_i];
+            thumbnailUrl = video.media$group.media$thumbnail[0].url;
+            thumbnailHeight = video.media$group.media$thumbnail[0].height;
+            thumbnailWidth = video.media$group.media$thumbnail[0].width;
             videoTitle = video.title.$t;
+            videoDescription = video.media$group.media$description.$t;
+            videoLengthString = getTimeString(video.media$group.yt$duration.seconds);
             idTokens = video.id.$t.split(':');
             videoId = idTokens[idTokens.length - 1];
-            newEntry = jQuery('<div style="width:100%" class="search-result" id=' + videoId + '>' + videoTitle + '</div>');
+            newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=' + videoId + '><table><tr><td rowspan=3><img src=' + thumbnailUrl + ' /></td><td><b>' + videoTitle + '</b></td></tr><tr><td>' + videoDescription + '</td></tr><tr><td>Duration: ' + videoLengthString + '</td></tr></table></div>');
             newEntry[0].onclick = function(evt) {
-              var child, targetId, _j, _len1, _ref, _results1;
-              targetId = evt.target.id;
+              var child, target, targetId, _j, _len1, _ref, _results1;
+              target = evt.target;
+              while (target.tagName !== 'DIV') {
+                target = target.parentNode;
+              }
+              targetId = target.id;
               _ref = $searchResults.children();
               _results1 = [];
               for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {

From c98e6c0714776d8a78e2d2ee9486a343e4dd6072 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 9 Apr 2013 21:26:41 -0500
Subject: [PATCH 39/67] better video duration printing

---
 src/plugins/oer/assorted/lib/video.coffee | 27 ++++++++++++++++++-
 src/plugins/oer/assorted/lib/video.js     | 32 ++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index cc9ce5fd67..70662d4c8d 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -78,7 +78,32 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     </form>'''
 
   getTimeString = (timeInSeconds) ->
-    return timeInSeconds+' secs'
+    nHours = 0
+    nMinutes = 0
+    nSeconds = 0
+    ivalue = parseInt(timeInSeconds)
+
+    if ivalue > 3600
+      nHours = Math.floor(ivalue / 3600)
+      ivalue = ivalue - (3600 * nHours)
+    if ivalue > 60
+      nMinutes = Math.floor(ivalue / 60)
+      ivalue = ivalue - (60 * nMinutes)
+    nSeconds = ivalue
+
+    str = ''
+    if nHours > 0
+      str = str + nHours.toString()+' hours'
+    if nMinutes > 0
+      if str.length != 0
+        str = str + ', '
+      str = str + nMinutes.toString() + ' mins'
+    if nSeconds > 0
+      if str.length != 0
+        str = str + ', '
+      str = str + nSeconds.toString() + ' secs'
+    return str
+
   # Defines a template for an embedder object which is responsible for generating embed html and validating a url
   showModalDialog = ($el) ->
       console.debug 'Inside showModalDialog'
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 9bff7a3367..db889a4b94 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -56,7 +56,37 @@
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
     DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     getTimeString = function(timeInSeconds) {
-      return timeInSeconds + ' secs';
+      var ivalue, nHours, nMinutes, nSeconds, str;
+      nHours = 0;
+      nMinutes = 0;
+      nSeconds = 0;
+      ivalue = parseInt(timeInSeconds);
+      if (ivalue > 3600) {
+        nHours = Math.floor(ivalue / 3600);
+        ivalue = ivalue - (3600 * nHours);
+      }
+      if (ivalue > 60) {
+        nMinutes = Math.floor(ivalue / 60);
+        ivalue = ivalue - (60 * nMinutes);
+      }
+      nSeconds = ivalue;
+      str = '';
+      if (nHours > 0) {
+        str = str + nHours.toString() + ' hours';
+      }
+      if (nMinutes > 0) {
+        if (str.length !== 0) {
+          str = str + ', ';
+        }
+        str = str + nMinutes.toString() + ' mins';
+      }
+      if (nSeconds > 0) {
+        if (str.length !== 0) {
+          str = str + ', ';
+        }
+        str = str + nSeconds.toString() + ' secs';
+      }
+      return str;
     };
     showModalDialog = function($el) {
       var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,

From e335f4b92a30dff5d0b2536a0188d81b9fc092a9 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 9 Apr 2013 22:06:38 -0500
Subject: [PATCH 40/67] starting to set up vimeo embedder, extract out
 embedders into separate objects, add radio buttons and switching of active
 embedder based on radio button values

---
 src/plugins/oer/assorted/css/image.css    |  1 +
 src/plugins/oer/assorted/lib/video.coffee | 95 ++++++++++++++++++-----
 2 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index e16e34b0f8..928c2f7c1e 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -46,6 +46,7 @@ form#linkModal:focus {
     width:100%;
     border-bottom: 2px solid white;
     cursor:pointer;
+    font-size:90%;
 }
 
 .search-result:hover {
diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 70662d4c8d..f0da191d43 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -4,9 +4,11 @@
 #
 define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
 
-  embedder = (url_validator, embed_code_generator) ->
+  embedder = (url_validator, embed_code_generator, query_generator, search_results_generator) ->
     this.embed_code_gen = embed_code_generator
     this.url_validator = url_validator
+    this.query_generator = query_generator
+    this.search_results_generator = search_results_generator
     embed_code_generator = (url) ->
       # Generates embed html -- this function should be replaced
       embed_html = '<p> Hello World </p>'
@@ -35,13 +37,60 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 #embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
       embed_html = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>'
     return embed_html
-  youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
+
+  youtube_query_generator = (queryTerms) -> 
+    terms = queryTerms.split(' ')
+    return 'https://gdata.youtube.com/feeds/api/videos?q='+terms.join('+')+'&alt=json&v=2'
+
+  youtube_search_results_generator = (responseObj) ->
+    eleList = [ ]
+    videoList = responseObj.feed.entry
+    for video in videoList
+      thumbnailUrl = video.media$group.media$thumbnail[0].url
+      thumbnailHeight = video.media$group.media$thumbnail[0].height
+      thumbnailWidth = video.media$group.media$thumbnail[0].width
+      videoTitle = video.title.$t
+      videoDescription = video.media$group.media$description.$t
+      videoLengthString = getTimeString(video.media$group.yt$duration.seconds)
+      idTokens = video.id.$t.split(':')
+      videoId = idTokens[idTokens.length-1]
+      newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
+      eleList.push(newEntry)
+    return eleList
+
+  vimeo_url_validator = (url) ->
+    true
+  
+  vimeo_embed_code_generator = (url) ->
+    return '<p></p>'
+#video_id = youtube_url_validator(url)
+#    embed_html = ''
+#    if (video_id)
+#embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
+#      embed_html = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>'
+#    return embed_html
+
+  vimeo_query_generator = (queryTerms) -> 
+    terms = queryTerms.split(' ')
+    return 'http://vimeo.com/api/rest/v2?format=json&method=vimeo.videos.search&user_id=jmaxg3&page=0&per_page=50&query='+terms.join('+')
+
+  vimeo_search_results_generator = (responseObj) ->
+    eleList = [ ]
+    console.debug responseObj
+    return [ ]
+
+
+  youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator)
+  vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator)
 
   # Adds the youtube embedders to the list of embedders
   embedders = []
   embedders[0] = youtube_embedder
-  console.debug 'initializing'
+  embedders[1] = vimeo_embedder
 
+  active_embedder = youtube_embedder
+  active_embedder_value = 'youtube'
+  
   checkURL = (url) ->
     for embedder in embedders
       if (embedder.url_validator(url)) 
@@ -64,6 +113,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         <center>OR</center>
         <div class="modal-body" >
             <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>
+            <center><table><tr><td><input id='media-sites' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input id='media-sites' type="radio" name="video-site" value="vimeo">Vimeo</input></td></tr></table></center>
             <center><button type="search" class="btn btn-primary action search">Search</button></center>
         </div>
         <div class="modal-body" >
@@ -77,6 +127,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       </div>
     </form>'''
 
+ 
   getTimeString = (timeInSeconds) ->
     nHours = 0
     nMinutes = 0
@@ -128,6 +179,20 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
             target.style.borderColor='red'
             target.style.borderWidth='medium'
 
+      for radio in dialog.find('#media-sites')
+        radio.onclick = (event) ->
+          console.debug 'Radio button clicked'
+          val = event.target.value
+          if active_embedder_value != val
+            index = 0
+            for radio in dialog.find('#media-sites')
+              if radio.value == val
+                console.debug 'Setting '+radio.value
+                active_embedder_value = radio.value
+                active_embedder = embedders[index]
+                break
+              index = index + 1
+              
       # If we're editing an image pull in the src.
       # It will be undefined if this is a new image.
       #
@@ -232,25 +297,15 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.on 'click', '.btn.btn-primary.action.search', (evt) =>
         evt.preventDefault() # Don't submit the form
-        terms = $searchTerms[0].value.split(' ')
-        queryUrl='https://gdata.youtube.com/feeds/api/videos?q='+terms.join('+')+'&alt=json&v=2'
+        queryUrl = active_embedder.query_generator($searchTerms[0].value)
         $searchResults.empty()
         $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'))
         jQuery.get(queryUrl, (data) => 
-                responseObj = jQuery.parseJSON(data)
-                videoList = responseObj.feed.entry
                 $searchResults.empty()
-                for video in videoList
-                  thumbnailUrl = video.media$group.media$thumbnail[0].url
-                  thumbnailHeight = video.media$group.media$thumbnail[0].height
-                  thumbnailWidth = video.media$group.media$thumbnail[0].width
-                  videoTitle = video.title.$t
-                  videoDescription = video.media$group.media$description.$t
-                  videoLengthString = getTimeString(video.media$group.yt$duration.seconds)
-                  idTokens = video.id.$t.split(':')
-                  videoId = idTokens[idTokens.length-1]
-                  newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
-                  newEntry[0].onclick = (evt) => 
+                responseObj = jQuery.parseJSON(data)
+                searchElements = active_embedder.search_results_generator(responseObj)
+                for ele in searchElements
+                   ele.onclick = (evt) => 
                     target = evt.target
                     while target.tagName != 'DIV'
                       target = target.parentNode
@@ -260,10 +315,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                         child.className = 'search-result-selected'
                       else
                         child.className = 'search-result'
-                        
-                  $searchResults.append(newEntry)
+                   $searchResults.append(ele)
                 )
-#response = jQuery.parseXML(text)
 
       dialog.on 'click', '.btn.action.cancel', (evt) =>
         evt.preventDefault() # Don't submit the form

From d13095d692a585e3469ab2fb08d28cf3cf92033b Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 9 Apr 2013 22:26:25 -0500
Subject: [PATCH 41/67] more separation of concerns (video embed code
 generation. still need to fill in the vimeo embed code generator and search
 results parser

---
 src/plugins/oer/assorted/css/image.css    |   5 +
 src/plugins/oer/assorted/lib/video.coffee |  67 +++-----
 src/plugins/oer/assorted/lib/video.js     | 180 ++++++++++++----------
 3 files changed, 123 insertions(+), 129 deletions(-)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 928c2f7c1e..91fa7db883 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -55,4 +55,9 @@ form#linkModal:focus {
 
 .search-result-selected {
     background:#888;
+    width:100%;
+    border-bottom: 2px solid white;
+    cursor:pointer;
+    font-size:90%;
+
 }
diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index f0da191d43..a2f18564c7 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -9,20 +9,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     this.url_validator = url_validator
     this.query_generator = query_generator
     this.search_results_generator = search_results_generator
-    embed_code_generator = (url) ->
-      # Generates embed html -- this function should be replaced
-      embed_html = '<p> Hello World </p>'
-      '''
-      Validates a URL. Returns video id if URL is valide. Else returns false.
-      Should be replaced with actual function. The default validates youtube URLs
-      '''
-    url_validator = (url) ->
-      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
-      result = if(url.match(regexp)) then RegExp.$1 else false
-    set_embed_code_generator = (url) ->
-      this.embed_code_gen = embed_code_generator
-    set_url_validator = (url) ->
-      this.url_validator = url_validator
     result = this
 
   # Creates a youtube embedder
@@ -30,13 +16,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
     result = if(url.match(regexp)) then RegExp.$1 else false
   
-  youtube_embed_code_generator = (url) ->
-    video_id = youtube_url_validator(url)
-    embed_html = ''
-    if (video_id)
-#embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
-      embed_html = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>'
-    return embed_html
+  youtube_embed_code_generator = (id) ->
+    return jQuery('<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>')
 
   youtube_query_generator = (queryTerms) -> 
     terms = queryTerms.split(' ')
@@ -220,24 +201,11 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         $uploadUrl.val(videoSource)
         $uploadUrl.show()
       # Retrieves embedder which can matches the format of the URL
-      getEmbedder = (url) ->
-        for embedder in embedders
-          if (embedder.url_validator(url)) 
-            return embedder
-        return false
+
       setvideoSource = (href) ->
         videoSource = href
         $submit.removeClass('disabled')
-      getEmbedEle = (url) ->
-        # Retrieves the embedder for this type of video
-        if(!(embedder = getEmbedder(url)))
-          console.debug("Error: URL not supported")
-          # TODO - ADD HELPFUL MESSAGE TO USER
-          dialog.modal('hide')
 
-        video = jQuery(embedder.embed_code_gen(url));
-        video.attr 'alt', dialog.find('[name=alt]').val()
-        return video
       # Uses the File API to render a preview of the image
       # and updates the modal's videoSource
       loadLocalFile = (file, $img, callback) ->
@@ -287,11 +255,10 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
             for child in $searchResults.children()
               if child.className == 'search-result-selected'
                 video_id = child.id
-                embedHtml = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>'
-                AlohaInsertIntoDom(jQuery(embedHtml))
+                AlohaInsertIntoDom(active_embedder.embed_code_gen(video_id))
           else
             # Use url
-            video = getEmbedEle(videoSource)
+            video = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource))
             AlohaInsertIntoDom(video);
           dialog.modal('hide')
 
@@ -305,17 +272,19 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                 responseObj = jQuery.parseJSON(data)
                 searchElements = active_embedder.search_results_generator(responseObj)
                 for ele in searchElements
-                   ele.onclick = (evt) => 
-                    target = evt.target
-                    while target.tagName != 'DIV'
-                      target = target.parentNode
-                    targetId = target.id
-                    for child in $searchResults.children()
-                      if child.id == targetId
-                        child.className = 'search-result-selected'
-                      else
-                        child.className = 'search-result'
-                   $searchResults.append(ele)
+                  console.debug ele
+                  ele[0].onclick = (evt) => 
+                   console.debug evt
+                   target = evt.target
+                   while target.tagName != 'DIV'
+                     target = target.parentNode
+                   targetId = target.id
+                   for child in $searchResults.children()
+                     if child.id == targetId
+                       child.className = 'search-result-selected'
+                     else
+                       child.className = 'search-result'
+                  $searchResults.append(ele)
                 )
 
       dialog.on 'click', '.btn.action.cancel', (evt) =>
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index db889a4b94..d5e4a8185b 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -2,27 +2,13 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, checkURL, embedder, embedders, getTimeString, populator, selector, showModalDialog, uploadImage, youtube_embed_code_generator, youtube_embedder, youtube_url_validator;
-    embedder = function(url_validator, embed_code_generator) {
-      var result, set_embed_code_generator, set_url_validator;
+    var DIALOG_HTML, WARNING_IMAGE_PATH, active_embedder, active_embedder_value, checkURL, embedder, embedders, getTimeString, populator, selector, showModalDialog, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
+    embedder = function(url_validator, embed_code_generator, query_generator, search_results_generator) {
+      var result;
       this.embed_code_gen = embed_code_generator;
       this.url_validator = url_validator;
-      embed_code_generator = function(url) {
-        var embed_html;
-        embed_html = '<p> Hello World </p>';
-        return 'Validates a URL. Returns video id if URL is valide. Else returns false.\nShould be replaced with actual function. The default validates youtube URLs';
-      };
-      url_validator = function(url) {
-        var regexp, result;
-        regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
-        return result = url.match(regexp) ? RegExp.$1 : false;
-      };
-      set_embed_code_generator = function(url) {
-        return this.embed_code_gen = embed_code_generator;
-      };
-      set_url_validator = function(url) {
-        return this.url_validator = url_validator;
-      };
+      this.query_generator = query_generator;
+      this.search_results_generator = search_results_generator;
       return result = this;
     };
     youtube_url_validator = function(url) {
@@ -30,19 +16,57 @@
       regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
       return result = url.match(regexp) ? RegExp.$1 : false;
     };
-    youtube_embed_code_generator = function(url) {
-      var embed_html, video_id;
-      video_id = youtube_url_validator(url);
-      embed_html = '';
-      if (video_id) {
-        embed_html = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>';
+    youtube_embed_code_generator = function(id) {
+      return jQuery('<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>');
+    };
+    youtube_query_generator = function(queryTerms) {
+      var terms;
+      terms = queryTerms.split(' ');
+      return 'https://gdata.youtube.com/feeds/api/videos?q=' + terms.join('+') + '&alt=json&v=2';
+    };
+    youtube_search_results_generator = function(responseObj) {
+      var eleList, idTokens, newEntry, thumbnailHeight, thumbnailUrl, thumbnailWidth, video, videoDescription, videoId, videoLengthString, videoList, videoTitle, _i, _len;
+      eleList = [];
+      videoList = responseObj.feed.entry;
+      for (_i = 0, _len = videoList.length; _i < _len; _i++) {
+        video = videoList[_i];
+        thumbnailUrl = video.media$group.media$thumbnail[0].url;
+        thumbnailHeight = video.media$group.media$thumbnail[0].height;
+        thumbnailWidth = video.media$group.media$thumbnail[0].width;
+        videoTitle = video.title.$t;
+        videoDescription = video.media$group.media$description.$t;
+        videoLengthString = getTimeString(video.media$group.yt$duration.seconds);
+        idTokens = video.id.$t.split(':');
+        videoId = idTokens[idTokens.length - 1];
+        newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=' + videoId + '><table><tr><td rowspan=3><img src=' + thumbnailUrl + ' /></td><td><b>' + videoTitle + '</b></td></tr><tr><td>' + videoDescription + '</td></tr><tr><td>Duration: ' + videoLengthString + '</td></tr></table></div>');
+        eleList.push(newEntry);
       }
-      return embed_html;
+      return eleList;
     };
-    youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator);
+    vimeo_url_validator = function(url) {
+      return true;
+    };
+    vimeo_embed_code_generator = function(url) {
+      return '<p></p>';
+    };
+    vimeo_query_generator = function(queryTerms) {
+      var terms;
+      terms = queryTerms.split(' ');
+      return 'http://vimeo.com/api/rest/v2?format=json&method=vimeo.videos.search&user_id=jmaxg3&page=0&per_page=50&query=' + terms.join('+');
+    };
+    vimeo_search_results_generator = function(responseObj) {
+      var eleList;
+      eleList = [];
+      console.debug(responseObj);
+      return [];
+    };
+    youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator);
+    vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator);
     embedders = [];
     embedders[0] = youtube_embedder;
-    console.debug('initializing');
+    embedders[1] = vimeo_embedder;
+    active_embedder = youtube_embedder;
+    active_embedder_value = 'youtube';
     checkURL = function(url) {
       var _i, _len;
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
@@ -54,7 +78,7 @@
       return false;
     };
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><table><tr><td><input id=\'media-sites\' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input id=\'media-sites\' type="radio" name="video-site" value="vimeo">Vimeo</input></td></tr></table></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     getTimeString = function(timeInSeconds) {
       var ivalue, nHours, nMinutes, nSeconds, str;
       nHours = 0;
@@ -89,7 +113,7 @@
       return str;
     };
     showModalDialog = function($el) {
-      var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, getEmbedEle, getEmbedder, imageAltText, loadLocalFile, root, settings, setvideoSource, videoSource,
+      var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, imageAltText, loadLocalFile, radio, root, settings, setvideoSource, videoSource, _i, _len, _ref,
         _this = this;
       console.debug('Inside showModalDialog');
       settings = Aloha.require('assorted/assorted-plugin').settings;
@@ -113,6 +137,31 @@
           return target.style.borderWidth = 'medium';
         }
       };
+      _ref = dialog.find('#media-sites');
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        radio = _ref[_i];
+        radio.onclick = function(event) {
+          var index, val, _j, _len1, _ref1, _results;
+          console.debug('Radio button clicked');
+          val = event.target.value;
+          if (active_embedder_value !== val) {
+            index = 0;
+            _ref1 = dialog.find('#media-sites');
+            _results = [];
+            for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+              radio = _ref1[_j];
+              if (radio.value === val) {
+                console.debug('Setting ' + radio.value);
+                active_embedder_value = radio.value;
+                active_embedder = embedders[index];
+                break;
+              }
+              _results.push(index = index + 1);
+            }
+            return _results;
+          }
+        };
+      }
       if ($el.is('img')) {
         videoSource = $el.attr('src');
         imageAltText = $el.attr('alt');
@@ -127,30 +176,10 @@
         $uploadUrl.val(videoSource);
         $uploadUrl.show();
       }
-      getEmbedder = function(url) {
-        var _i, _len;
-        for (_i = 0, _len = embedders.length; _i < _len; _i++) {
-          embedder = embedders[_i];
-          if (embedder.url_validator(url)) {
-            return embedder;
-          }
-        }
-        return false;
-      };
       setvideoSource = function(href) {
         videoSource = href;
         return $submit.removeClass('disabled');
       };
-      getEmbedEle = function(url) {
-        var video;
-        if (!(embedder = getEmbedder(url))) {
-          console.debug("Error: URL not supported");
-          dialog.modal('hide');
-        }
-        video = jQuery(embedder.embed_code_gen(url));
-        video.attr('alt', dialog.find('[name=alt]').val());
-        return video;
-      };
       loadLocalFile = function(file, $img, callback) {
         var reader;
         reader = new FileReader();
@@ -189,64 +218,55 @@
       });
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
-        var child, embedHtml, video, video_id, _i, _len, _ref;
+        var child, video, video_id, _j, _len1, _ref1;
         evt.preventDefault();
         if ($el.is('img')) {
           $el.attr('src', videoSource);
           return $el.attr('alt', dialog.find('[name=alt]').val());
         } else {
           if (videoSource.length === 0) {
-            _ref = $searchResults.children();
-            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-              child = _ref[_i];
+            _ref1 = $searchResults.children();
+            for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+              child = _ref1[_j];
               if (child.className === 'search-result-selected') {
                 video_id = child.id;
-                embedHtml = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>';
-                AlohaInsertIntoDom(jQuery(embedHtml));
+                AlohaInsertIntoDom(active_embedder.embed_code_gen(video_id));
               }
             }
           } else {
-            video = getEmbedEle(videoSource);
+            video = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource));
             AlohaInsertIntoDom(video);
           }
           return dialog.modal('hide');
         }
       });
       dialog.on('click', '.btn.btn-primary.action.search', function(evt) {
-        var queryUrl, terms;
+        var queryUrl;
         evt.preventDefault();
-        terms = $searchTerms[0].value.split(' ');
-        queryUrl = 'https://gdata.youtube.com/feeds/api/videos?q=' + terms.join('+') + '&alt=json&v=2';
+        queryUrl = active_embedder.query_generator($searchTerms[0].value);
         $searchResults.empty();
         $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'));
         return jQuery.get(queryUrl, function(data) {
-          var idTokens, newEntry, responseObj, thumbnailHeight, thumbnailUrl, thumbnailWidth, video, videoDescription, videoId, videoLengthString, videoList, videoTitle, _i, _len, _results;
-          responseObj = jQuery.parseJSON(data);
-          videoList = responseObj.feed.entry;
+          var ele, responseObj, searchElements, _j, _len1, _results;
           $searchResults.empty();
+          responseObj = jQuery.parseJSON(data);
+          searchElements = active_embedder.search_results_generator(responseObj);
           _results = [];
-          for (_i = 0, _len = videoList.length; _i < _len; _i++) {
-            video = videoList[_i];
-            thumbnailUrl = video.media$group.media$thumbnail[0].url;
-            thumbnailHeight = video.media$group.media$thumbnail[0].height;
-            thumbnailWidth = video.media$group.media$thumbnail[0].width;
-            videoTitle = video.title.$t;
-            videoDescription = video.media$group.media$description.$t;
-            videoLengthString = getTimeString(video.media$group.yt$duration.seconds);
-            idTokens = video.id.$t.split(':');
-            videoId = idTokens[idTokens.length - 1];
-            newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=' + videoId + '><table><tr><td rowspan=3><img src=' + thumbnailUrl + ' /></td><td><b>' + videoTitle + '</b></td></tr><tr><td>' + videoDescription + '</td></tr><tr><td>Duration: ' + videoLengthString + '</td></tr></table></div>');
-            newEntry[0].onclick = function(evt) {
-              var child, target, targetId, _j, _len1, _ref, _results1;
+          for (_j = 0, _len1 = searchElements.length; _j < _len1; _j++) {
+            ele = searchElements[_j];
+            console.debug(ele);
+            ele[0].onclick = function(evt) {
+              var child, target, targetId, _k, _len2, _ref1, _results1;
+              console.debug(evt);
               target = evt.target;
               while (target.tagName !== 'DIV') {
                 target = target.parentNode;
               }
               targetId = target.id;
-              _ref = $searchResults.children();
+              _ref1 = $searchResults.children();
               _results1 = [];
-              for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
-                child = _ref[_j];
+              for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) {
+                child = _ref1[_k];
                 if (child.id === targetId) {
                   _results1.push(child.className = 'search-result-selected');
                 } else {
@@ -255,7 +275,7 @@
               }
               return _results1;
             };
-            _results.push($searchResults.append(newEntry));
+            _results.push($searchResults.append(ele));
           }
           return _results;
         });

From d66484e86aae8b802cb43a4561c0355bc2f46e15 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 9 Apr 2013 22:47:21 -0500
Subject: [PATCH 42/67] tried to get vimeo working, but looks like we might
 have to do oauth stuff...

---
 src/plugins/oer/assorted/lib/video.coffee | 4 +++-
 src/plugins/oer/assorted/lib/video.js     | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index a2f18564c7..df40815686 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -53,7 +53,9 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   vimeo_query_generator = (queryTerms) -> 
     terms = queryTerms.split(' ')
-    return 'http://vimeo.com/api/rest/v2?format=json&method=vimeo.videos.search&user_id=jmaxg3&page=0&per_page=50&query='+terms.join('+')
+    url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query='+terms.join('+')+'&user_id=jmaxg3'
+    console.debug url
+    return url
 
   vimeo_search_results_generator = (responseObj) ->
     eleList = [ ]
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index d5e4a8185b..5f3793df35 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -50,9 +50,11 @@
       return '<p></p>';
     };
     vimeo_query_generator = function(queryTerms) {
-      var terms;
+      var terms, url;
       terms = queryTerms.split(' ');
-      return 'http://vimeo.com/api/rest/v2?format=json&method=vimeo.videos.search&user_id=jmaxg3&page=0&per_page=50&query=' + terms.join('+');
+      url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query=' + terms.join('+') + '&user_id=jmaxg3';
+      console.debug(url);
+      return url;
     };
     vimeo_search_results_generator = function(responseObj) {
       var eleList;

From a4990e14f2c36abf51831e68848a0bb9a5d52f69 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Thu, 11 Apr 2013 10:37:24 -0500
Subject: [PATCH 43/67] commented code for wrapping iframes in a div

---
 src/plugins/oer/assorted/lib/video.coffee | 11 ++++++++---
 src/plugins/oer/assorted/lib/video.js     |  9 +++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index df40815686..7aa3cc6554 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -252,16 +252,21 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
           $el.attr 'alt', dialog.find('[name=alt]').val()
         else
           # Embeds the video into the page
+          #mediaWrapper = jQuery('<div class="media"></div>')
           if videoSource.length == 0
             # Use search results
             for child in $searchResults.children()
               if child.className == 'search-result-selected'
                 video_id = child.id
-                AlohaInsertIntoDom(active_embedder.embed_code_gen(video_id))
+                mediaElement = active_embedder.embed_code_gen(video_id)
+                break
           else
             # Use url
-            video = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource))
-            AlohaInsertIntoDom(video);
+            mediaElement = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource))
+
+          #mediaWrapper.append(mediaElement)
+          #AlohaInsertIntoDom(mediaWrapper)
+          AlohaInsertIntoDom(mediaElement)
           dialog.modal('hide')
 
       dialog.on 'click', '.btn.btn-primary.action.search', (evt) =>
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 5f3793df35..4f532a0756 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -220,7 +220,7 @@
       });
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
-        var child, video, video_id, _j, _len1, _ref1;
+        var child, mediaElement, video_id, _j, _len1, _ref1;
         evt.preventDefault();
         if ($el.is('img')) {
           $el.attr('src', videoSource);
@@ -232,13 +232,14 @@
               child = _ref1[_j];
               if (child.className === 'search-result-selected') {
                 video_id = child.id;
-                AlohaInsertIntoDom(active_embedder.embed_code_gen(video_id));
+                mediaElement = active_embedder.embed_code_gen(video_id);
+                break;
               }
             }
           } else {
-            video = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource));
-            AlohaInsertIntoDom(video);
+            mediaElement = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource));
           }
+          AlohaInsertIntoDom(mediaElement);
           return dialog.modal('hide');
         }
       });

From 485d5cec77b6d3fd09dbc59f59d4e72561c8c6ba Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 16 Apr 2013 22:49:29 -0500
Subject: [PATCH 44/67] working vimeo url validator

---
 src/plugins/oer/assorted/lib/video.coffee | 14 +++++++++++---
 src/plugins/oer/assorted/lib/video.js     | 19 ++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 7aa3cc6554..c044f81aa0 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -40,7 +40,14 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return eleList
 
   vimeo_url_validator = (url) ->
-    true
+    if url.indexOf('https://vimeo.com/') == 0
+      videoIdStr = url.substring(18)
+      intRegex = /^[0-9]$/
+      for c in videoIdStr
+        if !intRegex.test(c)
+          return false
+      return videoIdStr
+    return false
   
   vimeo_embed_code_generator = (url) ->
     return '<p></p>'
@@ -77,6 +84,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   checkURL = (url) ->
     for embedder in embedders
       if (embedder.url_validator(url)) 
+        console.debug 'Url validated'
         return true
     return false
 
@@ -154,7 +162,9 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       dialog.find("#video-url-input")[0].onkeyup = (event) -> 
         target = event.currentTarget
         currentVal = target.value
+        console.debug currentVal
         valid = checkURL(currentVal)
+        console.debug valid
         if(valid) 
             target.style.borderColor='green'
             target.style.borderWidth='medium'
@@ -196,10 +206,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.find('[name=alt]').val(imageAltText)
       # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
-      console.debug 'Checking'
       # /^https?:\/\// - old regex
       if checkURL(videoSource)
-        console.debug 'Checked'
         $uploadUrl.val(videoSource)
         $uploadUrl.show()
       # Retrieves embedder which can matches the format of the URL
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 4f532a0756..328afb5f8c 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -44,7 +44,19 @@
       return eleList;
     };
     vimeo_url_validator = function(url) {
-      return true;
+      var c, intRegex, videoIdStr, _i, _len;
+      if (url.indexOf('https://vimeo.com/') === 0) {
+        videoIdStr = url.substring(18);
+        intRegex = /^[0-9]$/;
+        for (_i = 0, _len = videoIdStr.length; _i < _len; _i++) {
+          c = videoIdStr[_i];
+          if (!intRegex.test(c)) {
+            return false;
+          }
+        }
+        return videoIdStr;
+      }
+      return false;
     };
     vimeo_embed_code_generator = function(url) {
       return '<p></p>';
@@ -74,6 +86,7 @@
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
         if (embedder.url_validator(url)) {
+          console.debug('Url validated');
           return true;
         }
       }
@@ -130,7 +143,9 @@
         var currentVal, target, valid;
         target = event.currentTarget;
         currentVal = target.value;
+        console.debug(currentVal);
         valid = checkURL(currentVal);
+        console.debug(valid);
         if (valid) {
           target.style.borderColor = 'green';
           return target.style.borderWidth = 'medium';
@@ -172,9 +187,7 @@
         imageAltText = '';
       }
       dialog.find('[name=alt]').val(imageAltText);
-      console.debug('Checking');
       if (checkURL(videoSource)) {
-        console.debug('Checked');
         $uploadUrl.val(videoSource);
         $uploadUrl.show();
       }

From c77283aa55ed2b69aecbe9021d92a265e273e15b Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 16 Apr 2013 23:02:36 -0500
Subject: [PATCH 45/67] support for vimeo URLs (though still not searches)

---
 src/plugins/oer/assorted/lib/video.coffee | 17 ++++++-----------
 src/plugins/oer/assorted/lib/video.js     | 16 ++++++++++------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index c044f81aa0..243e2add70 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -49,19 +49,12 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       return videoIdStr
     return false
   
-  vimeo_embed_code_generator = (url) ->
-    return '<p></p>'
-#video_id = youtube_url_validator(url)
-#    embed_html = ''
-#    if (video_id)
-#embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
-#      embed_html = '<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>'
-#    return embed_html
+  vimeo_embed_code_generator = (id) ->
+    return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/'+id+'" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>') 
 
   vimeo_query_generator = (queryTerms) -> 
     terms = queryTerms.split(' ')
     url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query='+terms.join('+')+'&user_id=jmaxg3'
-    console.debug url
     return url
 
   vimeo_search_results_generator = (responseObj) ->
@@ -84,7 +77,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   checkURL = (url) ->
     for embedder in embedders
       if (embedder.url_validator(url)) 
-        console.debug 'Url validated'
         return true
     return false
 
@@ -270,7 +262,10 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                 break
           else
             # Use url
-            mediaElement = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource))
+            for embedder in embedders
+              if (embedder.url_validator(videoSource))
+                mediaElement = embedder.embed_code_gen(embedder.url_validator(videoSource))
+                break
 
           #mediaWrapper.append(mediaElement)
           #AlohaInsertIntoDom(mediaWrapper)
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 328afb5f8c..a3408bd3bb 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -58,14 +58,13 @@
       }
       return false;
     };
-    vimeo_embed_code_generator = function(url) {
-      return '<p></p>';
+    vimeo_embed_code_generator = function(id) {
+      return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/' + id + '" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>');
     };
     vimeo_query_generator = function(queryTerms) {
       var terms, url;
       terms = queryTerms.split(' ');
       url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query=' + terms.join('+') + '&user_id=jmaxg3';
-      console.debug(url);
       return url;
     };
     vimeo_search_results_generator = function(responseObj) {
@@ -86,7 +85,6 @@
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
         if (embedder.url_validator(url)) {
-          console.debug('Url validated');
           return true;
         }
       }
@@ -233,7 +231,7 @@
       });
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
-        var child, mediaElement, video_id, _j, _len1, _ref1;
+        var child, mediaElement, video_id, _j, _k, _len1, _len2, _ref1;
         evt.preventDefault();
         if ($el.is('img')) {
           $el.attr('src', videoSource);
@@ -250,7 +248,13 @@
               }
             }
           } else {
-            mediaElement = active_embedder.embed_code_gen(active_embedder.url_validator(videoSource));
+            for (_k = 0, _len2 = embedders.length; _k < _len2; _k++) {
+              embedder = embedders[_k];
+              if (embedder.url_validator(videoSource)) {
+                mediaElement = embedder.embed_code_gen(embedder.url_validator(videoSource));
+                break;
+              }
+            }
           }
           AlohaInsertIntoDom(mediaElement);
           return dialog.modal('hide');

From 0a1146a6be8861c2882584cbad0a67b9f9efcb06 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Tue, 16 Apr 2013 23:08:16 -0500
Subject: [PATCH 46/67] more robust vimeo url validator

---
 src/plugins/oer/assorted/lib/video.coffee | 32 +++++++++++++++--
 src/plugins/oer/assorted/lib/video.js     | 42 ++++++++++++++++++++---
 2 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 243e2add70..fc1c251426 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -40,15 +40,17 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return eleList
 
   vimeo_url_validator = (url) ->
-    if url.indexOf('https://vimeo.com/') == 0
-      videoIdStr = url.substring(18)
+    if url.indexOf('vimeo.com/') != -1
+      offset = url.indexOf('vimeo.com/')
+      offset = offset + 10
+      videoIdStr = url.substring(offset)
       intRegex = /^[0-9]$/
       for c in videoIdStr
         if !intRegex.test(c)
           return false
       return videoIdStr
     return false
-  
+
   vimeo_embed_code_generator = (id) ->
     return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/'+id+'" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>') 
 
@@ -62,14 +64,38 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     console.debug responseObj
     return [ ]
 
+  slideshare_url_validator = (url) ->
+    if url.indexOf('https://vimeo.com/') == 0
+      videoIdStr = url.substring(18)
+      intRegex = /^[0-9]$/
+      for c in videoIdStr
+        if !intRegex.test(c)
+          return false
+      return videoIdStr
+    return false
+  
+  slideshare_embed_code_generator = (id) ->
+    return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/'+id+'" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>') 
+
+  slideshare_query_generator = (queryTerms) -> 
+    terms = queryTerms.split(' ')
+    url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query='+terms.join('+')+'&user_id=jmaxg3'
+    return url
+
+  slideshare_search_results_generator = (responseObj) ->
+    eleList = [ ]
+    console.debug responseObj
+    return [ ]
 
   youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator)
   vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator)
+  slideshare_embedder = new embedder(slideshare_url_validator, slideshare_embed_code_generator, slideshare_query_generator, slideshare_search_results_generator)
 
   # Adds the youtube embedders to the list of embedders
   embedders = []
   embedders[0] = youtube_embedder
   embedders[1] = vimeo_embedder
+  embedders[2] = slideshare_embedder
 
   active_embedder = youtube_embedder
   active_embedder_value = 'youtube'
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index a3408bd3bb..2b3a6188f4 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -2,7 +2,7 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, active_embedder, active_embedder_value, checkURL, embedder, embedders, getTimeString, populator, selector, showModalDialog, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
+    var DIALOG_HTML, WARNING_IMAGE_PATH, active_embedder, active_embedder_value, checkURL, embedder, embedders, getTimeString, populator, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
     embedder = function(url_validator, embed_code_generator, query_generator, search_results_generator) {
       var result;
       this.embed_code_gen = embed_code_generator;
@@ -44,9 +44,11 @@
       return eleList;
     };
     vimeo_url_validator = function(url) {
-      var c, intRegex, videoIdStr, _i, _len;
-      if (url.indexOf('https://vimeo.com/') === 0) {
-        videoIdStr = url.substring(18);
+      var c, intRegex, offset, videoIdStr, _i, _len;
+      if (url.indexOf('vimeo.com/') !== -1) {
+        offset = url.indexOf('vimeo.com/');
+        offset = offset + 10;
+        videoIdStr = url.substring(offset);
         intRegex = /^[0-9]$/;
         for (_i = 0, _len = videoIdStr.length; _i < _len; _i++) {
           c = videoIdStr[_i];
@@ -73,11 +75,43 @@
       console.debug(responseObj);
       return [];
     };
+    slideshare_url_validator = function(url) {
+      var c, intRegex, videoIdStr, _i, _len;
+      if (url.indexOf('https://vimeo.com/') === 0) {
+        videoIdStr = url.substring(18);
+        intRegex = /^[0-9]$/;
+        for (_i = 0, _len = videoIdStr.length; _i < _len; _i++) {
+          c = videoIdStr[_i];
+          if (!intRegex.test(c)) {
+            return false;
+          }
+        }
+        return videoIdStr;
+      }
+      return false;
+    };
+    slideshare_embed_code_generator = function(id) {
+      return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/' + id + '" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>');
+    };
+    slideshare_query_generator = function(queryTerms) {
+      var terms, url;
+      terms = queryTerms.split(' ');
+      url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query=' + terms.join('+') + '&user_id=jmaxg3';
+      return url;
+    };
+    slideshare_search_results_generator = function(responseObj) {
+      var eleList;
+      eleList = [];
+      console.debug(responseObj);
+      return [];
+    };
     youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator);
     vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator);
+    slideshare_embedder = new embedder(slideshare_url_validator, slideshare_embed_code_generator, slideshare_query_generator, slideshare_search_results_generator);
     embedders = [];
     embedders[0] = youtube_embedder;
     embedders[1] = vimeo_embedder;
+    embedders[2] = slideshare_embedder;
     active_embedder = youtube_embedder;
     active_embedder_value = 'youtube';
     checkURL = function(url) {

From 3a0f1f0f7b5572b6811ca103d2b911325b20a81e Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 17 Apr 2013 00:31:56 -0500
Subject: [PATCH 47/67] working URL input for slideshare and vimeo

---
 src/plugins/oer/assorted/lib/video.coffee | 81 ++++++++++++++-------
 src/plugins/oer/assorted/lib/video.js     | 89 +++++++++++++----------
 2 files changed, 104 insertions(+), 66 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index fc1c251426..67a0bb4735 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -11,10 +11,24 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     this.search_results_generator = search_results_generator
     result = this
 
+
+  YOUTUBE_ID = 0
+  VIMEO_ID = 1
+  SLIDESHARE_ID = 2
+
+  lastKnownUrlId = ''
+  lastWorkingEmbedder = -1
+
   # Creates a youtube embedder
   youtube_url_validator = (url) ->
     regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
-    result = if(url.match(regexp)) then RegExp.$1 else false
+    if url.match(regexp)
+      lastKnownUrlId = RegExp.$1
+      lastWorkingEmbedder = YOUTUBE_ID
+      return RegExp.$1
+    else
+      lastWorkingEmbedder = -1
+      return false
   
   youtube_embed_code_generator = (id) ->
     return jQuery('<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>')
@@ -48,7 +62,10 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       for c in videoIdStr
         if !intRegex.test(c)
           return false
+      lastKnownUrlId = videoIdStr
+      lastWorkingEmbedder = VIMEO_ID
       return videoIdStr
+    lastWorkingEmbedder = -1
     return false
 
   vimeo_embed_code_generator = (id) ->
@@ -64,27 +81,34 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     console.debug responseObj
     return [ ]
 
-  slideshare_url_validator = (url) ->
-    if url.indexOf('https://vimeo.com/') == 0
-      videoIdStr = url.substring(18)
-      intRegex = /^[0-9]$/
-      for c in videoIdStr
-        if !intRegex.test(c)
-          return false
-      return videoIdStr
+  slideshare_url_validator = (inputurl, inputbox) ->
+    if inputurl.indexOf('slideshare.net') == -1
+      return false
+
+    encodedUrl = encodeURIComponent(inputurl)
+    jQuery.ajax({
+            url: 'http://www.slideshare.net/api/oembed/2?url='+encodedUrl+'&format=jsonp',
+            async:false,
+            dataType: 'jsonp',
+            success: (result, status, statusObject) -> 
+              id = result.slideshow_id
+              if inputurl == inputbox.value
+                inputbox.style.borderColor='green'
+                inputbox.style.borderWidth='medium'
+                lastKnownUrlId = id
+                lastWorkingEmbedder = SLIDESHARE_ID
+            })
+    
+    lastWorkingEmbedder = -1
     return false
   
   slideshare_embed_code_generator = (id) ->
-    return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/'+id+'" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>') 
+    return jQuery('<iframe style="width:427px; height:356px" src="http://www.slideshare.net/slideshow/embed_code/'+id+'" width="427" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe>') 
 
   slideshare_query_generator = (queryTerms) -> 
-    terms = queryTerms.split(' ')
-    url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query='+terms.join('+')+'&user_id=jmaxg3'
-    return url
+    return false
 
   slideshare_search_results_generator = (responseObj) ->
-    eleList = [ ]
-    console.debug responseObj
     return [ ]
 
   youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator)
@@ -93,16 +117,16 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   # Adds the youtube embedders to the list of embedders
   embedders = []
-  embedders[0] = youtube_embedder
-  embedders[1] = vimeo_embedder
-  embedders[2] = slideshare_embedder
+  embedders[YOUTUBE_ID] = youtube_embedder
+  embedders[VIMEO_ID] = vimeo_embedder
+  embedders[SLIDESHARE_ID] = slideshare_embedder
 
   active_embedder = youtube_embedder
   active_embedder_value = 'youtube'
   
-  checkURL = (url) ->
+  checkURL = (url, inputbox) ->
     for embedder in embedders
-      if (embedder.url_validator(url)) 
+      if (embedder.url_validator(url, inputbox)) 
         return true
     return false
 
@@ -180,9 +204,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       dialog.find("#video-url-input")[0].onkeyup = (event) -> 
         target = event.currentTarget
         currentVal = target.value
-        console.debug currentVal
-        valid = checkURL(currentVal)
-        console.debug valid
+        valid = checkURL(currentVal, target)
         if(valid) 
             target.style.borderColor='green'
             target.style.borderWidth='medium'
@@ -225,7 +247,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       dialog.find('[name=alt]').val(imageAltText)
       # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
       # /^https?:\/\// - old regex
-      if checkURL(videoSource)
+      if checkURL(videoSource, $uploadUrl)
         $uploadUrl.val(videoSource)
         $uploadUrl.show()
       # Retrieves embedder which can matches the format of the URL
@@ -288,10 +310,13 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                 break
           else
             # Use url
-            for embedder in embedders
-              if (embedder.url_validator(videoSource))
-                mediaElement = embedder.embed_code_gen(embedder.url_validator(videoSource))
-                break
+            if lastWorkingEmbedder == -1
+              return
+            mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId)
+            #for embedder in embedders
+            #  if (embedder.url_validator(videoSource))
+            #    mediaElement = embedder.embed_code_gen(embedder.url_validator(videoSource))
+            #    break
 
           #mediaWrapper.append(mediaElement)
           #AlohaInsertIntoDom(mediaWrapper)
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 2b3a6188f4..cd9761ddab 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -2,7 +2,7 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, WARNING_IMAGE_PATH, active_embedder, active_embedder_value, checkURL, embedder, embedders, getTimeString, populator, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
+    var DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, WARNING_IMAGE_PATH, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, populator, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
     embedder = function(url_validator, embed_code_generator, query_generator, search_results_generator) {
       var result;
       this.embed_code_gen = embed_code_generator;
@@ -11,10 +11,22 @@
       this.search_results_generator = search_results_generator;
       return result = this;
     };
+    YOUTUBE_ID = 0;
+    VIMEO_ID = 1;
+    SLIDESHARE_ID = 2;
+    lastKnownUrlId = '';
+    lastWorkingEmbedder = -1;
     youtube_url_validator = function(url) {
-      var regexp, result;
+      var regexp;
       regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
-      return result = url.match(regexp) ? RegExp.$1 : false;
+      if (url.match(regexp)) {
+        lastKnownUrlId = RegExp.$1;
+        lastWorkingEmbedder = YOUTUBE_ID;
+        return RegExp.$1;
+      } else {
+        lastWorkingEmbedder = -1;
+        return false;
+      }
     };
     youtube_embed_code_generator = function(id) {
       return jQuery('<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>');
@@ -56,8 +68,11 @@
             return false;
           }
         }
+        lastKnownUrlId = videoIdStr;
+        lastWorkingEmbedder = VIMEO_ID;
         return videoIdStr;
       }
+      lastWorkingEmbedder = -1;
       return false;
     };
     vimeo_embed_code_generator = function(id) {
@@ -75,50 +90,53 @@
       console.debug(responseObj);
       return [];
     };
-    slideshare_url_validator = function(url) {
-      var c, intRegex, videoIdStr, _i, _len;
-      if (url.indexOf('https://vimeo.com/') === 0) {
-        videoIdStr = url.substring(18);
-        intRegex = /^[0-9]$/;
-        for (_i = 0, _len = videoIdStr.length; _i < _len; _i++) {
-          c = videoIdStr[_i];
-          if (!intRegex.test(c)) {
-            return false;
+    slideshare_url_validator = function(inputurl, inputbox) {
+      var encodedUrl;
+      if (inputurl.indexOf('slideshare.net') === -1) {
+        return false;
+      }
+      encodedUrl = encodeURIComponent(inputurl);
+      jQuery.ajax({
+        url: 'http://www.slideshare.net/api/oembed/2?url=' + encodedUrl + '&format=jsonp',
+        async: false,
+        dataType: 'jsonp',
+        success: function(result, status, statusObject) {
+          var id;
+          id = result.slideshow_id;
+          if (inputurl === inputbox.value) {
+            inputbox.style.borderColor = 'green';
+            inputbox.style.borderWidth = 'medium';
+            lastKnownUrlId = id;
+            return lastWorkingEmbedder = SLIDESHARE_ID;
           }
         }
-        return videoIdStr;
-      }
+      });
+      lastWorkingEmbedder = -1;
       return false;
     };
     slideshare_embed_code_generator = function(id) {
-      return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/' + id + '" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>');
+      return jQuery('<iframe style="width:427px; height:356px" src="http://www.slideshare.net/slideshow/embed_code/' + id + '" width="427" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe>');
     };
     slideshare_query_generator = function(queryTerms) {
-      var terms, url;
-      terms = queryTerms.split(' ');
-      url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query=' + terms.join('+') + '&user_id=jmaxg3';
-      return url;
+      return false;
     };
     slideshare_search_results_generator = function(responseObj) {
-      var eleList;
-      eleList = [];
-      console.debug(responseObj);
       return [];
     };
     youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator);
     vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator);
     slideshare_embedder = new embedder(slideshare_url_validator, slideshare_embed_code_generator, slideshare_query_generator, slideshare_search_results_generator);
     embedders = [];
-    embedders[0] = youtube_embedder;
-    embedders[1] = vimeo_embedder;
-    embedders[2] = slideshare_embedder;
+    embedders[YOUTUBE_ID] = youtube_embedder;
+    embedders[VIMEO_ID] = vimeo_embedder;
+    embedders[SLIDESHARE_ID] = slideshare_embedder;
     active_embedder = youtube_embedder;
     active_embedder_value = 'youtube';
-    checkURL = function(url) {
+    checkURL = function(url, inputbox) {
       var _i, _len;
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
-        if (embedder.url_validator(url)) {
+        if (embedder.url_validator(url, inputbox)) {
           return true;
         }
       }
@@ -175,9 +193,7 @@
         var currentVal, target, valid;
         target = event.currentTarget;
         currentVal = target.value;
-        console.debug(currentVal);
-        valid = checkURL(currentVal);
-        console.debug(valid);
+        valid = checkURL(currentVal, target);
         if (valid) {
           target.style.borderColor = 'green';
           return target.style.borderWidth = 'medium';
@@ -219,7 +235,7 @@
         imageAltText = '';
       }
       dialog.find('[name=alt]').val(imageAltText);
-      if (checkURL(videoSource)) {
+      if (checkURL(videoSource, $uploadUrl)) {
         $uploadUrl.val(videoSource);
         $uploadUrl.show();
       }
@@ -265,7 +281,7 @@
       });
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
-        var child, mediaElement, video_id, _j, _k, _len1, _len2, _ref1;
+        var child, mediaElement, video_id, _j, _len1, _ref1;
         evt.preventDefault();
         if ($el.is('img')) {
           $el.attr('src', videoSource);
@@ -282,13 +298,10 @@
               }
             }
           } else {
-            for (_k = 0, _len2 = embedders.length; _k < _len2; _k++) {
-              embedder = embedders[_k];
-              if (embedder.url_validator(videoSource)) {
-                mediaElement = embedder.embed_code_gen(embedder.url_validator(videoSource));
-                break;
-              }
+            if (lastWorkingEmbedder === -1) {
+              return;
             }
+            mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId);
           }
           AlohaInsertIntoDom(mediaElement);
           return dialog.modal('hide');

From a9c0b4574b298a5f98d53a68ff0fa77801cbe9c9 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 17 Apr 2013 10:11:06 -0500
Subject: [PATCH 48/67] remove old code

---
 src/plugins/oer/assorted/lib/video.coffee | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 67a0bb4735..48940b36b6 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -313,10 +313,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
             if lastWorkingEmbedder == -1
               return
             mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId)
-            #for embedder in embedders
-            #  if (embedder.url_validator(videoSource))
-            #    mediaElement = embedder.embed_code_gen(embedder.url_validator(videoSource))
-            #    break
 
           #mediaWrapper.append(mediaElement)
           #AlohaInsertIntoDom(mediaWrapper)

From a7109a9c9a5acd9f4ad8bcc284c89b31541c3ce0 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 17 Apr 2013 17:09:56 -0500
Subject: [PATCH 49/67] support for concord labs embedding

---
 src/plugins/oer/assorted/lib/video.coffee | 35 ++++++++++++++++---
 src/plugins/oer/assorted/lib/video.js     | 41 +++++++++++++++++++----
 2 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 48940b36b6..f27c7711fb 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -15,6 +15,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   YOUTUBE_ID = 0
   VIMEO_ID = 1
   SLIDESHARE_ID = 2
+  CONCORD_ID = 3
 
   lastKnownUrlId = ''
   lastWorkingEmbedder = -1
@@ -77,8 +78,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return url
 
   vimeo_search_results_generator = (responseObj) ->
-    eleList = [ ]
-    console.debug responseObj
     return [ ]
 
   slideshare_url_validator = (inputurl, inputbox) ->
@@ -111,15 +110,43 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   slideshare_search_results_generator = (responseObj) ->
     return [ ]
 
+  concord_url_validator = (url) ->
+    concordLabUrl = 'lab.concord.org/examples/interactives/interactives.html#interactives/samples/'
+    if url.indexOf(concordLabUrl) != -1
+      offset = url.indexOf(concordLabUrl)
+      offset = offset + concordLabUrl.length
+      id = url.substring(offset)
+      if id.length > 5
+        post = id.substring(id.length-5)
+        if post == '.json'
+          id = id.substring(0, id.length-5)
+          console.debug id
+          lastKnownUrlId = id
+          lastWorkingEmbedder = CONCORD_ID
+          return id
+
+    return false
+
+  concord_embed_code_generator = (id) ->
+    return jQuery('<iframe style="width:925px; height:575px" width="925" height="575" frameborder="no" scrolling="no" src="http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/'+id+'.json"></iframe>')
+
+  concord_query_generator = (queryTerms) -> 
+    false
+
+  concord_search_results_generator = (responseObj) ->
+    return [ ]
+
   youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator)
   vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator)
   slideshare_embedder = new embedder(slideshare_url_validator, slideshare_embed_code_generator, slideshare_query_generator, slideshare_search_results_generator)
+  concord_embedder = new embedder(concord_url_validator, concord_embed_code_generator, concord_query_generator, concord_search_results_generator)
 
   # Adds the youtube embedders to the list of embedders
   embedders = []
   embedders[YOUTUBE_ID] = youtube_embedder
   embedders[VIMEO_ID] = vimeo_embedder
   embedders[SLIDESHARE_ID] = slideshare_embedder
+  embedders[CONCORD_ID] = concord_embedder
 
   active_embedder = youtube_embedder
   active_embedder_value = 'youtube'
@@ -284,7 +311,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         $previewImg = $placeholder.find('img')
         url = $uploadUrl.val()
         setvideoSource(url)
-        console.debug 'changing'
         if settings.image.preview
           $previewImg.attr 'src', url
           $placeholder.show()
@@ -295,6 +321,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.on 'click', '.btn.btn-primary.action.insert', (evt) =>
         evt.preventDefault() # Don't submit the form
+        console.debug 'Inserting...'
         if $el.is('img')
           $el.attr 'src', videoSource
           $el.attr 'alt', dialog.find('[name=alt]').val()
@@ -310,6 +337,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                 break
           else
             # Use url
+            console.debug 'Attempting URL support with '+lastWorkingEmbedder
             if lastWorkingEmbedder == -1
               return
             mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId)
@@ -436,7 +464,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   UI.adopt 'insertVideo-oer', null,
     click: () ->
-      console.debug 'Inserting video..'
       newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
       # Inserts Google Picker into the DOM
 # newVideoPicker()        
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index cd9761ddab..8c1e0b0fc0 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -2,7 +2,7 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, WARNING_IMAGE_PATH, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, populator, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
+    var CONCORD_ID, DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, WARNING_IMAGE_PATH, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, concord_embed_code_generator, concord_embedder, concord_query_generator, concord_search_results_generator, concord_url_validator, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, populator, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
     embedder = function(url_validator, embed_code_generator, query_generator, search_results_generator) {
       var result;
       this.embed_code_gen = embed_code_generator;
@@ -14,6 +14,7 @@
     YOUTUBE_ID = 0;
     VIMEO_ID = 1;
     SLIDESHARE_ID = 2;
+    CONCORD_ID = 3;
     lastKnownUrlId = '';
     lastWorkingEmbedder = -1;
     youtube_url_validator = function(url) {
@@ -85,9 +86,6 @@
       return url;
     };
     vimeo_search_results_generator = function(responseObj) {
-      var eleList;
-      eleList = [];
-      console.debug(responseObj);
       return [];
     };
     slideshare_url_validator = function(inputurl, inputbox) {
@@ -123,13 +121,44 @@
     slideshare_search_results_generator = function(responseObj) {
       return [];
     };
+    concord_url_validator = function(url) {
+      var concordLabUrl, id, offset, post;
+      concordLabUrl = 'lab.concord.org/examples/interactives/interactives.html#interactives/samples/';
+      if (url.indexOf(concordLabUrl) !== -1) {
+        offset = url.indexOf(concordLabUrl);
+        offset = offset + concordLabUrl.length;
+        id = url.substring(offset);
+        if (id.length > 5) {
+          post = id.substring(id.length - 5);
+          if (post === '.json') {
+            id = id.substring(0, id.length - 5);
+            console.debug(id);
+            lastKnownUrlId = id;
+            lastWorkingEmbedder = CONCORD_ID;
+            return id;
+          }
+        }
+      }
+      return false;
+    };
+    concord_embed_code_generator = function(id) {
+      return jQuery('<iframe style="width:925px; height:575px" width="925" height="575" frameborder="no" scrolling="no" src="http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/' + id + '.json"></iframe>');
+    };
+    concord_query_generator = function(queryTerms) {
+      return false;
+    };
+    concord_search_results_generator = function(responseObj) {
+      return [];
+    };
     youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator);
     vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator);
     slideshare_embedder = new embedder(slideshare_url_validator, slideshare_embed_code_generator, slideshare_query_generator, slideshare_search_results_generator);
+    concord_embedder = new embedder(concord_url_validator, concord_embed_code_generator, concord_query_generator, concord_search_results_generator);
     embedders = [];
     embedders[YOUTUBE_ID] = youtube_embedder;
     embedders[VIMEO_ID] = vimeo_embedder;
     embedders[SLIDESHARE_ID] = slideshare_embedder;
+    embedders[CONCORD_ID] = concord_embedder;
     active_embedder = youtube_embedder;
     active_embedder_value = 'youtube';
     checkURL = function(url, inputbox) {
@@ -273,7 +302,6 @@
         $previewImg = $placeholder.find('img');
         url = $uploadUrl.val();
         setvideoSource(url);
-        console.debug('changing');
         if (settings.image.preview) {
           $previewImg.attr('src', url);
           return $placeholder.show();
@@ -283,6 +311,7 @@
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
         var child, mediaElement, video_id, _j, _len1, _ref1;
         evt.preventDefault();
+        console.debug('Inserting...');
         if ($el.is('img')) {
           $el.attr('src', videoSource);
           return $el.attr('alt', dialog.find('[name=alt]').val());
@@ -298,6 +327,7 @@
               }
             }
           } else {
+            console.debug('Attempting URL support with ' + lastWorkingEmbedder);
             if (lastWorkingEmbedder === -1) {
               return;
             }
@@ -435,7 +465,6 @@
     UI.adopt('insertVideo-oer', null, {
       click: function() {
         var newEl, promise;
-        console.debug('Inserting video..');
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
         promise = showModalDialog(newEl);
         promise.done(function(data) {

From 473a538989fd27209468d2700aebb46fb87f0f05 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Mon, 22 Apr 2013 23:15:55 -0500
Subject: [PATCH 50/67] fix chrome support

---
 src/plugins/oer/assorted/lib/video.coffee | 12 +++++-------
 src/plugins/oer/assorted/lib/video.js     | 16 +++++++---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index f27c7711fb..75edfed605 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -50,7 +50,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       videoLengthString = getTimeString(video.media$group.yt$duration.seconds)
       idTokens = video.id.$t.split(':')
       videoId = idTokens[idTokens.length-1]
-      newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
+      newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td width=20% rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
       eleList.push(newEntry)
     return eleList
 
@@ -217,7 +217,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   # Defines a template for an embedder object which is responsible for generating embed html and validating a url
   showModalDialog = ($el) ->
-      console.debug 'Inside showModalDialog'
       settings = Aloha.require('assorted/assorted-plugin').settings
       root = Aloha.activeEditable.obj
       dialog = jQuery(DIALOG_HTML)
@@ -241,7 +240,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       for radio in dialog.find('#media-sites')
         radio.onclick = (event) ->
-          console.debug 'Radio button clicked'
           val = event.target.value
           if active_embedder_value != val
             index = 0
@@ -300,7 +298,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         evt.preventDefault()
         $placeholder.hide()
         $uploadUrl.hide()
-        console.debug 'Hiding placeholder url'
 
       dialog.find('.upload-url-link').on 'click', (evt) ->
         evt.preventDefault()
@@ -352,12 +349,13 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         queryUrl = active_embedder.query_generator($searchTerms[0].value)
         $searchResults.empty()
         $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'))
-        jQuery.get(queryUrl, (data) => 
+        jQuery.get(queryUrl, (responseObj) => 
                 $searchResults.empty()
-                responseObj = jQuery.parseJSON(data)
+                if (typeof responseObj) == 'string'
+                  responseObj = jQuery.parseJSON(responseObj)
+
                 searchElements = active_embedder.search_results_generator(responseObj)
                 for ele in searchElements
-                  console.debug ele
                   ele[0].onclick = (evt) => 
                    console.debug evt
                    target = evt.target
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 8c1e0b0fc0..e88254e320 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -51,7 +51,7 @@
         videoLengthString = getTimeString(video.media$group.yt$duration.seconds);
         idTokens = video.id.$t.split(':');
         videoId = idTokens[idTokens.length - 1];
-        newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=' + videoId + '><table><tr><td rowspan=3><img src=' + thumbnailUrl + ' /></td><td><b>' + videoTitle + '</b></td></tr><tr><td>' + videoDescription + '</td></tr><tr><td>Duration: ' + videoLengthString + '</td></tr></table></div>');
+        newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=' + videoId + '><table><tr><td width=20% rowspan=3><img src=' + thumbnailUrl + ' /></td><td><b>' + videoTitle + '</b></td></tr><tr><td>' + videoDescription + '</td></tr><tr><td>Duration: ' + videoLengthString + '</td></tr></table></div>');
         eleList.push(newEntry);
       }
       return eleList;
@@ -209,7 +209,6 @@
     showModalDialog = function($el) {
       var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, imageAltText, loadLocalFile, radio, root, settings, setvideoSource, videoSource, _i, _len, _ref,
         _this = this;
-      console.debug('Inside showModalDialog');
       settings = Aloha.require('assorted/assorted-plugin').settings;
       root = Aloha.activeEditable.obj;
       dialog = jQuery(DIALOG_HTML);
@@ -236,7 +235,6 @@
         radio = _ref[_i];
         radio.onclick = function(event) {
           var index, val, _j, _len1, _ref1, _results;
-          console.debug('Radio button clicked');
           val = event.target.value;
           if (active_embedder_value !== val) {
             index = 0;
@@ -289,8 +287,7 @@
       dialog.find('.upload-image-link').on('click', function(evt) {
         evt.preventDefault();
         $placeholder.hide();
-        $uploadUrl.hide();
-        return console.debug('Hiding placeholder url');
+        return $uploadUrl.hide();
       });
       dialog.find('.upload-url-link').on('click', function(evt) {
         evt.preventDefault();
@@ -343,15 +340,16 @@
         queryUrl = active_embedder.query_generator($searchTerms[0].value);
         $searchResults.empty();
         $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'));
-        return jQuery.get(queryUrl, function(data) {
-          var ele, responseObj, searchElements, _j, _len1, _results;
+        return jQuery.get(queryUrl, function(responseObj) {
+          var ele, searchElements, _j, _len1, _results;
           $searchResults.empty();
-          responseObj = jQuery.parseJSON(data);
+          if ((typeof responseObj) === 'string') {
+            responseObj = jQuery.parseJSON(responseObj);
+          }
           searchElements = active_embedder.search_results_generator(responseObj);
           _results = [];
           for (_j = 0, _len1 = searchElements.length; _j < _len1; _j++) {
             ele = searchElements[_j];
-            console.debug(ele);
             ele[0].onclick = function(evt) {
               var child, target, targetId, _k, _len2, _ref1, _results1;
               console.debug(evt);

From 0a7559a374adb55a2393d747dcb4ff9e86d4d752 Mon Sep 17 00:00:00 2001
From: Marvin Reimer <therealmarv@gmail.com>
Date: Wed, 24 Apr 2013 16:32:39 -0500
Subject: [PATCH 51/67] resize vimeo videos the same size as youtube

---
 src/plugins/oer/assorted/lib/video.coffee |  2 +-
 src/plugins/oer/assorted/lib/video.js     | 33 ++++++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 75edfed605..d0ad78dd9a 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -70,7 +70,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return false
 
   vimeo_embed_code_generator = (id) ->
-    return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/'+id+'" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>') 
+    return jQuery('<iframe style="width:640px; height:380px" src="http://player.vimeo.com/video/'+id+'" width="640" height="380" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>') 
 
   vimeo_query_generator = (queryTerms) -> 
     terms = queryTerms.split(' ')
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index e88254e320..05fae4b922 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -1,10 +1,11 @@
-// Generated by CoffeeScript 1.3.3
+// Generated by CoffeeScript 1.6.2
 (function() {
-
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
     var CONCORD_ID, DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, WARNING_IMAGE_PATH, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, concord_embed_code_generator, concord_embedder, concord_query_generator, concord_search_results_generator, concord_url_validator, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, populator, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
+
     embedder = function(url_validator, embed_code_generator, query_generator, search_results_generator) {
       var result;
+
       this.embed_code_gen = embed_code_generator;
       this.url_validator = url_validator;
       this.query_generator = query_generator;
@@ -19,6 +20,7 @@
     lastWorkingEmbedder = -1;
     youtube_url_validator = function(url) {
       var regexp;
+
       regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
       if (url.match(regexp)) {
         lastKnownUrlId = RegExp.$1;
@@ -34,11 +36,13 @@
     };
     youtube_query_generator = function(queryTerms) {
       var terms;
+
       terms = queryTerms.split(' ');
       return 'https://gdata.youtube.com/feeds/api/videos?q=' + terms.join('+') + '&alt=json&v=2';
     };
     youtube_search_results_generator = function(responseObj) {
       var eleList, idTokens, newEntry, thumbnailHeight, thumbnailUrl, thumbnailWidth, video, videoDescription, videoId, videoLengthString, videoList, videoTitle, _i, _len;
+
       eleList = [];
       videoList = responseObj.feed.entry;
       for (_i = 0, _len = videoList.length; _i < _len; _i++) {
@@ -58,6 +62,7 @@
     };
     vimeo_url_validator = function(url) {
       var c, intRegex, offset, videoIdStr, _i, _len;
+
       if (url.indexOf('vimeo.com/') !== -1) {
         offset = url.indexOf('vimeo.com/');
         offset = offset + 10;
@@ -77,10 +82,11 @@
       return false;
     };
     vimeo_embed_code_generator = function(id) {
-      return jQuery('<iframe style="width:500px; height:281px" src="http://player.vimeo.com/video/' + id + '" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>');
+      return jQuery('<iframe style="width:640px; height:380px" src="http://player.vimeo.com/video/' + id + '" width="640" height="380" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>');
     };
     vimeo_query_generator = function(queryTerms) {
       var terms, url;
+
       terms = queryTerms.split(' ');
       url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query=' + terms.join('+') + '&user_id=jmaxg3';
       return url;
@@ -90,6 +96,7 @@
     };
     slideshare_url_validator = function(inputurl, inputbox) {
       var encodedUrl;
+
       if (inputurl.indexOf('slideshare.net') === -1) {
         return false;
       }
@@ -100,6 +107,7 @@
         dataType: 'jsonp',
         success: function(result, status, statusObject) {
           var id;
+
           id = result.slideshow_id;
           if (inputurl === inputbox.value) {
             inputbox.style.borderColor = 'green';
@@ -123,6 +131,7 @@
     };
     concord_url_validator = function(url) {
       var concordLabUrl, id, offset, post;
+
       concordLabUrl = 'lab.concord.org/examples/interactives/interactives.html#interactives/samples/';
       if (url.indexOf(concordLabUrl) !== -1) {
         offset = url.indexOf(concordLabUrl);
@@ -163,6 +172,7 @@
     active_embedder_value = 'youtube';
     checkURL = function(url, inputbox) {
       var _i, _len;
+
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
         if (embedder.url_validator(url, inputbox)) {
@@ -175,6 +185,7 @@
     DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><table><tr><td><input id=\'media-sites\' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input id=\'media-sites\' type="radio" name="video-site" value="vimeo">Vimeo</input></td></tr></table></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     getTimeString = function(timeInSeconds) {
       var ivalue, nHours, nMinutes, nSeconds, str;
+
       nHours = 0;
       nMinutes = 0;
       nSeconds = 0;
@@ -209,6 +220,7 @@
     showModalDialog = function($el) {
       var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, imageAltText, loadLocalFile, radio, root, settings, setvideoSource, videoSource, _i, _len, _ref,
         _this = this;
+
       settings = Aloha.require('assorted/assorted-plugin').settings;
       root = Aloha.activeEditable.obj;
       dialog = jQuery(DIALOG_HTML);
@@ -219,6 +231,7 @@
       $submit = dialog.find('.action.insert');
       dialog.find("#video-url-input")[0].onkeyup = function(event) {
         var currentVal, target, valid;
+
         target = event.currentTarget;
         currentVal = target.value;
         valid = checkURL(currentVal, target);
@@ -235,6 +248,7 @@
         radio = _ref[_i];
         radio.onclick = function(event) {
           var index, val, _j, _len1, _ref1, _results;
+
           val = event.target.value;
           if (active_embedder_value !== val) {
             index = 0;
@@ -272,6 +286,7 @@
       };
       loadLocalFile = function(file, $img, callback) {
         var reader;
+
         reader = new FileReader();
         reader.onloadend = function() {
           if ($img) {
@@ -296,6 +311,7 @@
       });
       $uploadUrl.on('change', function() {
         var $previewImg, url;
+
         $previewImg = $placeholder.find('img');
         url = $uploadUrl.val();
         setvideoSource(url);
@@ -307,6 +323,7 @@
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
         var child, mediaElement, video_id, _j, _len1, _ref1;
+
         evt.preventDefault();
         console.debug('Inserting...');
         if ($el.is('img')) {
@@ -336,12 +353,14 @@
       });
       dialog.on('click', '.btn.btn-primary.action.search', function(evt) {
         var queryUrl;
+
         evt.preventDefault();
         queryUrl = active_embedder.query_generator($searchTerms[0].value);
         $searchResults.empty();
         $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'));
         return jQuery.get(queryUrl, function(responseObj) {
           var ele, searchElements, _j, _len1, _results;
+
           $searchResults.empty();
           if ((typeof responseObj) === 'string') {
             responseObj = jQuery.parseJSON(responseObj);
@@ -352,6 +371,7 @@
             ele = searchElements[_j];
             ele[0].onclick = function(evt) {
               var child, target, targetId, _k, _len2, _ref1, _results1;
+
               console.debug(evt);
               target = evt.target;
               while (target.tagName !== 'DIV') {
@@ -402,11 +422,13 @@
     selector = 'img';
     populator = function($el, pover) {
       var $bubble, editable, href;
+
       editable = Aloha.activeEditable;
       $bubble = jQuery('<div class="link-popover-details">\n    <a class="change">\n      <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/edit-link-03.png" />\n  <span title="Change the image\'s properties">Edit image...</span>\n</a>\n&nbsp; | &nbsp;\n<a class="remove">\n  <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/unlink-link-02.png" />\n      <span title="Delete the image">Delete</span>\n    </a>\n</div>');
       href = $el.attr('src');
       $bubble.find('.change').on('click', function() {
         var promise;
+
         Aloha.activeEditable = editable;
         promise = showModalDialog($el);
         promise.done(function(data) {
@@ -427,6 +449,7 @@
     };
     uploadImage = function(file, callback) {
       var f, plugin, settings, xhr;
+
       plugin = this;
       settings = Aloha.require('assorted/assorted-plugin').settings;
       xhr = new XMLHttpRequest();
@@ -436,6 +459,7 @@
         }
         xhr.onload = function() {
           var url;
+
           if (settings.image.parseresponse) {
             url = parseresponse(xhr);
           } else {
@@ -452,6 +476,7 @@
     };
     Aloha.bind('aloha-image-selected', function(event, target) {
       var $el, nodes;
+
       $el = jQuery(target);
       nodes = jQuery(Aloha.activeEditable.obj).find(selector);
       nodes = nodes.not($el);
@@ -463,6 +488,7 @@
     UI.adopt('insertVideo-oer', null, {
       click: function() {
         var newEl, promise;
+
         newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
         promise = showModalDialog(newEl);
         promise.done(function(data) {
@@ -476,6 +502,7 @@
         });
         promise.fail(function(data) {
           var $target;
+
           $target = jQuery(data.target);
           if (!$target.is('img')) {
             return $target.remove();

From 8c8b77b613937fe70ae3ccf11ec3657377a1101b Mon Sep 17 00:00:00 2001
From: Marvin Reimer <therealmarv@gmail.com>
Date: Wed, 24 Apr 2013 16:39:12 -0500
Subject: [PATCH 52/67] deactivate Vimeo search option for now

---
 src/plugins/oer/assorted/lib/video.coffee | 2 +-
 src/plugins/oer/assorted/lib/video.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index d0ad78dd9a..27e93bd38b 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -173,7 +173,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         <center>OR</center>
         <div class="modal-body" >
             <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>
-            <center><table><tr><td><input id='media-sites' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input id='media-sites' type="radio" name="video-site" value="vimeo">Vimeo</input></td></tr></table></center>
+            <center><table><tr><td><input id='media-sites' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input disabled id='media-sites' type="radio" name="video-site" value="vimeo">Vimeo (search not working)</input></td></tr></table></center>
             <center><button type="search" class="btn btn-primary action search">Search</button></center>
         </div>
         <div class="modal-body" >
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 05fae4b922..bdfa4290f1 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -182,7 +182,7 @@
       return false;
     };
     WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><table><tr><td><input id=\'media-sites\' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input id=\'media-sites\' type="radio" name="video-site" value="vimeo">Vimeo</input></td></tr></table></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><table><tr><td><input id=\'media-sites\' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input disabled id=\'media-sites\' type="radio" name="video-site" value="vimeo">Vimeo (search not working)</input></td></tr></table></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     getTimeString = function(timeInSeconds) {
       var ivalue, nHours, nMinutes, nSeconds, str;
 

From ef45dc54b5809acbcb4321940cae58001f12f4d1 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Thu, 2 May 2013 15:21:08 -0500
Subject: [PATCH 53/67] Cleaned up some of the extra code left over from our
 debugging

---
 src/plugins/oer/assorted/lib/aloha-helper.js  |   1 -
 .../oer/assorted/lib/gpicker_index.html       | 303 -----------------
 src/plugins/oer/assorted/lib/trash.js         | 227 -------------
 src/plugins/oer/assorted/lib/video.coffee     |  16 +-
 .../assorted/lib/video_custom_plugin.coffee   | 308 ------------------
 5 files changed, 11 insertions(+), 844 deletions(-)
 delete mode 100755 src/plugins/oer/assorted/lib/gpicker_index.html
 delete mode 100644 src/plugins/oer/assorted/lib/trash.js
 delete mode 100644 src/plugins/oer/assorted/lib/video_custom_plugin.coffee

diff --git a/src/plugins/oer/assorted/lib/aloha-helper.js b/src/plugins/oer/assorted/lib/aloha-helper.js
index 308446f9c5..05afa74dfe 100644
--- a/src/plugins/oer/assorted/lib/aloha-helper.js
+++ b/src/plugins/oer/assorted/lib/aloha-helper.js
@@ -1,7 +1,6 @@
 // Insert custom HTML into dom tree at the current cursor position of Aloha editor
 // used this as template: https://github.com/michaelperrin/sfAlohaPlugin/blob/cc320dcc984bcf7a2b54bb0191276679eb951742/web/js/aloha-plugins/image-upload/lib/image-upload-plugin.js#L106
 function AlohaInsertIntoDom(code) {
-	console.log("Trying to insert into the DOM");
     var range = Aloha.Selection.getRangeObject();
 
         GENTICS.Utils.Dom.insertIntoDOM(
diff --git a/src/plugins/oer/assorted/lib/gpicker_index.html b/src/plugins/oer/assorted/lib/gpicker_index.html
deleted file mode 100755
index da2c71482c..0000000000
--- a/src/plugins/oer/assorted/lib/gpicker_index.html
+++ /dev/null
@@ -1,303 +0,0 @@
-<!doctype html>
-<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
-<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"> <![endif]-->
-<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"> <![endif]-->
-<!--[if IE 9 ]>    <html lang="en" class="no-js ie9"> <![endif]-->
-<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en" class="no-js"> <!--<![endif]-->
-<head>
-	<title>The Aloha Editor Boilerplate - Just another demo page</title>
-
-	<meta charset="UTF-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-	<meta name="description" content="The Aloha Editor Boilerplate - Just another demo page">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="shortcut icon" href="/favicon.ico">
-	<link rel="apple-touch-icon" href="/apple-touch-icon.png">
-
-	<!--
-		Load the CSS styles for Aloha Editor
-	-->
-	<link rel="stylesheet" href="../../css/aloha.css" type="text/css">
-
-	<link rel="stylesheet" href="css/jquery-ui-1.8.16.custom.css" type="text/css">
-
-	<style>
-		/* Basic Styling for Sidebar */
-		.aloha-sidebar {
-		  position: fixed;
-		  right: 0;
-		  top: 0;
-		  width: 250px;
-		  height: 100%;
-		  border: 1px solid #000;
-		  border-width: 0 0 0 1px;
-		  background-color: #fff;
-		  padding: 10px;
-		}
-
-		.aloha-panel {
-		  border: 1px solid #000;
-		}
-
-		.aloha-panel-title {
-		  background-color: #000;
-		  color: #fff;
-		  padding: 5px 10px;
-		}
-
-		.aloha-panel-content {
-		 padding: 5px 10px;
-		}
-	</style>
-
-	<!--
-		All configuration for Aloha Editor for this demo is stored in js/aloha-config.js
-		It can also be placed inline here before loading Aloha Editor itself.
-	-->
-	<script src="js/aloha-config.js"></script>
-	<script src="../../lib/vendor/jquery-1.7.2.js"></script>
-	<script src="../../lib/require.js"></script>
-    <script>
-		Aloha.settings.jQuery = $.noConflict(true);
-    </script>
-	<!--
-		Load the Aloha Editor library.
-		The plugin list could also be added to the configuration.
-	-->
-	<script src="../../lib/aloha.js"
-	        data-aloha-plugins="common/ui,
-	                            common/format,
-	                            common/table,
-	                            common/list,
-	                            common/link,
-	                            common/highlighteditables,
-	                            common/undo,
-	                            common/contenthandler,
-	                            common/paste,
-	                            common/characterpicker,
-	                            common/commands,
-	                            common/block,
-	                            common/image,
-	                            common/abbr,
-	                            common/horizontalruler,
-	                            common/align,
-	                            extra/formatlesspaste,
-	                            extra/toc,
-	                            extra/headerids,
-	                            extra/listenforcer,
-	                            extra/metaview,
-	                            extra/numerated-headers,
-	                            extra/ribbon,
-	                            extra/wai-lang,
-	                            extra/flag-icons,
-	                            extra/linkbrowser,
-	                            extra/imagebrowser,
-	                            extra/cite"></script>
-	<!--
-		Application specific code
-	-->
-	<script src="http://www.google.com/jsapi"></script>
-	<script src="gpickerdialog.js"></script>
-	<script src="image-dialog.js"></script>
-	<script src="aloha-helper.js"></script>
-
-    <script src="ribbon-example.js"></script>
-	<link rel="stylesheet" href="css/style.css">
-	<script src="js/aloha-boilerplate.js"></script>
-</head>
-<body>
-	<div id="whole-site">
-		<div id="aloha-loading"><span>Loading Aloha Editor</span> <img src="img/loading1.gif" title="Loading Aloha Editor ..."/></div>
-		<div id="container">
-			<div id="header">
-				<a id="editor-logo" href="#"><img src="img/aloha-editor-logo.png" alt="Aloha Editor" /></a>
-				<p id="top-text">The Aloha Boilerplate.</p>
-			</div>
-			<div id="navigation">
-				<ul>
-					<li><a href="#">formatting</a></li>
-					<li><a href="#">images</a></li>
-					<li><a href="#">tables</a></li>
-					<li><a href="#">boxes</a></li>
-					<li><a href="#">comments</a></li>
-				</ul>
-			</div>
-			<div id="main" role="main">
-			<!-- Stage area start -->
-				<div class="stage-area">
-					<ul class="stage-switcher">
-						<li class="stage">
-							<span class="stage-icon" style="background-image: url(img/stage-icon-formats.png);"></span>
-							<h2>Formatting</h2>
-							<p>Bold, headlines, ...</p>
-							<div class="small-image stage-item">
-								<img src="img/stage-bg-formats.png" alt="" />
-								<div class="area-content">
-									<div class="aloha-textbox">
-									<p><b>Bold or headlines, whatever you might want</b></p>
-									<h2>Formatting content</h2>
-									<p>Editing any content with Aloha Editor is similar to editing with state of the art word processors on your desktop. No need to learn any HTML, Wiki or other markup language. The option dialogs have been designed for users not for techies. Writing content has never been that easy.</p>
-									<p><a href="#">More about content formatting</a></p>
-									</div>
-								</div>
-							</div>
-						</li>
-						<li class="stage">
-							<span class="stage-icon" style="background-image: url(img/stage-icon-images.png);"></span>
-							<h2>Images</h2>
-							<p>Placing, scaling ...</p>
-							<div class="full-image stage-item">
-								<img src="img/stage-bg-images.png" alt="" />
-								<div class="area-content">
-									<h3>Place and edit images with Aloha</h3>
-									<h2>Image-Editing</h2>
-									<p><img src="http://aloha-editor.org/logo/Aloha%20Editor%20HTML5%20sticker%20transparent%20128.png" title="Aloha Editor" alt="Aloha Editor" /> Editing any content with Aloha Editor is similar to editing with state of the art word processors on your desktop. No need to learn any HTML, Wiki or other markup language. The option dialogs have been designed for users not for techies. Writing content has never been that easy.</p>
-									<p><a href="#">Digg into placing/editing of images</a></p>
-								</div>
-							</div>
-						</li>
-						<li class="stage">
-							<span class="stage-icon" style="background-image: url(img/stage-icon-tables.png);"></span>
-							<h2>Tables</h2>
-							<p>All you might put into tables</p>
-							<div class="full-image stage-item">
-								<img src="img/stage-bg-tables.png" alt="" />
-								<div class="area-content">
-									<h3>Create and edit tables the way you want them to be</h3>
-									<h2>Table Stuff</h2>
-									<p>Editing any content with Aloha Editor is similar to editing with state of the art word processors on your desktop. No need to learn any HTML, Wiki or other markup language. The option dialogs have been designed for users not for techies. Writing content has never been that easy.</p>
-									<p><a href="#">Try out table editing</a></p>
-								</div>
-							</div>
-						</li>
-						<li class="stage">
-							<span class="stage-icon" style="background-image: url(img/stage-icon-boxes.png);"></span>
-							<h2>Boxes</h2>
-							<p>You may edit dynamic boxes</p>
-							<div class="full-image stage-item">
-								<img src="img/stage-bg-boxes.png" alt="" />
-								<div class="area-content">
-									<h3>You can edit dynamic content</h3>
-									<h2>Edit jQuery stuff</h2>
-									<p>Your imagination ist the limit. Edit every content even if it is dynamic.</p>
-									<p><a href="#">Try out jQuery boxes</a></p>
-								</div>
-							</div>
-						</li>
-						<li class="stage">
-							<span class="stage-icon" style="background-image: url(img/stage-icon-comments.png);"></span>
-							<h2>Comments</h2>
-							<p>threaded inline comments</p>
-							<div class="full-image stage-item">
-								<img src="img/stage-bg-comments.png" alt="" />
-								<div class="area-content">
-									<h3>Threaded inline enterprise commenting</h3>
-									<h2>Increase collaboration</h2>
-									<p>Your imagination ist the limit. Does more content fill the box and move it to the right?</p>
-									<p><a href="#">Try out jQuery boxes</a></p>
-								</div>
-							</div>
-						</li>
-					</ul>
-				</div>
-				<!-- Stage area end -->
-				<div id="content">
-					<p>Here you'll find some <b>example content</b> to show Aloha's <i>possibilities</i> regarding any kind of formatting.</p>
-					<h1>Headline 1</h1>
-					<h2>Headline 2</h2>
-					<h3>Headline 3</h3>
-					<h4>Headline 4</h4>
-					<h5>Headline 5</h5>
-					<h6>Headline 6</h6>
-					<p>Here we test, a <a title="" href="http://aloha-editor.org">link</a> and other formattings such as 
-					<b>bold</b>, <i>italic</i> or <del>deleted text</del>. You may also use formattings for maths 2
-					<sup>2</sup> = 4 or chemical formulas like CO<sub>2</sub>.
-					Or you may edit tables as you do in office products.</p>
-					<table summary="demo content for aloha tables">
-						<tbody>
-							<tr><td >This</td><td >is</td><td>a</td><td>demo</td></tr>
-							<tr><td>table</td><td colspan=2 rowspan=2>with</td><td>an</td></tr>
-							<tr><td>awesome</td><td>column</td></tr>
-							<tr><td>and</td><td>row</td><td>span</td><td>!</td></tr>
-						</tbody>
-						<caption>describe the table</caption>
-					</table>
-					<p>To describe code you would use fixed style <i>pre</i></p>
-					<pre>
-&lt;script&gt;
-	// make content editable
-	$('#content').aloha();
-	$('.top-text').aloha();
-&lt;/script&gt;
-					</pre>
-					<ul>
-						<li>List entry
-							<ul>
-								<li>List entry</li>
-								<li>List entry
-									<ul>
-										<li>List entry</li>
-										<li>List entry</li>
-									</ul>
-								</li>
-							</ul>
-						</li>
-						<li>List entry</li>
-						<li>List entry</li>
-						<li>List entry</li>
-					</ul>
-					<p><br/></p>
-					<ol>
-						<li>List entry
-							<ol>
-								<li>List entry</li>
-								<li>List entry
-									<ol>
-										<li>List entry</li>
-										<li>List entry</li>
-									</ol>
-								</li>
-							</ol>
-						</li>
-						<li>List entry</li>
-						<li>List entry</li>
-						<li>List entry</li>
-					</ol>
-					<p>For better sematical understanding and <abbr title="Web Accessibility Initiative">WAI</abbr> compatibility you can describe abbreviations
-					like <abbr title="Hyper Text Markup Language">HTML</abbr> and 
-					<abbr title="Cascading Style Sheets">CSS</abbr>.
-					</p>
-					<p><img class="inline-image" src="http://aloha-editor.org/logo/Aloha%20Editor%20HTML5%20technology%20128.png" alt="Aloha Editor" title="Aloha Editor" /></p>
-					<p>More Demos: <a href="http://aloha-editor.org/demos/" title="Aloha Editor Demos"> http://aloha-editor.org/demos/</a></p>
-				</div>
-				
-				<div id="references">
-					<img src="http://aloha-editor.org/logo/Aloha%20Editor%20logo%20text%20128.png" alt="Aloha Editor" title="Aloha Editor" /><br />
-					&middot; Ask a <a href="http://getsatisfaction.com/aloha_editor">question</a><br />
-					&middot; Read the <a href="http://aloha-editor.org/guides">guides</a><br />
-					&middot; Report an <a href="https://github.com/alohaeditor/Aloha-Editor/issues">issue</a><br />
-					<br />
-					Aloha Editor <a href="http://aloha-editor.org">website</a><br />
-				</div>
-			</div>
-		</div>
-		
-		<script type="text/javascript">
-			Aloha.ready( function(){
-				var $ = Aloha.jQuery;
-				// register all editable areas
-				$('#top-text').aloha();
-				$('#content').aloha();
-				$('.area-content').aloha();
-				// hide loading div
-				$('#aloha-loading').hide();
-				$('#aloha-loading span').html('Loading Plugins');
-			});
-		</script>
-	</div>
-	<!--[if lt IE 7 ]>
-	<script src="js/libs/dd_belatedpng.js"></script>
-	<script> DD_belatedPNG.fix('img, .png_bg');</script>
-	<![endif]-->
-</body>
-</html>
diff --git a/src/plugins/oer/assorted/lib/trash.js b/src/plugins/oer/assorted/lib/trash.js
deleted file mode 100644
index 302c583880..0000000000
--- a/src/plugins/oer/assorted/lib/trash.js
+++ /dev/null
@@ -1,227 +0,0 @@
-Aloha.ready(function(){
-	if (!Aloha.isPluginLoaded('ribbon')) {
-		return;
-	}
-    Aloha.require(["ribbon/ribbon-plugin", "ui/ui", "ui/menuButton", 'ui/dialog'], function(Ribbon, Ui, MenuButton, Dialog){
-
-		Ui.adopt("insertTag", MenuButton, {
-			text: "X",
-			menu: [
-				{ text: "Z",
-				  menu: [ { text: "one two", click: function(){console.log("Q");}, iconUrl: '../../plugins/extra/wai-lang/img/button.png' },
-						  { text: "three four five", click: function(){console.log("W");} } ],
-				  iconUrl: '../../plugins/extra/wai-lang/img/button.png'},
-				{ text: "V sdf asdf as fasd fasfd asfasf asf",
-				  menu: [ { text: "Q asd fas fasf as faw awe ftasf asd sad f", click: function(){console.log("Q");} },
-						  { text: "W", click: function(){console.log("W");} } ] }
-			],
-			iconUrl: '../../plugins/extra/wai-lang/img/button.png'
-		});
-
-		Ribbon.addButton({
-			text: 'Image',
-			menu: [
-				{
-					text: "Insert Image... (own dialog)",
-					click: function() {
-						createWysiwhatImagePicker();
-					}
-				},
-				{
-					text: "Insert Image... (Google Picker)",
-					click: function() {
-						newImagePicker();
-						/*
-						Dialog.alert({
-							text: "Google Picker should show up!"
-						});
-						*/
-					}
-				},
-				{
-					text: "Insert Image... (Flickr)",
-					click: function() {
-						Dialog.alert({
-							text: "Import from Flickr?!"
-						});						
-					}
-				},
-				{
-					text: "Foobar!",
-					click: function() {
-						var img = Aloha.jQuery("<img />").attr("src", "http://a0.twimg.com/profile_images/1262048739/You-Made-it__2__normal.png");
-						AlohaInsertIntoDom(img);
-					}
-				}
-			],
-		});
-
-		Ribbon.addButton({
-			text: 'Video',
-			menu: [
-				{
-					text: "Insert Video... (Google Picker)",
-					click: function() {
-						newVideoPicker();
-					}
-				},
-			],
-		});
-
-		Ribbon.show();
-
-
-		Ribbon.show();
-
-		// Comment Boilerplate example buttons out. Just kept in source for examples of new buttons
-		/*
-
-		Ribbon.addButton({
-			text: "split button",
-			menu: [
-				{
-					text: "action with submenu",
-					menu: [
-						{
-							text: "submenu only",
-							menu: [{ text: "action only", click: function(){ console.log("action only"); } }]
-						},
-						{
-							text: "action only",
-							click: function() {
-								console.log("action only");
-							}
-						}
-					],	
-					click: function(){
-						console.log("action with submenu");
-					}
-				}
-			],
-			click: function(){
-				console.log("split button");
-			},
-			iconUrl: '../../plugins/extra/wai-lang/img/button.png'
-		});
-		Ribbon.addButton({
-			text: "menu button",
-			menu: [
-				{
-					text: "action with submenu",
-					menu: [
-						{
-							text: "submenu only",
-							menu: [{
-								text: "action only",
-								click: function(){ console.log("action only"); }
-							}]
-						},
-						{
-							text: "action only  x x x x  x x",
-							click: function() {
-								console.log("action only");
-							}
-						}
-					],	
-					click: function(){
-						console.log("action with submenu");
-					}
-				}
-			]
-		});
-		Ribbon.addButton({
-			menu: [
-				{
-					text: "action with submenu",
-					menu: [
-						{
-							text: "submenu only",
-							menu: [{
-								text: "action only",
-								click: function(){ console.log("action only"); },
-								iconUrl: '../../plugins/extra/wai-lang/img/button.png'
-							}],
-							iconUrl: '../../plugins/extra/wai-lang/img/button.png'
-						},
-						{
-							text: "action only",
-							click: function() {
-								console.log("action only");
-							},
-							iconUrl: '../../plugins/extra/wai-lang/img/button.png'
-						}
-					],	
-					click: function(){
-						console.log("action with submenu");
-					},
-					iconUrl: '../../plugins/extra/wai-lang/img/button.png'
-				}
-			],
-			iconUrl: '../../plugins/extra/wai-lang/img/button.png'
-		});
-		Ribbon.addButton({
-			text: "split button2",
-			menu: [
-				{
-					text: "action with submenu",
-					menu: [
-						{
-							text: "submenu only",
-							menu: [{ text: "action only", click: function(){ console.log("action only"); } }]
-						},
-						{
-							text: "action only",
-							click: function() {
-								console.log("action only");
-							}
-						}
-					],	
-					click: function(){
-						console.log("action with submenu");
-					}
-				}
-			],
-			click: function(){
-				console.log("split button");
-			}
-		});
-
-		Ribbon.addButton({
-			text: 'confirm',
-			click: function() {
-				Dialog.confirm({
-					text: "Do you want to X?"
-				});
-			}
-		});
-
-		Ribbon.addButton({
-			text: 'alert',
-			click: function() {
-				Dialog.alert({
-					text: "X happened!"
-				});
-			}
-		});
-
-		Ribbon.addButton({
-			text: 'progress',
-			click: function() {
-				var progress = Dialog.progress({
-					text: "X is in progress...",
-					value: 0
-				});
-				var percent = 0;
-				var interval = setInterval(function() {
-					percent += 10;
-					progress(percent);
-					if (percent == 100) {
-						clearInterval(interval);
-					}
-				}, 1000);
-			}
-		});
-
-		*/
-    });
-});
diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 27e93bd38b..01457b23fc 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -20,6 +20,11 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   lastKnownUrlId = ''
   lastWorkingEmbedder = -1
 
+  ### 
+
+  Youtube Plugin 
+
+  ###
   # Creates a youtube embedder
   youtube_url_validator = (url) ->
     regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
@@ -54,6 +59,11 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       eleList.push(newEntry)
     return eleList
 
+  ### 
+
+  Vimeo Plugin 
+
+  ###
   vimeo_url_validator = (url) ->
     if url.indexOf('vimeo.com/') != -1
       offset = url.indexOf('vimeo.com/')
@@ -80,6 +90,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   vimeo_search_results_generator = (responseObj) ->
     return [ ]
 
+  
   slideshare_url_validator = (inputurl, inputbox) ->
     if inputurl.indexOf('slideshare.net') == -1
       return false
@@ -120,7 +131,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         post = id.substring(id.length-5)
         if post == '.json'
           id = id.substring(0, id.length-5)
-          console.debug id
           lastKnownUrlId = id
           lastWorkingEmbedder = CONCORD_ID
           return id
@@ -245,7 +255,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
             index = 0
             for radio in dialog.find('#media-sites')
               if radio.value == val
-                console.debug 'Setting '+radio.value
                 active_embedder_value = radio.value
                 active_embedder = embedders[index]
                 break
@@ -318,7 +327,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.on 'click', '.btn.btn-primary.action.insert', (evt) =>
         evt.preventDefault() # Don't submit the form
-        console.debug 'Inserting...'
         if $el.is('img')
           $el.attr 'src', videoSource
           $el.attr 'alt', dialog.find('[name=alt]').val()
@@ -334,7 +342,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                 break
           else
             # Use url
-            console.debug 'Attempting URL support with '+lastWorkingEmbedder
             if lastWorkingEmbedder == -1
               return
             mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId)
@@ -357,7 +364,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                 searchElements = active_embedder.search_results_generator(responseObj)
                 for ele in searchElements
                   ele[0].onclick = (evt) => 
-                   console.debug evt
                    target = evt.target
                    while target.tagName != 'DIV'
                      target = target.parentNode
diff --git a/src/plugins/oer/assorted/lib/video_custom_plugin.coffee b/src/plugins/oer/assorted/lib/video_custom_plugin.coffee
deleted file mode 100644
index 5310a36864..0000000000
--- a/src/plugins/oer/assorted/lib/video_custom_plugin.coffee
+++ /dev/null
@@ -1,308 +0,0 @@
- # Aloha Video Plugin
-# * -----------------
-# * This plugin handles when the insertVideo button is clicked
-#
-define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
-
-  embedder = (url_validator, embed_code_generator) ->
-    this.embed_code_gen = embed_code_generator
-    this.url_validator = url_validator
-    embed_code_generator = (url) ->
-      # Generates embed html -- this function should be replaced
-      embed_html = '<p> Hello World </p>'
-      '''
-      Validates a URL. Returns video id if URL is valide. Else returns false.
-      Should be replaced with actual function. The default validates youtube URLs
-      '''
-    url_validator = (url) ->
-      regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
-      result = if(url.match(regexp)) then RegExp.$1 else false
-    set_embed_code_generator = (url) ->
-      this.embed_code_gen = embed_code_generator
-    set_url_validator = (url) ->
-      this.url_validator = url_validator
-    result = this
-
-  # Creates a youtube embedder
-  youtube_url_validator = (url) ->
-    regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/
-    result = if(url.match(regexp)) then RegExp.$1 else false
-  
-  youtube_embed_code_generator = (url) ->
-    video_id = youtube_url_validator(url)
-    embed_html = ''
-    if (video_id)
-      embed_html = '<div class="multimedia-video"><iframe width="640" height="360" src="http:\/\/www.youtube.com/embed/' + video_id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe></div>'
-    return embed_html
-  youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator)
-
-  # Adds the youtube embedders to the list of embedders
-  embedders = []
-  embedders[0] = youtube_embedder
-  console.debug 'initializing'
-
-  checkURL = (url) ->
-    for embedder in embedders
-      if (embedder.url_validator(url)) 
-        return true
-    return false
-
-  # This will be prefixed with Aloha.settings.baseUrl
-  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
-
-  DIALOG_HTML = '''
-    <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3>Insert video</h3>
-      </div>
-      <div class="modal-body">
-        <div class="image-options">
-            <input type="text" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/>
-        </div>
-        <div class="image-alt">
-          <div class="forminfo">
-            Please provide a description of this video for the visually impaired.
-          </div>
-          <div>
-            <textarea name="alt" type="text" required="required" placeholder="Enter description ..."></textarea>
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button type="submit" class="btn btn-primary action insert">Save</button>
-        <button class="btn action cancel">Cancel</button>
-      </div>
-    </form>'''
-
-  # Defines a template for an embedder object which is responsible for generating embed html and validating a url
-  showModalDialog = ($el) ->
-      settings = Aloha.require('assorted/assorted-plugin').settings
-      root = Aloha.activeEditable.obj
-      dialog = jQuery(DIALOG_HTML)
-
-      # Find the dynamic modal elements and bind events to the buttons
-      $placeholder = dialog.find('.placeholder.preview')
-      $uploadUrl =   dialog.find('.upload-url-input')
-      $submit = dialog.find('.action.insert')
-      dialog.find("#video-url-input")[0].onkeyup = (event) -> 
-        target = event.currentTarget
-        currentVal = target.value
-        valid = checkURL(currentVal)
-        if(valid) 
-            target.style.borderColor='green'
-            target.style.borderWidth='medium'
-        else
-            target.style.borderColor='red'
-            target.style.borderWidth='medium'
-
-      # If we're editing an image pull in the src.
-      # It will be undefined if this is a new image.
-      #
-      # This variable is updated when one of the following occurs:
-      # * selects an image from the filesystem
-      # * enters a URL (TODO: Verify it's an image)
-      # * drops an image into the drop div
-
-      # $el might not be an image, it might be a placeholder for a future image
-      if $el.is('img')
-        # On submit $el.attr('src') will point to what is set in this variable
-        # preserve the alt text if editing an image
-        videoSource = $el.attr('src')
-        imageAltText = $el.attr('alt')
-      else
-        videoSource = ''
-        imageAltText = ''
-
-      dialog.find('[name=alt]').val(imageAltText)
-      # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
-      console.debug 'Checking'
-      # /^https?:\/\// - old regex
-      if checkURL(videoSource)
-        console.debug 'Checked'
-        $uploadUrl.val(videoSource)
-        $uploadUrl.show()
-      # Retrieves embedder which can matches the format of the URL
-      getEmbedder = (url) ->
-        for embedder in embedders
-          if (embedder.url_validator(url)) 
-            return embedder
-        return false
-      setvideoSource = (href) ->
-        videoSource = href
-        $submit.removeClass('disabled')
-      getEmbedEle = (url) ->
-        # Retrieves the embedder for this type of video
-        if(!(embedder = getEmbedder(url)))
-          console.debug("Error: URL not supported")
-          # TODO - ADD HELPFUL MESSAGE TO USER
-          dialog.modal('hide')
-
-        video = jQuery(embedder.embed_code_gen(url));
-        video.attr 'alt', dialog.find('[name=alt]').val()
-        return video
-      # Uses the File API to render a preview of the image
-      # and updates the modal's videoSource
-      loadLocalFile = (file, $img, callback) ->
-        reader = new FileReader()
-        reader.onloadend = () ->
-          if $img
-            $img.attr('src', reader.result)
-          # If we get an image then update the modal's videoSource
-          setvideoSource(reader.result)
-          callback(reader.result) if callback
-        reader.readAsDataURL(file)
-
-      # Add click handlers
-      dialog.find('.upload-image-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadUrl.hide()
-        console.debug 'Hiding placeholder url'
-
-      dialog.find('.upload-url-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadUrl.show()
-
-      $uploadUrl.on 'change', () ->
-        $previewImg = $placeholder.find('img')
-        url = $uploadUrl.val()
-        setvideoSource(url)
-        console.debug 'changing'
-        if settings.image.preview
-          $previewImg.attr 'src', url
-          $placeholder.show()
-
-      # On save update the actual video element. Use the submit event because this
-      # allows the use of html5 validation.
-      deferred = $.Deferred()
-      dialog.on 'submit', (evt) =>
-        evt.preventDefault() # Don't submit the form
-        if $el.is('img')
-          $el.attr 'src', videoSource
-          $el.attr 'alt', dialog.find('[name=alt]').val()
-        else
-          console.debug("Embedding the video")
-          # Embeds the video into the page
-          video = getEmbedEle(videoSource)
-          $el.replaceWith(video)
-          # $el = video -- not sure why this is necessary
-          dialog.modal('hide')
-
-      dialog.on 'click', '.btn.action.cancel', (evt) =>
-        evt.preventDefault() # Don't submit the form
-        deferred.reject(target: $el[0])
-        dialog.modal('hide')
-
-      dialog.on 'hidden', (event) ->
-        # If hidden without being confirmed/cancelled, reject
-        if deferred.state()=='pending'
-          deferred.reject(target: $el[0])
-        # Clean up after dialog was hidden
-        dialog.remove()
-
-      # Return promise, with an added show method
-      jQuery.extend true, deferred.promise(),
-        show: (title) ->
-            if title
-              dialog.find('.modal-header h3').text(title)
-            dialog.modal 'show'
-
-  selector = 'img'
-
-  populator = ($el, pover) ->
-      # When a click occurs, the activeEditable is cleared so squirrel it
-      editable = Aloha.activeEditable
-      $bubble = jQuery '''
-        <div class="link-popover-details">
-            <a class="change">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
-              <span title="Change the image's properties">Edit image...</span>
-            </a>
-            &nbsp; | &nbsp;
-            <a class="remove">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
-              <span title="Delete the image">Delete</span>
-            </a>
-        </div>'''
-
-      href = $el.attr('src')
-      $bubble.find('.change').on 'click', ->
-        # unsquirrel the activeEditable
-        Aloha.activeEditable = editable
-        promise = showModalDialog($el)
- 
-        promise.done (data)->
-          # Uploading if a local file was chosen
-          if data.files.length
-            jQuery(data.target).addClass('aloha-image-uploading')
-            uploadImage data.files[0], (url) ->
-              jQuery(data.target).attr('src', url).removeClass(
-                'aloha-image-uploading')
-        promise.show('Edit image')
-
-      $bubble.find('.remove').on 'click', ->
-        pover.stopOne($el)
-        $el.remove()
-      $bubble.contents()
-
-
-  uploadImage = (file, callback) ->
-    plugin = @
-    settings = Aloha.require('assorted/assorted-plugin').settings
-    xhr = new XMLHttpRequest()
-    if xhr.upload
-      if not settings.image.uploadurl
-        throw new Error("uploadurl not defined")
-
-      xhr.onload = () ->
-        if settings.image.parseresponse
-          url = parseresponse(xhr)
-        else
-          url = JSON.parse(xhr.response).url
-        callback(url)
-
-      xhr.open("POST", settings.image.uploadurl, true)
-      xhr.setRequestHeader("Cache-Control", "no-cache")
-      f = new FormData()
-      f.append(settings.image.uploadfield or 'upload', file, file.name)
-      xhr.send(f)
-
-
-  Aloha.bind 'aloha-image-selected', (event, target) ->
-      # Hide other tooltips of the same type
-      $el = jQuery(target)
-      nodes = jQuery(Aloha.activeEditable.obj).find(selector)
-      nodes = nodes.not($el)
-      nodes.trigger 'hide'
-      $el.trigger 'show'
-      $el.data('aloha-bubble-selected', true)
-      $el.off('.bubble')
-
-  UI.adopt 'insertVideo-oer', null,
-    click: () ->
-      newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
-      GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
-      promise = showModalDialog(newEl)
-
-      promise.done (data)->
-        # Uploading if a local file was chosen
-        if data.files.length
-          newEl.addClass('aloha-image-uploading')
-          uploadImage data.files[0], (url) ->
-            jQuery(data.target).attr('src', url)
-            newEl.removeClass('aloha-image-uploading')
-
-      promise.fail (data) ->
-        # Clean up placeholder if needed
-        $target = jQuery(data.target)
-        if not $target.is('img')
-          $target.remove()
-
-      # Finally show the dialog
-      promise.show()
-
-  # Return config
-  selector: selector
-  populator: populator

From c201c40a164467134bc1d50f8ff17bcad8a3f334 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Thu, 2 May 2013 15:24:49 -0500
Subject: [PATCH 54/67] Removed debugging comments

---
 src/demo/imageribbon/aloha-helper.js  | 1 -
 src/demo/imageribbon/gpickerdialog.js | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/src/demo/imageribbon/aloha-helper.js b/src/demo/imageribbon/aloha-helper.js
index 308446f9c5..05afa74dfe 100644
--- a/src/demo/imageribbon/aloha-helper.js
+++ b/src/demo/imageribbon/aloha-helper.js
@@ -1,7 +1,6 @@
 // Insert custom HTML into dom tree at the current cursor position of Aloha editor
 // used this as template: https://github.com/michaelperrin/sfAlohaPlugin/blob/cc320dcc984bcf7a2b54bb0191276679eb951742/web/js/aloha-plugins/image-upload/lib/image-upload-plugin.js#L106
 function AlohaInsertIntoDom(code) {
-	console.log("Trying to insert into the DOM");
     var range = Aloha.Selection.getRangeObject();
 
         GENTICS.Utils.Dom.insertIntoDOM(
diff --git a/src/demo/imageribbon/gpickerdialog.js b/src/demo/imageribbon/gpickerdialog.js
index b2adf4bda9..15efe1fe77 100644
--- a/src/demo/imageribbon/gpickerdialog.js
+++ b/src/demo/imageribbon/gpickerdialog.js
@@ -1,6 +1,5 @@
 // Google Picker for uploading images
 function newImagePicker() {
-    console.log("Creating new image Picker");
     google.load('picker', '1', {"callback" : createImagePicker});
 }       
 
@@ -35,13 +34,11 @@ function ImagePickerCallback(data) {
 
         var img = Aloha.jQuery("<img />").attr("src", image_url);
         AlohaInsertIntoDom(img);
-        console.log("Inserting into Dom from ImagePickerCallback");
     }
 }
 
 // Google Picker for uploading videos
 function newVideoPicker() {
-    console.log("Creating new video Picker in newVideoPicker");
     google.load('picker', '1', {"callback" : createVideoPicker});
 }
 // A simple callback implementation for Picker.
@@ -53,13 +50,11 @@ function VideoPickerCallback(data) {
         embed_url = doc[google.picker.Document.EMBEDDABLE_URL];
         var embed_code_template = Aloha.jQuery('<object width="420" height="236"><param name="movie" value="http://www.youtube.com/v/Rj8JoAAytyg?version=3&amp;hl=de_DE"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="" type="application/x-shockwave-flash" width="560" height="315" allowscriptaccess="always" allowfullscreen="true"></embed></object>');
         var embed_code = Aloha.jQuery(embed_code_template).find('embed').attr('src', embed_url);
-        console.log("Inserting into Dom from VideoPickerCallback");
         AlohaInsertIntoDom(embed_code);
     }
 }
 
 function createVideoPicker() {
-    console.log("Creating new video Picker");
     var picker = new google.picker.PickerBuilder().
         addView(new google.picker.VideoSearchView().
             setSite(google.picker.VideoSearchView.YOUTUBE)).
@@ -67,6 +62,5 @@ function createVideoPicker() {
         addView(new google.picker.WebCamView()).
         setCallback(VideoPickerCallback).
         build();
-        console.log("Created video Picker and set call back");
     picker.setVisible(true);
 }
\ No newline at end of file

From f4a46d5bb88c3006951bfd7cc4c1c833393a2184 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Thu, 2 May 2013 17:10:50 -0500
Subject: [PATCH 55/67] Formatted url strings to look cuter

---
 src/plugins/oer/assorted/lib/video.coffee | 30 +++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 01457b23fc..d42b1596c9 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -37,8 +37,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       return false
   
   youtube_embed_code_generator = (id) ->
-    return jQuery('<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>')
-
+    return jQuery("""<iframe style="width:640px; height:360px" width="640" height="360" 
+      src="http:\/\/www.youtube.com/embed/#{id}?wmode=transparent" frameborder="0" allowfullscreen></iframe>""")
   youtube_query_generator = (queryTerms) -> 
     terms = queryTerms.split(' ')
     return 'https://gdata.youtube.com/feeds/api/videos?q='+terms.join('+')+'&alt=json&v=2'
@@ -55,7 +55,11 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       videoLengthString = getTimeString(video.media$group.yt$duration.seconds)
       idTokens = video.id.$t.split(':')
       videoId = idTokens[idTokens.length-1]
-      newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td width=20% rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
+      # newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td width=20% rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
+      newEntry = jQuery("""<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=#{videoId}><table>
+        <tr><td width=20% rowspan=3><img src=#{thumbnailUrl}/></td>
+        <td><b>#{videoTitle}</b></td></tr><tr><td>#{videoDescription}</td></tr>
+        <tr><td>Duration:#{videoLengthString}</td></tr></table></div>""")
       eleList.push(newEntry)
     return eleList
 
@@ -80,11 +84,14 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return false
 
   vimeo_embed_code_generator = (id) ->
-    return jQuery('<iframe style="width:640px; height:380px" src="http://player.vimeo.com/video/'+id+'" width="640" height="380" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>') 
+    return jQuery("""<iframe style="width:640px; height:380px" src="http://player.vimeo.com/video/#{id}" 
+      width="640" height="380" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>""") 
 
   vimeo_query_generator = (queryTerms) -> 
     terms = queryTerms.split(' ')
-    url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query='+terms.join('+')+'&user_id=jmaxg3'
+    url = """http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&
+    oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&
+    oauth_version=1.0&page=0&per_page=50&query=#{terms.join('+')}&user_id=jmaxg3"""
     return url
 
   vimeo_search_results_generator = (responseObj) ->
@@ -97,14 +104,14 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
     encodedUrl = encodeURIComponent(inputurl)
     jQuery.ajax({
-            url: 'http://www.slideshare.net/api/oembed/2?url='+encodedUrl+'&format=jsonp',
+            url: """http://www.slideshare.net/api/oembed/2?url=#{encodedUrl}&format=jsonp""",
             async:false,
             dataType: 'jsonp',
             success: (result, status, statusObject) -> 
               id = result.slideshow_id
               if inputurl == inputbox.value
-                inputbox.style.borderColor='green'
-                inputbox.style.borderWidth='medium'
+                inputbox.style.borderColor = 'green'
+                inputbox.style.borderWidth = 'medium'
                 lastKnownUrlId = id
                 lastWorkingEmbedder = SLIDESHARE_ID
             })
@@ -113,7 +120,9 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return false
   
   slideshare_embed_code_generator = (id) ->
-    return jQuery('<iframe style="width:427px; height:356px" src="http://www.slideshare.net/slideshow/embed_code/'+id+'" width="427" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe>') 
+    return jQuery("""<iframe style="width:427px; height:356px" src="http://www.slideshare.net/slideshow/embed_code/#{id}" width="427" height="356" frameborder="0" 
+      marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" 
+      allowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe>""") 
 
   slideshare_query_generator = (queryTerms) -> 
     return false
@@ -138,7 +147,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return false
 
   concord_embed_code_generator = (id) ->
-    return jQuery('<iframe style="width:925px; height:575px" width="925" height="575" frameborder="no" scrolling="no" src="http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/'+id+'.json"></iframe>')
+    return jQuery("""<iframe style="width:925px; height:575px" width="925" height="575" frameborder="no" scrolling="no" 
+      src="http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/#{id}.json"></iframe>""")
 
   concord_query_generator = (queryTerms) -> 
     false

From dc4f0a3b261dfde1230e124b3b4af55a6dbb8747 Mon Sep 17 00:00:00 2001
From: root <gbadipe@gmail.com>
Date: Fri, 3 May 2013 17:26:47 -0500
Subject: [PATCH 56/67] Updated the js to use css classes instead of hardcoding
 styling

---
 src/plugins/oer/assorted/css/image.css    | 9 +++++++++
 src/plugins/oer/assorted/lib/video.coffee | 9 +++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 91fa7db883..761584c94e 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -61,3 +61,12 @@ form#linkModal:focus {
     font-size:90%;
 
 }
+
+.validURL {
+    border-color:black;
+    border-width:medium;
+}
+.invalidURL {
+    border-color:red;
+    border-width:medium;
+}
diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index d42b1596c9..9a00b731a6 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -110,8 +110,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
             success: (result, status, statusObject) -> 
               id = result.slideshow_id
               if inputurl == inputbox.value
-                inputbox.style.borderColor = 'green'
-                inputbox.style.borderWidth = 'medium'
+                inputbox.style.class = 'validURL'
                 lastKnownUrlId = id
                 lastWorkingEmbedder = SLIDESHARE_ID
             })
@@ -252,11 +251,9 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         currentVal = target.value
         valid = checkURL(currentVal, target)
         if(valid) 
-            target.style.borderColor='green'
-            target.style.borderWidth='medium'
+            target.style.class = 'validURL'
         else
-            target.style.borderColor='red'
-            target.style.borderWidth='medium'
+            target.style.class = 'invalidURL'
 
       for radio in dialog.find('#media-sites')
         radio.onclick = (event) ->

From 27743e4e6419a0cb53bd964a0106e6f54584448f Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Mon, 6 May 2013 12:14:38 -0500
Subject: [PATCH 57/67] Removed unnecessary code and fixed youtube search
 results html - added quotes

---
 src/plugins/oer/assorted/lib/video.coffee | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 9a00b731a6..7cb036e4cb 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -56,8 +56,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       idTokens = video.id.$t.split(':')
       videoId = idTokens[idTokens.length-1]
       # newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td width=20% rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
-      newEntry = jQuery("""<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=#{videoId}><table>
-        <tr><td width=20% rowspan=3><img src=#{thumbnailUrl}/></td>
+      newEntry = jQuery("""<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id="#{videoId}"><table>
+        <tr><td width=20% rowspan=3><img src="#{thumbnailUrl}"/></td>
         <td><b>#{videoTitle}</b></td></tr><tr><td>#{videoDescription}</td></tr>
         <tr><td>Duration:#{videoLengthString}</td></tr></table></div>""")
       eleList.push(newEntry)
@@ -176,9 +176,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         return true
     return false
 
-  # This will be prefixed with Aloha.settings.baseUrl
-  WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png'
-
   DIALOG_HTML = '''
     <form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">
       <div class="modal-header">

From 2aa9e08d8dc0d76ccfb9d874788b4287844421b9 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Tue, 7 May 2013 16:56:22 -0500
Subject: [PATCH 58/67] Commented out all unnecessary code and now trying to
 fix error where input box won't highlight when url is correct

---
 src/plugins/oer/assorted/css/image.css    |  10 +-
 src/plugins/oer/assorted/lib/video.coffee | 279 +++++++++++-----------
 2 files changed, 148 insertions(+), 141 deletions(-)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 761584c94e..734c0204b0 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -61,12 +61,16 @@ form#linkModal:focus {
     font-size:90%;
 
 }
-
-.validURL {
+.validURL input {
     border-color:black;
     border-width:medium;
 }
-.invalidURL {
+.invalidURL input {
     border-color:red;
     border-width:medium;
 }
+
+.invalidURL input[type=text] {
+    border-color:red;
+    border-width:medium;
+}
\ No newline at end of file
diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 7cb036e4cb..86d26e730d 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -250,7 +250,12 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         if(valid) 
             target.style.class = 'validURL'
         else
+            # jQuery(this).addClass('invalidURL')
+            jQuery(this).attr('class', 'invalidURL')
             target.style.class = 'invalidURL'
+            target.class = 'invalidURL'
+            target.className = 'invalidURL'
+            # target.style.borderColor = 'Red';
 
       for radio in dialog.find('#media-sites')
         radio.onclick = (event) ->
@@ -273,23 +278,22 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       # * drops an image into the drop div
 
       # $el might not be an image, it might be a placeholder for a future image
-      if $el.is('img')
-        # On submit $el.attr('src') will point to what is set in this variable
-        # preserve the alt text if editing an image
-        videoSource = $el.attr('src')
-        imageAltText = $el.attr('alt')
-      else
-        videoSource = ''
-        imageAltText = ''
-
-      dialog.find('[name=alt]').val(imageAltText)
+      # if $el.is('img')
+      #   # On submit $el.attr('src') will point to what is set in this variable
+      #   # preserve the alt text if editing an image
+      #   videoSource = $el.attr('src')
+      #   imageAltText = $el.attr('alt')
+      # else
+      #   videoSource = ''
+      #   imageAltText = ''
+
+      videoSource = ''
+      # dialog.find('[name=alt]').val(imageAltText)
       # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
-      # /^https?:\/\// - old regex
+      # Retrieves embedder which can matches the format of the URL
       if checkURL(videoSource, $uploadUrl)
         $uploadUrl.val(videoSource)
         $uploadUrl.show()
-      # Retrieves embedder which can matches the format of the URL
-
       setvideoSource = (href) ->
         videoSource = href
         $submit.removeClass('disabled')
@@ -307,23 +311,23 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         reader.readAsDataURL(file)
 
       # Add click handlers
-      dialog.find('.upload-image-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadUrl.hide()
-
-      dialog.find('.upload-url-link').on 'click', (evt) ->
-        evt.preventDefault()
-        $placeholder.hide()
-        $uploadUrl.show()
+      # dialog.find('.upload-image-link').on 'click', (evt) ->
+      #   evt.preventDefault()
+      #   $placeholder.hide()
+      #   $uploadUrl.hide()
+
+      # dialog.find('.upload-url-link').on 'click', (evt) ->
+      #   evt.preventDefault()
+      #   $placeholder.hide()
+      #   $uploadUrl.show()
 
       $uploadUrl.on 'change', () ->
-        $previewImg = $placeholder.find('img')
+        # $previewImg = $placeholder.find('img')
         url = $uploadUrl.val()
         setvideoSource(url)
-        if settings.image.preview
-          $previewImg.attr 'src', url
-          $placeholder.show()
+        # if settings.image.preview
+        #   $previewImg.attr 'src', url
+        #   $placeholder.show()
 
       # On save update the actual video element. Use the submit event because this
       # allows the use of html5 validation.
@@ -331,29 +335,29 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.on 'click', '.btn.btn-primary.action.insert', (evt) =>
         evt.preventDefault() # Don't submit the form
-        if $el.is('img')
-          $el.attr 'src', videoSource
-          $el.attr 'alt', dialog.find('[name=alt]').val()
+        # if $el.is('img')
+        #   $el.attr 'src', videoSource
+        #   $el.attr 'alt', dialog.find('[name=alt]').val()
+        # else
+        # Embeds the video into the page
+        #mediaWrapper = jQuery('<div class="media"></div>')
+        if videoSource.length == 0
+          # Use search results
+          for child in $searchResults.children()
+            if child.className == 'search-result-selected'
+              video_id = child.id
+              mediaElement = active_embedder.embed_code_gen(video_id)
+              break
         else
-          # Embeds the video into the page
-          #mediaWrapper = jQuery('<div class="media"></div>')
-          if videoSource.length == 0
-            # Use search results
-            for child in $searchResults.children()
-              if child.className == 'search-result-selected'
-                video_id = child.id
-                mediaElement = active_embedder.embed_code_gen(video_id)
-                break
-          else
-            # Use url
-            if lastWorkingEmbedder == -1
-              return
-            mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId)
-
-          #mediaWrapper.append(mediaElement)
-          #AlohaInsertIntoDom(mediaWrapper)
-          AlohaInsertIntoDom(mediaElement)
-          dialog.modal('hide')
+          # Use url
+          if lastWorkingEmbedder == -1
+            return
+          mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId)
+
+        #mediaWrapper.append(mediaElement)
+        #AlohaInsertIntoDom(mediaWrapper)
+        AlohaInsertIntoDom(mediaElement)
+        dialog.modal('hide')
 
       dialog.on 'click', '.btn.btn-primary.action.search', (evt) =>
         evt.preventDefault() # Don't submit the form
@@ -382,13 +386,13 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.on 'click', '.btn.action.cancel', (evt) =>
         evt.preventDefault() # Don't submit the form
-        deferred.reject(target: $el[0])
+        # deferred.reject(target: $el[0])
         dialog.modal('hide')
 
       dialog.on 'hidden', (event) ->
         # If hidden without being confirmed/cancelled, reject
-        if deferred.state()=='pending'
-          deferred.reject(target: $el[0])
+        # if deferred.state()=='pending'
+          # deferred.reject(target: $el[0])
         # Clean up after dialog was hidden
         dialog.remove()
 
@@ -401,100 +405,99 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   selector = 'img'
 
-  populator = ($el, pover) ->
-      # When a click occurs, the activeEditable is cleared so squirrel it
-      editable = Aloha.activeEditable
-      $bubble = jQuery '''
-        <div class="link-popover-details">
-            <a class="change">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
-              <span title="Change the image's properties">Edit image...</span>
-            </a>
-            &nbsp; | &nbsp;
-            <a class="remove">
-              <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
-              <span title="Delete the image">Delete</span>
-            </a>
-        </div>'''
-
-      href = $el.attr('src')
-      $bubble.find('.change').on 'click', ->
-        # unsquirrel the activeEditable
-        Aloha.activeEditable = editable
-        promise = showModalDialog($el)
+  # populator = ($el, pover) ->
+  #     # When a click occurs, the activeEditable is cleared so squirrel it
+  #     editable = Aloha.activeEditable
+  #     $bubble = jQuery '''
+  #       <div class="link-popover-details">
+  #           <a class="change">
+  #             <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
+  #             <span title="Change the image's properties">Edit image...</span>
+  #           </a>
+  #           &nbsp; | &nbsp;
+  #           <a class="remove">
+  #             <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
+  #             <span title="Delete the image">Delete</span>
+  #           </a>
+  #       </div>'''
+
+  #     href = $el.attr('src')
+  #     $bubble.find('.change').on 'click', ->
+  #       # unsquirrel the activeEditable
+  #       Aloha.activeEditable = editable
+  #       promise = showModalDialog($el)
  
-        promise.done (data)->
-          # Uploading if a local file was chosen
-          if data.files.length
-            jQuery(data.target).addClass('aloha-image-uploading')
-            uploadImage data.files[0], (url) ->
-              jQuery(data.target).attr('src', url).removeClass(
-                'aloha-image-uploading')
-        promise.show('Edit image')
-
-      $bubble.find('.remove').on 'click', ->
-        pover.stopOne($el)
-        $el.remove()
-      $bubble.contents()
-
-
-  uploadImage = (file, callback) ->
-    plugin = @
-    settings = Aloha.require('assorted/assorted-plugin').settings
-    xhr = new XMLHttpRequest()
-    if xhr.upload
-      if not settings.image.uploadurl
-        throw new Error("uploadurl not defined")
-
-      xhr.onload = () ->
-        if settings.image.parseresponse
-          url = parseresponse(xhr)
-        else
-          url = JSON.parse(xhr.response).url
-        callback(url)
-
-      xhr.open("POST", settings.image.uploadurl, true)
-      xhr.setRequestHeader("Cache-Control", "no-cache")
-      f = new FormData()
-      f.append(settings.image.uploadfield or 'upload', file, file.name)
-      xhr.send(f)
-
-
-  Aloha.bind 'aloha-image-selected', (event, target) ->
-      # Hide other tooltips of the same type
-      $el = jQuery(target)
-      nodes = jQuery(Aloha.activeEditable.obj).find(selector)
-      nodes = nodes.not($el)
-      nodes.trigger 'hide'
-      $el.trigger 'show'
-      $el.data('aloha-bubble-selected', true)
-      $el.off('.bubble')
+  #       promise.done (data)->
+  #         # Uploading if a local file was chosen
+  #         if data.files.length
+  #           jQuery(data.target).addClass('aloha-image-uploading')
+  #           uploadImage data.files[0], (url) ->
+  #             jQuery(data.target).attr('src', url).removeClass(
+  #               'aloha-image-uploading')
+  #       promise.show('Edit image')
+
+  #     $bubble.find('.remove').on 'click', ->
+  #       pover.stopOne($el)
+  #       $el.remove()
+  #     $bubble.contents()
+
+
+  # uploadImage = (file, callback) ->
+  #   # plugin = @
+  #   settings = Aloha.require('assorted/assorted-plugin').settings
+  #   xhr = new XMLHttpRequest()
+  #   if xhr.upload
+  #     if not settings.image.uploadurl
+  #       throw new Error("uploadurl not defined")
+
+  #     xhr.onload = () ->
+  #       if settings.image.parseresponse
+  #         url = parseresponse(xhr)
+  #       else
+  #         url = JSON.parse(xhr.response).url
+  #       callback(url)
+
+  #     xhr.open("POST", settings.image.uploadurl, true)
+  #     xhr.setRequestHeader("Cache-Control", "no-cache")
+  #     f = new FormData()
+  #     f.append(settings.image.uploadfield or 'upload', file, file.name)
+  #     xhr.send(f)
+
+
+  # Aloha.bind 'aloha-image-selected', (event, target) ->
+  #     # Hide other tooltips of the same type
+  #     $el = jQuery(target)
+  #     nodes = jQuery(Aloha.activeEditable.obj).find(selector)
+  #     nodes = nodes.not($el)
+  #     nodes.trigger 'hide'
+  #     $el.trigger 'show'
+  #     $el.data('aloha-bubble-selected', true)
+  #     $el.off('.bubble')
 
   UI.adopt 'insertVideo-oer', null,
     click: () ->
-      newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')
-      # Inserts Google Picker into the DOM
-# newVideoPicker()        
+      # newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')    
       # GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
-      promise = showModalDialog(newEl)
-
-      promise.done (data)->
-        # Uploading if a local file was chosen
-        if data.files.length
-          newEl.addClass('aloha-image-uploading')
-          uploadImage data.files[0], (url) ->
-            jQuery(data.target).attr('src', url)
-            newEl.removeClass('aloha-image-uploading')
-
-      promise.fail (data) ->
-        # Clean up placeholder if needed
-        $target = jQuery(data.target)
-        if not $target.is('img')
-          $target.remove()
+      promise = showModalDialog(null)
+
+      ## Add code here to handle video uploading. This is not currently supported ##
+      # promise.done (data)->
+      #   # Uploading if a local file was chosen
+      #   if data.files.length
+      #     newEl.addClass('aloha-image-uploading')
+      #     uploadImage data.files[0], (url) ->
+      #       jQuery(data.target).attr('src', url)
+      #       newEl.removeClass('aloha-image-uploading')
+
+      # promise.fail (data) ->
+      #   # Clean up placeholder if needed
+      #   $target = jQuery(data.target)
+      #   if not $target.is('img')
+      #     $target.remove()
 
       # Finally show the dialog
       promise.show()
 
   # Return config
-  selector: selector
-  populator: populator
+  # selector: selector
+  # populator: populator

From 4f61c876b4e619f57d1bf58cb04eaaee94e46039 Mon Sep 17 00:00:00 2001
From: bnwest <brian.n.west@gmail.com>
Date: Tue, 14 May 2013 21:35:41 +0200
Subject: [PATCH 59/67] mod the coffee file to match the js file.  create the
 js file using coffee and the coffee file. go team

---
 .../oer/assorted/lib/assorted-plugin.coffee   | 22 ++++++++++++++++++-
 .../oer/assorted/lib/assorted-plugin.js       |  2 ++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/plugins/oer/assorted/lib/assorted-plugin.coffee b/src/plugins/oer/assorted/lib/assorted-plugin.coffee
index 65b3a2f256..957673ae08 100644
--- a/src/plugins/oer/assorted/lib/assorted-plugin.coffee
+++ b/src/plugins/oer/assorted/lib/assorted-plugin.coffee
@@ -1,7 +1,27 @@
 ###
 Register a couple of assorted oer plugins
 ###
-define [ 'aloha/plugin', 'jquery', 'popover', './link', './image', './video', './figure', './title-figcaption', './list' ], (Plugin, $, Popover, linkConfig, imageConfig, videoConfig, figureConfig, figcaptionConfig) ->
+define [ 
+  'aloha/plugin', 
+  'jquery', 
+  'popover', 
+  './link', 
+  './image', 
+  './video', 
+  './gpickerdialog', 
+  './figure', 
+  './title-figcaption', 
+  './list' ], (
+  Plugin, 
+  $, 
+  Popover, 
+  linkConfig, 
+  imageConfig, 
+  videoConfig, 
+  gpickerConfig,
+  figureConfig, 
+  figcaptionConfig
+  ) ->
   Plugin.create 'assorted',
     defaultSettings:
         image:
diff --git a/src/plugins/oer/assorted/lib/assorted-plugin.js b/src/plugins/oer/assorted/lib/assorted-plugin.js
index 5f8e0e7b15..00f5921d9f 100644
--- a/src/plugins/oer/assorted/lib/assorted-plugin.js
+++ b/src/plugins/oer/assorted/lib/assorted-plugin.js
@@ -1,8 +1,10 @@
+// Generated by CoffeeScript 1.3.3
 
 /*
 Register a couple of assorted oer plugins
 */
 
+
 (function() {
 
   define(['aloha/plugin', 'jquery', 'popover', './link', './image', './video', './gpickerdialog', './figure', './title-figcaption', './list'], function(Plugin, $, Popover, linkConfig, imageConfig, videoConfig, gpickerConfig, figureConfig, figcaptionConfig) {

From 3876401d8e9e0bbe34b9f146ff9f463ab5d19032 Mon Sep 17 00:00:00 2001
From: Max Grossman <jmaxg3@gmail.com>
Date: Wed, 15 May 2013 08:25:11 -0500
Subject: [PATCH 60/67] Ensure .js and .coffee files for media plugin are up to
 date. Comment out pointless radio buttons until search support for other
 sites is added.

---
 src/plugins/oer/assorted/lib/video.coffee |   4 +-
 src/plugins/oer/assorted/lib/video.js     | 237 +++++-----------------
 2 files changed, 51 insertions(+), 190 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 86d26e730d..701ec0b5fc 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -189,8 +189,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         <center>OR</center>
         <div class="modal-body" >
             <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>
-            <center><table><tr><td><input id='media-sites' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input disabled id='media-sites' type="radio" name="video-site" value="vimeo">Vimeo (search not working)</input></td></tr></table></center>
-            <center><button type="search" class="btn btn-primary action search">Search</button></center>
+            <!-- <center><table><tr><td><input id='media-sites' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input disabled id='media-sites' type="radio" name="video-site" value="vimeo">Vimeo (search not working)</input></td></tr></table></center> -->
+            <center><button type="search" class="btn btn-primary action search">Search YouTube</button></center>
         </div>
         <div class="modal-body" >
             <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index bdfa4290f1..6bfaca80c3 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -1,11 +1,10 @@
-// Generated by CoffeeScript 1.6.2
+// Generated by CoffeeScript 1.3.3
 (function() {
-  define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var CONCORD_ID, DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, WARNING_IMAGE_PATH, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, concord_embed_code_generator, concord_embedder, concord_query_generator, concord_search_results_generator, concord_url_validator, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, populator, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, uploadImage, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
 
+  define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
+    var CONCORD_ID, DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, concord_embed_code_generator, concord_embedder, concord_query_generator, concord_search_results_generator, concord_url_validator, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
     embedder = function(url_validator, embed_code_generator, query_generator, search_results_generator) {
       var result;
-
       this.embed_code_gen = embed_code_generator;
       this.url_validator = url_validator;
       this.query_generator = query_generator;
@@ -18,9 +17,13 @@
     CONCORD_ID = 3;
     lastKnownUrlId = '';
     lastWorkingEmbedder = -1;
+    /* 
+    
+    Youtube Plugin
+    */
+
     youtube_url_validator = function(url) {
       var regexp;
-
       regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
       if (url.match(regexp)) {
         lastKnownUrlId = RegExp.$1;
@@ -32,17 +35,15 @@
       }
     };
     youtube_embed_code_generator = function(id) {
-      return jQuery('<iframe style="width:640px; height:360px" width="640" height="360" src="http:\/\/www.youtube.com/embed/' + id + '?wmode=transparent" frameborder="0" allowfullscreen></iframe>');
+      return jQuery("<iframe style=\"width:640px; height:360px\" width=\"640\" height=\"360\" \nsrc=\"http:\/\/www.youtube.com/embed/" + id + "?wmode=transparent\" frameborder=\"0\" allowfullscreen></iframe>");
     };
     youtube_query_generator = function(queryTerms) {
       var terms;
-
       terms = queryTerms.split(' ');
       return 'https://gdata.youtube.com/feeds/api/videos?q=' + terms.join('+') + '&alt=json&v=2';
     };
     youtube_search_results_generator = function(responseObj) {
       var eleList, idTokens, newEntry, thumbnailHeight, thumbnailUrl, thumbnailWidth, video, videoDescription, videoId, videoLengthString, videoList, videoTitle, _i, _len;
-
       eleList = [];
       videoList = responseObj.feed.entry;
       for (_i = 0, _len = videoList.length; _i < _len; _i++) {
@@ -55,14 +56,18 @@
         videoLengthString = getTimeString(video.media$group.yt$duration.seconds);
         idTokens = video.id.$t.split(':');
         videoId = idTokens[idTokens.length - 1];
-        newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id=' + videoId + '><table><tr><td width=20% rowspan=3><img src=' + thumbnailUrl + ' /></td><td><b>' + videoTitle + '</b></td></tr><tr><td>' + videoDescription + '</td></tr><tr><td>Duration: ' + videoLengthString + '</td></tr></table></div>');
+        newEntry = jQuery("<div style=\"width:100%;border-bottom: 1px solid black;\" class=\"search-result\" id=\"" + videoId + "\"><table>\n<tr><td width=20% rowspan=3><img src=\"" + thumbnailUrl + "\"/></td>\n<td><b>" + videoTitle + "</b></td></tr><tr><td>" + videoDescription + "</td></tr>\n<tr><td>Duration:" + videoLengthString + "</td></tr></table></div>");
         eleList.push(newEntry);
       }
       return eleList;
     };
+    /* 
+    
+    Vimeo Plugin
+    */
+
     vimeo_url_validator = function(url) {
       var c, intRegex, offset, videoIdStr, _i, _len;
-
       if (url.indexOf('vimeo.com/') !== -1) {
         offset = url.indexOf('vimeo.com/');
         offset = offset + 10;
@@ -82,13 +87,12 @@
       return false;
     };
     vimeo_embed_code_generator = function(id) {
-      return jQuery('<iframe style="width:640px; height:380px" src="http://player.vimeo.com/video/' + id + '" width="640" height="380" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>');
+      return jQuery("<iframe style=\"width:640px; height:380px\" src=\"http://player.vimeo.com/video/" + id + "\" \nwidth=\"640\" height=\"380\" frameborder=\"0\" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>");
     };
     vimeo_query_generator = function(queryTerms) {
       var terms, url;
-
       terms = queryTerms.split(' ');
-      url = 'http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&oauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&oauth_version=1.0&page=0&per_page=50&query=' + terms.join('+') + '&user_id=jmaxg3';
+      url = "http://vimeo.com/api/rest/v2&format=json&method=vimeo.videos.search&oauth_consumer_key=c1f5add1d34817a6775d10b3f6821268&\noauth_nonce=da3f0c0437ad303c7cdb11c522abef4f&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1365564937&oauth_token=1bba5c6f35030672b0b4b5c8cf8ed156&\noauth_version=1.0&page=0&per_page=50&query=" + (terms.join('+')) + "&user_id=jmaxg3";
       return url;
     };
     vimeo_search_results_generator = function(responseObj) {
@@ -96,22 +100,19 @@
     };
     slideshare_url_validator = function(inputurl, inputbox) {
       var encodedUrl;
-
       if (inputurl.indexOf('slideshare.net') === -1) {
         return false;
       }
       encodedUrl = encodeURIComponent(inputurl);
       jQuery.ajax({
-        url: 'http://www.slideshare.net/api/oembed/2?url=' + encodedUrl + '&format=jsonp',
+        url: "http://www.slideshare.net/api/oembed/2?url=" + encodedUrl + "&format=jsonp",
         async: false,
         dataType: 'jsonp',
         success: function(result, status, statusObject) {
           var id;
-
           id = result.slideshow_id;
           if (inputurl === inputbox.value) {
-            inputbox.style.borderColor = 'green';
-            inputbox.style.borderWidth = 'medium';
+            inputbox.style["class"] = 'validURL';
             lastKnownUrlId = id;
             return lastWorkingEmbedder = SLIDESHARE_ID;
           }
@@ -121,7 +122,7 @@
       return false;
     };
     slideshare_embed_code_generator = function(id) {
-      return jQuery('<iframe style="width:427px; height:356px" src="http://www.slideshare.net/slideshow/embed_code/' + id + '" width="427" height="356" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px" allowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe>');
+      return jQuery("<iframe style=\"width:427px; height:356px\" src=\"http://www.slideshare.net/slideshow/embed_code/" + id + "\" width=\"427\" height=\"356\" frameborder=\"0\" \nmarginwidth=\"0\" marginheight=\"0\" scrolling=\"no\" style=\"border:1px solid #CCC;border-width:1px 1px 0;margin-bottom:5px\" \nallowfullscreen webkitallowfullscreen mozallowfullscreen> </iframe>");
     };
     slideshare_query_generator = function(queryTerms) {
       return false;
@@ -131,7 +132,6 @@
     };
     concord_url_validator = function(url) {
       var concordLabUrl, id, offset, post;
-
       concordLabUrl = 'lab.concord.org/examples/interactives/interactives.html#interactives/samples/';
       if (url.indexOf(concordLabUrl) !== -1) {
         offset = url.indexOf(concordLabUrl);
@@ -141,7 +141,6 @@
           post = id.substring(id.length - 5);
           if (post === '.json') {
             id = id.substring(0, id.length - 5);
-            console.debug(id);
             lastKnownUrlId = id;
             lastWorkingEmbedder = CONCORD_ID;
             return id;
@@ -151,7 +150,7 @@
       return false;
     };
     concord_embed_code_generator = function(id) {
-      return jQuery('<iframe style="width:925px; height:575px" width="925" height="575" frameborder="no" scrolling="no" src="http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/' + id + '.json"></iframe>');
+      return jQuery("<iframe style=\"width:925px; height:575px\" width=\"925\" height=\"575\" frameborder=\"no\" scrolling=\"no\" \nsrc=\"http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/" + id + ".json\"></iframe>");
     };
     concord_query_generator = function(queryTerms) {
       return false;
@@ -172,7 +171,6 @@
     active_embedder_value = 'youtube';
     checkURL = function(url, inputbox) {
       var _i, _len;
-
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
         if (embedder.url_validator(url, inputbox)) {
@@ -181,11 +179,9 @@
       }
       return false;
     };
-    WARNING_IMAGE_PATH = '/../plugins/oerpub/image/img/warning.png';
-    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <center><table><tr><td><input id=\'media-sites\' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input disabled id=\'media-sites\' type="radio" name="video-site" value="vimeo">Vimeo (search not working)</input></td></tr></table></center>\n        <center><button type="search" class="btn btn-primary action search">Search</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
+    DIALOG_HTML = '<form class="plugin video modal hide fade" id="linkModal" tabindex="-1" role="dialog" aria-labelledby="linkModalLabel" aria-hidden="true" data-backdrop="false">\n  <div class="modal-header">\n    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>\n    <h3>Insert video</h3>\n  </div>\n  <div class="modal-body">\n    <div class="image-options">\n        <center><input type="text" style="width:80%;" id="video-url-input" class="upload-url-input" placeholder="Enter URL of video ..."/></center>\n    </div>\n    <center>OR</center>\n    <div class="modal-body" >\n        <center><input type="text" style="width:80%;" id="video-search-input" class-"upload-url-input" placeholder="Enter search terms for your video ..."/></center>\n        <!-- <center><table><tr><td><input id=\'media-sites\' type="radio" name="video-site" value="youtube" checked>Youtube</input></td><td><input disabled id=\'media-sites\' type="radio" name="video-site" value="vimeo">Vimeo (search not working)</input></td></tr></table></center> -->\n        <center><button type="search" class="btn btn-primary action search">Search YouTube</button></center>\n    </div>\n    <div class="modal-body" >\n        <div style="border:1px solid; height:200px; width:100%; overflow-x:auto; overflow-y:scroll;" id="search-results">\n        </div>\n    </div>\n  </div>\n  <div class="modal-footer">\n    <button type="submit" class="btn btn-primary action insert">Insert</button>\n    <button class="btn action cancel">Cancel</button>\n  </div>\n</form>';
     getTimeString = function(timeInSeconds) {
       var ivalue, nHours, nMinutes, nSeconds, str;
-
       nHours = 0;
       nMinutes = 0;
       nSeconds = 0;
@@ -218,9 +214,8 @@
       return str;
     };
     showModalDialog = function($el) {
-      var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, imageAltText, loadLocalFile, radio, root, settings, setvideoSource, videoSource, _i, _len, _ref,
+      var $placeholder, $searchResults, $searchTerms, $submit, $uploadUrl, deferred, dialog, loadLocalFile, radio, root, settings, setvideoSource, videoSource, _i, _len, _ref,
         _this = this;
-
       settings = Aloha.require('assorted/assorted-plugin').settings;
       root = Aloha.activeEditable.obj;
       dialog = jQuery(DIALOG_HTML);
@@ -231,16 +226,16 @@
       $submit = dialog.find('.action.insert');
       dialog.find("#video-url-input")[0].onkeyup = function(event) {
         var currentVal, target, valid;
-
         target = event.currentTarget;
         currentVal = target.value;
         valid = checkURL(currentVal, target);
         if (valid) {
-          target.style.borderColor = 'green';
-          return target.style.borderWidth = 'medium';
+          return target.style["class"] = 'validURL';
         } else {
-          target.style.borderColor = 'red';
-          return target.style.borderWidth = 'medium';
+          jQuery(this).attr('class', 'invalidURL');
+          target.style["class"] = 'invalidURL';
+          target["class"] = 'invalidURL';
+          return target.className = 'invalidURL';
         }
       };
       _ref = dialog.find('#media-sites');
@@ -248,7 +243,6 @@
         radio = _ref[_i];
         radio.onclick = function(event) {
           var index, val, _j, _len1, _ref1, _results;
-
           val = event.target.value;
           if (active_embedder_value !== val) {
             index = 0;
@@ -257,7 +251,6 @@
             for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
               radio = _ref1[_j];
               if (radio.value === val) {
-                console.debug('Setting ' + radio.value);
                 active_embedder_value = radio.value;
                 active_embedder = embedders[index];
                 break;
@@ -268,14 +261,7 @@
           }
         };
       }
-      if ($el.is('img')) {
-        videoSource = $el.attr('src');
-        imageAltText = $el.attr('alt');
-      } else {
-        videoSource = '';
-        imageAltText = '';
-      }
-      dialog.find('[name=alt]').val(imageAltText);
+      videoSource = '';
       if (checkURL(videoSource, $uploadUrl)) {
         $uploadUrl.val(videoSource);
         $uploadUrl.show();
@@ -286,7 +272,6 @@
       };
       loadLocalFile = function(file, $img, callback) {
         var reader;
-
         reader = new FileReader();
         reader.onloadend = function() {
           if ($img) {
@@ -299,68 +284,42 @@
         };
         return reader.readAsDataURL(file);
       };
-      dialog.find('.upload-image-link').on('click', function(evt) {
-        evt.preventDefault();
-        $placeholder.hide();
-        return $uploadUrl.hide();
-      });
-      dialog.find('.upload-url-link').on('click', function(evt) {
-        evt.preventDefault();
-        $placeholder.hide();
-        return $uploadUrl.show();
-      });
       $uploadUrl.on('change', function() {
-        var $previewImg, url;
-
-        $previewImg = $placeholder.find('img');
+        var url;
         url = $uploadUrl.val();
-        setvideoSource(url);
-        if (settings.image.preview) {
-          $previewImg.attr('src', url);
-          return $placeholder.show();
-        }
+        return setvideoSource(url);
       });
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
         var child, mediaElement, video_id, _j, _len1, _ref1;
-
         evt.preventDefault();
-        console.debug('Inserting...');
-        if ($el.is('img')) {
-          $el.attr('src', videoSource);
-          return $el.attr('alt', dialog.find('[name=alt]').val());
-        } else {
-          if (videoSource.length === 0) {
-            _ref1 = $searchResults.children();
-            for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-              child = _ref1[_j];
-              if (child.className === 'search-result-selected') {
-                video_id = child.id;
-                mediaElement = active_embedder.embed_code_gen(video_id);
-                break;
-              }
+        if (videoSource.length === 0) {
+          _ref1 = $searchResults.children();
+          for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+            child = _ref1[_j];
+            if (child.className === 'search-result-selected') {
+              video_id = child.id;
+              mediaElement = active_embedder.embed_code_gen(video_id);
+              break;
             }
-          } else {
-            console.debug('Attempting URL support with ' + lastWorkingEmbedder);
-            if (lastWorkingEmbedder === -1) {
-              return;
-            }
-            mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId);
           }
-          AlohaInsertIntoDom(mediaElement);
-          return dialog.modal('hide');
+        } else {
+          if (lastWorkingEmbedder === -1) {
+            return;
+          }
+          mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId);
         }
+        AlohaInsertIntoDom(mediaElement);
+        return dialog.modal('hide');
       });
       dialog.on('click', '.btn.btn-primary.action.search', function(evt) {
         var queryUrl;
-
         evt.preventDefault();
         queryUrl = active_embedder.query_generator($searchTerms[0].value);
         $searchResults.empty();
         $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'));
         return jQuery.get(queryUrl, function(responseObj) {
           var ele, searchElements, _j, _len1, _results;
-
           $searchResults.empty();
           if ((typeof responseObj) === 'string') {
             responseObj = jQuery.parseJSON(responseObj);
@@ -371,8 +330,6 @@
             ele = searchElements[_j];
             ele[0].onclick = function(evt) {
               var child, target, targetId, _k, _len2, _ref1, _results1;
-
-              console.debug(evt);
               target = evt.target;
               while (target.tagName !== 'DIV') {
                 target = target.parentNode;
@@ -397,17 +354,9 @@
       });
       dialog.on('click', '.btn.action.cancel', function(evt) {
         evt.preventDefault();
-        deferred.reject({
-          target: $el[0]
-        });
         return dialog.modal('hide');
       });
       dialog.on('hidden', function(event) {
-        if (deferred.state() === 'pending') {
-          deferred.reject({
-            target: $el[0]
-          });
-        }
         return dialog.remove();
       });
       return jQuery.extend(true, deferred.promise(), {
@@ -420,101 +369,13 @@
       });
     };
     selector = 'img';
-    populator = function($el, pover) {
-      var $bubble, editable, href;
-
-      editable = Aloha.activeEditable;
-      $bubble = jQuery('<div class="link-popover-details">\n    <a class="change">\n      <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/edit-link-03.png" />\n  <span title="Change the image\'s properties">Edit image...</span>\n</a>\n&nbsp; | &nbsp;\n<a class="remove">\n  <img src="' + Aloha.settings.baseUrl + '/../plugins/oerpub/assorted/img/unlink-link-02.png" />\n      <span title="Delete the image">Delete</span>\n    </a>\n</div>');
-      href = $el.attr('src');
-      $bubble.find('.change').on('click', function() {
-        var promise;
-
-        Aloha.activeEditable = editable;
-        promise = showModalDialog($el);
-        promise.done(function(data) {
-          if (data.files.length) {
-            jQuery(data.target).addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              return jQuery(data.target).attr('src', url).removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        return promise.show('Edit image');
-      });
-      $bubble.find('.remove').on('click', function() {
-        pover.stopOne($el);
-        return $el.remove();
-      });
-      return $bubble.contents();
-    };
-    uploadImage = function(file, callback) {
-      var f, plugin, settings, xhr;
-
-      plugin = this;
-      settings = Aloha.require('assorted/assorted-plugin').settings;
-      xhr = new XMLHttpRequest();
-      if (xhr.upload) {
-        if (!settings.image.uploadurl) {
-          throw new Error("uploadurl not defined");
-        }
-        xhr.onload = function() {
-          var url;
-
-          if (settings.image.parseresponse) {
-            url = parseresponse(xhr);
-          } else {
-            url = JSON.parse(xhr.response).url;
-          }
-          return callback(url);
-        };
-        xhr.open("POST", settings.image.uploadurl, true);
-        xhr.setRequestHeader("Cache-Control", "no-cache");
-        f = new FormData();
-        f.append(settings.image.uploadfield || 'upload', file, file.name);
-        return xhr.send(f);
-      }
-    };
-    Aloha.bind('aloha-image-selected', function(event, target) {
-      var $el, nodes;
-
-      $el = jQuery(target);
-      nodes = jQuery(Aloha.activeEditable.obj).find(selector);
-      nodes = nodes.not($el);
-      nodes.trigger('hide');
-      $el.trigger('show');
-      $el.data('aloha-bubble-selected', true);
-      return $el.off('.bubble');
-    });
-    UI.adopt('insertVideo-oer', null, {
+    return UI.adopt('insertVideo-oer', null, {
       click: function() {
-        var newEl, promise;
-
-        newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>');
-        promise = showModalDialog(newEl);
-        promise.done(function(data) {
-          if (data.files.length) {
-            newEl.addClass('aloha-image-uploading');
-            return uploadImage(data.files[0], function(url) {
-              jQuery(data.target).attr('src', url);
-              return newEl.removeClass('aloha-image-uploading');
-            });
-          }
-        });
-        promise.fail(function(data) {
-          var $target;
-
-          $target = jQuery(data.target);
-          if (!$target.is('img')) {
-            return $target.remove();
-          }
-        });
+        var promise;
+        promise = showModalDialog(null);
         return promise.show();
       }
     });
-    return {
-      selector: selector,
-      populator: populator
-    };
   });
 
 }).call(this);

From 193eb5495cd25c1831293fcb1ffced585822b1ae Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 15 May 2013 10:30:33 -0500
Subject: [PATCH 61/67] Trying to fix invalid url highlight by adding more
 specific css rule

---
 src/plugins/oer/assorted/css/image.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 734c0204b0..420a133683 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -70,7 +70,7 @@ form#linkModal:focus {
     border-width:medium;
 }
 
-.invalidURL input[type=text] {
+.invalidURL input[type="text"] {
     border-color:red;
     border-width:medium;
-}
\ No newline at end of file
+}

From 9b917eedc2800626ec17249cef029ad7a88f4df5 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 15 May 2013 16:41:53 -0500
Subject: [PATCH 62/67] Fixed input box highlighting issue, will now do full
 test before removing commented out code

---
 src/plugins/oer/assorted/lib/video.coffee |  7 +-
 src/plugins/oer/assorted/lib/video.js     | 86 ++++++++---------------
 2 files changed, 31 insertions(+), 62 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 701ec0b5fc..b63edf8444 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -248,14 +248,9 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         currentVal = target.value
         valid = checkURL(currentVal, target)
         if(valid) 
-            target.style.class = 'validURL'
+            target.className = 'validURL'
         else
-            # jQuery(this).addClass('invalidURL')
-            jQuery(this).attr('class', 'invalidURL')
-            target.style.class = 'invalidURL'
-            target.class = 'invalidURL'
             target.className = 'invalidURL'
-            # target.style.borderColor = 'Red';
 
       for radio in dialog.find('#media-sites')
         radio.onclick = (event) ->
diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 6bfaca80c3..86290fcd69 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 1.3.3
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
@@ -21,7 +20,6 @@
     
     Youtube Plugin
     */
-
     youtube_url_validator = function(url) {
       var regexp;
       regexp = /^(?:https?:\/\/)?(?:www\.)?youtube\.com\/watch\?(?=.*v=((\w|-){11}))(?:\S+)?$/;
@@ -65,7 +63,6 @@
     
     Vimeo Plugin
     */
-
     vimeo_url_validator = function(url) {
       var c, intRegex, offset, videoIdStr, _i, _len;
       if (url.indexOf('vimeo.com/') !== -1) {
@@ -75,9 +72,7 @@
         intRegex = /^[0-9]$/;
         for (_i = 0, _len = videoIdStr.length; _i < _len; _i++) {
           c = videoIdStr[_i];
-          if (!intRegex.test(c)) {
-            return false;
-          }
+          if (!intRegex.test(c)) return false;
         }
         lastKnownUrlId = videoIdStr;
         lastWorkingEmbedder = VIMEO_ID;
@@ -100,9 +95,7 @@
     };
     slideshare_url_validator = function(inputurl, inputbox) {
       var encodedUrl;
-      if (inputurl.indexOf('slideshare.net') === -1) {
-        return false;
-      }
+      if (inputurl.indexOf('slideshare.net') === -1) return false;
       encodedUrl = encodeURIComponent(inputurl);
       jQuery.ajax({
         url: "http://www.slideshare.net/api/oembed/2?url=" + encodedUrl + "&format=jsonp",
@@ -170,12 +163,10 @@
     active_embedder = youtube_embedder;
     active_embedder_value = 'youtube';
     checkURL = function(url, inputbox) {
-      var _i, _len;
+      var embedder, _i, _len;
       for (_i = 0, _len = embedders.length; _i < _len; _i++) {
         embedder = embedders[_i];
-        if (embedder.url_validator(url, inputbox)) {
-          return true;
-        }
+        if (embedder.url_validator(url, inputbox)) return true;
       }
       return false;
     };
@@ -196,19 +187,13 @@
       }
       nSeconds = ivalue;
       str = '';
-      if (nHours > 0) {
-        str = str + nHours.toString() + ' hours';
-      }
+      if (nHours > 0) str = str + nHours.toString() + ' hours';
       if (nMinutes > 0) {
-        if (str.length !== 0) {
-          str = str + ', ';
-        }
+        if (str.length !== 0) str = str + ', ';
         str = str + nMinutes.toString() + ' mins';
       }
       if (nSeconds > 0) {
-        if (str.length !== 0) {
-          str = str + ', ';
-        }
+        if (str.length !== 0) str = str + ', ';
         str = str + nSeconds.toString() + ' secs';
       }
       return str;
@@ -230,11 +215,8 @@
         currentVal = target.value;
         valid = checkURL(currentVal, target);
         if (valid) {
-          return target.style["class"] = 'validURL';
+          return target.className = 'validURL';
         } else {
-          jQuery(this).attr('class', 'invalidURL');
-          target.style["class"] = 'invalidURL';
-          target["class"] = 'invalidURL';
           return target.className = 'invalidURL';
         }
       };
@@ -242,14 +224,14 @@
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         radio = _ref[_i];
         radio.onclick = function(event) {
-          var index, val, _j, _len1, _ref1, _results;
+          var index, radio, val, _j, _len2, _ref2, _results;
           val = event.target.value;
           if (active_embedder_value !== val) {
             index = 0;
-            _ref1 = dialog.find('#media-sites');
+            _ref2 = dialog.find('#media-sites');
             _results = [];
-            for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-              radio = _ref1[_j];
+            for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
+              radio = _ref2[_j];
               if (radio.value === val) {
                 active_embedder_value = radio.value;
                 active_embedder = embedders[index];
@@ -274,13 +256,9 @@
         var reader;
         reader = new FileReader();
         reader.onloadend = function() {
-          if ($img) {
-            $img.attr('src', reader.result);
-          }
+          if ($img) $img.attr('src', reader.result);
           setvideoSource(reader.result);
-          if (callback) {
-            return callback(reader.result);
-          }
+          if (callback) return callback(reader.result);
         };
         return reader.readAsDataURL(file);
       };
@@ -291,12 +269,12 @@
       });
       deferred = $.Deferred();
       dialog.on('click', '.btn.btn-primary.action.insert', function(evt) {
-        var child, mediaElement, video_id, _j, _len1, _ref1;
+        var child, mediaElement, video_id, _j, _len2, _ref2;
         evt.preventDefault();
         if (videoSource.length === 0) {
-          _ref1 = $searchResults.children();
-          for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-            child = _ref1[_j];
+          _ref2 = $searchResults.children();
+          for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) {
+            child = _ref2[_j];
             if (child.className === 'search-result-selected') {
               video_id = child.id;
               mediaElement = active_embedder.embed_code_gen(video_id);
@@ -304,9 +282,7 @@
             }
           }
         } else {
-          if (lastWorkingEmbedder === -1) {
-            return;
-          }
+          if (lastWorkingEmbedder === -1) return;
           mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId);
         }
         AlohaInsertIntoDom(mediaElement);
@@ -319,33 +295,33 @@
         $searchResults.empty();
         $searchResults.append(jQuery('<div style="width=100%" >Searching...</div>'));
         return jQuery.get(queryUrl, function(responseObj) {
-          var ele, searchElements, _j, _len1, _results;
+          var ele, searchElements, _j, _len2, _results;
           $searchResults.empty();
           if ((typeof responseObj) === 'string') {
             responseObj = jQuery.parseJSON(responseObj);
           }
           searchElements = active_embedder.search_results_generator(responseObj);
           _results = [];
-          for (_j = 0, _len1 = searchElements.length; _j < _len1; _j++) {
+          for (_j = 0, _len2 = searchElements.length; _j < _len2; _j++) {
             ele = searchElements[_j];
             ele[0].onclick = function(evt) {
-              var child, target, targetId, _k, _len2, _ref1, _results1;
+              var child, target, targetId, _k, _len3, _ref2, _results2;
               target = evt.target;
               while (target.tagName !== 'DIV') {
                 target = target.parentNode;
               }
               targetId = target.id;
-              _ref1 = $searchResults.children();
-              _results1 = [];
-              for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) {
-                child = _ref1[_k];
+              _ref2 = $searchResults.children();
+              _results2 = [];
+              for (_k = 0, _len3 = _ref2.length; _k < _len3; _k++) {
+                child = _ref2[_k];
                 if (child.id === targetId) {
-                  _results1.push(child.className = 'search-result-selected');
+                  _results2.push(child.className = 'search-result-selected');
                 } else {
-                  _results1.push(child.className = 'search-result');
+                  _results2.push(child.className = 'search-result');
                 }
               }
-              return _results1;
+              return _results2;
             };
             _results.push($searchResults.append(ele));
           }
@@ -361,9 +337,7 @@
       });
       return jQuery.extend(true, deferred.promise(), {
         show: function(title) {
-          if (title) {
-            dialog.find('.modal-header h3').text(title);
-          }
+          if (title) dialog.find('.modal-header h3').text(title);
           return dialog.modal('show');
         }
       });

From 84a3e6c417e01fe5316e7f8071908442056c0f6e Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 15 May 2013 16:44:31 -0500
Subject: [PATCH 63/67] Commiting updated css file

---
 src/plugins/oer/assorted/css/image.css | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/plugins/oer/assorted/css/image.css b/src/plugins/oer/assorted/css/image.css
index 420a133683..21d60accbc 100644
--- a/src/plugins/oer/assorted/css/image.css
+++ b/src/plugins/oer/assorted/css/image.css
@@ -61,16 +61,18 @@ form#linkModal:focus {
     font-size:90%;
 
 }
-.validURL input {
-    border-color:black;
-    border-width:medium;
+#linkModal input[type="text"][class="validURL"] {
+    border: 2px solid #00FF00;
+    outline-color: #00FF00;
 }
-.invalidURL input {
-    border-color:red;
-    border-width:medium;
+#linkModal input[type="text"][class="validURL"]:focus {
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
 }
 
-.invalidURL input[type="text"] {
-    border-color:red;
-    border-width:medium;
+#linkModal input[type="text"][class="invalidURL"] {
+    border: 2px solid red;
+    outline-color: red;
 }
+#linkModal input[type="text"][class="invalidURL"]:focus {
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset;
+}
\ No newline at end of file

From 85c2e3b1ae7179f7d9eefce4123f4de0880385d5 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 15 May 2013 18:22:57 -0500
Subject: [PATCH 64/67] Changed the ajax request for slideshare embedder to be
 async b/c requests for 'jsonp' are inheretnly so

---
 src/plugins/oer/assorted/lib/video.coffee | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index b63edf8444..3bc003f7a3 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -105,14 +105,17 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     encodedUrl = encodeURIComponent(inputurl)
     jQuery.ajax({
             url: """http://www.slideshare.net/api/oembed/2?url=#{encodedUrl}&format=jsonp""",
-            async:false,
+            async:true,
             dataType: 'jsonp',
             success: (result, status, statusObject) -> 
               id = result.slideshow_id
               if inputurl == inputbox.value
-                inputbox.style.class = 'validURL'
+                inputbox.className = 'validURL'
                 lastKnownUrlId = id
                 lastWorkingEmbedder = SLIDESHARE_ID
+                return true
+            error: (result, status, statusObject) ->
+              return false
             })
     
     lastWorkingEmbedder = -1
@@ -130,7 +133,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
     return [ ]
 
   concord_url_validator = (url) ->
-    concordLabUrl = 'lab.concord.org/examples/interactives/interactives.html#interactives/samples/'
+    concordLabUrl = 'lab.concord.org/examples/interactives/embeddable.html#interactives/basic-examples/'
     if url.indexOf(concordLabUrl) != -1
       offset = url.indexOf(concordLabUrl)
       offset = offset + concordLabUrl.length
@@ -147,7 +150,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   concord_embed_code_generator = (id) ->
     return jQuery("""<iframe style="width:925px; height:575px" width="925" height="575" frameborder="no" scrolling="no" 
-      src="http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/#{id}.json"></iframe>""")
+      src="http://lab.concord.org/examples/interactives/embeddable.html#interactives/basic-examples/#{id}.json"></iframe>""")
 
   concord_query_generator = (queryTerms) -> 
     false

From 32e8d38fd6fe6ea99bddac7af83ddc8ebfb5bf2f Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 15 May 2013 18:39:43 -0500
Subject: [PATCH 65/67] Removed commented out code and changed concord url to
 reflect the changed url.

---
 src/plugins/oer/assorted/lib/video.coffee | 154 +++-------------------
 1 file changed, 18 insertions(+), 136 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.coffee b/src/plugins/oer/assorted/lib/video.coffee
index 3bc003f7a3..f71e07a39d 100644
--- a/src/plugins/oer/assorted/lib/video.coffee
+++ b/src/plugins/oer/assorted/lib/video.coffee
@@ -1,6 +1,7 @@
-# Aloha Video Plugin
+# Aloha Media Plugin
 # * -----------------
-# * This plugin handles when the insertVideo button is clicked
+# * This plugin handles media insertion
+# The plugin currently supports slides, concord simulations, vimeo and youtube videos
 #
 define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (Aloha, jQuery, Popover, UI) ->
 
@@ -55,7 +56,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       videoLengthString = getTimeString(video.media$group.yt$duration.seconds)
       idTokens = video.id.$t.split(':')
       videoId = idTokens[idTokens.length-1]
-      # newEntry = jQuery('<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id='+videoId+'><table><tr><td width=20% rowspan=3><img src='+thumbnailUrl+' /></td><td><b>'+videoTitle+'</b></td></tr><tr><td>'+videoDescription+'</td></tr><tr><td>Duration: '+videoLengthString+'</td></tr></table></div>')
       newEntry = jQuery("""<div style="width:100%;border-bottom: 1px solid black;" class="search-result" id="#{videoId}"><table>
         <tr><td width=20% rowspan=3><img src="#{thumbnailUrl}"/></td>
         <td><b>#{videoTitle}</b></td></tr><tr><td>#{videoDescription}</td></tr>
@@ -63,7 +63,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
       eleList.push(newEntry)
     return eleList
 
-  ### 
+  ###
 
   Vimeo Plugin 
 
@@ -96,7 +96,12 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
   vimeo_search_results_generator = (responseObj) ->
     return [ ]
+  
+  ###
 
+  Slideshare Plugin 
+
+  ###
   
   slideshare_url_validator = (inputurl, inputbox) ->
     if inputurl.indexOf('slideshare.net') == -1
@@ -132,6 +137,11 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   slideshare_search_results_generator = (responseObj) ->
     return [ ]
 
+  ###
+
+  Concord Plugin 
+
+  ###
   concord_url_validator = (url) ->
     concordLabUrl = 'lab.concord.org/examples/interactives/embeddable.html#interactives/basic-examples/'
     if url.indexOf(concordLabUrl) != -1
@@ -158,6 +168,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   concord_search_results_generator = (responseObj) ->
     return [ ]
 
+  # Instantiates all the embedders
   youtube_embedder = new embedder(youtube_url_validator, youtube_embed_code_generator, youtube_query_generator, youtube_search_results_generator)
   vimeo_embedder = new embedder(vimeo_url_validator, vimeo_embed_code_generator, vimeo_query_generator, vimeo_search_results_generator)
   slideshare_embedder = new embedder(slideshare_url_validator, slideshare_embed_code_generator, slideshare_query_generator, slideshare_search_results_generator)
@@ -173,6 +184,7 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
   active_embedder = youtube_embedder
   active_embedder_value = 'youtube'
   
+  # Checks if URL is recognized by any of the embedders
   checkURL = (url, inputbox) ->
     for embedder in embedders
       if (embedder.url_validator(url, inputbox)) 
@@ -266,27 +278,8 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
                 active_embedder = embedders[index]
                 break
               index = index + 1
-              
-      # If we're editing an image pull in the src.
-      # It will be undefined if this is a new image.
-      #
-      # This variable is updated when one of the following occurs:
-      # * selects an image from the filesystem
-      # * enters a URL (TODO: Verify it's an image)
-      # * drops an image into the drop div
-
-      # $el might not be an image, it might be a placeholder for a future image
-      # if $el.is('img')
-      #   # On submit $el.attr('src') will point to what is set in this variable
-      #   # preserve the alt text if editing an image
-      #   videoSource = $el.attr('src')
-      #   imageAltText = $el.attr('alt')
-      # else
-      #   videoSource = ''
-      #   imageAltText = ''
 
       videoSource = ''
-      # dialog.find('[name=alt]').val(imageAltText)
       # Checks if the URL is a valid one -- i.e. if one of the embedders can parse and generate embedded html for it
       # Retrieves embedder which can matches the format of the URL
       if checkURL(videoSource, $uploadUrl)
@@ -308,24 +301,9 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
           callback(reader.result) if callback
         reader.readAsDataURL(file)
 
-      # Add click handlers
-      # dialog.find('.upload-image-link').on 'click', (evt) ->
-      #   evt.preventDefault()
-      #   $placeholder.hide()
-      #   $uploadUrl.hide()
-
-      # dialog.find('.upload-url-link').on 'click', (evt) ->
-      #   evt.preventDefault()
-      #   $placeholder.hide()
-      #   $uploadUrl.show()
-
       $uploadUrl.on 'change', () ->
-        # $previewImg = $placeholder.find('img')
         url = $uploadUrl.val()
         setvideoSource(url)
-        # if settings.image.preview
-        #   $previewImg.attr 'src', url
-        #   $placeholder.show()
 
       # On save update the actual video element. Use the submit event because this
       # allows the use of html5 validation.
@@ -333,12 +311,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
 
       dialog.on 'click', '.btn.btn-primary.action.insert', (evt) =>
         evt.preventDefault() # Don't submit the form
-        # if $el.is('img')
-        #   $el.attr 'src', videoSource
-        #   $el.attr 'alt', dialog.find('[name=alt]').val()
-        # else
-        # Embeds the video into the page
-        #mediaWrapper = jQuery('<div class="media"></div>')
         if videoSource.length == 0
           # Use search results
           for child in $searchResults.children()
@@ -352,8 +324,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
             return
           mediaElement = embedders[lastWorkingEmbedder].embed_code_gen(lastKnownUrlId)
 
-        #mediaWrapper.append(mediaElement)
-        #AlohaInsertIntoDom(mediaWrapper)
         AlohaInsertIntoDom(mediaElement)
         dialog.modal('hide')
 
@@ -388,9 +358,6 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
         dialog.modal('hide')
 
       dialog.on 'hidden', (event) ->
-        # If hidden without being confirmed/cancelled, reject
-        # if deferred.state()=='pending'
-          # deferred.reject(target: $el[0])
         # Clean up after dialog was hidden
         dialog.remove()
 
@@ -401,101 +368,16 @@ define ['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], (A
               dialog.find('.modal-header h3').text(title)
             dialog.modal 'show'
 
-  selector = 'img'
-
-  # populator = ($el, pover) ->
-  #     # When a click occurs, the activeEditable is cleared so squirrel it
-  #     editable = Aloha.activeEditable
-  #     $bubble = jQuery '''
-  #       <div class="link-popover-details">
-  #           <a class="change">
-  #             <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/edit-link-03.png" />
-  #             <span title="Change the image's properties">Edit image...</span>
-  #           </a>
-  #           &nbsp; | &nbsp;
-  #           <a class="remove">
-  #             <img src="''' + Aloha.settings.baseUrl + '''/../plugins/oerpub/assorted/img/unlink-link-02.png" />
-  #             <span title="Delete the image">Delete</span>
-  #           </a>
-  #       </div>'''
-
-  #     href = $el.attr('src')
-  #     $bubble.find('.change').on 'click', ->
-  #       # unsquirrel the activeEditable
-  #       Aloha.activeEditable = editable
-  #       promise = showModalDialog($el)
- 
-  #       promise.done (data)->
-  #         # Uploading if a local file was chosen
-  #         if data.files.length
-  #           jQuery(data.target).addClass('aloha-image-uploading')
-  #           uploadImage data.files[0], (url) ->
-  #             jQuery(data.target).attr('src', url).removeClass(
-  #               'aloha-image-uploading')
-  #       promise.show('Edit image')
-
-  #     $bubble.find('.remove').on 'click', ->
-  #       pover.stopOne($el)
-  #       $el.remove()
-  #     $bubble.contents()
-
-
-  # uploadImage = (file, callback) ->
-  #   # plugin = @
-  #   settings = Aloha.require('assorted/assorted-plugin').settings
-  #   xhr = new XMLHttpRequest()
-  #   if xhr.upload
-  #     if not settings.image.uploadurl
-  #       throw new Error("uploadurl not defined")
-
-  #     xhr.onload = () ->
-  #       if settings.image.parseresponse
-  #         url = parseresponse(xhr)
-  #       else
-  #         url = JSON.parse(xhr.response).url
-  #       callback(url)
-
-  #     xhr.open("POST", settings.image.uploadurl, true)
-  #     xhr.setRequestHeader("Cache-Control", "no-cache")
-  #     f = new FormData()
-  #     f.append(settings.image.uploadfield or 'upload', file, file.name)
-  #     xhr.send(f)
-
-
-  # Aloha.bind 'aloha-image-selected', (event, target) ->
-  #     # Hide other tooltips of the same type
-  #     $el = jQuery(target)
-  #     nodes = jQuery(Aloha.activeEditable.obj).find(selector)
-  #     nodes = nodes.not($el)
-  #     nodes.trigger 'hide'
-  #     $el.trigger 'show'
-  #     $el.data('aloha-bubble-selected', true)
-  #     $el.off('.bubble')
+  #selector = 'img'
 
   UI.adopt 'insertVideo-oer', null,
     click: () ->
+      # Code to add a placeholder element
       # newEl = jQuery('<span class="aloha-ephemera image-placeholder"> </span>')    
       # GENTICS.Utils.Dom.insertIntoDOM newEl, Aloha.Selection.getRangeObject(), Aloha.activeEditable.obj
       promise = showModalDialog(null)
 
       ## Add code here to handle video uploading. This is not currently supported ##
-      # promise.done (data)->
-      #   # Uploading if a local file was chosen
-      #   if data.files.length
-      #     newEl.addClass('aloha-image-uploading')
-      #     uploadImage data.files[0], (url) ->
-      #       jQuery(data.target).attr('src', url)
-      #       newEl.removeClass('aloha-image-uploading')
-
-      # promise.fail (data) ->
-      #   # Clean up placeholder if needed
-      #   $target = jQuery(data.target)
-      #   if not $target.is('img')
-      #     $target.remove()
 
       # Finally show the dialog
       promise.show()
-
-  # Return config
-  # selector: selector
-  # populator: populator

From 2032acc8d60097a5ff4f9827a946cef73bec6bc9 Mon Sep 17 00:00:00 2001
From: gbenga <gbadipe@gmail.com>
Date: Wed, 15 May 2013 18:52:46 -0500
Subject: [PATCH 66/67] Adding js file

---
 src/plugins/oer/assorted/lib/video.js | 29 ++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/plugins/oer/assorted/lib/video.js b/src/plugins/oer/assorted/lib/video.js
index 86290fcd69..c41b8a0921 100644
--- a/src/plugins/oer/assorted/lib/video.js
+++ b/src/plugins/oer/assorted/lib/video.js
@@ -1,7 +1,7 @@
 (function() {
 
   define(['aloha', 'jquery', 'popover', 'ui/ui', 'css!assorted/css/image.css'], function(Aloha, jQuery, Popover, UI) {
-    var CONCORD_ID, DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, concord_embed_code_generator, concord_embedder, concord_query_generator, concord_search_results_generator, concord_url_validator, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, selector, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
+    var CONCORD_ID, DIALOG_HTML, SLIDESHARE_ID, VIMEO_ID, YOUTUBE_ID, active_embedder, active_embedder_value, checkURL, concord_embed_code_generator, concord_embedder, concord_query_generator, concord_search_results_generator, concord_url_validator, embedder, embedders, getTimeString, lastKnownUrlId, lastWorkingEmbedder, showModalDialog, slideshare_embed_code_generator, slideshare_embedder, slideshare_query_generator, slideshare_search_results_generator, slideshare_url_validator, vimeo_embed_code_generator, vimeo_embedder, vimeo_query_generator, vimeo_search_results_generator, vimeo_url_validator, youtube_embed_code_generator, youtube_embedder, youtube_query_generator, youtube_search_results_generator, youtube_url_validator;
     embedder = function(url_validator, embed_code_generator, query_generator, search_results_generator) {
       var result;
       this.embed_code_gen = embed_code_generator;
@@ -59,9 +59,9 @@
       }
       return eleList;
     };
-    /* 
+    /*
     
-    Vimeo Plugin
+      Vimeo Plugin
     */
     vimeo_url_validator = function(url) {
       var c, intRegex, offset, videoIdStr, _i, _len;
@@ -93,22 +93,30 @@
     vimeo_search_results_generator = function(responseObj) {
       return [];
     };
+    /*
+    
+      Slideshare Plugin
+    */
     slideshare_url_validator = function(inputurl, inputbox) {
       var encodedUrl;
       if (inputurl.indexOf('slideshare.net') === -1) return false;
       encodedUrl = encodeURIComponent(inputurl);
       jQuery.ajax({
         url: "http://www.slideshare.net/api/oembed/2?url=" + encodedUrl + "&format=jsonp",
-        async: false,
+        async: true,
         dataType: 'jsonp',
         success: function(result, status, statusObject) {
           var id;
           id = result.slideshow_id;
           if (inputurl === inputbox.value) {
-            inputbox.style["class"] = 'validURL';
+            inputbox.className = 'validURL';
             lastKnownUrlId = id;
-            return lastWorkingEmbedder = SLIDESHARE_ID;
+            lastWorkingEmbedder = SLIDESHARE_ID;
+            return true;
           }
+        },
+        error: function(result, status, statusObject) {
+          return false;
         }
       });
       lastWorkingEmbedder = -1;
@@ -123,9 +131,13 @@
     slideshare_search_results_generator = function(responseObj) {
       return [];
     };
+    /*
+    
+      Concord Plugin
+    */
     concord_url_validator = function(url) {
       var concordLabUrl, id, offset, post;
-      concordLabUrl = 'lab.concord.org/examples/interactives/interactives.html#interactives/samples/';
+      concordLabUrl = 'lab.concord.org/examples/interactives/embeddable.html#interactives/basic-examples/';
       if (url.indexOf(concordLabUrl) !== -1) {
         offset = url.indexOf(concordLabUrl);
         offset = offset + concordLabUrl.length;
@@ -143,7 +155,7 @@
       return false;
     };
     concord_embed_code_generator = function(id) {
-      return jQuery("<iframe style=\"width:925px; height:575px\" width=\"925\" height=\"575\" frameborder=\"no\" scrolling=\"no\" \nsrc=\"http://lab.concord.org/examples/interactives/embeddable.html#interactives/samples/" + id + ".json\"></iframe>");
+      return jQuery("<iframe style=\"width:925px; height:575px\" width=\"925\" height=\"575\" frameborder=\"no\" scrolling=\"no\" \nsrc=\"http://lab.concord.org/examples/interactives/embeddable.html#interactives/basic-examples/" + id + ".json\"></iframe>");
     };
     concord_query_generator = function(queryTerms) {
       return false;
@@ -342,7 +354,6 @@
         }
       });
     };
-    selector = 'img';
     return UI.adopt('insertVideo-oer', null, {
       click: function() {
         var promise;

From f01ee81dc078cf27c7f58f64246c5bc49c822a37 Mon Sep 17 00:00:00 2001
From: Izak Burger <isburger@gmail.com>
Date: Sat, 25 May 2013 16:34:43 +0200
Subject: [PATCH 67/67] Use jquery to process ajax loaded html

This deals better with xhtml. innerHTML does not deal with it at all well.
---
 oerpub/index.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/oerpub/index.html b/oerpub/index.html
index 548f5bb313..7555042202 100644
--- a/oerpub/index.html
+++ b/oerpub/index.html
@@ -247,10 +247,9 @@
                         // Fetch the preview
                         $('#statusmessage').data('message')('Loading preview...');
                         Aloha.jQuery.get(body_url, function(data){
-                            var d = document.createElement('html');
-                            d.innerHTML = data;
+                            var $d = Aloha.jQuery('<div />').html(data);
                             var $editable = Aloha.jQuery('#canvas').html(
-                                $('body > *', d));
+                                $d.find('> *'));
 
                             // Remove the pyramid debug toolbar from the preview
                             // if it exists. This code should do nothing in production