style checkboxes of filter issues area

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@28964 e39458fd-73e7-0310-bf30-c45bca0a0e42

2 files changed, 43 insertions, 6 deletions

diff --git a/bin/tracker_service.py b/bin/tracker_service.py
index b92fdb0de4..cd903db681 100644
--- a/bin/tracker_service.py
+++ b/bin/tracker_service.py
@@ -34,12 +34,12 @@ class BugFilter:
                            ('local', 'hide local scope', 'scope'),
                            ('unclear', 'hide unclear scope', 'scope'),
 
-                           ('undetermined_issues', 'extra: needs to be checked (will be shown in purple)', 'extra'),]
+                           ('undetermined_issues', 'needs to be checked (will be shown in purple)', 'extra'),]
 
     def __init__(self, params, nonodsa=False):
         self.action_list = self.default_action_list
         if not nonodsa:
-            self.action_list = self.default_action_list +  [('nodsa', 'extra: noDSA', 'extra')]
+            self.action_list = self.default_action_list +  [('nodsa', 'no DSA', 'extra')]
         self.params = {}
         for (prop, desc, field) in self.action_list:
             self.params[prop] = int(params.get(prop, (0,))[0])
@@ -54,12 +54,12 @@ class BugFilter:
         l.append(INPUT(type='hidden', name='filter', value='1'))
         for (prop, desc, field) in self.action_list:
             if prop in self.filters:
-                l.append(INPUT(desc, rel=field, type='checkbox', name='filter', value=prop, checked='checked'))
+                l.append(SPAN(INPUT(desc, type='checkbox', name='filter', value=prop, checked='checked'), rel=field))
                 self.params[prop]=1
             else:
-                l.append(INPUT(desc, rel=field, type='checkbox', name='filter', value=prop))
+                l.append(SPAN(INPUT(desc, type='checkbox', name='filter', value=prop), rel=field))
 
-        return FORM(tag("span",l),
+        return FORM(tag("span",l, id="filters"),
                     INPUT(type='submit', value='Apply'),
                     method='get')
 
@@ -1245,6 +1245,7 @@ Debian bug number.'''),
                     ' ',
                     A(url.scriptRelative("data/report"), "Reporting problems"),
                     method='get',
+                    id='searchform',
                     action=url.scriptRelative(''))
 
     def url_cve(self, url, name):
diff --git a/static/style.css b/static/style.css
index d5163ac0ea..d07030d220 100644
--- a/static/style.css
+++ b/static/style.css
@@ -126,9 +126,13 @@ hr {
 }
 
 form {
+	overflow: hidden;
+	margin: 1em 0;
+}
+
+#searchform {
 	text-align: center;
 	padding: 1em 0;
-	margin: 1em 0;
 	border-top: 1px solid #ddd;
 	border-bottom: 1px solid #ddd;
 }
@@ -159,6 +163,38 @@ input[type="submit"]:hover {
 	text-shadow: 0 0 3px #666;
 }
 
+input[type="checkbox"] {
+	vertical-align: middle;
+}
+
+span[rel="urgency"] {
+	padding: 0.5em 0;
+	color: #fff;
+	/*background: #729fcf;*/
+	background: #ad7fa8;
+}
+
+span[rel="scope"] {
+	padding: 0.5em 0;
+	color: #fff;
+	/*background: #3465a4;*/
+	background: #75507b;
+}
+
+span[rel="extra"] {
+	padding: 0.5em 0;
+	color: #fff;
+	/*background: #204a87;*/
+	background: #5c3566;
+}
+
+span[rel="urgency"]:last-child,
+span[rel="scope"]:last-child,
+span[rel="extra"]:last-child {
+	margin-right: 0.5em;
+	padding-right: 0.5em;
+}
+
 span.red { color: red; }
 span.purple { color: purple; }
 span.green { color: green; }