Merge branch 'master' into talmdal_dev

Conflicts:
	modules/user/views/admin_users.html.php

1 files changed, 9 insertions, 12 deletions

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) . "&amp;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>