Further website enhancements and adjustments

5 files changed, 56 insertions, 17 deletions

diff --git a/web/templates/contact.html.tmpl b/web/templates/contact.html.tmpl
index aac2645..4bafff4 100644
--- a/web/templates/contact.html.tmpl
+++ b/web/templates/contact.html.tmpl
@@ -4,6 +4,7 @@
    uuid = 'a57cd25d-42ee-4e3a-aa24-f42b9548dbdd'
    norder = '9989'
 %]
+[%- PROCESS 'constants.tt' -%]
 <p>All the fields have to be filled in ...</p>
 <p><strong>NB:</strong> As a matter of courtesy you should consider adding your name (or even a pseudonym) in the message to us. You know our names as well. Besides, it makes it easier to address you in a reply. Thanks.</p>
 <form action="/bin/sendmail.cgi" method="post" accept-charset="utf-8">
@@ -19,8 +20,7 @@
  <td>
  <select name="Recipient">
   <option value="developers" selected="selected">Developers</option>
-  <option value="bernhard">Bernhard</option>
-  <option value="oliver">Oliver</option>
+  [%- FOREACH key IN gpg_keys.sort('name') -%]<option value="[%- key.name | lower -%]">[%- key.name -%]</option>[%- END -%]
   <option value="team">The whole team</option>
  </select>
  </td>
@@ -55,24 +55,30 @@
  </tr>
 </table>
 </form>
-<h3>Report a bug?</h3>
+<h3>Report an issue or error ("bug")?</h3>
 <p>
-Please use the trackers over over on our SourceForge project page or for sensitive matters use a PGP-encrypted
-email. See below for public keys available.
+Please use <a class="wdslnk" href="[%- tracker_url -%]">the issue tracker over on Bitbucket</a> or for
+security-related reports use a PGP-encrypted email. See below for public keys available.
 </p>
 <h3>Email from your own client?</h3>
 <p>
 If you prefer to send an email, i.e. not use this contact form, you can use the lowercase form of the team
 member's first name and append the at sign and then <tt>windirstat.info</tt> to it to get the email address
-of that team member. If you can't remember the names, use the dropdown box above to receive a clue ;)
+of that team member (i.e. <tt>&lt;name&gt;@windirstat.info</tt>).
+If you can't remember the names, use the dropdown box above to receive a clue ;)
 </p>
 <h3>Using PGP to encrypt communication or to verify emails we send out</h3>
 <p>
-You can use the following PGP public keys to encrypt <em>to</em>. The keys will be available from commonly
-used key servers such as pgp.mit.edu or subkeys.pgp.net. Please use the traditional ASCII armor in your
-first communication to establish whether S/MIME can be used in future communication.
+You can use the following <a class="wdslnk" href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy">PGP</a>
+public keys to encrypt <em>to</em>. The keys will be available from commonly used key servers such as
+pgp.mit.edu or subkeys.pgp.net. Please use the traditional ASCII armor in your first communication to
+establish whether PGP/MIME can be used in future communication.
 </p>
 <ul>
-<li>Oliver: ID: <tt>0x6190BC32</tt>, fingerprint: <tt>58F4 12A6 E0E8 9A7C A849  F0E2 9E9B CC53 6190 BC32</tt></li>
+[%- FOREACH key IN gpg_keys.sort('name') -%]
+[%- IF key.id -%]
+<li><strong>[%- key.name -%]:</strong><br />&nbsp;&nbsp;PGP key ID: <a class="wdslnk" href="[%- key.id | format(gpg_search_fmt) -%]">[%- key.id -%]</a>,<br />&nbsp;&nbsp;&nbsp;&nbsp;key fingerprint: <tt>[%- key.fingerprint -%]</tt></li>
+[%- END -%]
+[%- END -%]
 </ul>
 [% END %]
