Changeset 65165 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Jan 5, 2017 5:50:27 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112668

Message:

TestManager: More apply buttons for the filter. Fixed filter width problem caused by float.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• htdocs/css/common.css (modified) (3 diffs)
• webui/wuimain.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/htdocs/css/common.css

@@ -336 +336 @@
     vertical-align: middle;
 }
-input.tm-side-filter-union-input:checked + label::after {
+input.tm-side-filter-union-input[type=checkbox]:checked + label::after {
     content:        '∉'; /* U+2209: not an element of. */
 }
-input.tm-side-filter-union-input + label::after {
+input.tm-side-filter-union-input[type=checkbox] + label::after {
     content:        '∈'; /* U+2208: element of. */
 }
@@ -366 +366 @@
     float:          right;
 }
+body.tm-wide-side-menu .tm-side-filter-title-buttons input {
+    display:        none;
+}
+.tm-side-filter-title-buttons input {
+    display:        inline;
+}
 .tm-side-filter-title-buttons input {
     font-size:      0.6em;
 }
-.tm-side-filter-union-input {
+.tm-side-filter-dt-buttons input {
+    font-size:      0.6em;
+}
+body.tm-wide-side-menu .tm-side-filter-dt-buttons input[type=submit] {
+    display:        inline;
+}
+.tm-side-filter-dt-buttons input[type=submit] {
+    display:        none;
+}
+.tm-side-filter-dt-buttons {
     float:          right;
 }
@@ -401 +416 @@
     font-family:    "Arial Narrow", Arial, sans-serif;
     font-weight:    normal;
+    clear:          both;       /* cancel .tm-side-filter-dt-buttons */
 }
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuimain.py

@@ -950 +950 @@
                 sHtml += u'  <dt class="%s"><a href="javascript:void(0)" onclick="toggleCollapsibleDtDd(this);">%s %s</a> ' \
                        % (sClass, sChar, webutils.escapeElem(oCrit.sName),);
+                sHtml += u'<span class="tm-side-filter-dt-buttons">';
                 if oCrit.sInvVarNm is not None:
                     sHtml += u'<input  id="sf-union-%s" class="tm-side-filter-union-input" ' \
                              u'name="%s" value="1" type="checkbox"%s />' \
-                             u'<label for="sf-union-%s" class="tm-side-filter-union-input"/>' \
+                             u'<label for="sf-union-%s" class="tm-side-filter-union-input"></label>' \
                            % ( oCrit.sInvVarNm, oCrit.sInvVarNm, ' checked' if oCrit.fInverted else '', oCrit.sInvVarNm,);
+                sHtml += u' <input type="submit" value="Apply" />';
+                sHtml += u'</span>';
                 sHtml += u'</dt>\n' \
                          u'  <dd class="%s">\n' \
                          u'   <ul>\n' \
-                         % (sClass, );
+                         % (sClass);
 
                 for oDesc in oCrit.aoPossible: