]> granicus.if.org Git - apache/commitdiff
since nobody objected, apply proposed style changes:
authorAndré Malo <nd@apache.org>
Sun, 22 Dec 2002 22:45:38 +0000 (22:45 +0000)
committerAndré Malo <nd@apache.org>
Sun, 22 Dec 2002 22:45:38 +0000 (22:45 +0000)
- reintroduced the sidebar for the module index page (obvious ;-)
  * didn't want to leave the section links so alone, thus added some
    <seealso>s.
- changed the ordering of the core/MPMs as follows:
  * core
  * mpm_common
  * alphabetical list of the mpms (ordered by their "natural" names).
- same appeared on the sitemap
- changed <h1> headings of the modulesynopsis files, so that they match the
  titles in the sitemap. This should better reflect the nature of the
  modules. (affects only core & MPMs)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98076 13f79535-47bb-0310-9956-ffa450edef68

docs/manual/mod/index.xml
docs/manual/style/css/manual.css
docs/manual/style/xsl/common.xsl
docs/manual/style/xsl/moduleindex.xsl
docs/manual/style/xsl/sitemap.xsl
docs/manual/style/xsl/synopsis.xsl

index 181fd2aaea78f939a214dc03a13dee505dd9be6b..346221115080aee35e6291a5809ea0818174a62b 100644 (file)
       directives</a>.
     </p>
   </summary>
+  <seealso><a href="../mpm.html">Multi-Processing Modules (MPMs)</a>
+  </seealso>
+  <seealso><a href="quickreference.html">Directive Quick Reference</a>
+  </seealso>
 
   &sitemap;
 </moduleindex>
\ No newline at end of file
index 17c728742d4d5b22ca792ed6ee8264b47eebcf1b..3811c06b398c6b0f50609e662da17c7806f49499 100644 (file)
@@ -473,6 +473,10 @@ ol.up-A {
     list-style-type: upper-alpha;
 }
 
+dd.separate {
+    margin-bottom: 2em;
+}
+
 li.separate {
     margin-bottom: 1em;
 }
@@ -537,7 +541,7 @@ div#quickview ul#toc {
     padding: 0;
 }
 
-/* #module-index div#quickview ul#toc, */
+#module-index div#quickview ul#toc,
 #manual-page div#quickview ul#toc {
     margin-left: 0;
 }
@@ -552,14 +556,14 @@ div#quickview li img {
     display: none;
 }
 
-/* #module-index div#quickview ul#toc, */
+#module-index div#quickview ul#toc,
 #manual-page div#quickview ul#toc,
 div#quickview #topics,
 div#quickview .seealso {
     padding-left: 15px;
 }
 
-/* #module-index div#quickview ul#toc li, */
+#module-index div#quickview ul#toc li,
 #manual-page div#quickview ul#toc li,
 div#quickview #topics li,
 div#quickview .seealso li {
index 5e73a7a1d850f7f2f698fcf120af5521373b570d..f78595304cdf34c406a92e0e5d094d86236279d7 100644 (file)
     </xsl:if>
   </xsl:template>
 
+
+  <xsl:template name="module-translatename">
+  <xsl:param name="name"/>
+  
+    <xsl:variable name="sname" select="translate($name,$lowercase,$uppercase)"/>
+
+    <xsl:choose>
+      <xsl:when test="starts-with($sname,'MOD_') or starts-with($sname,'MPM_')">
+        <xsl:value-of select="substring($name, 5)"/>
+      </xsl:when>
+      <xsl:when test="starts-with($sname,'MPMT_')">
+        <xsl:value-of select="substring($name, 6)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$name"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  <!-- /module-translatename -->
+
 </xsl:stylesheet>
index 14556d37d60a96b1ffe4816669fb5896d7e87698..941969c04196e60395586581bc8724e948767a68 100644 (file)
@@ -17,6 +17,7 @@
       <body id="module-index">
         <xsl:call-template name="top"/>  
 
+        <div id="page-content">
         <div id="preamble">
           <h1>
             <xsl:value-of select="title"/>
 
           <xsl:apply-templates select="summary" />
         </div>