diff --git a/web/templates/download.html.tmpl b/web/templates/download.html.tmpl
index fc1f12a..efb8c75 100644
--- a/web/templates/download.html.tmpl
+++ b/web/templates/download.html.tmpl
@@ -6,8 +6,9 @@
    norder = '1000'
 %]
 <ul class="download">
-<li class="download">WinDirStat [%- currver -%] from <a class="wdslnk" href="[%- download_FH -%]">FossHub</a>, <a class="wdslnk" href="[%- download_SF -%]">SourceForge</a> or <a class="wdslnk" href="[%- dlbase_M1 -%]/[%- fname_setup -%]">Triple IT</a></li>
-<li class="download_src">Source code repositories: <a href="/project/">SourceForge</a> (primary) or <a href="/bitbucket/">Bitbucket</a> (secondary). For source code in <tt>.7</tt> and <tt>.zip</tt> format, see below.</li>
+<li class="download">Download WinDirStat [%- currver -%] from <a class="wdslnk" href="[%- download_FH -%]">FossHub</a>.</li>
+<li class="download_mirr">Alternative download locations can be found <a class="wdslnk" href="#mirrors">below</a>.</li>
+<li class="download_src">Source code repositories: <a class="wdslnk" href="/project/">SourceForge</a> (primary) or <a class="wdslnk" href="/bitbucket/">Bitbucket</a> (secondary). For source code in <tt>.7</tt> and <tt>.zip</tt> format, see below.</li>
 </ul>
 
 <p><strong>Please verify your download afterwards.</strong> The hashes of the setup file are: <tt>MD5: [%- download_MD5 -%]</tt> and  <tt>SHA1: [%- download_SHA1 -%]</tt>.
@@ -31,6 +32,19 @@ The <tt>.exe</tt> files contained in the installer have the following SHA1 hashe
 Server versions of Windows generally work as well, but aren't always tested as well by us. Feel free to get in touch with us if you want to lend a hand :)
 </p>
 
+<h3><a name="mirrors" />List of official download mirrors</h3>
+<ul>
+  <li>
+    <a href="[%- download_FH -%]">FossHub</a>
+  </li>
+  <li>
+    <a href="[%- download_SF -%]">SourceForge</a>
+  </li>
+  <li>
+    <a href="[%- dlbase_M1 -%]/[%- fname_setup -%]">Triple IT</a>
+  </li>
+</ul>
+
 <h3>Canonical links</h3>
 <p>
   If you want to link to this website or one of the resources, please use the following links.
@@ -60,14 +74,15 @@ Server versions of Windows generally work as well, but aren't always tested as w
 	A Bitbucket team which can be used for those of you willing and able to contribute and already having a Bitbucket account. Send me pull requests, open issues or help create and improve Wiki pages.<br/>
 	There is also a Wiki and an issue tracker there to report errors, feature requests or generally any issues you may encounter when using WinDirStat.
   </li>
-  <li class="bigspace">Current installer (version [%- currver -%]):<br />
+  <li class="bigspace">Latest installer (currently version [%- currver -%]):<br />
     <a href="/wds_current_setup.exe">windirstat.info/wds_current_setup.exe</a>
   </li>
-  <li class="bigspace">Current Source release:<br />
-    <a href="/wds_current_source.zip">windirstat.info/wds_current_source.zip</a>, same file alternatively from <a href="[%- dlbase_M1 -%]/[%- fname_src_zip -%]">mirror #1</a>, <br/> and <br/>
-    <a href="/wds_current_source.7z">windirstat.info/wds_current_source.7z</a> (smaller), same file alternatively from <a href="[%- dlbase_M1 -%]/[%- fname_src_7z -%]">mirror #1</a>.
+  <li class="bigspace">Lastest source code release (currently version [%- currver -%]):<br />
+    <a href="/wds_current_source.zip">windirstat.info/wds_current_source.zip</a><br/> and <br/>
+    <a href="/wds_current_source.7z">windirstat.info/wds_current_source.7z</a>.
   </li>
 </ul>
