Skip to content

Commit

Permalink
Nouvelle mise en page du site
Browse files Browse the repository at this point in the history 
. Révision patrons nanoblogger
. Révision règles de constructions des pages
. Révision styles CSS
. Nouvelles polices de caractères pour les pages et les fichiers PDF

. Quelques corrections typos
  • Loading branch information
@platu
platu committed Nov 15, 2014
1 parent 9a9c79c commit 81a0d44
Show file tree
Hide file tree
Showing 20 changed files with 430 additions and 353 deletions.
2 changes: 1 addition & 1 deletion blog.conf
View file
Expand Up @@ -193,7 +193,7 @@ CAL_ARGS="-NMbh"

# tidy plugin configuration
#TIDY_CMD="tidy"
TIDY_HTML_ARGS="-asxhtml -n -utf8"
TIDY_HTML_ARGS="--merge-divs yes -asxhtml -n -utf8"
# used when verifying syndication feeds
TIDY_XML_ARGS="-xml -n -utf8 -wrap 0"

Expand Down
20 changes: 9 additions & 11 deletions common/Makefile.Rules
View file
Expand Up @@ -123,20 +123,19 @@ index.html: $(OUTPUT)/$(BASENAME).xml
nb --title $(BASENAME) make-page $(CWD)/$$file $(CWD)/`echo $${file##*/}` ) ;\
done
# Extraction et transformation de la table des matières
@echo '<div id="links">' >$(OUTPUT)/toc.htm
@echo '<div class="sidetitle">Formats</div>' >>$(OUTPUT)/toc.htm
@echo '<div class="side">' >>$(OUTPUT)/toc.htm
@echo '<div class="sidetitle">Formats</div><div class="side">' >$(OUTPUT)/toc.htm
@echo '<a href="/xml/$(BASENAME).xml" class="xml-small">Source DocBook XML</a>' >>$(OUTPUT)/toc.htm
@echo '<a href="/pdf/$(BASENAME).pdf" class="pdf-small">Fichier imprimable PDF</a>' >>$(OUTPUT)/toc.htm
@echo '<a href="https://github.com/platu/inetdoc/commits/master$(PAGEMENUITEM)/$(BASENAME).xml" class="git-small">Historique des versions</a>' >>$(OUTPUT)/toc.htm
@echo '</div>' >> $(OUTPUT)/toc.htm
@sed -n '/<div class=\"toc\">/,/<\/div>/p' $(OUTPUT)/$@ >> $(OUTPUT)/toc.htm
@sed -i -f $(MAIN_DIR)/common/docbook-xml-toc.sed $(OUTPUT)/toc.htm
@echo '</div>' >> $(OUTPUT)/toc.htm
# Insertion de la table des matières dans la partie liens de chaque page
@for file in `ls *.html`; do \
sed -n '1,/<div id=\"container\">/p' $$file >> $$file.tmp ;\
sed -i 's/<!-- insertion point --><\/div>/<!-- toc insert -->/' $$file ;\
sed -n '1,/<!-- toc insert -->/p' $$file >> $$file.tmp ;\
cat $(OUTPUT)/toc.htm >> $$file.tmp ;\
echo '</div><!-- /links -->' >> $$file.tmp ;\
sed -n '/<div id=\"content\">/,$$p' $$file >> $$file.tmp ;\
mv $$file.tmp $$file ;\
done
Expand Down Expand Up @@ -246,14 +245,13 @@ index.html: $(MAIN_DIR)/pdf/$(BASENAME).pdf $(BASENAME)-00.idx.png $(BASENAME)-0
if ! egrep -qi -e "$(STYLESHEET).css" $$file; then \
sed -i 's/<\/head>/<link rel=\"stylesheet\" href=\"$(STYLESHEET).css\" type=\"text\/css\" media=\"all\" \/>&/' $$file ;\
fi ;\
sed -n '1,/<div id=\"container\">/p' $$file > $$file.tmp ;\
echo '<div id="links">' >> $$file.tmp ;\
echo '<div class="sidetitle">Formats</div>' >> $$file.tmp ;\
echo '<div class="side">' >> $$file.tmp ;\
sed -n '1,/<!-- insertion point -->/p' $$file > $$file.tmp ;\
sed -i '$$d' $$file.tmp ;\
echo '<div class="sidetitle">Formats</div><div class="side">' >> $$file.tmp ;\
echo '<a href="/odp/$(BASENAME).odp" class="odp-small">Fichier OpenDocument</a><br />' >> $$file.tmp ;\
echo '<a href="/pdf/$(BASENAME).pdf" class="pdf-small">Fichier imprimable PDF</a><br />' >> $$file.tmp ;\
echo '</div> <!-- /side div -->' >> $$file.tmp ;\
echo '</div> <!-- /links div -->' >> $$file.tmp ;\
echo '</div><!-- /side -->' >> $$file.tmp ;\
echo '</div><!-- /links -->' >> $$file.tmp ;\
sed -n '/<div id=\"content\">/,$$p' $$file >> $$file.tmp ;\
mv $$file.tmp $$file ;\
done
Expand Down
1 change: 1 addition & 0 deletions common/docbook-xml-toc.sed
View file
Expand Up @@ -14,3 +14,4 @@ s/<\/strong>//
/<dt>/d
/<\/dt>/d
s/<\/a>/&<br \/>/
s/^[ \t]*//
99 changes: 64 additions & 35 deletions common/fop.xconf
View file
Expand Up @@ -79,51 +79,81 @@ the location of this file.
</font>
-->

