Merge branch 'master' of git@github.com:gallery/gallery3

4 files changed, 22 insertions, 8 deletions

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 53af2ba6..de027c1b 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -127,6 +127,7 @@ class Quick_Controller extends Controller {
       $msg = t("Deleted photo <b>%title</b>", array("title" => p::purify($item->title)));
     }
 
+    $parent = $item->parent();
     $item->delete();
     message::success($msg);
 
diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 92155434..06a2eaff 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -255,9 +255,11 @@
 
   function upload_complete(file) {
     var stats = this.getStats();
-    $("#gUploadQueueInfo").text("(<?= t("completed") ?> " + stats.successful_uploads +
-      " <?= t("of") ?> " + (stats.files_queued + stats.successful_uploads +
-      stats.upload_errors + stats.upload_cancelled + stats.queue_errors) + ")");
+    var msg = "(<?= t("completed __COMPLETED__ of __TOTAL__") ?>)";
+    msg = msg.replace("__COMPLETED__", stats.successful_uploads);
+    msg = msg.replace("__TOTAL__", stats.files_queued + stats.successful_uploads +
+      stats.upload_errors + stats.upload_cancelled + stats.queue_errors);
+    $("#gUploadQueueInfo").text(msg);
     if (stats.files_queued === 0) {
       $("#gUploadCancel").hide();
     }
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index bbad4e69..21952849 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -19,8 +19,6 @@
     </li>
   </ul>
 
-  <?= form::open(url::abs_site("server_add/start/$item->id"), array("method" => "post")) ?>
-  <?= access::csrf_form_field(); ?>
   <ul id="gServerAddTree" class="gCheckboxTree">
     <?= $tree ?>
   </ul>
@@ -31,10 +29,16 @@
   </div>
 
   <span>
-    <input id="gServerAddAddButton" class="submit ui-state-disabled" disabled="disabled"
-           type="submit" value="<?= t("Add") ?>">
+    <button id="gServerAddAddButton" class="ui-state-default ui-state-disabled ui-corner-all"
+            disabled="disabled">
+      <?= t("Add") ?>
+    </button>
+
+    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
+      <?= t("Close") ?>
+    </button>
   </span>
-  <?= form::close() ?>
+
   <script type="text/javascript">
     $("#gServerAddAddButton").ready(function() {
       $("#gServerAddAddButton").click(function(event) {
@@ -46,4 +50,5 @@
       });
     });
   </script>
+
 </div>
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c4670a4d..0c65cd96 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -899,8 +899,14 @@ form .gError,
 
 /* Server Add */
 
+#gServerAdd button {
+  float: left;
+  margin-bottom: .5em;
+}
+
 #gServerAddTree {
   cursor: pointer;
+  padding-left: 4px;
 }
 
 #gServerAddTree li {