+        <!-- /preamble -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+        <div id="quickview">
+          <ul id="toc">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+            <li>
+              <img src="{$path}/images/down.gif" alt="" />
+              <xsl:text> </xsl:text>
+              <a href="#core">
+                <xsl:value-of select="$messages/message[@name='corefeatures']"/>
+              </a>
+            </li>
+
+            <li>
+              <img src="{$path}/images/down.gif" alt="" />
+              <xsl:text> </xsl:text>
+              <a href="#other">
+                <xsl:value-of select="$messages/message[@name='othermodules']"/>
+              </a>
+            </li>
+          </ul>
+
+          <xsl:if test="seealso">
+            <h3>
+              <xsl:value-of select="$messages/message[@name='seealso']"/>
+            </h3>
+            
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+            <ul class="seealso">
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+              <xsl:for-each select="seealso">
+                <li>
+                  <xsl:apply-templates/>
+                </li>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+              </xsl:for-each>
+            </ul>
+          </xsl:if>
+        </div> <!-- /quickview -->
 
 <xsl:text>
 </xsl:text> <!-- insert line break -->
 <xsl:text>
 </xsl:text> <!-- insert line break -->
 
+          <!--                                -->
+          <!-- put core and mpm_common on top -->
+          <!--                                -->
           <dl>
 
 <xsl:text>
 </xsl:text> <!-- insert line break -->
 
-            <xsl:for-each select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis[status='MPM' or status='Core']">
-            <xsl:sort select="name"/>
+            <dt>
+              <a href="{document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/name}.html">
+                <xsl:value-of select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/name"/>
+              </a>
+            </dt>
+            <dd>
+              <xsl:apply-templates select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'core.xml')])/modulesynopsis/description"/>
+            </dd>
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+            <dt>
+              <a href="{document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/name}.html">
+                <xsl:value-of select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/name"/>
+              </a>
+            </dt>
+            <dd class="separate">
+              <xsl:apply-templates select="document(sitemap/category[@id='modules']/modulefilelist/modulefile[starts-with(.,'mpm_common.xml')])/modulesynopsis/description"/>
+            </dd>
+          <!-- /core, mpm_common -->
+
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
+            <xsl:variable name="modules" select="document(sitemap/category[@id='modules']/modulefilelist/modulefile)/modulesynopsis[status='MPM' and name != 'mpm_common']"/>
+            <xsl:variable name="translist">
+              <xsl:call-template name="module-translist">
+                <xsl:with-param name="modules" select="$modules"/>
+              </xsl:call-template>
+            </xsl:variable>
+
+            <xsl:for-each select="$modules">
+            <xsl:sort select="substring-before(substring-after($translist, concat('- ', translate(normalize-space(name),$lowercase,$uppercase), ' ')), ' -')"/>
 
               <dt>
                 <a href="{name}.html">
 </xsl:text> <!-- insert line break -->
 
             </xsl:for-each>
+            <!-- /mpm -->
           </dl>
         </div>
         <!-- /core section -->
           </dl>
         </div>
         <!-- /modules section -->
+        
+        </div>
+        <!-- /page-content -->
 
 <xsl:text>
 </xsl:text> <!-- insert line break -->
 
     <xsl:variable name="letter" select="substring($letters-todo,1,1)"/>
     <xsl:variable name="translist">
-      <xsl:call-template name="module-trans">
+      <xsl:call-template name="module-translist">
         <xsl:with-param name="modules" select="$modules"/>
       </xsl:call-template>
     </xsl:variable>
   <xsl:param name="modules"/>
 
     <xsl:variable name="translist">
-      <xsl:call-template name="module-trans">
+      <xsl:call-template name="module-translist">
         <xsl:with-param name="modules" select="$modules"/>
       </xsl:call-template>
     </xsl:variable>
 
   </xsl:template>
   <!-- /module-startletters -->
-  
+
 
   <!--                                                     -->
   <!-- define module name translations for sorting         -->
            ' -')
                                                            -->
   <!--                                                     -->
