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

4 files changed, 21 insertions, 151 deletions

diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 50c050a8..cfca5901 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -24,20 +24,4 @@ class server_add_theme_Core {
         . $theme->script("server_add.js");
     }
   }
-
-  static function admin_head($theme) {
-    $buf = "";
-    if (strpos(Router::$current_uri, "admin/server_add") !== false) {
-      $buf .= $theme->css("server_add.css")
-        . $theme->css("jquery.autocomplete.css");
-      $base = url::site("__ARGS__");
-      $csrf = access::csrf_token();
-      $buf .= "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
-
-      $buf .= $theme->script("jquery.autocomplete.js")
-        . $theme->script("admin.js");
-    }
-
-    return $buf;
-  }
 }
\ No newline at end of file
diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js
deleted file mode 100644
index 9d7bd181..00000000
--- a/modules/server_add/js/admin.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Set up autocomplete on the server path list
- *
- */
-$("document").ready(function() {
-  $("#g-path").autocomplete(
-    base_url.replace("__ARGS__", "admin/server_add/autocomplete"), {max: 256});
-});
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
deleted file mode 100644
index 02dda4c0..00000000
--- a/modules/server_add/js/server_add.js
+++ /dev/null
@@ -1,125 +0,0 @@
-(function($) {
-   $.widget("ui.gallery_server_add",  {
-     _init: function() {
-       var self = this;
-       $("#g-server-add-add-button", this.element).click(function(event) {
-         event.preventDefault();
-         $(".g-progress-bar", this.element).
-           progressbar().
-           progressbar("value", 0);
-         $("#g-server-add-progress", this.element).slideDown("fast", function() { self.start_add(); });
-       });
-       $("#g-server-add-pause-button", this.element).click(function(event) {
-         self.pause = true;
-         $("#g-server-add-pause-button", this.element).hide();
-         $("#g-server-add-continue-button", this.element).show();
-       });
-       $("#g-server-add-continue-button", this.element).click(function(event) {
-         self.pause = false;
-         $("#g-server-add-pause-button", this.element).show();
-         $("#g-server-add-continue-button", this.element).hide();
-         self.run_add();
-       });
-       $("#g-server-add-close-button", this.element).click(function(event) {
-         $("#g-dialog").dialog("close");
-         window.location.reload();
-       });
-       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
-         self.open_dir(event);
-       });
-       $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
-         self.select_file(event);
-       });
-       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
-         self.open_dir(event);
-       });
-       $("#g-dialog").bind("dialogclose", function(event, ui) {
-         window.location.reload();
-       });
-     },
-
-     taskURL: null,
-     pause: false,
-
-     start_add: function() {
-       var self = this;
-       var paths = [];
-       $.each($("span.selected", self.element), function () {
-	 paths.push($(this).attr("ref"));
-       });
-
-       $("#g-server-add-add-button", this.element).hide();
-       $("#g-server-add-pause-button", this.element).show();
-
-       $.ajax({
-         url: START_URL,
-         type: "POST",
-         async: false,
-         data: { "paths[]": paths },
-         dataType: "json",
-         success: function(data, textStatus) {
-           $("#g-status").html(data.status);
-           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
-           self.taskURL = data.url;
-           setTimeout(function() { self.run_add(); }, 25);
-         }
-       });
-       return false;
-     },
-
-     run_add: function () {
-       var self = this;
-       $.ajax({
-         url: self.taskURL,
-         async: false,
-         dataType: "json",
-         success: function(data, textStatus) {
-           $("#g-status").html(data.status);
-           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
-           if (data.done) {
-	     $("#g-server-add-progress", this.element).slideUp();
-             $("#g-server-add-add-button", this.element).show();
-             $("#g-server-add-pause-button", this.element).hide();
-             $("#g-server-add-continue-button", this.element).hide();
-           } else {
-             if (!self.pause) {
-               setTimeout(function() { self.run_add(); }, 25);
-             }
-           }
-         }
-       });
-     },
-
-     /**
-      * Load a new directory
-      */
-     open_dir: function(event) {
-       var self = this;
-       var path = $(event.target).attr("ref");
-       $.ajax({
-         url: GET_CHILDREN_URL.replace("__PATH__", path),
-         success: function(data, textStatus) {
-           $("#g-server-add-tree", self.element).html(data);
-           $("#g-server-add-tree span.g-directory", self.element).dblclick(function(event) {
-             self.open_dir(event);
-           });
-           $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
-             self.select_file(event);
-           });
-         }
-       });
-     },
-
-     /**
-      * Manage file selection state.
-      */
-     select_file:  function (event) {
-       $(event.target).toggleClass("selected");
-       if ($("#g-server-add span.selected").length) {
-         $("#g-server-add-add-button").enable(true).removeClass("ui-state-disabled");
-       } else {
-         $("#g-server-add-add-button").enable(false).addClass("ui-state-disabled");
-       }
-     }
-  });
-})(jQuery);
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 933ab7f8..474ad428 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,4 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= $theme->css("server_add.css") ?>
+<?= $theme->css("jquery.autocomplete.css") ?>
+<?= $theme->script("jquery.autocomplete.js") ?>
+<script type="text/javascript">
+$("document").ready(function() {
+  $("#g-path").autocomplete(
+    "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/server_add/autocomplete"),
+    {
+      max: 256,
+      loadingClass: "g-loading-small",
+    });
+});
+</script>
+
 <div class="g-block">
   <h1> <?= t("Add from server administration") ?> </h1>
   <div class="g-block-content">
@@ -8,12 +22,17 @@
       <? if (empty($paths)): ?>
       <li class="g-module-status g-info"><?= t("No authorized image source paths defined yet") ?></li>
       <? endif ?>
+
       <? foreach ($paths as $id => $path): ?>
       <li>
         <?= html::clean($path) ?>
-        <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
+        <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=<?= access::csrf_token() ?>") ?>"
            id="icon_<?= $id ?>"
-           class="g-remove-dir g-button"><span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
+           class="g-remove-dir g-button">
+          <span class="ui-icon ui-icon-trash">
+            <?= t("delete") ?>
+          </span>
+        </a>
       </li>
       <? endforeach ?>
     </ul>