Some enhancements/restyle

svn path=/Website/trunk/; revision=23328
This commit is contained in:
Peter Feij
2014-11-13 12:02:07 +00:00
parent 49f41c6095
commit a86a4ba588
3 changed files with 173 additions and 55 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -6,6 +6,119 @@
<xsl:value-of select="substring(translate('$Revision$', '$ ', ''), 10)"/>
</xsl:variable>
<xsl:template name="stylesheet">
<style>body {
font-family: Calibri, Verdana;
background-color: #fff;
margin-left: 8px;
margin-top: 8px;
color: #000;
font-size: 1em;
}
table {
border: 0;
}
th {
font-family: Calibri,Verdana;
font-size: 11pt;
font-weight: normal;
color: #ffffff;
text-decoration: none;
padding: 3px;
background-color: #003478;
}
th.resth {
font-family: Calibri,Verdana;
font-size: 11pt;
font-weight: normal;
color: #000;
text-decoration: none;
padding: 3px;
background-color: #fff;
}
td, p {
font-family: Calibri,Verdana;
font-style: normal;
font-size: 10pt;
font-weight: normal;
color: #000000;
text-align: left;
vertical-align: top;
}
td.result {
text-decoration: none;
padding-bottom: 2px;
padding-top: 2px;
padding-left: 2px;
padding-right: 2px;
background-color: #D6D8E8;
}
td.resresult {
text-decoration: none;
padding-bottom: 2px;
padding-top: 2px;
padding-left: 2px;
padding-right: 2px;
background-color: #fff;
}
td.sec_heading {
font-size: 9pt;
text-decoration: none;
padding-bottom: 2px;
padding-top: 2px;
padding-left: 2px;
padding-right: 2px;
text-align: left;
background-color: #d0d0d0;
}
td.caption {
font-size: 18pt;
padding-bottom: 30px;
padding-top: 40px;
}
td.subcaption {
font-size: 10pt;
font-weight: bold;
text-decoration: underline;
}
td.label {
font-size: 10pt;
}
td.value {
font-style: italic;
font-size: 10pt;
}
td.tekst {
font-size: 10pt;
}
td.tiny {
font-size: 6pt;
text-align: right;
}
.fatal {
background-color: red;
color: white;
font-weight: bold;
padding-left: 2px;
padding-right: 2px;
}
</style>
</xsl:template>
<xsl:template name="pageheader">
<table border="0" width="100%">
<tr>
@@ -49,7 +162,7 @@
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="99%" cellpadding="3">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="99%" cellpadding="3">
<tr>
<th align="left" width="25%" colspan="1">
<b>Datum</b>
@@ -77,7 +190,7 @@
<tr>
<th align="left" colspan="1"><b>Creditbedrag</b></th>
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Creditbedrag']"/></td>
</tr>
</tr>
<tr>
<th align="left" colspan="1"><b>Reden</b></th>
<td align="left" colspan="3">
@@ -85,18 +198,18 @@
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
</tr>
</table>
</td>
</tr>
<tr height="20px">
<td/>
</tr>
</tr>
<tr>
<td>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="99%" cellpadding="3">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="99%" cellpadding="3">
<tr>
<th align="left" colspan="3">
<b>Honorering creditering facturen:</b>
@@ -108,9 +221,9 @@
<td width="30%">Goedgekeurd / <strike>Afgekeurd</strike></td>
</xsl:when>
<xsl:otherwise>
<td width="30%">Goedgekeurd / Afgekeurd</td>
<td width="30%">Goedgekeurd / Afgekeurd</td>
</xsl:otherwise>
</xsl:choose>
</xsl:choose>
<td width="25%">Datum: <xsl:value-of select="tracking/track[@code='MLDACP']/datum/datum"/></td>
<td>Paraaf: <xsl:value-of select="tracking/track[@code='MLDACP']/user/naam_full"/><br/><br/><br/></td>
</tr>
@@ -124,25 +237,25 @@
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
</tr>
</td>
</tr>
</table>
</td>
</tr>
</tr>
</td>
</tr>
<tr height="20px">
<td/>
</tr>
</tr>
<tr>
<td>
<td>
<xsl:element name="a">
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="../bookmarks/melding"/><xsl:value-of select="key"/></xsl:attribute>klik hier om direct naar de melding te gaan</xsl:element>
</td>
</tr>
</table>
</tr>
</table>
</xsl:when>
<xsl:otherwise>
<xsl:otherwise>
<table border="0" width="100%" cellpadding="2">
<tr>
<td colspan="2" class="caption" style="padding-top:20px;padding-bottom:20px">
@@ -153,7 +266,7 @@
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="100%" cellpadding="2">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="100%" cellpadding="2px">
<tr>
<th align="left" width="20%">
<b>Datum aanvraag</b>
@@ -180,7 +293,7 @@
<xsl:value-of select="kenmerk[@naam='KlantID']"/>-<xsl:value-of select="kenmerk[@naam='Klant']/bedrijf/naam"/><xsl:if test="kenmerk[@naam='Klant']/bedrijf/leverancier_nr!=''"> / <xsl:value-of select="kenmerk[@naam='Klant']/bedrijf/leverancier_nr"/></xsl:if>
<xsl:if test="kenmerk[@naam='Klant']/bedrijf/post_adres!=''"><br/><br/><xsl:value-of select="kenmerk[@naam='Klant']/bedrijf/post_adres"/><br/><xsl:value-of select="kenmerk[@naam='Klant']/bedrijf/post_postcode"/><br/><xsl:value-of select="kenmerk[@naam='Klant']/bedrijf/post_plaats"/></xsl:if>
</xsl:otherwise>
</xsl:choose>
</xsl:choose>
</td>
<td align="right" width="18%">Acontobedrag</td>
<td align="left" width="32%"><xsl:if test="kenmerk[@naam='Acontobedrag']!=''">&#xA0;<xsl:value-of select="kenmerk[@naam='Acontobedrag']"/></xsl:if></td>
@@ -201,7 +314,7 @@
<xsl:value-of select="kenmerk[@naam='Factuurkenmerk']"/>
</td>
<td>Kilometerprijs</td>
<td><xsl:if test="kenmerk[@naam='Kilometerprijs']!=''">&#xA0;<xsl:value-of select="kenmerk[@naam='Kilometerprijs']"/></xsl:if></td>
<td><xsl:if test="kenmerk[@naam='Kilometerprijs']!=''">&#xA0;<xsl:value-of select="format-number(kenmerk[@naam='Kilometerprijs'], '###.##0,00', 'european')"/></xsl:if></td>
</tr>
<tr>
<td>Projectmanager</td>
@@ -221,7 +334,7 @@
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="100%" cellpadding="2">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="100%" cellpadding="2">
<tr>
<th align="left" width="17%">
<b>Projectnummer</b>
@@ -244,7 +357,6 @@
</tr>
<tr>
<td>AX:&#xA0;<xsl:value-of select="kenmerk[@naam='Toegekend AX-nummer']"/><br/>
<br/>
<br/>
<i>Logcentre:&#xA0;<xsl:value-of select="kenmerk[@naam='Logcentre']"/></i>
</td>
@@ -271,7 +383,7 @@
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="100%" cellpadding="2">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="100%" cellpadding="2">
<tr>
<th align="left">
<b>Toelichting</b>
@@ -299,7 +411,7 @@
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="100%" cellpadding="2">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="100%" cellpadding="2">
<tr>
<th align="left" width="25%">
<b>Benodigde parafen voor acceptatie</b>
@@ -339,7 +451,7 @@
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="99%" cellpadding="3">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="99%" cellpadding="3">
<tr>
<th align="left" width="25%" colspan="1">
<b>Datum: <xsl:value-of select="gemeld/datum"/></b>
@@ -359,7 +471,7 @@
<xsl:with-param name="string" select="omschrijving"/>
</xsl:call-template>
</td>
</tr>
</tr>
<tr>
<td align="right" colspan="1">Aantal</td>
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Aantal']"/></td>
@@ -370,7 +482,7 @@
<xsl:if test="kenmerk[@naam='Prijs'] !=''">
<xsl:value-of select="format-number(kenmerk[@naam='Prijs'], '###.##0,00', 'european')"/>
</xsl:if>
</td>
</td>
</tr>
<tr>
<td align="right" colspan="1">BTW</td>
@@ -379,7 +491,7 @@
<xsl:value-of select="format-number(kenmerk[@naam='BTW'], '###.##0,00', 'european')"/>
</xsl:if>
</td>
</tr>
</tr>
<tr>
<td align="right" colspan="1">Artikelcode</td>
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Artikelcode']"/></td>
@@ -393,7 +505,7 @@
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Evt. projectnummer']"/></td>
</tr>
<tr>
<td align="right" colspan="1">Verwachte leverdatum</td>
<td align="right" colspan="1">Verwachte leverdatum</td>
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Verwachte leverdatum']"/></td>
</tr>
<tr>
@@ -403,7 +515,7 @@
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Bestemd voor afdeling']"/></td>
</xsl:when>
<xsl:otherwise>
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Bestemd voor']/bedrijf/naam"/></td>
<td align="left" colspan="3"><xsl:value-of select="kenmerk[@naam='Bestemd voor']/bedrijf/naam"/></td>
</xsl:otherwise>
</xsl:choose>
</tr>
@@ -413,27 +525,27 @@
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="kenmerk[@naam='Opmerkingen']"/>
</xsl:call-template>
</td>
</td>
</tr>
<xsl:if test="opmerking !=''">
<tr>
<td align="right" colspan="1">Afhandeling</td>
<td align="left" colspan="3">
<td align="right" colspan="1">Afhandeling</td>
<td align="left" colspan="3">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="opmerking"/>
</xsl:call-template>
</td>
</tr>
</xsl:if>
</xsl:if>
</table>
</td>
</tr>
<tr height="20px">
<td/>
</tr>
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="99%" cellpadding="3">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="99%" cellpadding="3">
<tr>
<th align="left" colspan="2">
<b>Bestelgegevens:</b>
@@ -462,14 +574,14 @@
<tr>
<td>SGF-nummer(s)</td>
<td align="left"><xsl:value-of select="discipline/srtdiscipline/prefix"/><xsl:value-of select="key"/></td>
</tr>
</tr>
</table>
<tr height="20px">
<td/>
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="99%" cellpadding="3">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="99%" cellpadding="3">
<tr>
<th align="left" colspan="3">
<b>Afdelingsmanager:</b>
@@ -481,9 +593,9 @@
<td width="30%">Goedgekeurd / <strike>Afgekeurd</strike></td>
</xsl:when>
<xsl:otherwise>
<td width="30%">Goedgekeurd / Afgekeurd</td>
<td width="30%">Goedgekeurd / Afgekeurd</td>
</xsl:otherwise>
</xsl:choose>
</xsl:choose>
<td width="25%">Datum: <xsl:value-of select="kenmerk[@naam='Goedkeuringsdatum']"/></td>
<td>Paraaf: <xsl:value-of select="kenmerk[@naam='Afdelingsmanager']"/><br/><br/><br/></td>
</tr>
@@ -492,7 +604,7 @@
</tr>
<tr>
<td>
<table border="1" style="border-collapse: collapse; border: 1px solid #C0C0C0;" width="99%" cellpadding="3">
<table border="1" style="border-collapse: collapse; border: 1px solid #003478;" width="99%" cellpadding="3">
<tr>
<th align="left" colspan="3">
<b>Procuratiehouder (conform procuratiebeleid SG):</b>
@@ -504,28 +616,28 @@
<td width="30%">Goedgekeurd / <strike>Afgekeurd</strike></td>
</xsl:when>
<xsl:otherwise>
<td width="30%">Goedgekeurd / Afgekeurd</td>
<td width="30%">Goedgekeurd / Afgekeurd</td>
</xsl:otherwise>
</xsl:choose>
</xsl:choose>
<td width="25%">Datum: <xsl:value-of select="tracking/track[@code='MLDACP']/datum/datum"/></td>
<td>Paraaf: <xsl:value-of select="tracking/track[@code='MLDACP']/user/naam_full"/><br/><br/><br/></td>
</tr>
</table>
</td>
</tr>
</tr>
</td>
</tr>
<tr height="20px">
<td/>
</tr>
</tr>
<tr>
<td>
<td>
<xsl:element name="a">
<xsl:attribute name="href">https://<xsl:value-of select="$FacilitorRoot"/>?<xsl:value-of select="../bookmarks/melding"/><xsl:value-of select="key"/></xsl:attribute>klik hier om direct naar de melding te gaan</xsl:element>
</td>
</tr>
</tr>
</table>
</xsl:when>
</xsl:when>
<xsl:otherwise>
<table border="0" width="100%" cellpadding="2">
<tr>
@@ -776,8 +888,14 @@
</tr-->
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/contract"/>:</td>
<td colspan="2" class="value"><xsl:value-of select="omschrijving"/></td>
<td colspan="2" class="value">C<xsl:value-of select="nummer_intern"/>&#xA0;<xsl:value-of select="omschrijving"/></td>
</tr>
<xsl:if test="nummer != ''">
<tr>
<td class="label"><xsl:value-of select="//lcl/CNT/extern_nr"/>:</td>
<td colspan="2" class="value"><xsl:value-of select="nummer"/></td>
</tr>
</xsl:if>
<xsl:if test="kenmerk[@naam='SaaS-variant'] != ''">
<tr>
<td class="label">SaaS-variant:</td>
@@ -786,13 +904,13 @@
</xsl:if>
<xsl:if test="kenmerk[@naam='Laatste index-datum'] != '' and kenmerk[@naam='Laatste index-percentage'] != ''">
<tr>
<td class="label">Indexatie:</td>
<td class="label">Prijspeil/indexatie:</td>
<td colspan="2" class="value"><xsl:value-of select="kenmerk[@naam='Laatste index-datum']"/></td>
</tr>
</xsl:if>
<tr><td colspan="3" height="10px"/></tr>
</table>
<table style="border:none;border-collapse:collapse" width="100%" cellPadding="5">
<table style="border:none;border-collapse:collapse" width="100%" cellPadding="5px">
<colgroup>
<col width="40%"/>
<col width="18%"/>
@@ -805,8 +923,8 @@
<th style="border:1px solid black;text-align:center"><b>Ingangsdatum</b></th>
<th colspan="2" style="border:1px solid black;text-align:center">
<xsl:choose>
<xsl:when test="/facilitor/contract/discipline/key = 382"><b>Onderhoudskosten</b></xsl:when>
<xsl:otherwise><b>Prijs per maand</b></xsl:otherwise>
<xsl:when test="/facilitor/contract/discipline/key = 482"><b>Onderhoudskosten</b></xsl:when>
<xsl:otherwise><b>Per maand</b></xsl:otherwise>
</xsl:choose>
</th>
</tr>
@@ -992,24 +1110,24 @@
<xsl:if test="/facilitor/contract/kenmerk[@naam='Tarief Consultant'] != ''">
<tr>
<td class="label">Tarief Consultant:</td>
<td colspan="2" class="value"><xsl:value-of select="format-number(/facilitor/contract/kenmerk[@naam='Tarief Consultant'], '###.##0,00', 'european')"/></td>
<td colspan="2" class="value">&#xA0;<xsl:value-of select="format-number(/facilitor/contract/kenmerk[@naam='Tarief Consultant'], '###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
<xsl:if test="/facilitor/contract/kenmerk[@naam='Tarief Specialist'] != ''">
<tr>
<td class="label">Tarief Specialist:</td>
<td colspan="2" class="value"><xsl:value-of select="format-number(/facilitor/contract/kenmerk[@naam='Tarief Specialist'], '###.##0,00', 'european')"/></td>
<td colspan="2" class="value">&#xA0;<xsl:value-of select="format-number(/facilitor/contract/kenmerk[@naam='Tarief Specialist'], '###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
<xsl:if test="/facilitor/contract/kenmerk[@naam='Reiskosten'] != ''">
<tr>
<td class="label">Reiskosten (per km):</td>
<td colspan="2" class="value"><xsl:value-of select="format-number(/facilitor/contract/kenmerk[@naam='Reiskosten'], '###.##0,00', 'european')"/></td>
<td colspan="2" class="value">&#xA0;<xsl:value-of select="format-number(/facilitor/contract/kenmerk[@naam='Reiskosten'], '###.##0,00', 'european')"/></td>
</tr>
</xsl:if>
<tr><td colspan="3" height="10px"/></tr>
<tr>
<td colspan="3">Alle genoemde bedragen in dit document zijn exclusief BTW.</td>
<td colspan="3">Alle genoemde bedragen zijn exclusief BTW.</td>
</tr>
</table>
</xsl:when>