| changeset 3848 | 51518746d397 |
| parent 3595 | 3fab3649e6cd |
| 3847:b8ed9dbcc07b | 3848:51518746d397 |
|---|---|
1 This patch is required to generated oracle branded reports using |
1 This patch is specific to Oracle branding and will not be submitted upstream. |
2 openscap. |
|
3 This patch is not intended for upstream. |
|
4 |
2 |
5 --- openscap-1.2.0/xsl/xccdf-branding.xsl.~1~ 2014-10-21 10:40:31.095336311 -0700 |
3 --- openscap-1.2.1/xsl/xccdf-branding.xsl.~1~ 2015-01-10 03:44:55.684466847 -0800 |
6 +++ openscap-1.2.0/xsl/xccdf-branding.xsl 2014-10-21 10:43:10.657535998 -0700 |
4 +++ openscap-1.2.1/xsl/xccdf-branding.xsl 2015-01-14 09:35:05.077056778 -0800 |
7 @@ -44,30 +44,76 @@ |
5 @@ -43,24 +43,67 @@ |
6 1) Round all positions to 1 decimal place |
|
8 2) Remove inkscape, RDF, DC and other metadata |
7 2) Remove inkscape, RDF, DC and other metadata |
9 3) Move repeated style declarations into CSS classes |
|
10 --> |
8 --> |
11 - <svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="240" height="55"><style>.style0{fill:#38393f;}.style1{fill:#12497f;}</style><defs/><g transform="matrix(0.75266991,0,0,0.75266991,-16.573637,-103.09218)"><g><g><path d="m 112.6 173.8 c 0 -11.6 3 -18.2 13.9 -18.2 10.9 0 13.9 6.6 13.9 18.2 0 12.1 -3 17.9 -13.9 17.9 -10.9 0 -13.9 -6.2 -13.9 -17.9 z m 23.7 0 c 0 -9.5 -1.8 -14.8 -9.9 -14.8 -8.1 0 -9.9 5.2 -9.9 14.8 0 9.6 1.7 14.5 9.9 14.5 8.2 0 9.9 -4.6 9.9 -14.5 z" class="style0"/><path d="m 146.9 165.8 h 3.8 v 1.8 c 0 0 3.9 -2.3 7.6 -2.3 6.4 0 9.2 3.9 9.2 12.9 0 10 -3.3 13.5 -11.1 13.5 -2.4 0 -5 -0.4 -5.7 -0.6 v 11.3 h -3.8 v -36.7 z m 3.8 4.9 v 17.1 c 0.7 0.1 3.3 0.6 5.5 0.6 5.6 0 7.4 -2.9 7.4 -10.2 0 -7 -2.2 -9.5 -5.9 -9.5 -3.5 0 -7 2 -7 2 z" class="style0"/><path d="m 192.5 187.9 0.1 3 c 0 0 -5.8 0.8 -9.9 0.8 -7.6 0 -10.1 -4.4 -10.1 -13.1 0 -9.7 4.2 -13.4 10.6 -13.4 6.8 0 10.2 3.6 10.2 11.9 l -0.2 2.9 h -16.8 c 0 5.4 1.7 8.3 6.7 8.3 3.8 -0 9.4 -0.5 9.4 -0.5 z m -2.8 -10.9 c 0 -6.3 -1.9 -8.5 -6.4 -8.5 -4.3 0 -6.8 2.4 -6.8 8.5 h 13.2 z" class="style0"/><path d="m 199.4 191.2 v -25.4 h 3.8 v 1.8 c 0 0 4.1 -2.3 7.9 -2.3 7 0 8.6 3.5 8.6 12.5 v 13.4 h -3.8 v -13.3 c 0 -6.7 -0.8 -9.2 -5.5 -9.2 -3.7 0 -7.2 1.9 -7.2 1.9 v 20.6 l -3.8 0 0 0 z" class="style0"/></g><g><path d="m 246.7 159.8 c 0 0 -7.1 -0.9 -10 -0.9 -5 0 -7.6 1.8 -7.6 5.7 0 4.6 2.4 5.3 8.6 6.7 7 1.6 10.1 3.3 10.1 9.5 0 7.8 -4.3 10.8 -11.2 10.8 -4.2 0 -11.1 -1.1 -11.1 -1.1 l 0.4 -3.3 c 0 0 6.9 0.9 10.5 0.9 5 0 7.5 -2.2 7.5 -7.1 0 -4 -2.1 -5.1 -7.8 -6.2 -7.3 -1.6 -10.9 -3.3 -10.9 -10 0 -6.8 4.5 -9.5 11.3 -9.5 4.2 0 10.6 1 10.6 1 l -0.4 3.3 z" class="style0"/><path d="m 275.8 190.7 c -2.5 0.5 -6.4 1.1 -9.7 1.1 -10.5 0 -12.9 -6.4 -12.9 -18 0 -11.9 2.3 -18.2 12.9 -18.2 3.6 0 7.5 0.7 9.7 1.1 l -0.2 3.3 c -2.3 -0.4 -6.4 -0.9 -9.1 -0.9 -7.8 0 -9.2 4.7 -9.2 14.7 0 9.8 1.3 14.5 9.3 14.5 2.8 0 6.6 -0.5 9 -0.9 l 0.2 3.4 z" class="style0"/><path d="m 288.8 156.1 h 8.5 l 9.7 35.2 h -3.9 l -2.5 -9.1 h -15 l -2.5 9.1 h -3.9 l 9.7 -35.2 z m -2.4 22.6 h 13.3 l -5.3 -19.3 h -2.6 l -5.3 19.3 z" class="style0"/><path d="m 316.4 179.4 v 11.8 h -3.9 V 156.1 h 12.9 c 7.7 0 11.2 3.7 11.2 11.3 0 7.7 -3.6 12 -11.2 12 h -8.9 z m 8.9 -3.5 c 5.1 0 7.3 -3.1 7.3 -8.5 0 -5.4 -2.1 -7.9 -7.3 -7.9 h -8.9 v 16.4 h 8.9 z" class="style0"/></g></g><g><path d="m 24.7 173.5 c 0 -9 3.5 -17.5 9.9 -23.9 6.8 -6.8 15.7 -10.4 25 -10 8.6 0.3 16.9 3.9 22.9 9.8 6.4 6.4 9.9 14.9 10 23.8 0.1 9.1 -3.5 17.8 -10 24.3 -13.2 13.2 -34.7 13.1 -48 -0.1 -1.5 -1.5 -1.9 -4.2 0.2 -6.2 l 9 -9 c -2 -3.6 -4.9 -13.1 2.6 -20.7 7.6 -7.6 18.6 -6 24.4 -0.2 3.3 3.3 5.1 7.6 5.1 12.1 0.1 4.6 -1.8 9.1 -5.3 12.5 -4.2 4.2 -10.2 5.8 -16.1 4.4 -1.5 -0.4 -2.4 -1.9 -2.1 -3.4 0.4 -1.5 1.9 -2.4 3.4 -2.1 4.1 1 8 -0.1 10.9 -2.9 2.3 -2.3 3.6 -5.3 3.6 -8.4 0 -0 0 -0.1 0 -0.1 -0 -3 -1.3 -5.9 -3.5 -8.2 -3.9 -3.9 -11.3 -4.9 -16.5 0.2 -6.3 6.3 -1.6 14.1 -1.6 14.2 1.5 2.4 0.7 5 -0.9 6.3 l -8.4 8.4 c 9.9 8.9 27.2 11.2 39.1 -0.8 5.4 -5.4 8.4 -12.5 8.4 -20 0 -0.1 0 -0.2 -0 -0.3 -0.1 -7.5 -3 -14.6 -8.4 -19.9 -5 -5 -11.9 -8 -19.1 -8.2 -7.8 -0.3 -15.2 2.7 -20.9 8.4 -8.7 8.7 -8.7 19 -7.9 24.3 0.3 2.4 1.1 4.9 2.2 7.3 0.6 1.4 0 3.1 -1.4 3.7 -1.4 0.6 -3.1 0 -3.7 -1.4 -1.3 -2.9 -2.2 -5.8 -2.6 -8.7 -0.3 -1.7 -0.4 -3.5 -0.4 -5.2 z" class="style1"/></g></g></svg> |
9 - |
12 +<svg |
10 -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="52" height="52" id="svg2"><g transform="matrix(0.75266991,0,0,0.75266991,-17.752968,-104.57468)" id="g32"><path d="m 24.7,173.5 c 0,-9 3.5,-17.5 9.9,-23.9 6.8,-6.8 15.7,-10.4 25,-10 8.6,0.3 16.9,3.9 22.9,9.8 6.4,6.4 9.9,14.9 10,23.8 0.1,9.1 -3.5,17.8 -10,24.3 -13.2,13.2 -34.7,13.1 -48,-0.1 -1.5,-1.5 -1.9,-4.2 0.2,-6.2 l 9,-9 c -2,-3.6 -4.9,-13.1 2.6,-20.7 7.6,-7.6 18.6,-6 24.4,-0.2 3.3,3.3 5.1,7.6 5.1,12.1 0.1,4.6 -1.8,9.1 -5.3,12.5 -4.2,4.2 -10.2,5.8 -16.1,4.4 -1.5,-0.4 -2.4,-1.9 -2.1,-3.4 0.4,-1.5 1.9,-2.4 3.4,-2.1 4.1,1 8,-0.1 10.9,-2.9 2.3,-2.3 3.6,-5.3 3.6,-8.4 0,0 0,-0.1 0,-0.1 0,-3 -1.3,-5.9 -3.5,-8.2 -3.9,-3.9 -11.3,-4.9 -16.5,0.2 -6.3,6.3 -1.6,14.1 -1.6,14.2 1.5,2.4 0.7,5 -0.9,6.3 l -8.4,8.4 c 9.9,8.9 27.2,11.2 39.1,-0.8 5.4,-5.4 8.4,-12.5 8.4,-20 0,-0.1 0,-0.2 0,-0.3 -0.1,-7.5 -3,-14.6 -8.4,-19.9 -5,-5 -11.9,-8 -19.1,-8.2 -7.8,-0.3 -15.2,2.7 -20.9,8.4 -8.7,8.7 -8.7,19 -7.9,24.3 0.3,2.4 1.1,4.9 2.2,7.3 0.6,1.4 0,3.1 -1.4,3.7 -1.4,0.6 -3.1,0 -3.7,-1.4 -1.3,-2.9 -2.2,-5.8 -2.6,-8.7 -0.3,-1.7 -0.4,-3.5 -0.4,-5.2 z" id="path34" style="fill:#12497f"/></g></svg> |
13 + version="1.1" |
11 +<svg |
14 + xmlns="http://www.w3.org/2000/svg" |
12 + version="1.1" |
15 + xmlns:xlink="http://www.w3.org/1999/xlink" |
13 + xmlns="http://www.w3.org/2000/svg" |
16 + width="100px" height="49px" |
14 + xmlns:xlink="http://www.w3.org/1999/xlink" |
17 + viewBox="0 0 100 49" preserveAspectRatio="none"> |
15 + width="100px" height="49px" |
18 + <g> |
16 + viewBox="0 0 100 49" preserveAspectRatio="none"> |
19 +<image width="100" height="49" xlink:href="data:image/png;base64, |
17 + <g> |
18 +<image alt="Oracle Solaris" width="100" height="49" |
|
19 + xlink:href="data:image/png;base64, |
|
20 +iVBORw0KGgoAAAANSUhEUgAAAMgAAABhCAMAAACklR6KAAAAn1BMVEX////lAAAAAADn5+ff398M |
20 +iVBORw0KGgoAAAANSUhEUgAAAMgAAABhCAMAAACklR6KAAAAn1BMVEX////lAAAAAADn5+ff398M |
21 +DAzxm53tRlPqKzPpIi771dnnAA/nABLnAAv2tLf5wMT72dvtYGZ3d3frQUk3NzfxfYW+vr6IiIif |
21 +DAzxm53tRlPqKzPpIi771dnnAA/nABLnAAv2tLf5wMT72dvtYGZ3d3frQUk3NzfxfYW+vr6IiIif |
22 +n5/++fqurq7y8vI/Pz/Pz89gYGD2qLCSkpL85OZubm4jIyP+8fNTU1MbGxtKSkouLi6AgID5x8ru |
22 +n5/++fqurq7y8vI/Pz/Pz89gYGD2qLCSkpL85OZubm4jIyP+8fNTU1MbGxtKSkouLi6AgID5x8ru |
23 +b3TvWGTtU1vqO0HwZ3HzlJrxhovpGSP0rKzveXu2qy5AAAAG10lEQVR4nO1Z2ZaiSBQkwZVFUUtk |
23 +b3TvWGTtU1vqO0HwZ3HzlJrxhovpGSP0rKzveXu2qy5AAAAG10lEQVR4nO1Z2ZaiSBQkwZVFUUtk |
24 +ERHFjSoVLf//2yZuAsrmdHlq5tgPGQ+t5MaNvEtcqyVJQEBAQEBAQEBAQEBAQEBA4E0wvztlBGY2 |
24 +ERHFjSoVLf//2yZuAsrmdHlq5tgPGQ+t5MaNvEtcqyVJQEBAQEBAQEBAQEBAQEBA4E0wvztlBGY2 |
49 +bVq76kQQWUuqaWvXIyJtTn6p5ERQtva8bLm//G+2X8J3x1sUKsm+e6QaWtZaPli+PefVbCzvZy5t |
49 +bVq76kQQWUuqaWvXIyJtTn6p5ERQtva8bLm//G+2X8J3x1sUKsm+e6QaWtZaPli+PefVbCzvZy5t |
50 +QRHLiFCSzXZtedN69o7/G557IEMcpMrYc9ftNDr8dTnZ4at2qhQIJxCh6oWMQapwItZsSQT8BZeW |
50 +QRHLiFCSzXZtedN69o7/G557IEMcpMrYc9ftNDr8dTnZ4at2qhQIJxCh6oWMQapwItZsSQT8BZeW |
51 +94AqLpUgKMhBau3SegQK+1L5RahlaNtORsQ70AcRcZapgEApdy/8VeG/BcqvvGopuExEFT1sLMWH |
51 +94AqLpUgKMhBau3SegQK+1L5RahlaNtORsQ70AcRcZapgEApdy/8VeG/BcqvvGopuExEFT1sLMWH |
52 +Qqy4IO5XM8D1XFx1RuigZESkmbzNyi+ag52lKMv1O6U9v2weVHBFFkHUouQPK+uQSiDNf1ge5PKh |
52 +Qqy4IO5XM8D1XFx1RuigZESkmbzNyi+ag52lKMv1O6U9v2weVHBFFkHUouQPK+uQSiDNf1ge5PKh |
53 +I3tyxn3b2xwCKEskenuVmuBY1EjtbLpYz94tOFz/sHDTymotNpa33ByIlrXauY6/WkCEPJeuY26/ |
53 +I3tyxn3b2xwCKEskenuVmuBY1EjtbLpYz94tOFz/sHDTymotNpa33ByIlrXauY6/WkCEPJeuY26/ |
54 +WUoEBAQEBAQEBAQEBAQEBAT+H/wDTtmvpnnKESQAAAAASUVORK5CYII= |
54 +WUoEBAQEBAQEBAQEBAQEBAT+H/wDTtmvpnnKESQAAAAASUVORK5CYII="/> </g> </svg> |
55 +"/> |
|
56 + </g> |
|
57 +</svg> |
|
58 + |
|
59 </xsl:template> |
55 </xsl:template> |
60 |
56 |
61 <xsl:template name="xccdf-report-header"> |
57 <xsl:template name="xccdf-report-header"> |
62 <nav class="navbar navbar-default" role="navigation"> |
58 <nav class="navbar navbar-default" role="navigation"> |
63 - <div class="navbar-header"> |
59 - <div class="navbar-header" style="float: none"> |
64 + <div class="navbar-header" style="width:100%; height:100%; padding-bottom:5px;"> |
60 + <div class="navbar-header" style="width:100%; height:100%; padding-bottom:5px; float:none"> |
65 <a class="navbar-brand" href="#"> |
61 <a class="navbar-brand" href="#"> |
66 <xsl:call-template name="xccdf-branding-logo"/> |
62 <xsl:call-template name="xccdf-branding-logo"/> |
67 </a> |
63 </a> |
68 - <div style="padding-left: 270px !important"><h1>Evaluation Report</h1></div> |
64 - <div><h1>OpenSCAP Evaluation Report</h1></div> |
69 + <div style="padding-left:30px; text-align:left;"><h2>Compliance Report</h2></div> |
65 + <div style="padding-left:30px; text-align:left;"><h2>Compliance Report</h2></div> |
70 </div> |
66 </div> |
71 </nav> |
67 </nav> |
72 </xsl:template> |
68 </xsl:template> |
73 |
69 |
74 <xsl:template name="xccdf-report-footer"> |
70 <xsl:template name="xccdf-report-footer"> |
75 <footer id="footer"> |
71 <footer id="footer"> |
76 - <div class="container"> |
72 - <div class="container"> |
77 + <!--<div class="container"> |
73 + <!-- |
74 + <div class="container"> |
|
78 <p class="muted credit"> |
75 <p class="muted credit"> |
79 Generated using <a href="http://open-scap.org">OpenSCAP</a> |
76 Generated using <a href="http://open-scap.org">OpenSCAP</a> |
80 <xsl:if test="$oscap-version"> |
77 <xsl:if test="$oscap-version"> |
81 <xsl:value-of select="concat(' ', $oscap-version)"/> |
78 @@ -68,22 +110,24 @@ |
82 </xsl:if> |
79 </xsl:if> |
83 </p> |
80 </p> |
84 - </div> |
81 </div> |
85 + </div> --> |
82 + --> |
86 </footer> |
83 </footer> |
87 </xsl:template> |
84 </xsl:template> |
88 |
85 |
86 <xsl:template name="xccdf-guide-header"> |
|
87 <nav class="navbar navbar-default" role="navigation"> |
|
88 - <div class="navbar-header" style="float: none"> |
|
89 + <div class="navbar-header" style="width:100%; height:100%; padding-bottom:5px;float:none"> |
|
90 <a class="navbar-brand" href="#"> |
|
91 <xsl:call-template name="xccdf-branding-logo"/> |
|
92 </a> |
|
93 - <div><h1>OpenSCAP Security Guide</h1></div> |
|
94 + <div style="padding-left:30px; text-align:left;"><h2>Security Guide</h2></div> |
|
95 </div> |
|
96 </nav> |
|
97 </xsl:template> |
|
98 |
|
99 <xsl:template name="xccdf-guide-footer"> |
|
100 <footer id="footer"> |
|
101 + <!-- |
|
102 <div class="container"> |
|
103 <p class="muted credit"> |
|
104 Generated using <a href="http://open-scap.org">OpenSCAP</a> |
|
105 @@ -92,6 +136,7 @@ |
|
106 </xsl:if> |
|
107 </p> |
|
108 </div> |
|
109 + --> |
|
110 </footer> |
|
111 </xsl:template> |
|
112 |