Improve table of contents menu and style sheet.

[aple.git] / include / m4 / aple.m4
diff --git a/include/m4/aple.m4 b/include/m4/aple.m4

index c209513a5a8419115a2e544b408b91363656902c..7b23385d22705cc3931e1b5423fab92b1fefb098 100644 (file)
--- a/include/m4/aple.m4
+++ b/include/m4/aple.m4
@@ -13,22 +13,18 @@ define(«REFERENCE», [«REMOVE_NEWLINE(«$2»)»](««#»»«LOCAL_LINK_NAME(«
  define(«XREFERENCE», «[$2]»«($1)»)
  define(«EMPH», ««_»REMOVE_NEWLINE(«$1»)«_»»)
  define(«CMD», «`REMOVE_NEWLINE(«$1»)`»)
-define(«SECTION», «
-divert(«0»)
-<li> <a href='«#»LOCAL_LINK_NAME(«$1»)'>$1</a> </li>
-divert(«2»)
-<h2 id="LOCAL_LINK_NAME(«$1»)">$1</h2>
-»)
-define(«SUBSECTION», «<h3 id="LOCAL_LINK_NAME(«$1»)">$1</h3>
-»)
+define(«SECTION», « divert(«0») <a
+href='«#»LOCAL_LINK_NAME(«$1»)'>$1</a><br> divert(«2») <h2
+id="LOCAL_LINK_NAME(«$1»)">$1</h2> ») define(«SUBSECTION»,
+«<h3 id="LOCAL_LINK_NAME(«$1»)">$1</h3> »)
  
  define(«OVERVIEW», «
  
-<div id="overview_heading">
-ifelse(«$2», «», «Overview», «$2»)
-</div>
-<div id="overview_text">
-$1
+<div class="overview">
+       <center> <strong>
+               ifelse(«$2», «», «Overview», «$2»)
+       </strong> </center>
+       $1
  </div>
  »)
  define(«EXERCISES», «<h3> Exercises </h3>»)
@@ -63,7 +59,7 @@ define(«HEADER», «
  <body>
  <table class="logo"> <tr>
         <td class="logo">LOGO()</td>
-       <td id="title"> <h1>
+       <td class="logo"> <h1>
                 ifelse(«$3», «», «
                         substr(translit(«$2», «_», « »), 0, index(«$2», .m4))
                 », «
@@ -76,28 +72,26 @@ define(«HEADER», «
  »)
  
  define(«TABLE_OF_CONTENTS», «
-       <ul id="$1">
-               <li> TOC_ENTRY(«Introduction», «$2») </li>
-               <li> TOC_ENTRY(«Unix_Concepts», «$2») </li>
-               ifelse(PUBLIC(), «false», «
-                       <li> TOC_ENTRY(Command_Line_Utilities, «$2») </li>
-               »)
-               <li> TOC_ENTRY(Networking, «$2») </li>
-               <li> TOC_ENTRY(LVM, «$2») </li>
-               <li> TOC_ENTRY(«Filesystems», «$2») </li>
-               <li> TOC_ENTRY(OS-Level_Virtualization, «$2») </li>
-               ifelse(PUBLIC(), «false», «
-                       <li> TOC_ENTRY(Gridengine, «$2») </li>
-                       <li> TOC_ENTRY(Git, «$2») </li>
-                       <li> TOC_ENTRY(Bash, «$2») </li>
-                       <li> TOC_ENTRY(Debugging, «$2») </li>
-               »)
-       </ul>
+       TOC_ENTRY(«Introduction», «$2»)
+       TOC_ENTRY(«Unix_Concepts», «$2»)
+       ifelse(PUBLIC(), «false», «
+               TOC_ENTRY(Command_Line_Utilities, «$2»)
+       »)
+       TOC_ENTRY(Networking, «$2»)
+       TOC_ENTRY(LVM, «$2»)
+       TOC_ENTRY(«Filesystems», «$2»)
+       TOC_ENTRY(OS-Level_Virtualization, «$2»)
+       ifelse(PUBLIC(), «false», «
+               TOC_ENTRY(Gridengine, «$2»)
+               TOC_ENTRY(Git, «$2»)
+               TOC_ENTRY(Bash, «$2»)
+               TOC_ENTRY(Debugging, «$2»)
+       »)
  »)
  
  define(«TITLE», «
  HEADER(«$1», «$2», «$3»)
-<hr>
+
  <div class="dropdown">
  <svg
         height="35" width="30"
@@ -108,13 +102,19 @@ HEADER(«$1», «$2», «$3»)
         <rect fill="black" height="3" width="20" x="5" y="11" rx="2"/>
         <rect fill="black" height="3" width="20" x="5" y="17" rx="2"/>
  </svg>
-       <div class="dropdown-content">
-               <h3> Chapter </h3>
-               TABLE_OF_CONTENTS(«chapter_list»)
-               <h4> Section </h4>
-               <ul>
+<div class="dropdown-content">
+       <table class="menu">
+               <tr>
+                       <th> Chapter </th>
+                       <th> Section </th>
+               </tr> <tr>
+                       <td class="menu">
+                               TABLE_OF_CONTENTS(«chapter_list»)
+                       </td> <td class="menu">
  divert(«1»)
-</ul>
+                       </td>
+               </tr>
+       </table>
  </div>
  </div>
  divert(«2»)