+
 <h3>Thanks</h3>
 <p>
 Our heartfelt gratitude goes to the following companies and organizations in alphabetical order for supporting WinDirStat:
diff --git a/web/templates/include/constants.tt b/web/templates/include/constants.tt
index 599a97a..b184b5c 100644
--- a/web/templates/include/constants.tt
+++ b/web/templates/include/constants.tt
@@ -9,6 +9,18 @@
         cont = 'WinDirStat, WDS, Kissenbaumkarten, Baumkarten, Windows, Festplattenstatistik, Festplattenreinigung, Festplattenbereinigung'
       }
     ]
+  gpg_keys = [
+      {
+        id = '0x6190BC32'
+		name = 'Oliver'
+		fingerprint = '58F4 12A6 E0E8 9A7C A849 F0E2 9E9B CC53 6190 BC32'
+      }
+	  {
+        id = '0x9D168DA9'
+		name = 'Bernhard'
+		fingerprint = '5BE7 AB89 A4EF 0A78 7047 CAF2 9312 A642 9D16 8DA9'
+      }
+    ]
   revisit = '5 days'
   currver = '1.1.2'
   download_FH   = 'http://www.fosshub.com/WinDirStat.html'
@@ -20,4 +32,6 @@
   fname_src_7z  = 'wds_current_source.7z'
   fname_SHA1SUM = 'SHA1SUMS'
   dlbase_M1     = 'http://download01.windirstat.info'
+  gpg_search_fmt= 'http://pgp.mit.edu:11371/pks/lookup?search=%s&amp;op=index'
+  tracker_url   = 'https://bitbucket.org/windirstat/windirstat/issues'
 %]
diff --git a/web/templates/include/styles.css b/web/templates/include/styles.css
index 851cd81..2e27548 100644
--- a/web/templates/include/styles.css
+++ b/web/templates/include/styles.css
@@ -175,6 +175,10 @@ li.download {
   padding-bottom: 1em;
 }
 
+li.download_mirr {
+  padding-left: 50px;
+}
+
 li.download_src {
   padding-left: 50px;
 }
diff --git a/web/templates/index.html.tmpl b/web/templates/index.html.tmpl
index 3eadec9..35b4626 100644
--- a/web/templates/index.html.tmpl
+++ b/web/templates/index.html.tmpl
@@ -5,7 +5,7 @@
    norder = '0000'
 %]
 <p>WinDirStat is a disk usage statistics viewer and cleanup tool 
-for various versions of <strong>Microsoft Windows</strong>.<br /><strong><em>Note:</em></strong> if you are looking for an alternative for <strong>Linux</strong>, you are looking for <a href="http://kdirstat.sourceforge.net/">KDirStat</a> (<tt>apt-get install kdirstat</tt> on Debian-derivatives) and for <strong>MacOS X</strong> it would be <a href="http://www.derlien.com/">Disk Inventory X</a> or <a href="http://grandperspectiv.sourceforge.net/">GrandPerspective</a>.</p>
+for various versions of <strong>Microsoft Windows</strong>.<br /><strong><em>Note:</em></strong> if you are looking for an alternative for <strong>Linux</strong>, you are looking for <a class="wdslnk" href="http://kdirstat.sourceforge.net/">KDirStat</a> (<tt>apt-get install kdirstat</tt> on Debian-derivatives) and for <strong>MacOS X</strong> it would be <a class="wdslnk" href="http://www.derlien.com/">Disk Inventory X</a> or <a class="wdslnk" href="http://grandperspectiv.sourceforge.net/">GrandPerspective</a>.</p>
 <p>Please visit the <a href="http://blog.windirstat.info" class="wdslnk">WinDirStat blog</a> for more up-to-date information about the program.</p>
 <p>On start up, it reads the whole directory tree once and then presents it in three useful views:</p>
 <ul>