-  <xsl:template name="module-trans">
+  <xsl:template name="module-translist">
   <xsl:param name="modules"/>
 
     <xsl:text>-</xsl:text>
       <xsl:text> </xsl:text>
       <xsl:value-of select="$sname"/>
       <xsl:text> </xsl:text>
-
-      <xsl:choose>
-        <xsl:when test="starts-with($sname,'MOD_') or starts-with($sname,'MPM_')">
-          <xsl:value-of select="substring($sname, 5)"/>
-        </xsl:when>
-        <xsl:when test="starts-with($sname,'MPMT_')">
-          <xsl:value-of select="substring($sname, 6)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$sname"/>
-        </xsl:otherwise>
-      </xsl:choose>
-
+      <xsl:call-template name="module-translatename">
+        <xsl:with-param name="name" select="$sname"/>
+      </xsl:call-template>
       <xsl:text> -</xsl:text>
     </xsl:for-each>
 
   </xsl:template>
-  <!-- /module-trans -->
+  <!-- /module-translist -->
 
   </xsl:stylesheet>
index fb3e2f2d53d2783079f2bd32eef863cb1b2b6644..1436b829b6931497d6f4b7f67a3983d89518d8a1 100644 (file)
 
     <xsl:call-template name="toplink"/>
 
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
     <div class="section">
 
       <!-- Section heading -->
         </xsl:if>
       </h2>
 
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
       <!-- category body -->
       <ul>
         <xsl:apply-templates select="page"/>
       
       <xsl:apply-templates select="modulefilelist"/>
 
+<xsl:text>
+</xsl:text> <!-- insert line break -->
+
     </div> <!-- /.section -->
   </xsl:template>
   <!-- /category -->
   <!-- insert module list into sitemap                    -->
   <!--                                                    -->
   <xsl:template match="category/modulefilelist">
-    <ul>
+
+    <!-- create our own translation list first -->
+    <xsl:variable name="translist">
+      <xsl:text>-</xsl:text>
+
       <xsl:for-each select="modulefile">
-        <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
         <xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
+   
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="$current/name"/>
+        <xsl:text> </xsl:text>
+        <xsl:call-template name="module-translatename">
+          <xsl:with-param name="name" select="$current/name"/>
+        </xsl:call-template>
+        <xsl:text> -</xsl:text>
+      </xsl:for-each>
+    </xsl:variable>
 
-        <xsl:if test="$current/status='MPM' or $current/status='Core'">
-          <xsl:variable name="name"><xsl:choose>
-            <xsl:when test="starts-with($current/name,'mpm_')">
-              <xsl:value-of select="substring($current/name,5)"/>
-            </xsl:when>
+    <ul>
+      <!-- put core and mpm_common on top -->
+      <li>
+        <a href="mod/core.html">
+          <xsl:value-of select="$messages/message[@name='apachecore']"/>
+        </a>
+      </li>
 
-            <xsl:otherwise>
-              <xsl:value-of select="$current/name"/>
-            </xsl:otherwise>
-          </xsl:choose></xsl:variable>
+<xsl:text>
+</xsl:text> <!-- insert line break -->
 
-          <li>
-            <a href="mod/{$current/name}.html"><xsl:choose>
-              <xsl:when test="$name='core'">
-                <xsl:value-of select="$messages/message[@name='apachecore']"/>
-              </xsl:when>
-
-              <xsl:when test="$name='common'">
-                <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
-              </xsl:when>
-                
-              <xsl:otherwise>
-                <xsl:value-of select="$messages/message[@name='apachempm']"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="$name"/>
-              </xsl:otherwise></xsl:choose>
-            </a>
-          </li>
+      <li>
+        <a href="mod/mpm_common.html">
+          <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
+        </a>
+      </li>
 
 <xsl:text>
 </xsl:text> <!-- insert line break -->
 
-        </xsl:if>
-      </xsl:for-each>
-      <!-- /core,mpm -->
-
       <xsl:for-each select="modulefile">
-        <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
+      <xsl:sort select="substring-before(substring-after($translist, concat('- ', document(concat($basedir,'mod/',.))/modulesynopsis/name, ' ')), ' -')"/>
+
         <xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
 
