Major change to local import, in that checking the high level

directory will process all the files underneath w/o having to expand
the tree first.

2 files changed, 7 insertions, 4 deletions

diff --git a/modules/local_import/views/local_import_tree.html.php b/modules/local_import/views/local_import_tree.html.php
index e515852a..b028cfa1 100644
--- a/modules/local_import/views/local_import_tree.html.php
+++ b/modules/local_import/views/local_import_tree.html.php
@@ -14,9 +14,9 @@ $("#<?= $uid ?>").ready(function() {
   <? 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" ref="<?= $file_info["path"] ?>"></span>
+      <span class="ui-icon ui-icon-plus" ref="<?= $file ?>"></span>
     <? endif ?>
-    <?= "<label>" . form::checkbox("checkbox", $file_info["path"]) . " $file</label>" ?>
+    <?= "<label>" . form::checkbox("checkbox", $file) . " $file</label>" ?>
   </li>
   <? endforeach ?>
 </ul>
diff --git a/modules/local_import/views/local_import_tree_dialog.html.php b/modules/local_import/views/local_import_tree_dialog.html.php
index e553b54b..1cd28ec6 100644
--- a/modules/local_import/views/local_import_tree_dialog.html.php
+++ b/modules/local_import/views/local_import_tree_dialog.html.php
@@ -5,6 +5,7 @@ $("#gLocalImport").ready(function() {
     do_import(this, event);
   });
   $("#gProgressBar").progressbar();
+  $("#gLocalImport ul").css("display", "block");
 });</script>
 <div id="gLocalImport">
   <h1 style="display: none;"><?= sprintf(t("Import Photos to '%s'"), $album_title) ?></h1>
@@ -21,8 +22,10 @@ $("#gLocalImport").ready(function() {
     <div id="gLocalImportTree" >
       <?= $tree ?>
     </div>
-    <?= form::submit(array("id" => "gImportButton", "name" => "import", "disabled" => true),
+    <span>
+    <?= form::submit(array("id" => "gImportButton", "name" => "import", "disabled" => true, "class" => "submit"),
                      t("Import")) ?>
-    <div id="gProgressBar"></div>
+    </span>
   <?= form::close() ?> 
+  <div id="gProgressBar" ></div>
 </div>