<!-- SANS Font -->
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf">
<font-triplet name="DejaVuSans" style="normal" weight="normal"/>
<!-- Source Sans Pro -->
<font embed-url="/usr/share/fonts/truetype/source-sans-pro/SourceSansPro-ExtraLight.ttf">
<font-triplet name="SourceSansPro" style="normal" weight="200"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf">
<font-triplet name="DejaVuSans" style="italic" weight="normal"/>

<font embed-url="/usr/share/fonts/truetype/source-sans-pro/SourceSansPro-Regular.ttf">
<font-triplet name="SourceSansPro" style="normal" weight="400"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf">
<font-triplet name="DejaVuSans" style="normal" weight="bold"/>

<font embed-url="/usr/share/fonts/truetype/source-sans-pro/SourceSansPro-Bold.ttf">
<font-triplet name="SourceSansPro" style="normal" weight="700"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf">
<font-triplet name="DejaVuSans" style="italic" weight="bold"/>

<font embed-url="/usr/share/fonts/truetype/source-sans-pro/SourceSansPro-ExtraLightIt.ttf">
<font-triplet name="SourceSansPro" style="italic" weight="200"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-ExtraLight.ttf">
<font-triplet name="DejaVuSans" style="normal" weight="200"/>

<font embed-url="/usr/share/fonts/truetype/source-sans-pro/SourceSansPro-It.ttf">
<font-triplet name="SourceSansPro" style="italic" weight="400"/>
</font>

<!-- MONO Spaced Font -->
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf">
<font-triplet name="DejaVuSansMono" style="normal" weight="normal"/>
<font embed-url="/usr/share/fonts/truetype/source-sans-pro/SourceSansPro-BoldIt.ttf">
<font-triplet name="SourceSansPro" style="italic" weight="700"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf">
<font-triplet name="DejaVuSansMono" style="italic" weight="normal"/>

<!-- Source Serif Pro -->
<font embed-url="/usr/share/fonts/truetype/source-serif-pro/SourceSerifPro-Regular.ttf">
<font-triplet name="SourceSerifPro" style="normal" weight="200"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf">
<font-triplet name="DejaVuSansMono" style="normal" weight="bold"/>

