[jboss-cvs] JBossAS SVN: r70552 - in trunk/docbook-support: jbossorg-jdocbook-style/src/main/css/css and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Mar 7 10:57:50 EST 2008


Author: newtonm
Date: 2008-03-07 10:57:50 -0500 (Fri, 07 Mar 2008)
New Revision: 70552

Added:
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl
   trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/codehighlight.css
Modified:
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
   trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl
   trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/documentation.css
   trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/jbossorg.css
   trunk/docbook-support/jbossorg-jdocbook-style/src/main/images/images/dot.png
Log:
Added code highlighting, meaningful words highlighting, different coloured note/tip/important/warning/caution, no image scaling, center-justified text and darker bullet points.

Added: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl	                        (rev 0)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/highlight.xsl	2008-03-07 15:57:50 UTC (rev 70552)
@@ -0,0 +1,25 @@
+<?xml version='1.0'?>
+
+<!--<!DOCTYPE xsl:stylesheet>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	version="1.0" xmlns="http://www.w3.org/TR/xhtml1/transitional"
+	exclude-result-prefixes="#default">-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                                xmlns:exsl="http://exslt.org/common"
+                                version="1.0"
+                                exclude-result-prefixes="exsl">
+	
+  <xsl:template match="programlisting[@role='XML']|programlisting[@role='JAVA']|programlisting[@role='XHTML']|programlisting[@role='JSP']">
+    <xsl:variable name="kidz">
+      <xsl:apply-templates></xsl:apply-templates>
+    </xsl:variable>
+    <pre class="{@role}">
+      <xsl:value-of 
+        select="javahl:highlight(string($kidz), attribute::role)"
+        xmlns:javahl="java:com.exadel.docbook.colorer.HighLighter"
+        disable-output-escaping="yes"/>
+    </pre>
+  </xsl:template>
+	
+</xsl:stylesheet>

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl	2008-03-07 15:35:48 UTC (rev 70551)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-eclipse.xsl	2008-03-07 15:57:50 UTC (rev 70552)
@@ -21,6 +21,7 @@
 
 <xsl:include href="redhat.xsl"/>
 <xsl:include href="xhtml-common.xsl"/>
+<xsl:include href="highlight.xsl"/>
 
 <!-- This is needed to generate the correct xhtml-strict DOCTYPE on the front page -->
 <xsl:output method="xml"

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl	2008-03-07 15:35:48 UTC (rev 70551)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/main-html.xsl	2008-03-07 15:57:50 UTC (rev 70552)
@@ -21,6 +21,8 @@
 
 <xsl:include href="redhat.xsl"/>
 <xsl:include href="xhtml-common.xsl"/>
+<xsl:include href="highlight.xsl"/>
+
 <xsl:param name="confidential" select="0"/>
 
 <xsl:param name="generate.legalnotice.link" select="1"/>
@@ -30,6 +32,9 @@
 <xsl:param name="chunk.first.sections" select="1"/>
 <xsl:param name="chunk.toc" select="''"/>
 
+<!-- Ignore image scaling in html version -->
+<xsl:param name="ignore.image.scaling" select="1"/> 
+
 <!-- This is needed to generate the correct xhtml-strict DOCTYPE on the front page -->
 <xsl:output method="xml"
             encoding="UTF-8"

Modified: trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl
===================================================================
--- trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl	2008-03-07 15:35:48 UTC (rev 70551)
+++ trunk/docbook-support/jbossorg-docbook-xslt/src/main/resources/xslt/org/jboss/nochunk-html.xsl	2008-03-07 15:57:50 UTC (rev 70552)
@@ -18,8 +18,12 @@
 
 	<xsl:include href="redhat.xsl"/>
 	<xsl:include href="xhtml-common.xsl"/>
+        <xsl:include href="highlight.xsl"/>
         <xsl:param name="confidential" select="0"/>
 
+<!-- Ignore image scaling in html version -->
+<xsl:param name="ignore.image.scaling" select="1"/> 
+
 <!-- This is needed to generate the correct xhtml-strict DOCTYPE on the page -->
 <xsl:output method="xml"
             encoding="UTF-8"

