Revision: 3c034725f771
Branch:   default
Author:   Pekka Klärck
Date:     Thu Feb  6 16:00:14 2014 UTC
Log:      report: Help for new generic search

Update issue 1634
Added help to new search.
http://code.google.com/p/robotframework/source/detail?r=3c034725f771

Modified:
 /src/robot/htmldata/rebot/report.css
 /src/robot/htmldata/rebot/report.html

=======================================
--- /src/robot/htmldata/rebot/report.css        Wed Feb  5 13:17:55 2014 UTC
+++ /src/robot/htmldata/rebot/report.css        Thu Feb  6 16:00:14 2014 UTC
@@ -39,29 +39,30 @@
     display: none;
 }
 /* Search */
-#search td, #search th {
-    padding: 0 0.4em 0.4em 0.4em;
-}
 #search-suite, #search-test, #search-include, #search-exclude {
-    width: 20em;
+    width: 25em;
 }
 #search a:hover {
     text-decoration: none;
 }
 #search-help div {
-    margin: 0.5em 0.5em 0.7em 0.5em;
-    padding: 0.5em;
+    margin: 0.5em 0.5em 0.7em 0;
+    padding: 0.7em;
     background: #ECECF7;
     border: 1px solid #BCBCD7;
     border-radius: 3px;
 }
-#search-help p {
+#search-help h3, #search-help p {
     margin: 0 0 0.7em 0;
 }
-#search-help table, #search-help tr, #search-help th, #search-help td {
+.search-help-examples, .search-help-examples tr {
+    background: transparent;
+    margin: 0;
+}
+.search-help-examples th, .search-help-examples td {
     background: transparent;
     margin: 0;
-    padding: 0.1em 0.7em 0.1em 0;
+    padding: 0.2em 0.7em 0.2em 0;
 }
 #search-help table {
     table-layout: auto;
@@ -76,10 +77,10 @@
     width: 10%;
 }
 .help-explanation {
-    width: 60%;
+    width: 65%;
 }
 .help-examples {
-    width: 30%;
+    width: 25%;
 }
 /* Tabs - adapted from http://www.htmldog.com/articles/tabs */
 #detail-tabs {
=======================================
--- /src/robot/htmldata/rebot/report.html       Thu Feb  6 12:34:59 2014 UTC
+++ /src/robot/htmldata/rebot/report.html       Thu Feb  6 16:00:14 2014 UTC
@@ -658,6 +658,111 @@
              title="Toggle search pattern help.">Help</a>
         </td>
       </tr>
+      <tr id="search-help" style="display: none">
+        <th></th>
+        <td>
+          <div>
+            <h3>Search fields</h3>
+            <p>
+              Test cases can be searched based on test suite and test case
+ 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>&#8209;&#8209;suite</em>, + <em>&#8209;&#8209;test</em>, <em>&#8209;&#8209;include</em>, and + <em>&#8209;&#8209;exclude</em> command line options, respectively.
+            </p>
+            <table class="search-help-examples">
+              <col class="help-item">
+              <col class="help-explanation">
+              <col class="help-examples>
+              <tr>
+                <th>Field</th>
+                <th>Explanation</th>
+                <th>Examples</th>
+              </tr>
+              <tr>
+                <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
+                  parent suite names.
+                </td>
+                <td>My Suite<br>Root.Parent.Sui*</td>
+              </tr>
+              <tr>
+                <td>Test</td>
+                <td>
+                  Matching tests are included. The pattern can match either
+                  test's own name or its full name containing also parent
+                  suite names.
+                </td>
+                <td>Test*<br>Root.Pa*.T???</td>
+              </tr>
+              <tr>
+                <td>Include</td>
+                <td>
+                  Tests that contain matching tags are included.
+                </td>
+                <td>smoke<br>bug-*</td>
+              </tr>
+              <tr>
+                <td>Exclude</td>
+                <td>
+                  Tests that contain matching tags are not included.
+                </td>
+                <td>slow<br>feature-4?</td>
+              </tr>
+            </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
+ <a href="https://code.google.com/p/robotframework/wiki/UserGuide";>Robot
+              Framework User Guide</a> for more details.
+            </p>
+            <table class="search-help-examples">
+              <col class="help-item">
+              <col class="help-explanation">
+              <col class="help-examples>
+              <tr>
+                <th>Pattern</th>
+                <th>Explanation</th>
+                <th>Examples</th>
+              </tr>
+              <tr>
+                <td>*</td>
+                <td>Matches anything, even an empty string.</td>
+                <td>f*<br>sprint-*</td>
+              </tr>
+              <tr>
+                <td>?</td>
+                <td>Matches any single character.</td>
+                <td>f??<br>sprint-6??</td>
+              </tr>
+              <tr>
+                <td>AND</td>
+                <td>Matches if all patterns match.</td>
+                <td>foo AND bar<br>x AND y* AND z??</td>
+              </tr>
+              <tr>
+                <td>OR</td>
+                <td>Matches if any pattern match.</td>
+                <td>foo OR bar<br>x OR y* OR z1 AND z2</td>
+              </tr>
+              <tr>
+                <td>NOT</td>
+ <td>Matches if pattern before matches and pattern after does not.</td>
+                <td>foo NOT bar<br>* NOT id-* AND smoke</td>
+              </tr>
+            </table>
+          </div>
+        </td>
+      </tr>
     </table>
   </form>
 </script>

--

--- 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.

Reply via email to