<font embed-url="/usr/share/fonts/truetype/source-serif-pro/SourceSerifPro-Regular.ttf">
<font-triplet name="SourceSerifPro" style="normal" weight="400"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf">
<font-triplet name="DejaVuSansMono" style="italic" weight="bold"/>

<font embed-url="/usr/share/fonts/truetype/source-serif-pro/SourceSerifPro-Bold.ttf">
<font-triplet name="SourceSerifPro" style="normal" weight="700"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-serif-pro/SourceSerifPro-Regular.ttf">
<font-triplet name="SourceSerifPro" style="italic" weight="200"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-serif-pro/SourceSerifPro-Regular.ttf">
<font-triplet name="SourceSerifPro" style="italic" weight="400"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-serif-pro/SourceSerifPro-Bold.ttf">
<font-triplet name="SourceSerif" style="italic" weight="700"/>
</font>

<!-- Source Code Pro -->
<font embed-url="/usr/share/fonts/truetype/source-code-pro/SourceCodePro-ExtraLight.ttf">
<font-triplet name="SourceCodePro" style="normal" weight="200"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-code-pro/SourceCodePro-Regular.ttf">
<font-triplet name="SourceCodePro" style="normal" weight="400"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-code-pro/SourceCodePro-Bold.ttf">
<font-triplet name="SourceCodePro" style="normal" weight="700"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-code-pro/SourceCodePro-ExtraLight.ttf">
<font-triplet name="SourceCodePro" style="italic" weight="200"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-code-pro/SourceCodePro-Regular.ttf">
<font-triplet name="SourceCodePro" style="italic" weight="400"/>
</font>

<font embed-url="/usr/share/fonts/truetype/source-code-pro/SourceCodePro-Bold.ttf">
<font-triplet name="SourceCodePro" style="italic" weight="700"/>
</font>

<!-- SERIF Font -->
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf">
<font-triplet name="DejaVuSerif" style="normal" weight="normal"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf">
<font-triplet name="DejaVuSerif" style="italic" weight="normal"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf">
<font-triplet name="DejaVuSerif" style="normal" weight="bold"/>
</font>
<font embed-url="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf">
<font-triplet name="DejaVuSerif" style="italic" weight="bold"/>
</font>

<!-- register all the fonts found in a directory
and all of its sub directories (use with care)
<directory recursive="true">C:\MyFonts2</directory>-->
Expand All @@ -133,7 +163,6 @@ the location of this file.

<directory recursive="true">/usr/share/fonts/truetype/</directory>
<auto-detect/>

</fonts>

<!-- This option lets you specify additional options on an XML handler -->
Expand Down
48 changes: 25 additions & 23 deletions common/fopdf.xsl
View file
Expand Up @@ -55,7 +55,7 @@
</xsl:template>

<xsl:attribute-set name="xref.properties">
<xsl:attribute name="color">#af0228</xsl:attribute>
<xsl:attribute name="color">#cc0033</xsl:attribute>
</xsl:attribute-set>

<xsl:param name="qanda.inherit.numeration" select="0" />
Expand All @@ -77,10 +77,10 @@
Fonts & Styles
################################################### -->

<xsl:param name="title.font.family">DejaVuSans</xsl:param>
<xsl:param name="body.font.family">DejaVuSerif</xsl:param>
<xsl:param name="monospace.font.family">DejaVuSansMono</xsl:param>
<xsl:param name="symbol.font.family">DejaVuSansMono</xsl:param>
<xsl:param name="title.font.family">SourceSansPro</xsl:param>
<xsl:param name="body.font.family">SourceSerifPro</xsl:param>
<xsl:param name="monospace.font.family">SourceCodePro</xsl:param>
<xsl:param name="symbol.font.family">SourceCodePro</xsl:param>

<!-- Default Font size -->
<xsl:param name="body.font.master">9</xsl:param>
Expand Down Expand Up @@ -140,21 +140,21 @@
<fo:block>
<fo:block background-color="#333" padding="3pt">
<fo:block color="#fff" text-align="right"
font-family="DejaVuSans-Bold" font-size="18pt"
margin-right="10mm">
font-family="SourceSansPro" font-size="18pt"
font-weight="bold" margin-right="10mm">
<xsl:value-of select="d:title|d:info/d:title" />
</fo:block>

