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

Timestamp:

Mar 24, 2020 8:08:41 PM (5 years ago)

Author:

vboxsync

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

136613

Message:

TestManager/html: Addressed some of the stuff that's deprecated in HTML5 on the schedgroup edit/details page.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/db.py (modified) (1 diff)
• htdocs/css/common.css (modified) (3 diffs)
• webui/wuicontentbase.py (modified) (4 diffs)
• webui/wuihlpform.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/db.py

@@ -642 +642 @@
             iEntry += 1;
             sDebug += ' <tr>\n' \
-                      '  <td align="right">%s</td>\n' \
-                      '  <td align="right">%s</td>\n' \
-                      '  <td align="right">%s</td>\n' \
-                      '  <td align="right">%s</td>\n' \
+                      '  <td>%s</td>\n' \
+                      '  <td>%s</td>\n' \
+                      '  <td>%s</td>\n' \
+                      '  <td>%s</td>\n' \
                       '  <td><pre>%s</pre></td>\n' \
                       '  <td>%s</td>\n' \

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

@@ -739 +739 @@
 }
 
+table.tmformtblschedgroupmembers tr td:nth-child(3),
+table.tmformtblschedgroupmembers tr td:nth-child(4) {
+    text-align: center;
+}
+
 
 /*
@@ -821 +826 @@
 table.tmlistnavtab {
     width:          100%;
+}
+
+table.tmlistnavtab tr td:nth-child(1) {
+    text-align:     left;
+}
+
+table.tmlistnavtab tr td:nth-child(2) {
+    text-align:     right;
 }
 
@@ -1073 +1086 @@
 }
 
+table.tmsqltable tr td {
+    text-align:     left;
+}
+
+table.tmsqltable tr td:nth-child(1),
+table.tmsqltable tr td:nth-child(2),
+table.tmsqltable tr td:nth-child(3),
+table.tmsqltable tr td:nth-child(4) {
+    text-align:     right;
+}
+
+
 
 /*

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

@@ -524 +524 @@
             if isinstance(oChange, AttributeChangeEntryPre):
                 sContent += '        <tr class="%s%s"><td>%s</td>'\
-                            '<td><div class="tdpre"><pre>%s</pre></div></td>' \
-                            '<td><div class="tdpre"><pre>%s</pre></div></td></tr>\n' \
+                            '<td><div class="tdpre">%s%s%s</div></td>' \
+                            '<td><div class="tdpre">%s%s%s</div></td></tr>\n' \
                           % ( sRowClass, 'odd' if j & 1 else 'even',
                               webutils.escapeElem(oChange.sAttr),
-                              webutils.escapeElem(oChange.sOldText),
-                              webutils.escapeElem(oChange.sNewText), );
+                              '<pre>' if oChange.sOldText else '',
+                               webutils.escapeElem(oChange.sOldText),
+                              '</pre>' if oChange.sOldText else '',
+                              '<pre>' if oChange.sNewText else '',
+                              webutils.escapeElem(oChange.sNewText),
+                              '</pre>' if oChange.sNewText else '', );
             else:
                 sContent += '        <tr class="%s%s"><td>%s</td><td>%s</td><td>%s</td></tr>\n' \
@@ -555 +559 @@
 
         # Prev and combo box in one cell. Both inside the form for formatting reasons.
-        sNavigation += '    <td align="left">\n' \
+        sNavigation += '    <td>\n' \
                        '    <form name="ChangeLogEntriesPerPageForm" method="GET">\n'
 
@@ -592 +596 @@
         if fMoreEntries:
             dParams[WuiDispatcherBase.ksParamChangeLogPageNo] = iPageNo + 1;
-            sNavigation += '    <td align="right"><a href="?%s#tmchangelog">Next</a></td>\n' \
+            sNavigation += '      <td><a href="?%s#tmchangelog">Next</a></td>\n' \
                          % (webutils.encodeUrlParams(dParams),);
         else:
-            sNavigation += '      <td align="right">Next</td>\n';
+            sNavigation += '      <td>Next</td>\n';
 
         sNavigation += '    </tr>\n' \
@@ -645 +649 @@
             sContent += self.formatChangeLogEntry(aoEntries, iEntry, sUrl, dParams);
 
-        sContent += '    <tbody>\n' \
+        sContent += '    </tbody>\n' \
                     '  </table>\n';
         if fShowNavigation and len(aoEntries) >= 8:

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

@@ -780 +780 @@
                       ','.join([unicode(oTestGroup.idTestGroup) for oTestGroup in aoAllRelevantTestGroups]), ));
 
-        self._add(u'<table class="tmformtbl">\n'
+        self._add(u'<table class="tmformtbl tmformtblschedgroupmembers">\n'
                   u' <thead>\n'
                   u'  <tr>\n'
@@ -828 +828 @@
                           oTestGroup.idTestGroup, oTestGroup.idTestGroup, escapeElem(oTestGroup.sName),
                           ));
-            self._add(u'    <td align="left">%s</td>\n' % ( escapeElem(oTestGroup.sName), ));
-
-            self._add(u'    <td align="center">\n'
+            self._add(u'    <td>%s</td>\n' % ( escapeElem(oTestGroup.sName), ));
+
+            self._add(u'    <td>\n'
                       u'      <input name="%s[%s]" type="text" value="%s" style="max-width:3em;" %s>\n'
                       u'    </td>\n'
@@ -837 +837 @@
                           ' readonly class="tmform-input-readonly"' if fReadOnly else '', ));
 
-            self._add(u'    <td align="center">\n'
+            self._add(u'    <td>\n'
                       u'      <select name="%s[%s]" id="%s[%s]" class="tmform-combobox"%s>\n'
                       u'        <option value="-1"%s>None</option>\n'
@@ -853 +853 @@
                       u'    </td>\n');
 
-            self._add(u'    <td align="left">\n'
+            self._add(u'    <td>\n'
                       u'      Todo<input name="%s[%s]" type="hidden" value="%s">\n'
                       u'    </td>\n'