Rewrite the server_add to have the server format the selection when a branch is opened. Sub trees re only retrieved when the branch is opened. Changed the

start task processing to fill in any subtrees that are selected, but were never expanded on the client.  Added the loading icon.

Signed-off-by: Bharat Mediratta <bharat@menalto.com>

2 files changed, 6 insertions, 11 deletions

diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index b7b494e4..33047fb3 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -1,14 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
-$("#<?= $tree_id ?>").ready(function() {
-  $("#<?= $tree_id ?> span.ui-icon").click(function(event) {
-    open_close_branch(this, event);
-  });
-
-  $("#<?= $tree_id ?> :checkbox").click(function(event) {
-    checkbox_click(this, event);
-  });
-});
 </script>
 <ul id="<?= $tree_id ?>" class="gCheckboxTree">
   <? foreach ($data as $file => $file_info): ?>
@@ -16,7 +7,8 @@ $("#<?= $tree_id ?>").ready(function() {
     <? if (!empty($file_info["is_dir"])): ?>
     <span class="ui-icon ui-icon-plus"></span>
     <? endif ?>
-    <label> <?= form::checkbox("checkbox[]", p::clean($file_info["path"])) . " " . p::clean($file) ?> </label>
+       <label> <?= form::checkbox("checkbox[]", p::clean($file_info["path"]), $checked) . " " . p::clean($file) ?> </label>
+    <div class="gServerAddChildren" style="display: none"></div>
   </li>
   <? endforeach ?>
 </ul>
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 f600ce60..0bfd52e6 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -2,8 +2,11 @@
 <script>
   var FATAL_ERROR = "<?= t("Fatal Error") ?>";
   var FILE_IMPORT_WARNING = "<?= t("Add from server warning") ?>";
+  $("#gServerAdd").ready(function() {
+    init_server_add_form();
+  });
 </script>
-<?= html::script("modules/server_add/js/server_add.js"); ?>
+<!-- ?= html::script("modules/server_add/js/server_add.js"); ? -->
 <div id="gServerAdd">
   <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => p::clean($album_title))) ?></h1>