2 new revisions:
Revision: 9534d76f039f
Branch: default
Author: Pekka Klärck
Date: Thu Feb 6 21:14:42 2014 UTC
Log: report: Removed separate tag search in favor of generic searts
that su...
http://code.google.com/p/robotframework/source/detail?r=9534d76f039f
Revision: dc5dabf4d598
Branch: default
Author: Pekka Klärck
Date: Thu Feb 6 21:15:25 2014 UTC
Log: report: Search help text and style tuning....
http://code.google.com/p/robotframework/source/detail?r=dc5dabf4d598
==============================================================================
Revision: 9534d76f039f
Branch: default
Author: Pekka Klärck
Date: Thu Feb 6 21:14:42 2014 UTC
Log: report: Removed separate tag search in favor of generic searts
that supports also tags.
Update issue 1634
Removed separate tag search.
http://code.google.com/p/robotframework/source/detail?r=9534d76f039f
Modified:
/src/robot/htmldata/rebot/print.css
/src/robot/htmldata/rebot/report.html
=======================================
--- /src/robot/htmldata/rebot/print.css Fri Jan 31 09:51:12 2014 UTC
+++ /src/robot/htmldata/rebot/print.css Thu Feb 6 21:14:42 2014 UTC
@@ -12,7 +12,7 @@
.details, .statistics {
width: 100%;
}
-#generated-ago, #top-right-header, #normal-selector, #search,
+#generated-ago, #top-right-header, #normal-selector,
.folding-button, .expand, .hidden, .details-col-toggle {
display: none;
}
=======================================
--- /src/robot/htmldata/rebot/report.html Thu Feb 6 16:00:14 2014 UTC
+++ /src/robot/htmldata/rebot/report.html Thu Feb 6 21:14:42 2014 UTC
@@ -158,8 +158,10 @@
renderTagSelector(name);
if (name) {
var tag = findTag(name);
- renderTagDetails(tag);
- updatePrintSelector(name, tag.info);
+ if (tag) {
+ renderTagDetails(tag);
+ updatePrintSelector(name, tag.info);
+ }
}
scrollToSelector('tags', name);
}
@@ -170,7 +172,7 @@
if (tags[i].label == name)
return tags[i];
}
- return {combined: name, label: name, info: 'search'};
+ return null;
}
function renderTagSelector(name) {
@@ -183,11 +185,6 @@
function renderTagDetails(tag) {
var tests = getTestsHavingTag(tag);
tag.totalTime = calculateTotalTime(tests);
- if (tag.info == 'search') {
- tag.total = tests.length;
- tag.pass = calculatePassed(tests);
- tag.fail = tag.total - tag.pass;
- }
$.tmpl('tagOrTotalDetailsTemplate', tag).appendTo('#details-header');
drawTestDetailsTable(tests, true);
}
@@ -532,72 +529,6 @@
</td>
<td id="print-selector"></td>
</tr>
- <tr id="search">
- <th>Search:</th>
- <td>
- <form>
- <input id="search-field" type="text" value="{{html selected}}">
- <input type="submit" value="Search"
onclick="tagDetailSelected(util.escape($('#search-field').val()))">
- <input type="button" value="Clear"
onclick="$('#search-field').val('')">
- <a href="javascript:void(0)" onclick="$('#search-help').toggle()"
- title="Toggle search pattern help.">Help</a>
- </form>
- </td>
- </tr>
- <tr id="search-help" style="display: none">
- <th></th>
- <td>
- <div>
- <p>
- Search patterns support wildcards and combining operators
explained
- in the table below. Search is also case, space and underscore
- insensitive. See <em>Tag patterns</em> section in
- <a
href="https://code.google.com/p/robotframework/wiki/UserGuide";>Robot
- Framework User Guide</a> for more details.
- </p>
- <table>
- <col class="help-item">
- <col class="help-explanation">
- <col class="help-examples>
- <tr>
- <th></th>
- <th>Explanation</th>
- <th>Examples</th>
- </tr>
- <tr>
- <td>*</td>
- <td>Matches anything, even an empty string.</td>
- <td>f*, sprint-*, x*y*z</td>
- </tr>
- <tr>
- <td>?</td>
- <td>Matches any single character.</td>
- <td>f??, sprint-??, x?y?z</td>
- </tr>
- <tr>
- <td>AND</td>
- <td>Matches if all patterns match.</td>
- <td>fooANDbar, xANDy*ANDz??</td>
- </tr>
- <tr>
- <td>OR</td>
- <td>Matches if any pattern match.</td>
- <td>fooORbar, xORy*ORz??</td>
- </tr>
- <tr>
- <td>NOT</td>
- <td>Matches if pattern before matches and pattern after does
not.</td>
- <td>fooNOTbar, *NOTowner-*</td>
- </tr>
- <tr>
- <td>Mixed</td>
- <td>The above operators can also be used together. The
operator precedence, from highest to lowest, is AND, OR, and NOT.</td>
- <td>xANDyORz, x*NOTyANDz</td>
- </tr>
- </table>
- </div>
- </td>
- </tr>
</table>
</script>
==============================================================================
Revision: dc5dabf4d598
Branch: default
Author: Pekka Klärck
Date: Thu Feb 6 21:15:25 2014 UTC
Log: report: Search help text and style tuning.
Update issue 1634
Search help text and style tuning.
http://code.google.com/p/robotframework/source/detail?r=dc5dabf4d598
Modified:
/src/robot/htmldata/rebot/report.css
/src/robot/htmldata/rebot/report.html
=======================================
--- /src/robot/htmldata/rebot/report.css Thu Feb 6 16:00:14 2014 UTC
+++ /src/robot/htmldata/rebot/report.css Thu Feb 6 21:15:25 2014 UTC
@@ -55,23 +55,17 @@
#search-help h3, #search-help p {
margin: 0 0 0.7em 0;
}
-.search-help-examples, .search-help-examples tr {
- background: transparent;
- margin: 0;
+.search-help-examples {
+ table-layout: auto;
+ width: 100%;
}
+.search-help-examples, .search-help-examples tr,
.search-help-examples th, .search-help-examples td {
background: transparent;
margin: 0;
- padding: 0.2em 0.7em 0.2em 0;
}
-#search-help table {
- table-layout: auto;
- width: 100%;
-}
-#search-help th {
- font-weight: normal;
- font-style: italic;
- letter-spacing: 0.1em;
+.search-help-examples th, .search-help-examples td {
+ padding: 0.2em 0.7em 0.2em 0;
}
.help-item {
width: 10%;
=======================================
--- /src/robot/htmldata/rebot/report.html Thu Feb 6 21:14:42 2014 UTC
+++ /src/robot/htmldata/rebot/report.html Thu Feb 6 21:15:25 2014 UTC
@@ -586,7 +586,7 @@
$('#search-include').val('');
$('#search-exclude').val('')">
<a href="javascript:void(0)" onclick="$('#search-help').toggle()"
- title="Toggle search pattern help.">Help</a>
+ title="Toggle search help.">Help</a>
</td>
</tr>
<tr id="search-help" style="display: none">
@@ -599,7 +599,7 @@
names as well as based on tags. If multiple search criteria
are
used, only tests matching all of them are included.
Search fields have same semantics as
<em>‑‑suite</em>,
- <em>‑‑test</em>, <em>‑‑include</em>,
and
+ <em>‑‑test</em>, <em>‑‑include</em>
and
<em>‑‑exclude</em> command line options,
respectively.
</p>
<table class="search-help-examples">
@@ -615,7 +615,7 @@
<td>Suite</td>
<td>
Tests in matching suites are included. The pattern can
match
- either suite's own name or its full name containing also
+ either suite's name or its full name that contains also
parent suite names.
</td>
<td>My Suite<br>Root.Parent.Sui*</td>
@@ -624,7 +624,7 @@
<td>Test</td>
<td>
Matching tests are included. The pattern can match either
- test's own name or its full name containing also parent
+ test's name or its full name that contains also parent
suite names.
</td>
<td>Test*<br>Root.Pa*.T???</td>
@@ -646,15 +646,15 @@
</table>
<h3>Patterns</h3>
<p>
- All searches support <em>*</em> and <em>?</em> wildcards and
are case, space
- and underscore sensitive. Tag related searches also support
<em>AND</em>,
- <em>OR</em>, and <em>NOT</em> combining operators. If
operators are used together,
- their precedence is <em>AND</em>, <em>OR</em>, <em>NOT</em>.
-
- See <em>Simple patterns</em>
- and <em>Tag patterns</em> sections in
+ All searches support <em>*</em> and <em>?</em> wildcards and
are
+ case, space and underscore sensitive. Tag related searches
also
+ support <em>AND</em>, <em>OR</em> and <em>NOT</em>
(case-sensitive)
+ combining operators. If operators are used together, their
+ precedence, from highest to lowest, is <em>AND</em>,
<em>OR</em>,
+ <em>NOT</em>. See <em>Simple patterns</em> and
+ <em>Tag patterns</em> sections in
<a
href="https://code.google.com/p/robotframework/wiki/UserGuide";>Robot
- Framework User Guide</a> for more details.
+ Framework User Guide</a> version 2.8.4 or newer for more
details.
</p>
<table class="search-help-examples">
<col class="help-item">
@@ -673,7 +673,7 @@
<tr>
<td>?</td>
<td>Matches any single character.</td>
- <td>f??<br>sprint-6??</td>
+ <td>f??<br>sprint-1?</td>
</tr>
<tr>
<td>AND</td>
@@ -682,7 +682,7 @@
</tr>
<tr>
<td>OR</td>
- <td>Matches if any pattern match.</td>
+ <td>Matches if any pattern matches.</td>
<td>foo OR bar<br>x OR y* OR z1 AND z2</td>
</tr>
<tr>
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to robotframework-commit+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
