diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-19 06:27:18 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-19 06:27:18 -0700 |
| commit | 1b530e4680b09391d7f99e91f1b0b1eb6b2069fc (patch) | |
| tree | 9beee9ad047c5efa41dae7f64a0195b304770b61 /modules/server_add | |
| parent | 9a6a404a3239c964528b501d3c187ead84b1f7a0 (diff) | |
| parent | b2d0b3ebbb1764593e387a2e07e0d4e67f4f5474 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/user/views/admin_users.html.php
Diffstat (limited to 'modules/server_add')
| -rw-r--r-- | modules/server_add/controllers/admin_server_add.php | 2 | ||||
| -rw-r--r-- | modules/server_add/views/admin_server_add.html.php | 21 |
2 files changed, 10 insertions, 13 deletions
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php index 837a2c00..cb71e1f1 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" => "g-server-add-admin-form")); + array("id" => "g-server-add-admin-form", "class" => "g-short-form g-wide")); $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/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php index e447ee6d..eae767af 100644 --- a/modules/server_add/views/admin_server_add.html.php +++ b/modules/server_add/views/admin_server_add.html.php @@ -1,25 +1,22 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="g-server-add-admin"> - <h2> - <?= t("Add From Server Admininstration") ?> - </h2> - <div id="g-authorized-path"> - <h3><?= t("Authorized Paths") ?></h3> +<div class="g-block"> + <h1> <?= t("Add From Server Admininstration") ?> </h1> + <div class="g-block-content"> + <h2><?= t("Authorized Paths") ?></h2> <ul<? if (!empty($paths)): ?> style="display: none;"<? endif ?>> <li class="g-module-status g-info"><?= t("No Authorized image source paths defined yet") ?></li> </ul> - <ul id="g-path-list"> + <ul> <? foreach ($paths as $id => $path): ?> <li class="ui-icon-left"> + <span class="ui-icon ui-icon-folder-open"></span> + <?= html::clean($path) ?> <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&csrf=$csrf") ?>" id="icon_<?= $id?>" - class="g-remove-dir ui-icon ui-icon-trash"> - X - </a> - <?= html::clean($path) ?> + class="g-remove-dir"><span class="ui-icon ui-icon-trash">X</span></a> </li> <? endforeach ?> </ul> + <?= $form ?> </div> - <?= $form ?> </div> |