-        <xsl:if test="$current/status!='MPM' and $current/status!='Core' and $current/status!='Obsolete'">
+        <xsl:if test="$current/status='MPM' and $current/name!='mpm_common'">
+          <xsl:variable name="name" select="substring-before(substring-after($translist, concat('- ', $current/name, ' ')), ' -')"/>
+
           <li>
             <a href="mod/{$current/name}.html">
-              <xsl:value-of select="$messages/message[@name='apachemodule']"/>
+              <xsl:value-of select="$messages/message[@name='apachempm']"/>
               <xsl:text> </xsl:text>
-              <xsl:value-of select="$current/name"/>
+              <xsl:value-of select="$name"/>
             </a>
           </li>
 
 
         </xsl:if>
       </xsl:for-each>
-      <!-- /other modules -->
     </ul>
+    <!-- /core, mpm -->
 
-    <!-- obsolete modules -->
-<!--
     <ul>
       <xsl:for-each select="modulefile">
-        <xsl:sort select="document(concat($basedir,'mod/',.))/modulesynopsis/name"/>
+      <xsl:sort select="substring-before(substring-after($translist, concat('- ', document(concat($basedir,'mod/',.))/modulesynopsis/name, ' ')), ' -')"/>
+
         <xsl:variable name="current" select="document(concat($basedir,'mod/',.))/modulesynopsis" />
 
-        <xsl:if test="$current/status='Obsolete'">
+        <xsl:if test="$current/status!='MPM' and $current/status!='Core' and $current/status!='Obsolete'">
           <li>
-            <a href="mod/obs_{$current/name}.html">
-              <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
+            <a href="mod/{$current/name}.html">
+              <xsl:value-of select="$messages/message[@name='apachemodule']"/>
               <xsl:text> </xsl:text>
               <xsl:value-of select="$current/name"/>
             </a>
           </li>
+
 <xsl:text>
-</xsl:text>
+</xsl:text> <!-- insert line break -->
 
         </xsl:if>
       </xsl:for-each>
-     </ul>
--->
-     <!-- /obsolete modules -->
+    </ul>
+    <!-- /other modules -->
 
   </xsl:template>
   <!-- /category/modulefilelist -->
index b354fc0375bb72fa6882c7e6b378527f5dc12b85..e5f34ab38ad5e7bbdd0200dd32c7c4cec14f61ae 100644 (file)
 
           <div id="preamble">
             <h1>
-              <xsl:if test="status='Obsolete'">
-                <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
-              </xsl:if>
-              <xsl:if test="status!='Obsolete'">
-                <xsl:value-of select="$messages/message[@name='apachemodule']"/>
-              </xsl:if>
-              <xsl:text> </xsl:text> 
-              <xsl:value-of select="name"/>
+              <xsl:choose>
+                <xsl:when test="status='Core'">
+                  <xsl:value-of select="$messages/message[@name='apachecore']"/>
+                </xsl:when>
+                
+                <xsl:when test="name='mpm_common'">
+                  <xsl:value-of select="$messages/message[@name='apachempmcommon']"/>
+                </xsl:when>
+
+                <xsl:when test="status='MPM'">
+                  <xsl:value-of select="$messages/message[@name='apachempm']"/>
+                  <xsl:text> </xsl:text>
+                  <xsl:call-template name="module-translatename">
+                    <xsl:with-param name="name" select="name" />
+                  </xsl:call-template>
+                </xsl:when>
+
+                <xsl:otherwise>
+                  <xsl:if test="status='Obsolete'">
+                    <xsl:value-of select="$messages/message[@name='obsoleteapachemodule']"/>
+                  </xsl:if>
+                  <xsl:if test="status!='Obsolete'">
+                    <xsl:value-of select="$messages/message[@name='apachemodule']"/>
+                  </xsl:if>
+                  <xsl:text> </xsl:text>
+                  <xsl:value-of select="name"/>
+                </xsl:otherwise>
+              </xsl:choose>
             </h1>
 
 <xsl:text>