Mercurial > hg > nginx-site
changeset 1313:2aeeb695e844
Regenerated.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Mon, 29 Sep 2014 14:45:12 +0400 |
| parents | 91a4eee45eb7 |
| children | 3475e118fc5d |
| files | xslt/body.xslt xslt/error.xslt xslt/style.xslt |
| diffstat | 3 files changed, 66 insertions(+), 79 deletions(-) [+] |
line wrap: on
line diff
--- a/xslt/body.xslt Mon Sep 29 14:09:44 2014 +0400 +++ b/xslt/body.xslt Mon Sep 29 14:45:12 2014 +0400 @@ -17,52 +17,33 @@ </xsl:variable> <body> - <table width="100%"> - <tr> - <td width="70%"> - <div id="banner"> - <xsl:if test="@lang = 'he'"> <xsl:attribute name="class"> <xsl:text>ltr</xsl:text> </xsl:attribute> </xsl:if> - <center> - <table> - <tr> - <td align="center"> - <strong>Join our upcoming user conference, - <a href="http://nginx.com/nginxconf/?utm_source=nginxorg&utm_medium=banner&utm_campaign=nginxconf2014" onClick="ga('send', 'event', 'banner', 'click', 'nginxconf14');">nginx.conf 2014</a>.</strong> - </td> - </tr> - <tr> - <td align="center"> - <i>Learn, share, and celebrate 10 years of NGINX! Oct. 20-22, - Hyatt Regency San Francisco Airport.</i> - </td> - </tr> - </table> - </center> - </div> - </td> - <td align="right"> + + <div id="banner"> + <xsl:if test="@lang = 'he'"> <xsl:attribute name="class"> <xsl:text>ltr</xsl:text> </xsl:attribute> </xsl:if> + <strong>Join our upcoming user conference, + <a href="http://nginx.com/nginxconf/?utm_source=nginxorg&utm_medium=banner&utm_campaign=nginxconf2014" onClick="ga('send', 'event', 'banner', 'click', 'nginxconf14');">nginx.conf 2014</a></strong><br/> + <em>Learn, share, and celebrate 10 years of NGINX! Oct. 20-22, + Hyatt Regency San Francisco Airport.</em> + </div> + + <div id="main"> + <div id="menu"> + <h1> <xsl:if test="@lang = 'he'"> <xsl:attribute name="align"> <xsl:text>left</xsl:text> </xsl:attribute> </xsl:if> - <a href="http://nginx.org"> - <img src="http://nginx.org/nginx.gif" alt="nginx" border="0"/> + <a href="/"> + <img src="/nginx.png" alt="nginx"/> </a> - </td> - </tr> - - <tr> - <td width="70%"><center><h3> - <xsl:value-of select="@name"/> <xsl:if test="$YEAR"> <xsl:text>: </xsl:text> <xsl:value-of select="$YEAR"/> </xsl:if> - </h3></center></td> + </h1> + <div> + <xsl:apply-templates select="document(concat($XML, '/menu.xml')) + /menus/menu[@lang = $lang]/item"/> + </div> + </div> - <td rowspan="2" align="{$MENU_ALIGN}" valign="top"> - <br/> - - <xsl:apply-templates select="document(concat($XML, '/menu.xml')) - /menus/menu[@lang = $lang]/item"/> - </td> - - </tr> - - <tr><td valign="top"> + <div id="content"> + <h2> + <xsl:value-of select="@name"/> <xsl:if test="$YEAR"> <xsl:text>: </xsl:text> <xsl:value-of select="$YEAR"/> </xsl:if> + </h2> <xsl:if test="$ORIGIN and document(concat($XML, '/', $ORIGIN))/*/@rev and (not(@rev) or @@ -129,10 +110,8 @@ </td></tr></table> </xsl:if> - - </td></tr> - - </table> + </div> + </div> </body> </xsl:template>
--- a/xslt/error.xslt Mon Sep 29 14:09:44 2014 +0400 +++ b/xslt/error.xslt Mon Sep 29 14:45:12 2014 +0400 @@ -16,45 +16,27 @@ --> <xsl:param select="'../xml'" name="XML"/> <xsl:param name="YEAR"/> +<xsl:param name="ORIGIN"/> <xsl:param name="TRANS"/> <xsl:variable select="/error/@link" name="LINK"/> <xsl:variable select="/error/@lang" name="LANG"/> <xsl:include href="dirname.xslt"/> +<xsl:include href="link.xslt"/> +<xsl:include href="style.xslt"/> +<xsl:include href="body.xslt"/> <xsl:include href="menu.xslt"/> <xsl:include href="ga.xslt"/> +<xsl:include href="content.xslt"/> <xsl:template match="/error"> <html><head><title> <xsl:value-of select="@name"/> </title> - <style type="text/css"><xsl:value-of select=" normalize-space(' - body { background: white; - color: black; - font-family: Georgia, serif; } - ') "/> - </style> - - <xsl:call-template name="ga"/></head> + <xsl:call-template name="style"><xsl:with-param select="@lang" name="lang"/></xsl:call-template><xsl:call-template name="ga"/></head> - <body> - <table width="100%"> - <tr> - <td width="70%"><center><h1> <xsl:value-of select="@name"/> </h1></center></td> - <td rowspan="2" align="right" valign="top"> - <img src="/nginx.gif" alt="nginx"/><br/> - - <br/> - <br/> - - <xsl:apply-templates select="document(concat($XML, '/menu.xml')) - /menus/menu[@lang = current()/@lang]/item"/> - </td> - </tr> - </table> - </body> - </html> + <xsl:call-template name="body"><xsl:with-param select="@lang" name="lang"/></xsl:call-template></html> </xsl:template> </xsl:stylesheet>
--- a/xslt/style.xslt Mon Sep 29 14:09:44 2014 +0400 +++ b/xslt/style.xslt Mon Sep 29 14:45:12 2014 +0400 @@ -11,9 +11,34 @@ <style type="text/css"><xsl:value-of select=" normalize-space(' body { background: white; color: black; - font-family: Georgia, serif; + font-family: sans-serif; + line-height: 1.4em; + text-align: center; margin: 0; - padding: .5em .5em .5em 1.5em; } + padding: 0; } + #banner { background: black; + color: #F2F2F2; + line-height: 1.2em; + padding: .3em 0; + box-shadow: 0 5px 10px black; } + #banner a { color: #00B140; } + #main { text-align: left; + margin: 0 auto; + min-width: 32em; + max-width: 64em; } + #menu { float: right; + width: 11em; + padding: 0 .5em 1em .5em; + border-left: 2px solid #DDD; } + #content { margin-right: 13.5em; + padding: 0 .2em 0 1.5em; } + h1 { display: block; + font-size: 3em; + text-align: left; + margin: 0; + margin-bottom: .5em; } + h1 img { width: 100%; } + h2 { text-align: center; } p { text-align: justify; } table.news p { margin-top: 0; } table.news td { vertical-align: baseline; } @@ -22,11 +47,11 @@ white-space: nowrap; } table.donors td { vertical-align: baseline; } table.donors li { text-align: left; } - div.directive, #banner { - background: #F2F2F2; + div.directive { background: #F2F2F2; + line-height: 1em; margin: 1em 0 1em -1em; - padding: .7em .7em .7em 1em; } - div.directive { border-top: 2px solid #DDD; } + padding: .7em .7em .7em 1em; + border-top: 2px solid #DDD; } div.directive th { padding-left: 0; padding-right: .5em; vertical-align: baseline; @@ -37,7 +62,6 @@ margin: 0; } div.directive p { margin: .5em 0 0 .1em; font-size: .8em; } - #banner { margin: 0 0 0 -1em; } a.notrans { color: gray; text-decoration:none; } span.initial { font-size: 200%; @@ -61,8 +85,10 @@ li blockquote, dd blockquote { margin: .7em 0; } blockquote.note { border: 1px dotted #999; + line-height: 1.2em; text-align: justify; } blockquote.example { + line-height: 1em; border-left: 1px solid #BBB; } blockquote.example pre { padding: 0;