Bug 956190 (part 2): Merge params.css and editusers.css with admin.css

r/a=justdave

6 files changed, 32 insertions, 28 deletions

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"
 %]