4 files changed, 35 insertions, 9 deletions
diff --git a/public/assets/javascripts/ui/lib/AlertModal.js b/public/assets/javascripts/ui/lib/AlertModal.js
index c5693ad..1aeb048 100644
--- a/public/assets/javascripts/ui/lib/AlertModal.js
+++ b/public/assets/javascripts/ui/lib/AlertModal.js
@@ -1,6 +1,6 @@
 
 
-var AlertModal = ModalFormView.extend({
+var AlertModal = new( ModalFormView.extend({
 	el: ".mediaDrawer.alert",
 
 	events: {
@@ -9,9 +9,10 @@ var AlertModal = ModalFormView.extend({
 	},
 	
 	alert: function(message, callback){
-		this.$(".message").html(message)
+		this.$(".message").empty().append(message)
 		this.callback = callback
 		this.show()
+		this.$(".ok").focus()
 	},
 	
 	advance: function(e){
@@ -21,5 +22,5 @@ var AlertModal = ModalFormView.extend({
 		this.callback = null
 	}
 
-})
+}))
 
diff --git a/public/assets/javascripts/ui/lib/ConfirmModal.js b/public/assets/javascripts/ui/lib/ConfirmModal.js
index 868ce8e..01720bb 100644
--- a/public/assets/javascripts/ui/lib/ConfirmModal.js
+++ b/public/assets/javascripts/ui/lib/ConfirmModal.js
@@ -1,6 +1,6 @@
 
 
-var ConfirmModal = ModalFormView.extend({
+var ConfirmModal = new( ModalFormView.extend({
 	el: ".mediaDrawer.confirm",
 
 	events: {
@@ -9,7 +9,7 @@ var ConfirmModal = ModalFormView.extend({
 	},
 	
 	confirm: function(question, callback){
-		this.$(".question").html(question)
+		this.$(".question").empty().append(question)
 		this.callback = callback
 		this.show()
 	},
@@ -21,5 +21,4 @@ var ConfirmModal = ModalFormView.extend({
 		this.callback = null
 	}
 
-})
-
+}) )
+\ No newline at end of file
diff --git a/public/assets/javascripts/ui/lib/ErrorModal.js b/public/assets/javascripts/ui/lib/ErrorModal.js
new file mode 100644
index 0000000..8b01077
--- /dev/null
+++ b/public/assets/javascripts/ui/lib/ErrorModal.js
@@ -0,0 +1,26 @@
+
+
+var ErrorModal = new( ModalFormView.extend({
+	el: ".mediaDrawer.error",
+
+	events: {
+		"click .ok": "advance",
+		"click .close": "advance",
+	},
+	
+	alert: function(message, callback){
+		this.$(".errorList").empty().append(message)
+		this.callback = callback
+		this.show()
+		this.$(".ok").focus()
+	},
+	
+	advance: function(e){
+		e && e.preventDefault()
+		this.hide()
+		this.callback && this.callback()
+		this.callback = null
+	}
+
+}))
+
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index 2de4554..dc1801b 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -3,7 +3,7 @@ var FormView = View.extend({
 	method: "post",
 
 	events: {
-		"submit form": "submit"
+		"submit form": "save"
 	},
 
 	initialize: function(){
@@ -51,7 +51,7 @@ var FormView = View.extend({
 		return fd
 	},
 	
-	submit: function(e){
+	save: function(e){
 		e.preventDefault()
 
 		this.$errors.hide().css("opacity", 0.0);