[jbehave-scm] [1575] trunk/core/jbehave-core/src/main/resources/style: JBEHAVE-230: Better html rendering.

Sat, 20 Feb 2010 09:30:51 -0800

Title: [1575] trunk/core/jbehave-core/src/main/resources/style: JBEHAVE-230: Better html rendering.

Diff

Modified: trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java (1574 => 1575)

--- trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java	2010-02-20 16:27:10 UTC (rev 1574)
+++ trunk/core/jbehave-core/src/behaviour/java/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java	2010-02-20 17:30:38 UTC (rev 1575)
@@ -90,10 +90,10 @@
         // Then
         String expected = "<div class=\"story\">\n<h1>An interesting story</h1>\n"
                 + "<div class=\"path\">/path/to/story</div>\n"
-                + "<div class=\"narrative\">Narrative:\n" 
-                + "<div class=\"inOrderTo\"><span class=\"keyword inOrderTo\">In order to</span> renovate my house</div>\n" 
-                + "<div class=\"asA\"><span class=\"keyword asA\">As a</span> customer</div>\n" 
-                + "<div class=\"iWantTo\"><span class=\"keyword iWantTo\">I want to</span> get a loan</div>\n" 
+                + "<div class=\"narrative\"><h2>Narrative:</h2>\n" 
+                + "<div class=\"element inOrderTo\"><span class=\"keyword inOrderTo\">In order to</span> renovate my house</div>\n" 
+                + "<div class=\"element asA\"><span class=\"keyword asA\">As a</span> customer</div>\n" 
+                + "<div class=\"element iWantTo\"><span class=\"keyword iWantTo\">I want to</span> get a loan</div>\n" 
                 + "</div>\n" 
                 + "<div class=\"scenario\">\n<h2>Scenario: I ask for a loan</h2>\n"
                 + "<div class=\"givenScenarios\">GivenScenarios: [/given/scenario1,/given/scenario2]</div>\n"
@@ -140,10 +140,10 @@
         // Then
         String expected = "<div class=\"story\">\n<h1>An interesting story</h1>\n"
                 + "<div class=\"path\">/path/to/story</div>\n"
-                + "<div class=\"narrative\">Narrative:\n" 
-                + "<div class=\"inOrderTo\"><span class=\"keyword inOrderTo\">In order to</span> renovate my house</div>\n" 
-                + "<div class=\"asA\"><span class=\"keyword asA\">As a</span> customer</div>\n" 
-                + "<div class=\"iWantTo\"><span class=\"keyword iWantTo\">I want to</span> get a loan</div>\n" 
+                + "<div class=\"narrative\"><h2>Narrative:</h2>\n" 
+                + "<div class=\"element inOrderTo\"><span class=\"keyword inOrderTo\">In order to</span> renovate my house</div>\n" 
+                + "<div class=\"element asA\"><span class=\"keyword asA\">As a</span> customer</div>\n" 
+                + "<div class=\"element iWantTo\"><span class=\"keyword iWantTo\">I want to</span> get a loan</div>\n" 
                 + "</div>\n" 
                 + "<div class=\"scenario\">\n<h2>Scenario: I ask for a loan</h2>\n"
                 + "<div class=\"givenScenarios\">GivenScenarios: [/given/scenario1,/given/scenario2]</div>\n"

Modified: trunk/core/jbehave-core/src/main/java/org/jbehave/scenario/reporters/HtmlPrintStreamScenarioReporter.java (1574 => 1575)

--- trunk/core/jbehave-core/src/main/java/org/jbehave/scenario/reporters/HtmlPrintStreamScenarioReporter.java	2010-02-20 16:27:10 UTC (rev 1574)
+++ trunk/core/jbehave-core/src/main/java/org/jbehave/scenario/reporters/HtmlPrintStreamScenarioReporter.java	2010-02-20 17:30:38 UTC (rev 1575)
@@ -47,7 +47,7 @@
         patterns.setProperty("notPerformed", "<div class=\"step notPerformed\">{0} <span class=\"keyword notPerformed\">({1})</span></div>\n");
         patterns.setProperty("failed", "<div class=\"step failed\">{0} <span class=\"keyword failed\">({1})</span></div>\n");
         patterns.setProperty("beforeStory", "<div class=\"story\">\n<h1>{0}</h1>\n<div class=\"path\">{1}</div>\n");
-        patterns.setProperty("narrative", "<div class=\"narrative\">{0}\n<div class=\"inOrderTo\"><span class=\"keyword inOrderTo\">{1}</span> {2}</div>\n<div class=\"asA\"><span class=\"keyword asA\">{3}</span> {4}</div>\n<div class=\"iWantTo\"><span class=\"keyword iWantTo\">{5}</span> {6}</div>\n</div>\n");        
+        patterns.setProperty("narrative", "<div class=\"narrative\"><h2>{0}</h2>\n<div class=\"element inOrderTo\"><span class=\"keyword inOrderTo\">{1}</span> {2}</div>\n<div class=\"element asA\"><span class=\"keyword asA\">{3}</span> {4}</div>\n<div class=\"element iWantTo\"><span class=\"keyword iWantTo\">{5}</span> {6}</div>\n</div>\n");        
         patterns.setProperty("afterStory", "</div>\n");
         patterns.setProperty("beforeScenario", "<div class=\"scenario\">\n<h2>{0} {1}</h2>\n");
         patterns.setProperty("afterScenario", "</div>\n");

Modified: trunk/core/jbehave-core/src/main/resources/style/jbehave-reports.css (1574 => 1575)

--- trunk/core/jbehave-core/src/main/resources/style/jbehave-reports.css	2010-02-20 16:27:10 UTC (rev 1574)
+++ trunk/core/jbehave-core/src/main/resources/style/jbehave-reports.css	2010-02-20 17:30:38 UTC (rev 1575)
@@ -122,10 +122,13 @@
 
 .narrative {
   text-align: left;
-  margin-left: 10px;
-  color: purple; 
+  color: blue; 
 }
 
+.element {
+  padding-left: 10px;	
+}
+
 span.inOrderTo, span.asA, span.iWantTo {
   font-weight: bold;
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to