Added: trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/codehighlight.css
===================================================================
--- trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/codehighlight.css	                        (rev 0)
+++ trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/codehighlight.css	2008-03-07 15:57:50 UTC (rev 70552)
@@ -0,0 +1,158 @@
+SPAN.property {
+        COLOR: #008cca;
+}
+PRE.JAVA {
+	LINE-HEIGHT: 0px
+}
+PRE.XML {
+	LINE-HEIGHT: 8px
+}
+PRE.JSP {
+	LINE-HEIGHT: 0px
+}
+PRE.XHTML {
+	LINE-HEIGHT: 0px
+}
+.java_type {
+	COLOR: #008cca
+}
+.java_keyword {
+	FONT-WEIGHT: bold; COLOR: rgb(0,0,0)
+}
+.java_javadoc_comment {
+	COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_comment {
+	COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_operator {
+	COLOR: #003399
+}
+.java_plain {
+	COLOR: rgb(0,0,0)
+}
+.java_literal {
+	COLOR: #ff6600
+}
+PRE CODE {
+	FONT-SIZE: 12px; COLOR: rgb(0,0,0); FONT-FAMILY: monospace; WHITE-SPACE: nowrap
+}
+.java_javadoc_tag {
+	FONT-WEIGHT: bold; COLOR: rgb(147,147,147); FONT-STYLE: italic; BACKGROUND-COLOR: rgb(247,247,247)
+}
+.java_separator {
+	COLOR: #008cca
+}
+.xml_plain {
+	COLOR: rgb(0,0,0)
+}
+.xml_tag_name {
+	COLOR: #3F7F7F
+}
+.xml_comment {
+	COLOR: rgb(147,147,147); BACKGROUND-COLOR: rgb(247,247,247)
+}
+.xml_tag_symbols {
+	COLOR: #008cca
+}
+.xml_rife_tag {
+	COLOR: rgb(0,0,0); BACKGROUND-COLOR: rgb(228,230,160)
+}
+.xml_attribute_value {
+	COLOR: #2A00FF
+}
+.xml_attribute_name {
+	FONT-WEIGHT: bold; COLOR: #7F007F
+}
+.xml_char_data {
+	COLOR: rgb(0,0,0)
+}
+.xml_rife_name {
+	COLOR: #008cca; BACKGROUND-COLOR: rgb(228,230,160)
+}
+.xml_processing_instruction {
+	FONT-WEIGHT: bold; COLOR: rgb(0,0,0); FONT-STYLE: italic
+}
+TD.java {
+	VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
+}
+TD.java-ln {
+	VERTICAL-ALIGN: top; LINE-HEIGHT: 10px
+}
+TT.java {
+	MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px;
+        font-family: verdana,helvetica,sans-serif;
+}
+TT.java-ln {
+	MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java {
+	MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+	MARGIN-BOTTOM: 0em; LINE-HEIGHT: 10px
+}
+TD.java-ln {
+	LINE-HEIGHT: 10px; TEXT-ALIGN: right
+}
+TT.java-ln {
+	COLOR: #888888; LINE-HEIGHT: 10px
+}
+PRE.java-ln {
+	COLOR: #888888; LINE-HEIGHT: 10px
+}
+SPAN.java0 {
+	FONT-SIZE: 8pt; COLOR: #ffffff; LINE-HEIGHT: 10px
+}
+SPAN.java1 {
+	FONT-SIZE: 8pt; COLOR: #808080
+}
+SPAN.java2 {
+	FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+/* Single-line comment */
+SPAN.java3 {
+	FONT-SIZE: 8pt; COLOR: #3f7f5f; LINE-HEIGHT: 10px
+}
+/* Keywords excluding 'return' */
+SPAN.java4 {
+	FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #7F1B55; LINE-HEIGHT: 10px
+}
+SPAN.java5 {
+	FONT-SIZE: 8pt; COLOR: #2a00ff; LINE-HEIGHT: 10px
+}
+SPAN.java6 {
+	FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java7 {
+	FONT-SIZE: 8pt; COLOR: #990000; LINE-HEIGHT: 10px
+}
+SPAN.java8 {
+	FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+/* primitive types: long, int, void etc... */
+SPAN.java9 {
+	FONT-WEIGHT: bold; FONT-SIZE: 8pt; COLOR: #7F0055; LINE-HEIGHT: 10px
+}
+SPAN.java10 {
+	FONT-SIZE: 8pt; COLOR: #000000; LINE-HEIGHT: 10px
+}
+SPAN.java11 {
+	FONT-SIZE: 8pt; COLOR: #7f9fbf; LINE-HEIGHT: 10px
+}
+SPAN.java12 {
+	FONT-SIZE: 8pt; COLOR: #7f7f9f; LINE-HEIGHT: 10px
+}
+SPAN.java13 {
+	FONT-SIZE: 8pt; COLOR: #3f3fbf; LINE-HEIGHT: 10px
+}
+SPAN.java14 {
+	FONT-SIZE: 8pt; COLOR: #3f5fbf; LINE-HEIGHT: 10px
+}
+SPAN.java15 {
+	FONT-SIZE: 8pt; COLOR: #ff6100; LINE-HEIGHT: 10px
+}
+/* Annotations */
+SPAN.java16 {
+	FONT-SIZE: 8pt; COLOR: #646464; LINE-HEIGHT: 10px
+}

Modified: trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/documentation.css
===================================================================
--- trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/documentation.css	2008-03-07 15:35:48 UTC (rev 70551)
+++ trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/documentation.css	2008-03-07 15:57:50 UTC (rev 70552)
@@ -25,7 +25,7 @@
 /*user interface styles*/
 .screen .replaceable {color:#444;}
 .screen{background-color:#ede7c8;color:#333;padding:.5em 1em;margin:0em;}
-pre,code,.guibutton,.keycap,.guilabel{font-size:0.9em;font-family:"liberation mono", "Bitstream vera mono",monospace;}
+pre,code,.guibutton,.keycap,.guilabel{font-size:0.9em;font-family: verdana,helvetica,sans-serif;}
 .guibutton,.keycap,.guilabel{font-weight:bold;white-space:nowrap;color:#444;font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;}
 .guibutton,.guilabel{}
 .keycap{padding: .1em .4em;}
@@ -44,11 +44,24 @@
 code{white-space:nowrap;}
 
 /*Notifications*/
-div.note,div.tip ,div.important ,div.caution ,div.warning{
-	background: #849092; color:white;padding:1em;padding-bottom:20px;border:1px solid #8a9195;margin-bottom:1.5em;background-repeat:no-repeat; background-position:10px 10px;
-}
 
-div.note pre,div.tip pre ,div.important pre ,div.caution pre ,div.warning pre {background-color:#d6dee0; color:#334558; border: 1px solid #e1e9eb;}
+/* set basic colors and spacing */
+div.note { background: #b5bcbd; color:#4c5253; border:1px solid #8a9195; margin-bottom:1.5em;background-repeat:no-repeat; background-position:10px 10px;padding:1em;padding-bottom:20px;}
+div.tip { background: #7e917f ; color:white; border:1px solid #8a9195; margin-bottom:1.5em;background-repeat:no-repeat; background-position:10px 10px;padding:1em;padding-bottom:20px;}
+div.important { background: #4a5d75; color:white; border:1px solid #8a9195; margin-bottom:1.5em;background-repeat:no-repeat; background-position:10px 10px;padding:1em;padding-bottom:20px;}
+div.caution { background: #e3a835; color:#533500; border:1px solid #ab710a;  margin-bottom:1.5em;background-repeat:no-repeat; background-position:10px 10px;padding:1em;padding-bottom:20px;}
+div.warning { background: #7b1e1e; color:white; border:1px solid #65504e; margin-bottom:1.5em;background-repeat:no-repeat; background-position:10px 10px;padding:1em;padding-bottom:20px;}
+
+/* pre tag color settings */
+
+div.note pre {background-color:#d6dee0; color:#334558; border: 1px solid #e1e9eb;}
+div.tip pre {background-color:#d5e1d5; color:#334558; border: 1px solid #e1e9eb;}
+div.important pre {background-color:#e1eef4; color:#334558; border: 1px solid #e1e9eb;}
+div.caution pre {background-color:#faf8ed; color:#334558; border: 1px solid #e1e9eb;}
+div.warning pre {background-color:#faf8ed; color:#334558; border: 1px solid #e1e9eb;}
+
+/* background images and margin */
+
 div.note,div.tip ,div.important ,div.caution ,div.warning {margin-top:.5em;}
 div.note {background-image:url(../images/note.png);}
 div.tip {background-image:url(../images/tip.png);}
@@ -62,8 +75,14 @@
 pre .replaceable, tt .replaceable{
 	color:#444 !important;
 	}	
-div.note h2,div.tip h2,div.important h2,div.caution h2,div.warning h2{height:32px;font-size:1.3em;color:white;}
+div.note h2,div.tip h2,div.important h2,div.caution h2,div.warning h2{height:32px;font-size:1.3em;}
 
+div.note h2 {color: #4c5253;}
+div.tip h2 {color:white;}
+div.important h2 { color:white;}
+div.caution h2 {color:#533500;}
+div.warning h2 {color:white;}
+
 div.note .guilabel,div.tip .guilabel,div.important .guilabel,div.caution .guilabel,div.warning .guilabel{color:white !important;}
 /*
 div.note h2,div.tip h2,div.important h2,div.caution h2,div.warning h2{
@@ -85,19 +104,17 @@
 	color:#0066cc !important;
 	}
 
-div.note a:visited,div.tip a:visited ,div.important a:visited ,div.caution a:visited ,
-div.warning a:visited,div.note a:link ,div.tip a:link ,div.important a:link ,div.caution a:link ,div.warning a:link{
+div.note a:visited,div.tip a:visited ,div.important a:visited ,
+div.warning a:visited,div.note a:link ,div.tip a:link ,div.important a:link , div.warning a:link{
 	color:#f7f2d0;
 	}
+	
+div.note a:visited,div.note a:link, div.caution a:link, div.caution a:visited  {
+	color:#0066cc;}
 
-/*notification icons*/
+/*notification icons spacing*/
 div.note h2,div.note p,div.tip h2,div.tip p,div.caution h2,div.caution p,div.warning h2,div.warning p,div.important h2,.important p {padding:0em;margin:0em;padding-left:56px;}
-/*div.note h2{background-image:url(../images/note.png)}
-div.tip h2{background-image:url(../images/tip.png)}
-div.caution h2{background-image:url(../images/caution.png)}
-div.warning h2{background-image:url(../images/warning.png)}
-div.important h2{background-image:url(../images/important.png)}
-*/
+
 /*Page Title*/
 #title {padding:0px; margin: 0px;}
 #title strong{display:none;}
@@ -187,7 +204,12 @@
 
 pre .replaceable, 
 pre .keycap{color:white;}
-pre{font-family:"liberation mono", "bitstream vera mono", "dejavu mono" monospace;}
+pre{
+  font-family: verdana,helvetica,sans-serif;
+  background-color: #F5F5F5;
+  border: 1px solid #CCCCCC;
+  padding: 5px 15px 5px 25px
+}
 
 div.note .replaceable,
 div.tip  .replaceable,

Modified: trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/jbossorg.css
===================================================================
--- trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/jbossorg.css	2008-03-07 15:35:48 UTC (rev 70551)
+++ trunk/docbook-support/jbossorg-jdocbook-style/src/main/css/css/jbossorg.css	2008-03-07 15:57:50 UTC (rev 70552)
@@ -3,6 +3,7 @@
 @import url(html/css/reports.css);
 
 @import url(html/css/dirty.css);
+ at import url(codehighlight.css);
 
 body{
 	background-image:url(../images/bkg_gradient.gif);
@@ -14,6 +15,7 @@
 	padding:0em 2em;
 	color:#333;
 	line-height:150%;
+        text-align: justify;
 	}
 
 /*Links*/

Modified: trunk/docbook-support/jbossorg-jdocbook-style/src/main/images/images/dot.png
===================================================================
(Binary files differ)




More information about the jboss-cvs-commits mailing list