diff --git a/include/admin/tpl/category.inc.tpl b/include/admin/tpl/category.inc.tpl
index c06263c2..d405d2da 100644
--- a/include/admin/tpl/category.inc.tpl
+++ b/include/admin/tpl/category.inc.tpl
@@ -139,10 +139,10 @@
{if $view}
{$CONST.CATEGORY_INDEX}:
{if is_array($viewCats)}
-
+
{foreach $viewCategories as $category}
{* TODO: Ideally, this should use true nesting, i.e. nested lists instead of a level class. *}
- -
+
-
{$category.category_name|escape:"html"}
diff --git a/include/admin/tpl/groups.inc.tpl b/include/admin/tpl/groups.inc.tpl
index 259335da..629d7743 100644
--- a/include/admin/tpl/groups.inc.tpl
+++ b/include/admin/tpl/groups.inc.tpl
@@ -14,9 +14,9 @@
{if !$delete}
{$CONST.GROUP}
-
+
{foreach $groups as $group}
- -
+
-
{$group.name|escape:"html"}
- {$CONST.EDIT}
diff --git a/include/admin/tpl/images.inc.tpl b/include/admin/tpl/images.inc.tpl
index c6ec33fc..4e97da98 100644
--- a/include/admin/tpl/images.inc.tpl
+++ b/include/admin/tpl/images.inc.tpl
@@ -206,9 +206,9 @@
{$CONST.BASE_DIRECTORY}
-
+
{foreach $folders as $folder}
- -
+
-
{$folder.name}
- {$CONST.EDIT}
diff --git a/include/admin/tpl/users.inc.tpl b/include/admin/tpl/users.inc.tpl
index d9c5176c..1db4c97b 100644
--- a/include/admin/tpl/users.inc.tpl
+++ b/include/admin/tpl/users.inc.tpl
@@ -43,10 +43,10 @@
{if $delete == false}
{$CONST.USER} ({$CONST.USER_LEVEL})
-
+
{foreach $users as $user}
{if $user.isEditable}
- -
+
-
{$user.realname|escape:"html"} ({$user.userlevel})
- {$CONST.PREVIEW}
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 609dcb67..705ade25 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -417,7 +417,8 @@ form > a,
#media_pane_sort label,
#image_directory_create_form label,
#mediaPropertyForm .media_file_props label,
-#entries_list .entry_info span {
+#entries_list .entry_info span,
+.folder_name {
display: inline-block;
*display: inline;
*zoom: 1;
@@ -926,7 +927,11 @@ summary { cursor: pointer; }
.category_data,
.user_name,
-.group_name { min-width: 8em; }
+.group_name,
+.folder_name {
+ min-width: 8em;
+ padding: .4em 0;
+}
#image_directory_create_form .form_field input,
#image_directory_create_form .form_select select,
@@ -1064,7 +1069,11 @@ fieldset p,
line-height: 1.5;
}
-#entries_list>li { padding: 0 .4em; }
+#entries_list>li,
+#categories li,
+#serendipity_image_folders li { padding: 0 0 0 .4em; }
+
+#categories .edit_actions li { padding: 0; }
#entries_list .entry_info span { margin: 0 1em .75em 0; }