Restore the topic-adaptive sub-menus of the sidebar. There is still work left to be done: there is too much spacing (empty lines) between the menu items.

3 files changed, 32 insertions, 55 deletions

diff --git a/TWiki/WebMenu.mdwn b/TWiki/WebMenu.mdwn
deleted file mode 100644
index 783bd757..00000000
--- a/TWiki/WebMenu.mdwn
+++ /dev/null
@@ -1,35 +0,0 @@
-See the [[TWiki/WebMenuFormat]] for formatting tips. If you don't understand anything of this, or you screw things up entirely, don't worry. Simply email [[Main/JoachimNilsson]] and ask him to fix the menu. :)
-
-* Set ALLOWTOPICCHANGE = [[Main/TWikiAdminGroup]]
-
-# %WEB\{name="..." home="|." [expand="always|never"]\}% - entry for Web
-
-# %ITEM\{name="..." topic="..."\}% - topic in Web
-
-# %DEFAULTITEMS% - default topics
-
-# %DEFAULTITEMS% replaced by this
-
-* SET DEFAULTITEMS = %ITEM\{name=" "\}%,%ITEM\{name="Index" topic="WebIndex"\}%,%ITEM\{name="Search" topic="WebSearch"\}%,%ITEM\{name="Statistics" topic="WebStatistics" \}%,%ITEM\{name="ChangeLog" topic="WebChanges"\}%
-
-%WEB\{name="Hurd" home="Hurd"\}% %ITEM\{name="About" topic="TheGnuHurd"\}% %ITEM\{name="Status" topic="GNUHurdStatus"\}% %ITEM\{name="Limitations" topic="KnownHurdLimits"\}% %ITEM\{name="Seen Hurd" topic="SeenHurd"\}% %ITEM\{name="Translators" topic="TranslatorPages"\}% %ITEM\{name="FAQ" topic="FrequentlyAskedQuestions"\}% %ITEM\{name="ToDo" topic="ToDo"\}%
-
-%ITEM\{name="HurdNG" topic="NextHurd"\}% %DEFAULTITEMS%
-
-%WEB\{name="Distrib" home="Distrib"\}% %ITEM\{name="Installation" topic="InstallNotes"\}% %ITEM\{name="Getting Help" topic="NewQuestions"\}% %DEFAULTITEMS%
-
-%WEB\{name="Mach" home="Mach"\}% %ITEM\{name="History" topic="MachHistory"\}% %ITEM\{name="GNU Mach" topic="GNUMach"\}% %ITEM\{name="Oskit Mach" topic="OskitMach"\}% %DEFAULTITEMS%
-
-%WEB\{name="GNU" home="GNU"\}% %LINK\{name="GNU Homepage" url="http://www.gnu.org"\}% %LINK\{name="Savannah" url="http://savannah.gnu.org"\}% %ITEM\{name="ToDo" topic="ToDo"\}% %DEFAULTITEMS%
-
-%WEB\{name="Mig" home="Mig"\}% %ITEM\{name="About" topic="MachInterfaceGenerator"\}% %ITEM\{name="Documentation" topic="MigDocumentation"\}% %DEFAULTITEMS%
-
-%WEB\{name="Hurd User Groups" home="Hug"\}% %DEFAULTITEMS%
-
-%WEB\{name="Main" home="Main"\}% %ITEM\{name="Users" topic="TWikiUsers"\}% %ITEM\{name="Groups" topic="TWikiGroups"\}% %ITEM\{name="Hurd Pages" topic="PersonalHurdPages"\}% %DEFAULTITEMS%
-
-%WEB\{name="TWiki" home="TWiki"\}% %ITEM\{name="Welcome" topic="WelcomeGuest"\}% %ITEM\{name="Register" topic="TWikiRegistration"\}% %DEFAULTITEMS%
-
-%WEB\{name="Sandbox" home="Test"\}% %DEFAULTITEMS%
-
-Add "ToDo" to GNU menu. -- [[Main/AaronHawley]] - 29 Jun 2006
diff --git a/TWiki/WebMenuFormat.mdwn b/TWiki/WebMenuFormat.mdwn
deleted file mode 100644
index 77005da4..00000000
--- a/TWiki/WebMenuFormat.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-# <a name="WebMenu_format"> </a> [[WebMenu]] format
-
-<table border="1" cellpadding="1" cellspacing="0">
-  <tr>
-    <td> %<nop>WEB{name="..." home="..." [expand="always or never"]}% </nop></td>
-    <td> entry for Web </td>
-  </tr>
-  <tr>
-    <td> %<nop>ITEM{name="..." [topic="..."]}% </nop></td>
-    <td> topic in Web, any number of these after %<nop>WEB% </nop></td>
-  </tr>
-  <tr>
-    <td> %<nop>DEFAULTITEMS% </nop></td>
-    <td> default topics sefined by using SET DEFAULTITEMS </td>
-  </tr>
-</table>
-
-* One of the above items per line, see example that comes with [[TigerSkinPlugin]], or the Knowledge webs [[Know/WebMenu]].
-
-* The DEFAULTITEMS is a comma separated set of items. _No_ spaces between comma and items!
diff --git a/sidebar.mdwn b/sidebar.mdwn
index cf07d7c2..7c09f378 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -5,13 +5,45 @@
 ---
 
 * **[[Distrib]]**
+[[if test="destpage(Distrib*)"
+     then="
+  * *[[Installation|Distrib/InstallNotes]]*
+  * *[[Getting_Help|Distrib/NewQuestions]]*
+"]]
 * **[[GNU]]**
+[[if test="destpage(GNU*)"
+     then="
+  * *[GNU Homepage](http://www.gnu.org/)*
+  * *[Savannah](http://savannah.gnu.org/)*
+  * *[[GNU/ToDo]]*
+"]]
 
 ---
 
 * **[[Hurd]]**
+[[if test="destpage(Hurd*)"
+     then="
+  * *[[About|Hurd/TheGnuHurd]]*
+  * *[[Status|Hurd/GNUHurdStatus]]*
+  * *[[Limitations|Hurd/KnownHurdLimits]]*
+  * *[[Seen_Hurd|Hurd/SeenHurd]]*
+  * *[[Translators|Hurd/TranslatorPages]]*
+  * *[[FAQ|Hurd/FrequentlyAskedQuestions]]*
+  * *[[Hurd/ToDo]]*
+"]]
 * **[[Mach]]**
+[[if test="destpage(Mach*)"
+     then="
+  * *[[History|Mach/MachHistory]]*
+  * *[[GNU_Mach|Mach/GNUMach]]*
+  * *[[OSKit_Mach|Mach/OskitMach]]*
+"]]
 * **[[Mig]]**
+[[if test="destpage(Mig*)"
+     then="
+  * *[[About|Mig/Mach_Interface_Generator]]*
+  * *[[Documentation|Mig/MigDocumentation]]*
+"]]
 
 ---