Updated download section, committing old change to index page as well

4 files changed, 36 insertions, 8 deletions

diff --git a/web/templates/download.html.tmpl b/web/templates/download.html.tmpl
index f45ca24..607c79e 100644
--- a/web/templates/download.html.tmpl
+++ b/web/templates/download.html.tmpl
@@ -5,14 +5,21 @@
    uuid = '8dccb375-74a0-4fde-a733-0019572b0646'
    norder = '1000'
 %]
+<ul class="download">
+<li class="download">WinDirStat [%- currver -%] from <a class="wdslnk" href="[%- download_DBS -%]">DownloadBestSoft</a></li>
+<li class="download">WinDirStat [%- currver -%] from <a class="wdslnk" href="[%- download_SF -%]">SourceForge.net</a></li>
+</ul>
+
+<h3>License</h3>
 <p>WinDirStat is free software published under the GNU General Public License.</p>
+<p>In general that means you are free to do whatever you like with the binary form (mirror it, put it on media accompanying printed magazines and also use it inside your company) free of charge. You also need not notify us in any way, although we appreciate feedback.</p>
+
+<h3>Compatibility</h3>
 <p>It is known to run on Windows 95 (IE5), Windows 98 SE, Windows ME, Windows NT4
 (SP5), Windows 2000, Windows XP, Windows Server 2003, Windows Vista, and Windows 7.
 </p>
-<p>Please download the installer (version [%- currver -%]) from the
-<a href="http://sourceforge.net/projects/windirstat/">sourceforge project summary page</a>
-or follow one of the links below.
-</p>
+
+<h3>Canonical links</h3>
 <p>
   If you want to link to this website or one of the resources, please use the following links.
   They point to the mirrors of SourceForge and are guaranteed to link to the current release always,
@@ -26,12 +33,15 @@ or follow one of the links below.
   <li class="bigspace">Blog:<br />
     <a href="http://blog.windirstat.info">http://blog.windirstat.info</a>
   </li>
+  <li class="bigspace">SourceForge.net project summary page:<br />
+    <a href="/project/">www.windirstat.info/project/</a>
+  </li>
   <li class="bigspace">Current installer (version [%- currver -%]):<br />
-    <a href="/wds_current_setup.exe">http://windirstat.info/wds_current_setup.exe</a>
+    <a href="/wds_current_setup.exe">www.windirstat.info/wds_current_setup.exe</a>
   </li>
   <li class="bigspace">Current Source release:<br />
-    <a href="/wds_current_source.zip">http://windirstat.info/wds_current_source.zip</a> <br/> or <br/>
-    <a href="/wds_current_source.7z">http://windirstat.info/wds_current_source.7z</a>
+    <a href="/wds_current_source.zip">www.windirstat.info/wds_current_source.zip</a> <br/> or <br/>
+    <a href="/wds_current_source.7z">www.windirstat.info/wds_current_source.7z</a>
   </li>
 </ul>
 [% END %]
diff --git a/web/templates/include/constants.tt b/web/templates/include/constants.tt
index 35db569..604be9b 100644
--- a/web/templates/include/constants.tt
+++ b/web/templates/include/constants.tt
@@ -11,4 +11,6 @@
     ]
   revisit = '5 days'
   currver = '1.1.2'
+  download_DBS = 'http://www.downloadbestsoft.com/WinDirStat.html'
+  download_SF  = 'http://prdownloads.sourceforge.net/windirstat/windirstat1_1_2_setup.exe'
 %]
diff --git a/web/templates/include/styles.css b/web/templates/include/styles.css
index 26b940f..73589dd 100644
--- a/web/templates/include/styles.css
+++ b/web/templates/include/styles.css
@@ -42,16 +42,19 @@ body {
 
 a.wdslnk:link {
 	color:#007000;
+	font-weight:bold;
 	text-decoration:none;
 }
 
 a.wdslnk:visited {
 	color:#004000;
+	font-weight:bold;
 	text-decoration:none;
 }
 
 a.wdslnk:hover, a.wdslnk:active {
 	color:#007000;
+	font-weight:bold;
 	text-decoration:underline;
 }
 
@@ -155,3 +158,16 @@ td.bordleft {
   border : 1px solid #cccccc;
   width : 100%;
 }
+
+ul.download {
+  border : 1px dashed #cccccc;
+  padding : 1em;
+  margin : 1em;
+  font-size : 150%;
+  list-style : disc inside url('/images/download.png');
+  background-color : #C0E0B0
+}
+
+li.download {
+  padding-bottom : 1ex;
+}
diff --git a/web/templates/index.html.tmpl b/web/templates/index.html.tmpl
index 802b6c1..3eadec9 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 Microsoft Windows.</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 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>
 <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>