Minor adjustments after redirecting to windirstat.net from windirstat.info and after making everything available via https

6 files changed, 18 insertions, 70 deletions

diff --git a/web/GNUmakefile b/web/GNUmakefile
index f035133..4b04127 100644
--- a/web/GNUmakefile
+++ b/web/GNUmakefile
@@ -5,7 +5,6 @@ TPAGEFLAG:=--pre_chomp --post_chomp --trim --include_path=templates/include
 AUTOMENU:=templates/include/automenu.inc
 STYLESHEET:=templates/include/styles.css
 
-.PHONY: all
 all: $(HTMLPAGES)
 
 $(AUTOMENU): $(TEMPLATES)
@@ -15,6 +14,9 @@ $(AUTOMENU): $(TEMPLATES)
 	-@echo "$< --> $@"
 	tpage $(TPAGEFLAG) $< > $@
 
-.PHONY: clean
 clean:
 	rm -f $(HTMLPAGES) $(AUTOMENU)
+rebuild: clean all
+
+.PHONY: all clean rebuild
+.NOTPARALLEL: clean rebuild
diff --git a/web/templates/future.html.tmpl_ b/web/templates/future.html.tmpl_
deleted file mode 100644
index ed3f6ad..0000000
--- a/web/templates/future.html.tmpl_
+++ /dev/null
@@ -1,27 +0,0 @@
-[% WRAPPER 'html-body.tt'
-   title = 'Future plans'
-   description = 'Plans for future development'
-   uuid = '64593a62-f4f2-4657-94b0-4d8faf0cdae1'
-   norder = '5000'
-%]
-<ul>
-    <li>The ability to select (and cleanup) more than one file at the same time will be
-      a natural enhancement.
-      </li>
-    <li>We'll study SequoiaView's filtering capabilities again and possibly implement
-      filters. However, we want to keep WinDirStat's user interface as simple and
-      natural as possible.
-      </li>
-    <li>Support for an optional windirstat.ini file will be added, so that all settings
-      can easily be ported to other machines and there is no registry footprint at
-      all.
-      </li>
-    <li>Saving the current scan to a file.
-      </li>
-
-    <li>Plugin-system to extend the features of WinDirStat via a simple plugin-API.
-      </li>
-    <li>Check for updates as a menu item on the help menu.
-      </li>
-</ul>
-[% END %]
diff --git a/web/templates/include/automenu.inc b/web/templates/include/automenu.inc
index 9048e0c..4ac1526 100644
--- a/web/templates/include/automenu.inc
+++ b/web/templates/include/automenu.inc
@@ -41,6 +41,14 @@ pages = [
  }
 
  {
+   fname = 'permalink.html'
+   title = 'Permanent Links'
+   description = 'Permalinks to downloads and other content'
+   uuid = '24719a1c-e784-454d-9a05-4bbf82e53cb5'
+   norder = '3000'
+ }
+
+ {
    fname = 'translations.html'
    title = 'Translation Project'
    description = 'Translations of WinDirStat'
diff --git a/web/templates/index.html.tmpl b/web/templates/index.html.tmpl
index 35b4626..de53929 100644
--- a/web/templates/index.html.tmpl
+++ b/web/templates/index.html.tmpl
@@ -5,8 +5,8 @@
    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 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>
+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> or <tt>apt-get install k4dirstat</tt> on Debian-derivatives) or <a class="wdslnk" href="https://github.com/shundhammer/qdirstat" >QDirStat</a> 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="https://blog.windirstat.net" 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>
 <li>The directory list, which resembles the tree view of the Windows Explorer but is sorted by file/subtree size,</li>
diff --git a/web/templates/permalink.html.tmpl_ b/web/templates/permalink.html.tmpl
index ea1893f..885e904 100644
--- a/web/templates/permalink.html.tmpl_
+++ b/web/templates/permalink.html.tmpl
@@ -12,14 +12,14 @@
 
   <ul>
     <li class="bigspace">Website:<br />
-      <a href="/">http://windirstat.info</a>
+      <a href="/">windirstat.net</a>
       </li>
     <li class="bigspace">Current installer:<br />
-      <a href="/wds_current_setup.exe">http://windirstat.info/wds_current_setup.exe</a>
+      <a href="/wds_current_setup.exe">windirstat.net/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">windirstat.net/wds_current_source.zip</a> <br/> or <br/>
+<a href="/wds_current_source.7z">windirstat.net/wds_current_source.7z</a>
       </li>
   </ul>
 [% END %]
diff --git a/web/templates/relnotes.html.tmpl_ b/web/templates/relnotes.html.tmpl_
deleted file mode 100644
index 32b71ec..0000000
--- a/web/templates/relnotes.html.tmpl_
+++ /dev/null
@@ -1,35 +0,0 @@
-[% WRAPPER 'html-body.tt'
-   title = 'Release Notes'
-   description = 'Release notes'
-   uuid = 'd9561859-314c-49ec-bdc2-b8759c613e02'
-   norder = '2000'
-%]
-  <p>
-  <b>2007-09-02</b> Re-release which now includes Finnish and Estonian language
-  DLLs. I aim for a release which will actually feature new functionality
-  around the end of 2007, beginning of 2008. Sorry for the long delay to the
-  translators. This should speed up now that I have one formerly pressing issue
-  off my mind.
-  </p>
-  <p>
-  <b>2006-10-10</b> Another re-release which includes Dutch translation for WDS.
-  Sorry to Gerben since I missed Dutch in the update from September - it should
-  have been included there.
-  </p>
-
-  <p>
-  <b>2006-09-06</b> A re-release of the installer and the ZIP archives was done.
-  The content did not change in either case, but the installer now supports German
-  in addition to English as the user interface language. The ZIP archives should
-  be more compatible.
-  <br /><b>Note:</b> the installer may not work on the very first edition of Windows 95.
-  All Windows 95 users please provide us with feedback on that issue.
-  </p>
-  <p>
-  <b>2006-08-23</b> The <a href="http://blog.windirstat.info">WinDirStat weblog</a> has been opened.
-  </p>
-
-  <p>
-  <b>2005-07-16</b> The version 1.1.2 has been released.
-  </p>
-[% END %]