<xsl:for-each select="d:info/*/d:author">
<fo:block color="#eee" text-align="right"
font-family="DejaVuSans-Bold" font-size="10pt"
margin-right="10mm">
font-family="SourceSansPro" font-size="10pt"
font-weight="bold" margin-right="10mm">
<xsl:value-of select="d:personname/d:firstname"/>
<xsl:text> </xsl:text>
<xsl:value-of select="d:personname/d:surname"/>
</fo:block>
<fo:block color="#ddd" text-align="right"
font-family="DejaVuSans" font-size="9pt"
font-family="SourceSansPro" font-size="9pt"
margin-right="10mm">
<xsl:value-of select="d:affiliation/d:address/d:email"/>
</fo:block>
Expand All @@ -171,22 +171,23 @@

<xsl:for-each select="d:info/*/d:editor">
<fo:block color="#eee" text-align="right"
font-family="DejaVuSans-Bold" font-size="10pt"
margin-right="10mm">
font-family="SourceSansPro" font-size="10pt"
font-weight="bold" margin-right="10mm">
<xsl:value-of select="d:personname/d:firstname"/>
<xsl:text> </xsl:text>
<xsl:value-of select="d:personname/d:surname"/>
</fo:block>
<fo:block color="#ddd" text-align="right"
font-family="DejaVuSans" font-size="9pt"
font-family="SourceSansPro" font-size="9pt"
margin-right="10mm">
<xsl:value-of select="d:affiliation/d:address/d:email"/>
</fo:block>
</xsl:for-each>
</fo:block>

<fo:block color="#fff" background-color="#af0228" text-align="left"
font-size="9pt" font-weight="bold" font-style="italic" padding="3pt">
<fo:block color="#fff" background-color="#cc0033" text-align="left"
font-family="SourceSansPro" font-size="9pt"
font-weight="bold" font-style="italic" padding="3pt">
<xsl:text>http://www.inetdoc.net</xsl:text>
</fo:block>

Expand All @@ -208,21 +209,21 @@
<fo:block>
<fo:block background-color="#333" padding="3pt">
<fo:block color="#fff" text-align="right"
font-family="DejaVuSans-Bold" font-size="18pt"
font-family="SourceSansPro-Bold" font-size="18pt"
margin-right="10mm" margin-bottom="5pt">
<xsl:value-of select="d:title|d:info/d:title" />
</fo:block>

<xsl:for-each select="//d:author">
<fo:block color="#eee" text-align="right"
font-family="DejaVuSans-Bold" font-size="10pt"
font-family="SourceSansPro-Bold" font-size="10pt"
margin-right="10mm">
<xsl:value-of select="d:personname/d:firstname"/>
<xsl:text> </xsl:text>
<xsl:value-of select="d:personname/d:surname"/>
</fo:block>
<fo:block color="#ddd" text-align="right"
font-family="DejaVuSans" font-size="9pt"
font-family="SourceSansPro" font-size="9pt"
margin-right="10mm">
<xsl:value-of select="d:affiliation/d:address/d:email"/>
</fo:block>
Expand All @@ -239,21 +240,21 @@

<xsl:for-each select="//d:editor">
<fo:block color="#eee" text-align="right"
font-family="DejaVuSans-Bold" font-size="10pt"
font-family="SourceSansPro-Bold" font-size="10pt"
margin-right="10mm">
<xsl:value-of select="d:personname/d:firstname"/>
<xsl:text> </xsl:text>
<xsl:value-of select="d:personname/d:surname"/>
</fo:block>
<fo:block color="#ddd" text-align="right"
font-family="DejaVuSans" font-size="9pt"
font-family="SourceSansPro" font-size="9pt"
margin-right="10mm">
<xsl:value-of select="d:affiliation/d:address/d:email"/>
</fo:block>
</xsl:for-each>
</fo:block>

