Skip to content

Commit

Permalink
Revue de la génération des versions 9.X
Browse files Browse the repository at this point in the history
Suite à la refonte du site, les anciennes générations ne trouvaient plus
images et feuilles de style. Ceci est une tentative pour améliorer ça,
en espérant ne pas avoir cassé les autres formats :)
  • Loading branch information
gleu committed Nov 6, 2020
1 parent 12e8c96 commit 566e3cb
Show file tree
Hide file tree
Showing 17 changed files with 129 additions and 33 deletions.
14 changes: 7 additions & 7 deletions postgresql/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ index.html: $(src)
[ -d $(BASEDIR)/$(HTM_OUTPUT)/stylesheets ] || mkdir $(BASEDIR)/$(HTM_OUTPUT)/stylesheets
cp stylesheets/*.css $(BASEDIR)/$(HTM_OUTPUT)/stylesheets

[ -d $(BASEDIR)/$(HTM_OUTPUT)/images ] || mkdir $(BASEDIR)/$(HTM_OUTPUT)/images
cp img/*.png $(BASEDIR)/$(HTM_OUTPUT)/images
[ -d $(BASEDIR)/$(HTM_OUTPUT)/img ] || mkdir $(BASEDIR)/$(HTM_OUTPUT)/img
cp img/*.png $(BASEDIR)/$(HTM_OUTPUT)/img
cd $(BASEDIR)/$(HTM_OUTPUT)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
cd $(BASEDIR)/$(HTM_OUTPUT)/; sed -i -e "s@../images@images@g" *.html
cd $(BASEDIR)/$(HTM_OUTPUT)/; sed -i -e "s@../img@img@g" *.html

for filename in `find $(BASEDIR)/$(HTM_OUTPUT) -name "*.html"`; do \
tidy -config tidy.conf $$filename; \
Expand All @@ -56,7 +56,7 @@ index.html: $(src)
mv $(BASEDIR)/$(TGZ_OUTPUT) $(BASEDIR)/$(ZIP_OUTPUT) $(BASEDIR)/$(HTM_OUTPUT)

rm -f $(BASEDIR)/$(HTM_OUTPUT)/*.html
rm -rf $(BASEDIR)/$(HTM_OUTPUT)/images
rm -rf $(BASEDIR)/$(HTM_OUTPUT)/img
rm -rf $(BASEDIR)/$(HTM_OUTPUT)/prologue
rm -rf $(BASEDIR)/$(HTM_OUTPUT)/stylesheets

Expand All @@ -72,10 +72,10 @@ webhtml: $(src)
[ -d $(BASEDIR)/$(WEB_OUTPUT)/stylesheets ] || mkdir $(BASEDIR)/$(WEB_OUTPUT)/stylesheets
cp stylesheets/*.css $(BASEDIR)/$(WEB_OUTPUT)/stylesheets

[ -d $(BASEDIR)/$(WEB_OUTPUT)/images ] || mkdir $(BASEDIR)/$(WEB_OUTPUT)/images
cp img/*.png $(BASEDIR)/$(WEB_OUTPUT)/images
[ -d $(BASEDIR)/$(WEB_OUTPUT)/img ] || mkdir $(BASEDIR)/$(WEB_OUTPUT)/img
cp img/*.png $(BASEDIR)/$(WEB_OUTPUT)/img
cd $(BASEDIR)/$(WEB_OUTPUT)/; sed -i -e "s@../stylesheets@stylesheets@g" *.html
cd $(BASEDIR)/$(WEB_OUTPUT)/; sed -i -e "s@../images@images@g" *.html
cd $(BASEDIR)/$(WEB_OUTPUT)/; sed -i -e "s@../img@img@g" *.html
cd $(BASEDIR)/$(WEB_OUTPUT)/; sed -i -e 's@border="1"@border="0"@g' *.html

for filename in `find $(BASEDIR)/$(WEB_OUTPUT) -name "*.html"`; do \
Expand Down
Binary file added postgresql/img/hdr_fill.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added postgresql/img/hdr_left.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added postgresql/img/hdr_right.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added postgresql/img/nav_fill.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added postgresql/img/nav_lft.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added postgresql/img/nav_rgt.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added postgresql/img/nav_tbl_btm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added postgresql/img/nav_tbl_top.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions postgresql/stylesheets/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#pgHeader {
position: relative;
background: url("http://docs.postgresql.fr/theme/img/hdr_fill.png") repeat-x;
background: url("../img/hdr_fill.png") repeat-x;
height: 80px;
margin: 0;
padding: 0;
Expand Down Expand Up @@ -126,7 +126,7 @@

#pgFrontFeature {
position: relative;
background: #F5F5F5 url(http://docs.postgresql.fr/theme/img/feature_elephant.png) bottom right no-repeat;
background: #F5F5F5 url(../img/feature_elephant.png) bottom right no-repeat;
padding: 15px;
margin-bottom: 1em;
font-size: 1.0em;
Expand Down Expand Up @@ -244,7 +244,7 @@ div.pgFrontUser {
width: 100%;
padding-top: 7px;
float: left;
background: url(http://docs.postgresql.fr/theme/img/usr_tbl_top.png) top right no-repeat;
background: url(../img/usr_tbl_top.png) top right no-repeat;
background-size: auto;
margin-bottom: 15px;
}
Expand All @@ -260,7 +260,7 @@ div.pgFrontCenterUser {


div.pgFrontUserInner {
background: url(http://docs.postgresql.fr/theme/img/images/usr_tbl_btm.png) bottom left no-repeat;
background: url(../img/images/usr_tbl_btm.png) bottom left no-repeat;
width: 100%;
padding-bottom: 7px;
}
Expand Down Expand Up @@ -318,7 +318,7 @@ div.pgFrontUserContent {
#pgFrontShortcutsList li {
margin: 0;
padding-left: 12px;
background-image: url(http://docs.postgresql.fr/theme/img/images/blt_blu_arrow.png);
background-image: url(../img/images/blt_blu_arrow.png);
background-repeat: no-repeat;
background-position: 0px 0.5em;
}
Expand All @@ -340,15 +340,15 @@ div.pgFrontUserContent {
#pgSponsorWrap {
width: 150px;
background-color: #F5F5F5;
background-image: url(http://docs.postgresql.fr/theme/img/images/nav_tbl_top.png);
background-image: url(../img/images/nav_tbl_top.png);
background-position: top right;
background-repeat: no-repeat;
font-size: 0.4em;
margin-top: 10px;
}

#pgSponsorWrap ul {
background-image: url(http://docs.postgresql.fr/theme/img/images/nav_tbl_btm.png);
background-image: url(../img/images/nav_tbl_btm.png);
background-position: bottom left;
background-repeat: no-repeat;
list-style: none;
Expand Down
8 changes: 4 additions & 4 deletions postgresql/stylesheets/navigationclasses.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
margin: 0;
padding: 0;
height: 23px;
background: #B7B7B7 url("http://docs.postgresql.fr/theme/img/nav_fill.png") top left repeat-x;
background: #B7B7B7 url("../img/nav_fill.png") top left repeat-x;
overflow: visible;
margin-top: 2px;
}
Expand Down Expand Up @@ -135,13 +135,13 @@
width: 90%;
background-color: #F5F5F5;
-moz-border-radius:12px;
background-image: url(http://docs.postgresql.fr/theme/img/nav_tbl_top.png);
background-image: url(../img/nav_tbl_top.png);
background-position: top right;
background-repeat: no-repeat;
}

.pgSideNav ul, #pgSideNav div {
background-image: url(http://docs.postgresql.fr/theme/img/nav_tbl_btm.png);
background-image: url(../img/nav_tbl_btm.png);
-moz-border-radius:12px;
background-position: bottom left;
background-repeat: no-repeat;
Expand All @@ -165,7 +165,7 @@
border-bottom: 1px solid #EFEFEF;
margin: 0;
padding-left: 12px;
background-image: url(http://docs.postgresql.fr/theme/img/blt_gry_arrow.png);
background-image: url(../img/blt_gry_arrow.png);
background-repeat: no-repeat;
background-position: 12px 0.65em;
list-style-type: none;
Expand Down
4 changes: 2 additions & 2 deletions postgresql/stylesheets/pg-chm.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ p {

li {
display: list-item;
list-style-image:url(../images/puce.png);
list-style-image:url(../img/puce.png);
}

p {
Expand Down Expand Up @@ -338,4 +338,4 @@ div.table table td tt.varname {
div.table table td tt.literal {
font-weight: bold;
color: green;
}
}
8 changes: 4 additions & 4 deletions postgresql/stylesheets/pg-chunk-common.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
<div id="top">
<div id="pgHeader">
<span id="pgHeaderLogoLeft">
<a href="/" title="PostgreSQL"><img src="http://docs.postgresql.fr/theme/img/hdr_left.png" width="230" height="80" alt="PostgreSQL" /></a>
<a href="/" title="PostgreSQL"><img src="img/hdr_left.png" width="230" height="80" alt="PostgreSQL" /></a>
</span>
<span id="pgHeaderLogoRight">
<a href="/" title="La base de données la plus sophistiquée au monde."><img src="http://docs.postgresql.fr/theme/img/hdr_right.png" width="210" height="80" alt="La base de données la plus sophistiquée au monde." /></a>
<a href="/" title="La base de données la plus sophistiquée au monde."><img src="img/hdr_right.png" width="210" height="80" alt="La base de données la plus sophistiquée au monde." /></a>
</span>
</div>
</div>
<div class="pgTopNav">
<div class="pgTopNavLeft">
<img src="http://docs.postgresql.fr/theme/img/nav_lft.png" width="7" height="23" alt="" />
<img src="img/nav_lft.png" width="7" height="23" alt="" />
</div>
<div class="pgTopNavRight">
<img src="http://docs.postgresql.fr/theme/img/nav_rgt.png" width="7" height="23" alt="" />
<img src="img/nav_rgt.png" width="7" height="23" alt="" />
</div>
<ul class="pgTopNavList">
<li> <a href="http://www.postgresql.fr/" title="Accueil">Accueil</a> </li>
Expand Down
6 changes: 3 additions & 3 deletions postgresql/stylesheets/pg.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ body {
background-position: top left;
background-attachment: fixed;
background-repeat: no-repeat;
background-image: url(../images/coin.png);
background-image: url(../img/coin.png);
padding-bottom: 1em;
}

Expand Down Expand Up @@ -61,7 +61,7 @@ p {

li {
display: list-item;
list-style-image:url(../images/puce.png);
list-style-image:url(../img/puce.png);
}

p {
Expand Down Expand Up @@ -460,4 +460,4 @@ div.navfooter table td.right img{
div.navfooter table td.center{
vertical-align: top;
width: 6%;
}
}
96 changes: 96 additions & 0 deletions postgresql/stylesheets/pgfr.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
p, li, li p {
text-align: justify;
}

div.item-list li, div.pgSideNav, li.pgSideNav .pgSideNav li {
text-align:left;
}

.form-text {
font-size: 0.8em;
width: 140px;
border: 1px solid #7A7A7A;
background: #FFFFFF;
padding: 2px;
}

.form-password{
font-size: 0.8em;
width: 140px;
border: 1px solid #7A7A7A;
background: #FFFFFF;
padding: 2px;
}

textarea,select,input,.form-radio{
font-size: 1.0em;
/*width: 140px;*/
border: 1px solid #7A7A7A;
background: #FFFFFF;
padding: 2px;

}

