Merge dev into dbrefactor

2013-08-19 00:24:48 -05:00 · 2013-08-19 00:24:48 -05:00 · 8b3ae3b546
commit 8b3ae3b546
parent d100936b65 d62931098d
14 changed files with 197 additions and 151 deletions
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@ -785,7 +785,7 @@ Callbacks = {
        }
        makeAlert("Error", data, "alert-error")
            .addClass("span12")
-            .insertAfter($("#mediaurl").parent());
+            .insertBefore($("#extended_controls"));
    },

    setTemp: function(data) {