FSFE
/
fsfe-website
29
30
Fork 85
Code Issues 62 Pull Requests 14 Wiki Activity

Final polish of the order form changes
the build failed Details

This commit is contained in:
Reinhard Müller 2019-09-03 17:09:55 +02:00
parent c0646f7404
commit 1d287ac9d5
5 changed files with 161 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cgi-bin/weborder.pl
View File

@ -46,22 +46,13 @@ my $email = decode("utf-8", $query->param("email"));
my $phone = decode("utf-8", $query->param("phone")); my $phone = decode("utf-8", $query->param("phone"));
my $language = $query->param("language"); my $language = $query->param("language");
# Calculate shipping fees based on country codes from drop-down list # Determine shipping fees based on country code from drop-down list
my @eu = ('AT', 'BE', 'BG', 'HR', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU', 'IE', 'IT',
'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'GB');
my $shipping; my $shipping;
given ($country_code) { if ($country_code == 'DE') {
when ($_ eq 'DE') { $shipping = 5;
$shipping = 3; } else {
} $shipping = 8;
when ($_ ~~ @eu) {
$shipping = 7;
}
default {
$shipping = 12;
}
} }
# Remove all parameters except for items and prices. # Remove all parameters except for items and prices.

67
order/order.de.xhtml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8"?>
<html> <html>
<head> <head>
<title>Fanartikel – FSFE</title> <title>Fanartikel – FSFE</title>
<style type="text/css"> <style type="text/css">
div#toc { div#toc {
float: right; float: right;
@ -27,7 +27,7 @@
<body class="toplevel"> <body class="toplevel">
<h1>Fanartikel</h1> <h1>Fanartikel</h1>
<div id="toc"> <div id="toc">
<p style="text-indent:1em;">Kategorien:</p> <p style="text-indent:1em;">Kategorien:</p>
<ul style="margin-bottom: 1em;"> <ul style="margin-bottom: 1em;">
@ -46,7 +46,7 @@
Bewusstsein zu bringen. Mit jedem Kauf unterstützen Sie wichtige Bewusstsein zu bringen. Mit jedem Kauf unterstützen Sie wichtige
Projekte der FSFE. Projekte der FSFE.
</p> </p>
<p> <p>
Um die genauen Maße zu erhalten, bewegen Sie den Mauszeiger über die Größenangaben oder Um die genauen Maße zu erhalten, bewegen Sie den Mauszeiger über die Größenangaben oder
sehen Sie in der <a href="size.html">Größentabelle</a> nach. sehen Sie in der <a href="size.html">Größentabelle</a> nach.
@ -56,19 +56,19 @@
<form action="/cgi-bin/weborder.pl" method="post" class="item-grid"> <form action="/cgi-bin/weborder.pl" method="post" class="item-grid">
<h2 id="tshirt">T-Shirts</h2> <h2 id="tshirt">T-Shirts</h2>
<dynamic-content type="tshirt"/> <dynamic-content type="tshirt"/>
<h2 id="girlie">Damen-T-Shirts</h2> <h2 id="girlie">Damen-T-Shirts</h2>
<dynamic-content type="girlie"/> <dynamic-content type="girlie"/>
<h2 id="hooded">Kapuzenshirts</h2> <h2 id="hooded">Kapuzenshirts</h2>
<dynamic-content type="hooded"/> <dynamic-content type="hooded"/>
<!-- h2 id="baby-clothes">Babykleidung</h2> <!-- h2 id="baby-clothes">Babykleidung</h2>
<dynamic-content type="baby-clothes"/ --> <dynamic-content type="baby-clothes"/ -->
<h2 id="other">Andere Artikel</h2> <h2 id="other">Andere Artikel</h2>
@ -76,7 +76,7 @@
<dynamic-content type="other"/> <dynamic-content type="other"/>
<h2>Infomaterial</h2> <h2>Infomaterial</h2>
<p> <p>
Auf unserer Auf unserer
<a href="/contribute/spreadtheword.html#promo-material">Informationsmaterial-Seite</a> <a href="/contribute/spreadtheword.html#promo-material">Informationsmaterial-Seite</a>
@ -85,57 +85,44 @@
<h2>Versand</h2> <h2>Versand</h2>
<input type="hidden" name="shipping" value="1"/> <p>The following shipping fees apply:</p>
<div class="radio"> <ul>
<label> <li>Shipping within Germany: €5.00</li>
<input type="radio" name="_shipping" id="shipping-de" value="3" /> <li>Shipping worldwide: €8.00</li>
<strong>Versand innerhalb Deutschlands (€3.00)</strong> </ul>
</label>
</div> <h2>Ihre Daten</h2>
<div class="radio">
<label>
<input type="radio" name="_shipping" id="shipping-eu" value="7" checked="" />
<strong>Versand innerhalb Europas (€7.00)</strong>
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="_shipping" id="shipping-world" value="12" />
<strong>Versand außerhalb Europas (€12.00)</strong>
</label>
</div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="name">Name:</label>
<label class="control-label" for="name">Name:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="name" name="name" type="text" /> <input class="form-control" id="name" name="name" type="text" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Adresse:</label>
<label class="control-label vcenter" for="address">Vollständige Adresse:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<textarea class="form-control" rows="5" id="address" name="address" type="text" /> <textarea class="form-control" rows="5" id="address" name="address" type="text" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Land:</label>
<label class="control-label" for="email">E-Mail:</label> <div class="col-sm-4">
<country-list />
</div> </div>
</div>
<div class="row form-group">
<label class="col-sm-2 control-label" for="email">E-Mail:</label>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="email" name="email" type="email" /> <input class="form-control" id="email" name="email" type="email" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="phone">Telefon:</label>
<label class="control-label" for="phone">Telefon:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="phone" name="phone" type="text" /> <input class="form-control" id="phone" name="phone" type="text" />
</div> </div>
@ -162,8 +149,6 @@
wenn Sie die Bestellung abgeschickt haben. wenn Sie die Bestellung abgeschickt haben.
</p> </p>
</body> </body>
<timestamp>$Date$ $Author$</timestamp>
</html> </html>
<!-- <!--
Local Variables: *** Local Variables: ***

38
order/order.en.xhtml
View File

@ -3,7 +3,7 @@
<html> <html>
<head> <head>
<title>Merchandise – FSFE</title> <title>Merchandise – FSFE</title>
<style type="text/css"> <style type="text/css">
div#toc { div#toc {
float: right; float: right;
@ -79,61 +79,49 @@
<p> <p>
Check our Check our
<a href="/contribute/spreadtheword.html#promo-material">order page for information material</a> <a href="/contribute/spreadtheword.html#promo-material">order page for information material</a>
to order leaflets, stickers and other things. to order leaflets, stickers and other things.
</p> </p>
<h2>Shipping</h2> <h2>Shipping</h2>
<p>The following shipping fees apply: <p>The following shipping fees apply:</p>
<ul> <ul>
<li>Shipping within Germany: €3.00</li> <li>Shipping within Germany: €5.00</li>
<li>Shipping within Europe: €7.00</li> <li>Shipping worldwide: €8.00</li>
<li>Shipping worldwide: €12.00</li> </ul>
</ul>
</p>
<h2>Your Data</h2> <h2>Your Data</h2>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="name">Name:</label>
<label class="control-label" for="name">Name:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="name" name="name" type="text" /> <input class="form-control" id="name" name="name" type="text" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Address:</label>
<label class="control-label vcenter" for="address">Address:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<textarea class="form-control" rows="5" id="address" name="address" type="text" /> <textarea class="form-control" rows="5" id="address" name="address" type="text" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Country:</label>
<label class="control-label" for="address">Country:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<country-list /> <country-list />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="email">Email:</label>
<label class="control-label" for="email">Email:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="email" name="email" type="email" /> <input class="form-control" id="email" name="email" type="email" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="phone">Phone:</label>
<label class="control-label" for="phone">Phone:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="phone" name="phone" type="text" /> <input class="form-control" id="phone" name="phone" type="text" />
</div> </div>
@ -159,8 +147,6 @@
cards. You will receive further information upon submission of your order. cards. You will receive further information upon submission of your order.
</p> </p>
</body> </body>
<timestamp>$Date$ $Author$</timestamp>
</html> </html>
<!-- <!--
Local Variables: *** Local Variables: ***

56
order/order.it.xhtml
View File

@ -3,7 +3,7 @@
<html> <html>
<head> <head>
<title>Prodotti – FSFE</title> <title>Prodotti – FSFE</title>
<style type="text/css"> <style type="text/css">
div#toc { div#toc {
float: right; float: right;
@ -41,10 +41,10 @@
<p class="p-summary"> <p class="p-summary">
Mostra il tuo amore per il Software Libero usando e indossando i nostri prodotti. Mostra il tuo amore per il Software Libero usando e indossando i nostri prodotti.
I vestiti Software Libero sono un buon modo per far conoscere i nostri principi I vestiti Software Libero sono un buon modo per far conoscere i nostri principi
nella zona in cui vivi, e inoltre ogni acquisto finanzia i progetti della FSFE. nella zona in cui vivi, e inoltre ogni acquisto finanzia i progetti della FSFE.
</p> </p>
<p> <p>
Per ottenere informazioni dettagliate sulle dimensioni effettive degli abiti Per ottenere informazioni dettagliate sulle dimensioni effettive degli abiti
posiziona il puntatore del mouse sui codici delle taglie (S, M, ecc...) oppure posiziona il puntatore del mouse sui codici delle taglie (S, M, ecc...) oppure
@ -79,62 +79,49 @@
<p> <p>
Visita la pagina del Visita la pagina del
<a href="/contribute/spreadtheword.html#promo-material">materiale informativo</a> <a href="/contribute/spreadtheword.html#promo-material">materiale informativo</a>
per consultare e richiedere volantini, adesivi e altro materiale. per consultare e richiedere volantini, adesivi e altro materiale.
</p> </p>
<h2>Spedizione</h2> <h2>Spedizione</h2>
<input type="hidden" name="shipping" value="1"/> <p>Si applicano le seguenti spese di spedizione:</p>
<div class="radio"> <ul>
<label> <li>Spedizione in Germania: €5.00</li>
<input type="radio" name="_shipping" id="shipping-de" value="3" /> <li>Spedizione nel mondo intero: €8.00</li>
<strong>Spedizione in Germania (3,00 €)</strong> </ul>
</label>
</div> <h2>I tuoi dati</h2>
<div class="radio">
<label>
<input type="radio" name="_shipping" id="shipping-eu" value="7" checked="" />
<strong>Spedizione in Europa (7,00 €)</strong>
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="_shipping" id="shipping-world" value="12" />
<strong>Spedizione extra UE (12,00 €)</strong>
</label>
</div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="name">Nome:</label>
<label class="control-label" for="name">Nome:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="name" name="name" type="text" /> <input class="form-control" id="name" name="name" type="text" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Indirizzo:</label>
<label class="control-label vcenter" for="address">Indirizzo:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<textarea class="form-control" rows="5" id="address" name="address" type="text" /> <textarea class="form-control" rows="5" id="address" name="address" type="text" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Paese:</label>
<label class="control-label" for="email">Email:</label> <div class="col-sm-4">
<country-list />
</div> </div>
</div>
<div class="row form-group">
<label class="col-sm-2 control-label" for="email">Email:</label>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="email" name="email" type="email" /> <input class="form-control" id="email" name="email" type="email" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="phone">Telefono:</label>
<label class="control-label" for="phone">Telefono:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="phone" name="phone" type="text" /> <input class="form-control" id="phone" name="phone" type="text" />
</div> </div>
@ -161,7 +148,6 @@
</p> </p>
</body> </body>
<timestamp>$Date$ $Author$</timestamp>
<translator>Stefano Fraccaro e Sebastiano Pistore</translator> <translator>Stefano Fraccaro e Sebastiano Pistore</translator>
</html> </html>
<!-- <!--

203
order/order.nl.xhtml
View File

@ -1,111 +1,101 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8"?>
<html> <html>
<head> <head>
<title>Fan-artikelen – FSFE</title> <title>Fan-artikelen – FSFE</title>
<style type="text/css">
div#toc {
float: right;
clear: right;
border: solid 1px;
margin: .5em;
background: rgb(240,240,240);
width: 30%;
}
@media only screen and (max-width: 600px) { <style type="text/css">
div#toc { div#toc {
width: 100%; float: right;
} clear: right;
} border: solid 1px;
</style> margin: .5em;
<meta name="description" content="Toon uw liefde voor Vrije Software door de FSFE-fanartikelen te gebruiken en te dragen." /> background: rgb(240,240,240);
<meta name="keywords" content="winkel bestel t-shirt shirts hoodie artikelen fan-artikelen promoot magneet tas slab pin verzenden kopen post betaling" /> width: 30%;
<meta name="image" content="https://fsfe.org/graphics/tshirt-promo-800px.jpg" /> }
</head>
<body class="toplevel"> @media only screen and (max-width: 600px) {
<h1>Fan-artikelen</h1> div#toc {
width: 100%;
}
}
</style>
<meta name="description" content="Toon uw liefde voor Vrije Software door de FSFE-fanartikelen te gebruiken en te dragen." />
<meta name="keywords" content="winkel bestel t-shirt shirts hoodie artikelen fan-artikelen promoot magneet tas slab pin verzenden kopen post betaling" />
<meta name="image" content="https://fsfe.org/graphics/tshirt-promo-800px.jpg" />
</head>
<div id="toc"> <body class="toplevel">
<p style="text-indent:1em;">Beschikbare fan-artikelen:</p> <h1>Fan-artikelen</h1>
<ul style="margin-bottom: 1em;">
<li><a href="#tshirt">T-Shirts</a></li>
<li><a href="#girlie">T-Shirts voor dames</a></li>
<li><a href="#hooded">Shirts met kap (hoodies)</a></li>
<!-- li><a href="#baby-clothes">Babykleding</a></li -->
<li><a href="#other">Andere artikelen</a></li>
</ul>
</div>
<p class="p-summary"> <div id="toc">
Toon uw liefde voor Vrije Software door de fan-artikelen hieronder te <p style="text-indent:1em;">Beschikbare fan-artikelen:</p>
gebruiken en te dragen. Het dragen van Vrije Software-kleding is een goede <ul style="margin-bottom: 1em;">
manier om het bewustzijn in uw lokale gemeenschap te vergroten en iedere <li><a href="#tshirt">T-Shirts</a></li>
verkoop helpt om cruciale FSFE-projecten te financieren. <li><a href="#girlie">T-Shirts voor dames</a></li>
</p> <li><a href="#hooded">Shirts met kap (hoodies)</a></li>
<!-- li><a href="#baby-clothes">Babykleding</a></li -->
<p> <li><a href="#other">Andere artikelen</a></li>
Plaats voor gedetailleerde informatie over de werkelijke dimensies van de verschillende kledingformaten uw muiscursor over het kledingformaat of bekijk de <a href="size.html">maattabel</a>. </ul>
</p> </div>
<p style="clear:both;"></p> <p class="p-summary">
Toon uw liefde voor Vrije Software door de fan-artikelen hieronder te
gebruiken en te dragen. Het dragen van Vrije Software-kleding is een goede
manier om het bewustzijn in uw lokale gemeenschap te vergroten en iedere
verkoop helpt om cruciale FSFE-projecten te financieren.
</p>
<p>
Plaats voor gedetailleerde informatie over de werkelijke dimensies van de
verschillende kledingformaten uw muiscursor over het kledingformaat of
bekijk de <a href="size.html">maattabel</a>.
</p>
<p style="clear:both;"></p>
<form action="/cgi-bin/weborder.pl" method="post" class="item-grid"> <form action="/cgi-bin/weborder.pl" method="post" class="item-grid">
<h2 id="tshirt">T-Shirts</h2> <h2 id="tshirt">T-Shirts</h2>
<dynamic-content type="tshirt"/> <dynamic-content type="tshirt"/>
<h2 id="girlie">T-Shirts voor dames</h2> <h2 id="girlie">T-Shirts voor dames</h2>
<dynamic-content type="girlie"/> <dynamic-content type="girlie"/>
<h2 id="hooded">Shirts met kap (hoodies)</h2> <h2 id="hooded">Shirts met kap (hoodies)</h2>
<dynamic-content type="hooded"/> <dynamic-content type="hooded"/>
<!-- h2 id="baby-clothes">Babykleding</h2> <!-- h2 id="baby-clothes">Babykleding</h2>
<dynamic-content type="baby-clothes"/ --> <dynamic-content type="baby-clothes"/ -->
<h2 id="other">Andere artikelen</h2> <h2 id="other">Andere artikelen</h2>
<dynamic-content type="other"/> <dynamic-content type="other"/>
<h2>Promotiematerialen</h2> <h2>Promotiematerialen</h2>
<p> <p>
Bekijk onze <a href="/contribute/spreadtheword.html#promo-material">bestelpagina Bekijk onze
om informatiematerialen</a> zoals folders en stickers te bestellen. <a href="/contribute/spreadtheword.html#promo-material">bestelpagina om informatiematerialen</a>
</p> zoals folders en stickers te bestellen.
</p>
<h2>Verzenden</h2> <h2>Verzenden</h2>
<input type="hidden" name="shipping" value="1"/> <p>De volgende verzendkosten zijn van toepassing:</p>
<div class="radio"> <ul>
<label> <li>Verzending binnen Duitsland: €5.00</li>
<input type="radio" name="_shipping" id="shipping-de" value="3" /> <li>Wereldwijd verzenden: €8.00</li>
<strong>Verzenden binnen Duitsland (€3.00)</strong> </ul>
</label>
</div> <h2>Je gegevens</h2>
<div class="radio">
<label>
<input type="radio" name="_shipping" id="shipping-eu" value="7" checked="" />
<strong>Verzenden binnen Europa (€7.00)</strong>
</label>
</div>
<div class="radio">
<label>
<input type="radio" name="_shipping" id="shipping-world" value="12" />
<strong>Verzenden buiten Europa (€12.00)</strong>
</label>
</div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="name">naam:</label>
<label class="control-label" for="name">naam:</label>
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="name" name="name" type="text" /> <input class="form-control" id="name" name="name" type="text" />
@ -113,27 +103,28 @@ Toon uw liefde voor Vrije Software door de fan-artikelen hieronder te
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Adres:</label>
<label class="control-label vcenter" for="address">Compleet adres:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<textarea class="form-control" rows="5" id="address" name="address" type="text" /> <textarea class="form-control" rows="5" id="address" name="address" type="text" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="address">Land:</label>
<label class="control-label" for="email">E-mail:</label> <div class="col-sm-4">
<country-list />
</div> </div>
</div>
<div class="row form-group">
<label class="col-sm-2 control-label" for="email">E-mail:</label>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="email" name="email" type="email" /> <input class="form-control" id="email" name="email" type="email" />
</div> </div>
</div> </div>
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-2"> <label class="col-sm-2 control-label" for="phone">Telefoon:</label>
<label class="control-label" for="phone">Telefoon:</label>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<input class="form-control" id="phone" name="phone" type="text" /> <input class="form-control" id="phone" name="phone" type="text" />
</div> </div>
@ -154,17 +145,17 @@ Toon uw liefde voor Vrije Software door de fan-artikelen hieronder te
</div> </div>
</form> </form>
<p> <p>
Betaling is mogelijk via bankoverschrijving, PayPal en verschillende Betaling is mogelijk via bankoverschrijving, PayPal en verschillende
credit- en debitcards. U ontvangt verdere informatie na het plaatsen van uw bestelling. credit- en debitcards. U ontvangt verdere informatie na het plaatsen
</p> van uw bestelling.
</body> </p>
</body>
<timestamp>$Date$ $Author$</timestamp> <translator>André Ockers</translator>
<translator>André Ockers</translator> </html>
</html> <!--
<!-- Local Variables: ***
Local Variables: *** mode: xml ***
mode: xml *** End: ***
End: *** -->
-->