.form-submit{
font-size: 0.8em;
width: 140px;
border: 1px solid #7A7A7A;
background: #dddddd;
padding: 2px;

}

hr{
color: #DADADA;
size: 1px;
}

.plop{
color: #FF0000;
}

h1.plop a:link{
color: #EC5800;
text-decoration: none;
text-align: left;
}

h1.plop a:hover{
color: #EC5800;
text-decoration: underline;
}

div.contentsLink{
text-align: right;
}
/*Win IE fix \*/
* html #pgTopNav { height: 1%; margin-top: 0px; }
* html .pgTopNav { height: 1%; margin-top: 0px; }

/*End Win IE fix*/

/*Win IE fix \*/
* html #pgTopNavLeft { height: 1%; }
* html .pgTopNavLeft { height: 1%; }

/*End Win IE fix*/

/*Win IE fix \*/
* html #pgTopNavRight { height: 1%; }
* html .pgTopNavRight { height: 1%; }


/*End Win IE fix*/

/*Win IE fix \*/
* html #pgTopNavList { height: 1%; margin-bottom: -2px; }
* html #pgTopNavList li { margin: 0 0.5em 0 -0.5em; }
* html .pgTopNavList { height: 1%; margin-bottom: -2px; }
* html .pgTopNavList li { margin: 0 0.5em 0 -0.5em; }
/* specifique à drupal */
li.leaf{
list-style-type: none;
}
li.collapsed, li.expanded{
list-style-type: none;
}
4 changes: 2 additions & 2 deletions postgresql/stylesheets/xhtml/pg-navigational-web.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<img src="images/prev.png" alt="Précédent" />
<img src="img/prev.png" alt="Précédent" />
<xsl:choose>
<xsl:when test="$prev/refmeta/refentrytitle != ''">
<xsl:value-of select="$prev/refmeta/refentrytitle"/>
Expand Down Expand Up @@ -244,7 +244,7 @@
<xsl:value-of select="$next/title"/>
</xsl:otherwise>
</xsl:choose>
<img src="images/next.png" alt="Suivant" />
<img src="img/next.png" alt="Suivant" />
</a>
</xsl:if>
</td>
Expand Down
8 changes: 4 additions & 4 deletions postgresql/stylesheets/xhtml/pg-navigational.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<img src="images/prev.png" alt="Précédent" />
<img src="img/prev.png" alt="Précédent" />
<xsl:choose>
<xsl:when test="$prev/refmeta/refentrytitle != ''">
<xsl:value-of select="$prev/refmeta/refentrytitle"/>
Expand All @@ -213,7 +213,7 @@
<xsl:attribute name="title">
<xsl:apply-templates select="$up" mode="object.title.markup"/>
</xsl:attribute>
<img src="images/up.png" alt="Niveau supérieur" />
<img src="img/up.png" alt="Niveau supérieur" />
</a>
</xsl:if>
<xsl:if test="$home != .">
Expand All @@ -228,7 +228,7 @@
<xsl:text> - </xsl:text>
<xsl:value-of select="$home/bookinfo/subtitle"/>
</xsl:attribute>
<img src="images/home.png" alt="Sommaire" />
<img src="img/home.png" alt="Sommaire" />
</a>
</xsl:if>
</td>
Expand Down Expand Up @@ -269,7 +269,7 @@
<xsl:value-of select="$next/title"/>
</xsl:otherwise>
</xsl:choose>
<img src="images/next.png" alt="Suivant" />
<img src="img/next.png" alt="Suivant" />
</a>
</xsl:if>
</td>
Expand Down

0 comments on commit 566e3cb

Please sign in to comment.