2 files changed, 80 insertions, 29 deletions
diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index 33047fb3..254a9da0 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -1,14 +1,41 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-</script>
-<ul id="<?= $tree_id ?>" class="gCheckboxTree">
-  <? foreach ($data as $file => $file_info): ?>
-  <li class="<?= empty($file_info["is_dir"]) ? "gFile" : "gDirectory gCollapsed ui-icon-left" ?>">
-    <? if (!empty($file_info["is_dir"])): ?>
-    <span class="ui-icon ui-icon-plus"></span>
-    <? endif ?>
-       <label> <?= form::checkbox("checkbox[]", p::clean($file_info["path"]), $checked) . " " . p::clean($file) ?> </label>
-    <div class="gServerAddChildren" style="display: none"></div>
-  </li>
-  <? endforeach ?>
-</ul>
+<li class="ui-icon-left">
+  <span class="ui-icon ui-icon-folder-open"></span>
+  <span ondblclick="open_dir('')">
+    <?= t("All") ?>
+  </span>
+  <ul>
+
+    <? foreach ($parents as $dir): ?>
+    <li class="ui-icon-left">
+      <span class="ui-icon ui-icon-folder-open"></span>
+      <span ondblclick="open_dir('<?= $dir ?>')">
+        <?= basename($dir) ?>
+      </span>
+      <ul>
+        <? endforeach ?>
+
+        <? foreach ($files as $file): ?>
+        <li class="ui-icon-left">
+          <span class="ui-icon <?= is_dir($file) ? "ui-icon-folder-collapsed" : "ui-icon-document" ?>"></span>
+          <span onclick="select_file(this)"
+                <? if (is_dir($file)): ?>
+                ondblclick="open_dir($(this).attr('file'))"
+                <? endif ?>
+                file="<?= $file ?>"
+                >
+            <?= p::clean(basename($file)) ?>
+          </span>
+        </li>
+        <? endforeach ?>
+        <? if (!$files): ?>
+        <li> <i> <?= t("empty") ?> </i> </li>
+        <? endif ?>
+
+        <? foreach ($parents as $dir): ?>
+      </ul>
+    </li>
+    <? endforeach ?>
+
+  </ul>
+</li>
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 8b296987..21952849 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -1,30 +1,54 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script>
-  var FATAL_ERROR = "<?= t("Fatal Error") ?>";
-  var FILE_IMPORT_WARNING = "<?= t("Add from server warning") ?>";
-  $("#gServerAdd").ready(function() {
-    init_server_add_form();
-  });
+<script type="text/javascript">
+  var GET_CHILDREN_URL = "<?= url::site("server_add/children?path=__PATH__") ?>";
+  var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&csrf=$csrf") ?>";
 </script>
+
 <div id="gServerAdd">
-  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => p::clean($album_title))) ?></h1>
+  <h1 style="display: none;"><?= t("Add Photos to '%title'", array("title" => p::purify($item->title))) ?></h1>
 
   <p id="gDescription"><?= t("Photos will be added to album:") ?></p>
   <ul class="gBreadcrumbs">
-    <? foreach ($parents as $parent): ?>
-    <li><?= p::clean($parent->title) ?></li>
+    <? foreach ($item->parents() as $parent): ?>
+    <li>
+      <?= p::purify($parent->title) ?>
+    </li>
     <? endforeach ?>
-    <li class="active"><?= p::clean($album_title) ?></li>
+    <li class="active">
+      <?= p::purify($item->title) ?>
+    </li>
   </ul>
 
-  <?= form::open($action, array("method" => "post")) ?>
-  <div id="gServerAddTree" >
+  <ul id="gServerAddTree" class="gCheckboxTree">
     <?= $tree ?>
+  </ul>
+
+  <div id="gProgress" style="display: none">
+    <div class="gProgressBar"></div>
+    <div id="gStatus"></div>
   </div>
+
   <span>
-    <?= form::submit(array("id" => "gServerPauseButton", "name" => "add", "disabled" => true, "class" => "submit", "style" => "display:none"), t("Pause")) ?>
-    <?= form::submit(array("id" => "gServerAddButton", "name" => "add", "disabled" => true, "class" => "submit"), 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() ?>
-  <div class="gProgressBar" style="visibility: hidden" ></div>
+
+  <script type="text/javascript">
+    $("#gServerAddAddButton").ready(function() {
+      $("#gServerAddAddButton").click(function(event) {
+         event.preventDefault();
+         $("#gServerAdd .gProgressBar").
+           progressbar().
+           progressbar("value", 0);
+         $("#gProgress").slideDown("fast", function() { start_add() });
+      });
+    });
+  </script>
+
 </div>