summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--skins/standard/admin.css90
-rw-r--r--skins/standard/editusers.css64
-rw-r--r--skins/standard/params.css77
-rw-r--r--template/en/default/admin/params/editparams.html.tmpl7
-rw-r--r--template/en/default/admin/users/confirm-delete.html.tmpl9
-rw-r--r--template/en/default/admin/users/create.html.tmpl30
-rw-r--r--template/en/default/admin/users/edit.html.tmpl6
-rw-r--r--template/en/default/admin/users/list.html.tmpl6
-rw-r--r--template/en/default/admin/users/search.html.tmpl2
9 files changed, 122 insertions, 169 deletions
diff --git a/skins/standard/admin.css b/skins/standard/admin.css
index 9367e2a4f..cdf75ac2c 100644
--- a/skins/standard/admin.css
+++ b/skins/standard/admin.css
@@ -84,6 +84,15 @@ td.admin_links dt.forbidden a, td.admin_links dd.forbidden a {
cursor: default;
}
+div.table {
+ display: inline-table;
+}
+
+div.cell {
+ display: table-cell;
+ vertical-align: top;
+}
+
.open-status, .closed-status {
width: 8em;
padding: 0.3em;
@@ -213,3 +222,84 @@ table.schedule_list th, table.search_list th {
border: 1px dotted black;
text-align: center;
}
+
+#group_membership tr.indirect {
+ background-color: #cccccc;
+}
+
+#group_membership th {
+ text-align: left;
+ padding: 0 1ex;
+}
+
+#group_membership th.checkbox, #group_membership td.checkbox {
+ text-align: center;
+ white-space: nowrap;
+}
+
+#user_responsibilities th {
+ text-align: center;
+ padding: 0 1em 1em;
+}
+
+#user_responsibilities th.product {
+ text-align: left;
+ padding: 1em 0 0;
+}
+
+#menu {
+ width: 10em;
+ margin-right: 0.5em;
+ border: solid thin;
+ border-spacing: 0px;
+ border-collapse: collapse;
+ text-align: center;
+ color: black;
+ background-color: #edf2f2;
+ font-weight: normal;
+}
+
+#menu a:link, #menu a:visited {
+ color: #039;
+ background-color: transparent;
+}
+
+#menu a:hover, #menu a:active {
+ color: red;
+ background-color: transparent;
+}
+
+#menu td {
+ border: solid thin;
+ padding: 0.2em 0.5em;
+}
+
+#menu td.selected_section {
+ color: #090;
+ background-color: white;
+}
+
+#menu td.index {
+ color: black;
+ background-color: #edf;
+}
+
+#params_index {
+ padding-left: 1em;
+}
+
+#edit_params dd {
+ margin-bottom: 1.5em;
+}
+
+.sortlist_separator {
+ font-weight: bold;
+ font-size: 80%;
+ background-color: #dddddd;
+}
+
+#contribute {
+ border: 1px dotted black;
+ padding: .5em;
+ font-size: small;
+}
diff --git a/skins/standard/editusers.css b/skins/standard/editusers.css
deleted file mode 100644
index 05cee4b39..000000000
--- a/skins/standard/editusers.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0.
- */
-
-table.main {
- border-spacing: 1em;
-}
-table.main tr {
- vertical-align: top;
- border-top: solid thin black;
-}
-table.main th {
- text-align: right;
- white-space: nowrap;
-}
-table.main th,
-table.main td {
- padding: 0;
-}
-table.main ul {
- list-style-type: none;
- padding-left: 0
-}
-
-table.groups {
- border-spacing: 1px;
-}
-table.groups tr.indirect {
- background-color: #cccccc;
-}
-table.groups th {
- text-align: left;
- padding: 0 1ex;
-}
-table.groups td {
- padding: 2px;
-}
-table.groups th.checkbox, table.groups td.checkbox {
- text-align: center;
- white-space: nowrap;
-}
-
-table#user_responsibilities th {
- text-align: center;
- padding: 0 1em 1em;
-}
-
-table#user_responsibilities th.product {
- text-align: left;
- padding: 1em 0 0;
-}
-
-table#user_responsibilities td.center {
- text-align: center;
-}
-
-.missing {
- color: red;
- border-color: inherit;
-}
diff --git a/skins/standard/params.css b/skins/standard/params.css
deleted file mode 100644
index 491a8a47a..000000000
--- a/skins/standard/params.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0.
- */
-
-#menu {
- width: 10em;
- margin-right: 0.5em;
- border: solid thin;
- border-spacing: 0px;
- border-collapse: collapse;
- text-align: center;
- color: black;
- background-color: #edf2f2;
- font-weight: normal;
-}
-
-#menu a:link, #menu a:visited {
- color: #039;
- background-color: transparent;
-}
-
-#menu a:hover, #menu a:active {
- color: red;
- background-color: transparent;
-}
-
-#menu td {
- border: solid thin;
- padding: 0.2em 0.5em;
-}
-
-#params_index {
- padding-left: 1em;
-}
-
-div.table {
- display: inline-table;
-}
-
-div.cell {
- display: table-cell;
- vertical-align: top;
-}
-
-td.selected_section {
- color: #090;
- background-color: white;
-}
-
-td.index {
- color: black;
- background-color: #edf;
-}
-
-dt {
- font-weight: bold;
-}
-
-dd {
- margin-bottom: 1.5em;
-}
-
-.sortlist_separator {
- font-weight: bold;
- font-size: 80%;
- background-color: #dddddd;
-}
-
-.contribute {
- border: 1px dotted black;
- padding: .5em;
- font-size: small;
-}
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index 4cc22da99..6a9248fcc 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -35,7 +35,7 @@
[% PROCESS global/header.html.tmpl
title = title
message = message
- style_urls = ['skins/standard/params.css']
+ style_urls = ['skins/standard/admin.css']
javascript_urls = ['js/params.js', 'js/util.js']
doc_section = "administration.html#bugzilla-configuration"
%]
@@ -68,7 +68,8 @@
</div>
<div class="cell">
- <div class="contribute"><strong>Note:</strong>
+ <div id="contribute">
+ <strong>Note:</strong>
Bugzilla is developed entirely by volunteers.
The best way to give back to the Bugzilla project is to
<a href="http://www.bugzilla.org/contribute/">contribute</a> yourself!
@@ -86,7 +87,7 @@
</p>
[%# CONTENT PANEL %]
- <form method="post" action="editparams.cgi">
+ <form id="edit_params" method="post" action="editparams.cgi">
[% PROCESS admin/params/common.html.tmpl panel = current_panel %]
<input type="hidden" name="section" value="[% current_panel.name FILTER html %]">
<input type="hidden" name="action" value="save">
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index e59c01534..28fc50a2c 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -38,8 +38,7 @@
[% PROCESS global/header.html.tmpl
title = title
- style_urls = ['skins/standard/admin.css',
- 'skins/standard/editusers.css']
+ style_urls = ['skins/standard/admin.css']
doc_section = "administration.html#deleting-users"
%]
@@ -47,7 +46,11 @@
listselectionvalues = listselectionvalues
%]
-<table class="main">
+<table id="admin_table">
+ <tr class="column_header">
+ <th>Field</th>
+ <th>Value</th>
+ </tr>
<tr>
<th>Login name:</th>
<td>[% otheruser.login FILTER html %]</td>
diff --git a/template/en/default/admin/users/create.html.tmpl b/template/en/default/admin/users/create.html.tmpl
index 497616745..f85f416f4 100644
--- a/template/en/default/admin/users/create.html.tmpl
+++ b/template/en/default/admin/users/create.html.tmpl
@@ -14,7 +14,7 @@
[% PROCESS global/header.html.tmpl
title = "Add user"
- style_urls = ['skins/standard/editusers.css']
+ style_urls = ['skins/standard/admin.css']
doc_section = "administration.html#creating-new-users"
%]
@@ -22,20 +22,20 @@
listselectionvalues = listselectionvalues
%]
-<form name="f" method="post" action="editusers.cgi">
-<table class="main">
- [% PROCESS admin/users/userdata.html.tmpl
- editform = 0
- editusers = editusers
- otheruser = []
- %]
-</table>
-<p>
- <input type="submit" id="add" value="Add">
- <input type="hidden" name="action" value="new">
- <input type="hidden" name="token" value="[% token FILTER html %]">
- [% INCLUDE listselectionhiddenfields %]
-</p>
+<form method="post" action="editusers.cgi">
+ <table id="admin_table_edit">
+ [% PROCESS admin/users/userdata.html.tmpl
+ editform = 0
+ editusers = editusers
+ otheruser = []
+ %]
+ </table>
+ <p>
+ <input type="submit" id="add" value="Add">
+ <input type="hidden" name="action" value="new">
+ <input type="hidden" name="token" value="[% token FILTER html %]">
+ [% INCLUDE listselectionhiddenfields %]
+ </p>
</form>
<p>
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index 3e0eb3c34..a0b75e6d7 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -22,7 +22,7 @@
[% PROCESS global/header.html.tmpl
title = title
message = message
- style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css']
+ style_urls = ['skins/standard/admin.css']
doc_section = "administration.html#modifying-users"
javascript_urls = [ 'js/field.js' ]
%]
@@ -32,7 +32,7 @@
%]
<form method="post" action="editusers.cgi">
-<table class="main">
+<table id="admin_table_edit">
[% PROCESS admin/users/userdata.html.tmpl
editform = 1
editusers = editusers
@@ -42,7 +42,7 @@
<tr>
<th>Group access:</th>
<td>
- <table class="groups">
+ <table id="group_membership">
<tr>
[% IF editusers %]
<th colspan="3">
diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl
index 3fcb6ca81..bfe1be139 100644
--- a/template/en/default/admin/users/list.html.tmpl
+++ b/template/en/default/admin/users/list.html.tmpl
@@ -16,7 +16,7 @@
[% PROCESS global/header.html.tmpl
title = "Select user"
- style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css']
+ style_urls = ['skins/standard/admin.css']
doc_section = "administration.html#user-administration"
%]
@@ -65,11 +65,11 @@
[% FOREACH thisuser = users %]
[% IF !thisuser.realname %]
[%# We cannot pass one class now and one class later. %]
- [% SET classes = (thisuser.is_enabled ? "missing" : "bz_inactive missing") %]
+ [% SET classes = (thisuser.is_enabled ? "warning" : "bz_inactive warning") %]
[% overrides.realname.login_name.${thisuser.login_name} = {
content => "missing"
override_content => 1
- class => "$classes"
+ class => classes
override_class => 1
}
%]
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index 2d3bb819a..a23796cd6 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -17,7 +17,7 @@
[% PROCESS global/header.html.tmpl
title = "Search users"
- style_urls = ['skins/standard/editusers.css']
+ style_urls = ['skins/standard/admin.css']
doc_section = "administration.html#managing-other-users"
%]
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-23 22:13:03 +0100