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

Conflicts:
	themes/default/js/ui.init.js

7 files changed, 14 insertions, 9 deletions

diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php
index e4842163..bfce46f0 100644
--- a/modules/gallery/views/after_install.html.php
+++ b/modules/gallery/views/after_install.html.php
@@ -16,7 +16,7 @@
     title="<?= t("Edit Your Profile") ?>"
     id="gAfterInstallChangePasswordLink" class="gButtonLink ui-state-default ui-corners-all"><?= t("Change Password Now") ?></a>
   <script>
-    $("#gAfterInstallChangePasswordLink").bind("click", handleDialogEvent);
+    $("#gAfterInstallChangePasswordLink").gallery_dialog();
   </script>
 </p>
 
diff --git a/modules/organize/js/organize.js b/modules/organize/js/organize.js
index f10cbcc9..31657d3a 100644
--- a/modules/organize/js/organize.js
+++ b/modules/organize/js/organize.js
@@ -391,7 +391,7 @@ function organize_dialog_init() {
   $(".gBranchText").droppable(treeDroppable);
   $(".gBranchText").click(organizeOpenFolder);
   retrieveMicroThumbs(item_id);
-  //showLoading("#gDialog");
+  //$.gallery_show_loading("#gDialog");
 
   $("#gMicroThumbPanel").droppable(thumbDroppable);
   $("#gMicroThumbPanel").selectable(selectable);
diff --git a/modules/organize/js/organize_init.js b/modules/organize/js/organize_init.js
index ed036fdb..30bc78dd 100644
--- a/modules/organize/js/organize_init.js
+++ b/modules/organize/js/organize_init.js
@@ -17,7 +17,7 @@ $("document").ready(function() {
       zIndex: 75
     });
 
-    //showLoading("#gDialog");
+    //$.gallery_show_loading("#gDialog");
 
     $.get(href, function(data) {
       $("#gDialog").html(data);
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 21952849..5c5dfd0f 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -34,7 +34,7 @@
       <?= t("Add") ?>
     </button>
 
-    <button class="ui-state-default ui-corner-all" onclick="closeDialog(); window.location.reload();">
+    <button id="gServerCloseButton" class="ui-state-default ui-corner-all">
       <?= t("Close") ?>
     </button>
   </span>
@@ -48,6 +48,9 @@
            progressbar("value", 0);
          $("#gProgress").slideDown("fast", function() { start_add() });
       });
+      $("#gServerCloseButton").click(function(event) {
+        $("#gDialog").dialog("close");
+      });
     });
   </script>
 
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 765c2a35..61ac73f4 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -23,7 +23,7 @@ function closeEditInPlaceForms() {
     $("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert"));
     li.height("");
     $(".gEditable", li).bind("click", editInPlace);
-    $(".gDialogLink", li).bind("click", handleDialogEvent);
+    $(".gDialogLink", li).gallery_dialog();
   }
 }
 
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 69042aed..8de2d248 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -19,8 +19,10 @@
  */
 class user_theme_Core {
   static function header_top($theme) {
-    $view = new View("login.html");
-    $view->user = user::active();
-    return $view->render();
+    if ($theme->page_type != "login") {
+      $view = new View("login.html");
+      $view->user = user::active();
+      return $view->render();
+    }
   }
 }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 542b8b8b..9bd4c068 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -28,7 +28,7 @@
           {},
           function(data) {
             $("#group-" + group_id).html(data);
-            $("#group-" + group_id + " .gDialogLink").bind("click", handleDialogEvent);
+            $("#group-" + group_id + " .gDialogLink").gallery_dialog();
           });
   }