<fo:block color="#fff" background-color="#af0228" text-align="left"
<fo:block color="#fff" background-color="#cc0033" text-align="left"
font-size="9pt" font-weight="bold" font-style="italic" padding="3pt"
margin-bottom="9pt">
<xsl:text>http://www.inetdoc.net</xsl:text>
Expand Down Expand Up @@ -479,13 +480,13 @@

<!-- Chapter -->
<xsl:template match="d:title" mode="chapter.titlepage.recto.auto.mode">
<fo:block font-family="DejaVuSans-Bold" font-size="12pt" color="#af0228">
<fo:block font-family="SourceSansPro-Bold" font-size="12pt" color="#cc0033">
<xsl:text>CHAPITRE </xsl:text>
<xsl:call-template name="chapnum"/>
</fo:block>
<fo:block background-color="#333" padding="3pt">
<fo:block color="#fff" text-align="right"
font-family="DejaVuSans-Bold" font-size="15pt"
font-family="SourceSansPro-Bold" font-size="15pt"
margin-right="10mm" margin-bottom="5pt">
<xsl:value-of select="ancestor-or-self::d:title"/>
</fo:block>
Expand Down Expand Up @@ -529,6 +530,7 @@ up into multiple documents.
<xsl:value-of select="$body.font.master * 1.25"/>
<xsl:text>pt</xsl:text>
</xsl:attribute>
<xsl:attribute name="border-bottom-style">solid</xsl:attribute>
</xsl:attribute-set>

<!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
Expand Down
2 changes: 1 addition & 1 deletion common/odp2index.sh
View file
Expand Up @@ -14,7 +14,7 @@ cat >> "$2" <<-EOF
<div id='presentation'>
EOF

for file in `ls $1-*[0-9].png`; do \
for file in $(ls $1-*[0-9].png); do \
cat >> "$2" <<-EOF
<a href='`basename $file .png`.html'>
<img src='`basename $file .png`.idx.png' width='200'
Expand Down
4 changes: 2 additions & 2 deletions formations/interco-lan-wan/interco-lan-wan.xml
View file
Expand Up @@ -84,7 +84,7 @@
trois couches : cœur, distribution et accès, on étudie les modes
d'interconnexion entre ces couches fonctionnelles.</para>

<para>Une interconnexion au niveau liaisons de données dans la couche
<para>Une interconnexion au niveau liaison de données dans la couche
distribution est préconisée si un ou plusieurs <acronym>VLAN</acronym>s
recouvrent la majeure partie des équipements de la couche accès. Ce choix a
des conséquences sur l'étendue des domaines de diffusion et les temps de
Expand All @@ -99,7 +99,7 @@
d'administration et des temps de transit variables.</para>

<para>Aux caractéristiques des protocoles usuels d'interconnexion des niveaux
liaisons de données et réseau, viennent s'ajouter les fonctions de
liaison de données et réseau, viennent s'ajouter les fonctions de
virtualisation émergentes. Ces fonctions ont une incidence importante sur les
performances et les caractéristiques des interconnexions réseau. Elles
peuvent se substituer aux protocoles historiques pour atteindre les critères
Expand Down
4 changes: 2 additions & 2 deletions guides/iptables-tutorial/Makefile
View file
Expand Up @@ -5,8 +5,8 @@ endif
# Type(s) de traitement
PROCESS = xml2xhtml xml2pdf

XML_FILES = iptables-tutorial.xml
XML_FILES = iptables-tutorial.xml $(wildcard images/*.png chapters/*.xml scripts/*)

all: $(PROCESS) $(wildcard images/*.png chapters/*.xml scripts/*)
all: $(PROCESS)

include $(MAIN_DIR)/common/Makefile.Rules
Binary file added images/background.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 81a0d44

Please sign in to comment.