From 3e6ba7acc3291f2268cbe9c9bef0a492b557babb Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 4 Oct 2009 00:27:22 -0600 Subject: Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. --- .../server_add/controllers/admin_server_add.php | 2 +- modules/server_add/js/admin.js | 2 +- modules/server_add/js/server_add.js | 58 +++++++++++----------- modules/server_add/views/admin_server_add.html.php | 10 ++-- modules/server_add/views/server_add_tree.html.php | 6 +-- .../views/server_add_tree_dialog.html.php | 26 +++++----- 6 files changed, 52 insertions(+), 52 deletions(-) (limited to 'modules/server_add') diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php index 38190fee..098f6f71 100644 --- a/modules/server_add/controllers/admin_server_add.php +++ b/modules/server_add/controllers/admin_server_add.php @@ -83,7 +83,7 @@ class Admin_Server_Add_Controller extends Admin_Controller { private function _get_admin_form() { $form = new Forge("admin/server_add/add_path", "", "post", - array("id" => "gServerAddAdminForm")); + array("id" => "g-server-add-adminForm")); $add_path = $form->group("add_path"); $add_path->input("path")->label(t("Path"))->rules("required") ->error_messages("not_readable", t("This directory is not readable by the webserver")) diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js index 5440af2a..edbddf33 100644 --- a/modules/server_add/js/admin.js +++ b/modules/server_add/js/admin.js @@ -3,6 +3,6 @@ * */ $("document").ready(function() { - $("#gServerAddAdmin input:text").autocomplete( + $("#g-server-add-admin input:text").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 index 86bff079..a2a831c9 100644 --- a/modules/server_add/js/server_add.js +++ b/modules/server_add/js/server_add.js @@ -2,35 +2,35 @@ $.widget("ui.gallery_server_add", { _init: function() { var self = this; - $("#gServerAddAddButton", this.element).click(function(event) { + $("#g-server-add-add-button", this.element).click(function(event) { event.preventDefault(); - $(".gProgressBar", this.element). + $(".g-progress-bar", this.element). progressbar(). progressbar("value", 0); - $("#gServerAddProgress", this.element).slideDown("fast", function() { self.start_add(); }); + $("#g-server-add-progress", this.element).slideDown("fast", function() { self.start_add(); }); }); - $("#gServerAddPauseButton", this.element).click(function(event) { + $("#g-server-add-pause-button", this.element).click(function(event) { self.pause = true; - $("#gServerAddPauseButton", this.element).hide(); - $("#gServerAddContinueButton", this.element).show(); + $("#g-server-add-pause-button", this.element).hide(); + $("#g-server-add-continue-button", this.element).show(); }); - $("#gServerAddContinueButton", this.element).click(function(event) { + $("#g-server-add-continue-button", this.element).click(function(event) { self.pause = false; - $("#gServerAddPauseButton", this.element).show(); - $("#gServerAddContinueButton", this.element).hide(); + $("#g-server-add-pause-button", this.element).show(); + $("#g-server-add-continue-button", this.element).hide(); self.run_add(); }); - $("#gServerAddCloseButton", this.element).click(function(event) { + $("#g-server-addCloseButton", this.element).click(function(event) { $("#g-dialog").dialog("close"); window.location.reload(); }); - $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) { + $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) { self.open_dir(event); }); - $("#gServerAddTree span.gFile, #gServerAddTree span.gDirectory", this.element).click(function(event) { + $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) { self.select_file(event); }); - $("#gServerAddTree span.gDirectory", this.element).dblclick(function(event) { + $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) { self.open_dir(event); }); $("#g-dialog").bind("dialogclose", function(event, ui) { @@ -48,8 +48,8 @@ paths.push($(this).attr("ref")); }); - $("#gServerAddAddButton", this.element).hide(); - $("#gServerAddPauseButton", this.element).show(); + $("#g-server-add-add-button", this.element).hide(); + $("#g-server-add-pause-button", this.element).show(); $.ajax({ url: START_URL, @@ -58,8 +58,8 @@ data: { "paths[]": paths }, dataType: "json", success: function(data, textStatus) { - $("#gStatus").html(data.status); - $(".gProgressBar", self.element).progressbar("value", data.percent_complete); + $("#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); } @@ -74,13 +74,13 @@ async: false, dataType: "json", success: function(data, textStatus) { - $("#gStatus").html(data.status); - $(".gProgressBar", self.element).progressbar("value", data.percent_complete); + $("#g-status").html(data.status); + $(".g-progress-bar", self.element).progressbar("value", data.percent_complete); if (data.done) { - $("#gServerAddProgress", this.element).slideUp(); - $("#gServerAddAddButton", this.element).show(); - $("#gServerAddPauseButton", this.element).hide(); - $("#gServerAddContinueButton", this.element).hide(); + $("#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); @@ -99,11 +99,11 @@ $.ajax({ url: GET_CHILDREN_URL.replace("__PATH__", path), success: function(data, textStatus) { - $("#gServerAddTree", self.element).html(data); - $("#gServerAddTree span.gDirectory", self.element).dblclick(function(event) { + $("#g-server-add-tree", self.element).html(data); + $("#g-server-add-tree span.g-directory", self.element).dblclick(function(event) { self.open_dir(event); }); - $("#gServerAddTree span.gFile, #gServerAddTree span.gDirectory", this.element).click(function(event) { + $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) { self.select_file(event); }); } @@ -115,10 +115,10 @@ */ select_file: function (event) { $(event.target).toggleClass("selected"); - if ($("#gServerAdd span.selected").length) { - $("#gServerAddAddButton").enable(true).removeClass("ui-state-disabled"); + if ($("#g-server-add span.selected").length) { + $("#g-server-add-add-button").enable(true).removeClass("ui-state-disabled"); } else { - $("#gServerAddAddButton").enable(false).addClass("ui-state-disabled"); + $("#g-server-add-add-button").enable(false).addClass("ui-state-disabled"); } } }); diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php index 4fd7f257..e447ee6d 100644 --- a/modules/server_add/views/admin_server_add.html.php +++ b/modules/server_add/views/admin_server_add.html.php @@ -1,19 +1,19 @@ -
+

-
+

style="display: none;"> -
    • +
    • -
      +
        $path): ?>
      • " id="icon_" - class="gRemoveDir ui-icon ui-icon-trash"> + class="g-remove-dir ui-icon ui-icon-trash"> X diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php index 4e5bf601..91354329 100644 --- a/modules/server_add/views/server_add_tree.html.php +++ b/modules/server_add/views/server_add_tree.html.php @@ -1,7 +1,7 @@
      • - +
          @@ -9,7 +9,7 @@
        • - +
            @@ -18,7 +18,7 @@
          • "> - " + " ref="" > 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 fdb66d1c..31648a70 100644 --- a/modules/server_add/views/server_add_tree_dialog.html.php +++ b/modules/server_add/views/server_add_tree_dialog.html.php @@ -4,11 +4,11 @@ var START_URL = "id}&csrf=$csrf") ?>"; -
            +

            html::purify($item->title))) ?>

            -

            -
              +

              +
                parents() as $parent): ?>
              • title) ?> @@ -19,35 +19,35 @@
              -
                +
                -