Skip to content

Commit

Permalink
Revue de la génération des versions 10.X
Browse files Browse the repository at this point in the history
Suite à la refonte du site, les nouvelles 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 9e4f172 commit b094b58
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 16 deletions.
4 changes: 3 additions & 1 deletion postgresql/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
ALLXML := $(wildcard $(srcdir)/*.xml $(srcdir)/ref/*.xml)

ALL_IMAGES := $(wildcard $(srcdir)/images/*.svg)
ALL_WEBSITE_IMAGES := $(wildcard $(srcdir)/images/*.png)

##
## pgfr release
Expand Down Expand Up @@ -114,11 +115,12 @@ html-stamp: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
cp $(srcdir)/css/*.css html/
touch $@

html-website: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES)
html-website: stylesheet.xsl postgres.xml $(ALLXML) $(ALL_IMAGES) $(ALL_WEBSITE_IMAGES)
$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --param website.stylesheet 1 $(wordlist 1,2,$^)
mv html $@
cp $(ALL_IMAGES) $@/
cp $(ALL_WEBSITE_IMAGES) $@/
cp $(srcdir)/css/*.css $@/

htmlhelp: htmlhelp-stamp
Expand Down
4 changes: 2 additions & 2 deletions postgresql/css/pgfr.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
margin: 5px;
padding: 0;
height: 23px;
background: #B7B7B7 url("/css/postgresql/img/nav_fill.png") top left repeat-x;
background: #B7B7B7 url("nav_fill.png") top left repeat-x;
overflow: visible;
margin-top: 2px;
}
Expand Down Expand Up @@ -78,7 +78,7 @@ p.code {

#pgHeader {
position: relative;
background: url("/css/postgresql/img/hdr_fill.png") repeat-x;
background: url("hdr_fill.png") repeat-x;
height: 80px;
margin: 5px;
padding: 0;
Expand Down
Binary file added postgresql/images/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/images/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/images/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/images/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/images/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/images/nav_rgt.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions postgresql/pgfr.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
<div id="pgHeader">
<span id="pgHeaderLogoLeft">
<a href="/" title="PostgreSQL">
<img src="http://docs.postgresql.fr/theme/img/hdr_left.png"
<img src="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"
<img src="hdr_right.png"
width="210"
height="80"
alt="La base de données la plus sophistiquée au monde." />
Expand All @@ -42,36 +42,36 @@
</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="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="nav_rgt.png" width="7" height="23" alt="" />
</div>
<ul class="pgTopNavList">
<li>
<a href="http://www.postgresql.fr/" title="Accueil">Accueil</a>
<a href="https://www.postgresql.fr/" title="Accueil">Accueil</a>
</li>
<li>
<a href="http://blog.postgresql.fr/" title="Lire les actualités">Actualités</a>
<a href="https://blog.postgresql.fr/" title="Lire les actualités">Actualités</a>
</li>
<li>
<a href="http://docs.postgresql.fr/" title="Lire la documentation officielle">Documentation</a>
<a href="https://docs.postgresql.fr/" title="Lire la documentation officielle">Documentation</a>
</li>
<li>
<a href="http://forums.postgresql.fr/" title="Pour poser des questions">Forums</a>
<a href="https://forums.postgresql.fr/" title="Pour poser des questions">Forums</a>
</li>
<li>
<a href="http://asso.postgresql.fr/" title="La vie de l'association">Association</a>
<a href="https://asso.postgresql.fr/" title="La vie de l'association">Association</a>
</li>
<li>
<a href="http://www.postgresql.fr/devel:accueil"
<a href="https://www.postgresql.fr/devel:accueil"
title="Informations pour les développeurs/traducteurs">Développeurs</a>
</li>
<li>
<a href="http://planete.postgresql.fr" title="La planète francophone sur PostgreSQL">Planète</a>
<a href="https://planete.postgresql.fr" title="La planète francophone sur PostgreSQL">Planète</a>
</li>
<li>
<a href="http://support.postgresql.fr" title="Support sur PostgreSQL">Support</a>
<a href="https://support.postgresql.fr" title="Support sur PostgreSQL">Support</a>
</li>
</ul>
</div>
Expand Down
1 change: 0 additions & 1 deletion postgresql/stylesheet.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<xsl:otherwise>
pgfr.css
fontawesome.css
bootstrap.min.css
main.css
normalize.css
</xsl:otherwise>
Expand Down

0 comments on commit b094b58

Please sign in to comment.