You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by hl...@apache.org on 2004/09/26 17:08:19 UTC

cvs commit: jakarta-hivemind/src/images private-icon.psp

hlship      2004/09/26 08:08:19

  Modified:    hivebuild/hivedoc-xsl hivemind.css hivemind.xsl
               .        status.xml
  Added:       hivebuild/hivedoc-xsl spacer.gif private-icon.png
               src/images private-icon.psp
  Log:
  Modify HiveDoc XSL to display public/private visibility of services, configurations.
  Improve the L&F of the HiveDoc (at least, under FireFox).
  
  Revision  Changes    Path
  1.2       +39 -8     jakarta-hivemind/hivebuild/hivedoc-xsl/hivemind.css
  
  Index: hivemind.css
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/hivedoc-xsl/hivemind.css,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hivemind.css	18 Jul 2004 22:40:22 -0000	1.1
  +++ hivemind.css	26 Sep 2004 15:08:19 -0000	1.2
  @@ -32,25 +32,42 @@
   A:Hover  {}
   
   BODY  {
  -	font-family : Trebuchet MS, San Serif;
  +  font-family : Trebuchet MS, San Serif;
  +  background-color: #EBEBEB;
   }
   
  +TABLE.summary TR
  +{
  +  background-color: grey;
  +  color: white;
  +}
  +
  +TABLE.summary A
  +{
  +  color: white;
  +}
  +
  +TABLE.summary TR.nested
  +{
  +  background-color: transparent;
  +  color: black;
  +}
   
   TABLE.summary TH  {
  -	text-align : right;
  -	border-style : dashed;
  -	border-width : thin;
  +  background-color: black;
  +  color: white;
  +  text-align: right;
   }
   
   TABLE.summary TD  {
  -	border-style : dashed;
  -	border-width : thin;
   	vertical-align: top;
  +	text-align: left;
   }
   
   TABLE.summary TD.description  {
   	font-style: italic;
  -	padding-left: 20px;
  +	color: black;
  +	background-color: transparent;
   }
   
   TABLE.summary TD
  @@ -68,6 +85,13 @@
   	text-align: left;
   }
   
  +
  +TABLE.summary TD.indent
  +{
  +  width: 30px;
  +  background-color: transparent;  
  +}
  +
   LI
   {
     list-style-type: none;
  @@ -94,4 +118,11 @@
   SPAN.literal
   {
     font-family: monospace;
  +}
  +
  +DIV.nested
  +{
  +  margin: 5px;
  +  padding: 5px;
  +  border-style: dotted;
   }
  
  
  
  1.4       +60 -16    jakarta-hivemind/hivebuild/hivedoc-xsl/hivemind.xsl
  
  Index: hivemind.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/hivedoc-xsl/hivemind.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- hivemind.xsl	20 Aug 2004 14:22:27 -0000	1.3
  +++ hivemind.xsl	26 Sep 2004 15:08:19 -0000	1.4
  @@ -61,6 +61,9 @@
               <td>
                 <xsl:for-each select="/registry/module/configuration-point">
                   <xsl:sort select="@id"/>
  +                <xsl:call-template name="visibility-icon">
  +                  <xsl:with-param name="root">.</xsl:with-param>
  +                </xsl:call-template>               
                   <a href="config/{@id}.html">
                     <xsl:value-of select="@id"/>
                   </a>
  @@ -70,6 +73,9 @@
               <td>
                 <xsl:for-each select="/registry/module/service-point">
                   <xsl:sort select="@id"/>
  +                <xsl:call-template name="visibility-icon">
  +                  <xsl:with-param name="root">.</xsl:with-param>
  +                </xsl:call-template> 
                   <a href="service/{@id}.html">
                     <xsl:value-of select="@id"/>
                   </a>
  @@ -79,6 +85,9 @@
               <td>
                 <xsl:for-each select="/registry/module/schema">
                   <xsl:sort select="@id"/>
  +                <xsl:call-template name="visibility-icon">
  +                  <xsl:with-param name="root">.</xsl:with-param>
  +                </xsl:call-template> 
                   <a href="schema/{@id}.html">
                     <xsl:value-of select="@id"/>
                   </a>
  @@ -145,6 +154,7 @@
                   <td>
                     <xsl:for-each select="configuration-point">
                       <xsl:sort select="@id"/>
  +                    <xsl:call-template name="visibility-icon"/>
                       <xsl:apply-templates select="." mode="link"/>
                       <br/>
                     </xsl:for-each>
  @@ -154,6 +164,7 @@
                   <td>
                     <xsl:for-each select="service-point">
                       <xsl:sort select="@id"/>
  +                    <xsl:call-template name="visibility-icon"/>
                       <xsl:apply-templates select="." mode="link"/>
                       <br/>
                     </xsl:for-each>
  @@ -163,6 +174,7 @@
                   <td>
                     <xsl:for-each select="schema">
                       <xsl:sort select="@id"/>
  +                    <xsl:call-template name="visibility-icon"/>
                       <xsl:apply-templates select="." mode="link"/>
                       <br/>
                     </xsl:for-each>
  @@ -233,6 +245,7 @@
                     </td>
                   </tr>
                 </xsl:if>
  +              <xsl:call-template name="visibility"/>
                 <xsl:if test="normalize-space(./text())">
                   <tr>
                     <td colspan="2" class="description">
  @@ -285,9 +298,8 @@
       <table class="summary">
         <tbody>
           <xsl:if test="normalize-space(./text())">
  -          <tr>
  -            <td/>
  -            <td colspan="2" class="description">
  +          <tr class="nested">
  +            <td colspan="3" class="description">
                 <xsl:value-of select="./text()"/>
               </td>
             </tr>
  @@ -304,7 +316,7 @@
     </xsl:template>
     <xsl:template match="element">
       <tr>
  -      <th class="section-id" colspan="3">Element <span class="tag"><xsl:value-of select="@name"/></span></th>
  +      <th class="section-id" colspan="3">Element <xsl:value-of select="@name"/></th>
       </tr>
       <xsl:if test="normalize-space(./text())">
         <tr>
  @@ -314,11 +326,11 @@
         </tr>
       </xsl:if>
       <xsl:for-each select="attribute">
  -      <xsl:sort select="name"/>
  +      <xsl:sort select="@name"/>
         <xsl:apply-templates select="."/>
       </xsl:for-each>
       <xsl:if test="rules|conversion">
  -      <tr>
  +      <tr class="nested">
           <td/>
           <td colspan="2">
             <h3>Conversion Rules</h3>
  @@ -329,22 +341,25 @@
         </tr>
       </xsl:if>
       <xsl:if test="element">
  -      <tr>
  +      <tr class="nested">
           <td/>
           <td colspan="2">
  -          <table class="summary">
  -            <tbody>
  -              <xsl:apply-templates select="element"/>
  -            </tbody>
  -          </table>
  +          <h3>Nested Elements</h3>
  +          <div class="nested">
  +            <table class="summary">
  +              <tbody>
  +                <xsl:apply-templates select="element"/>
  +              </tbody>
  +            </table>
  +          </div>
           </td>
         </tr>
       </xsl:if>
     </xsl:template>
     <xsl:template match="attribute">
       <tr>
  -      <td/>
  -      <td>Attribute <span class="attribute"><xsl:value-of select="@name"/></span></td>
  +      <td class="indent"/>
  +      <th>Attribute <xsl:value-of select="@name"/></th>
         <td>
           <xsl:choose>
             <xsl:when test="@required = 'true'"> Required </xsl:when>
  @@ -355,7 +370,7 @@
       </tr>
       <xsl:if test="@translator">
         <tr>
  -        <td/>
  +        <td class="indent"/>
           <th>Translator</th>
           <td>
             <xsl:value-of select="@translator"/>
  @@ -364,7 +379,7 @@
       </xsl:if>
       <xsl:if test="normalize-space(./text())">
         <tr>
  -        <td/>
  +        <td class="indent"/>
           <td colspan="2" class="description">
             <xsl:value-of select="./text()"/>
           </td>
  @@ -421,6 +436,7 @@
                     </td>
                   </tr>
                 </xsl:if>
  +              <xsl:call-template name="visibility"/>
                 <xsl:if test="normalize-space(./text())">
                   <tr>
                     <td colspan="2" class="description">
  @@ -526,5 +542,33 @@
           </xsl:when>
         </xsl:choose>
       </li>
  +  </xsl:template>
  +  
  +  <xsl:template name="visibility-icon">
  +    <xsl:param name="root">..</xsl:param>
  +    <xsl:choose>
  +      <xsl:when test="@visibility = 'private'">
  +        <img src="{$root}/private-icon.png" width="30" height="30" alt="[PRIVATE]"/>
  +      </xsl:when>
  +      <xsl:otherwise>
  +        <img src="{$root}/spacer.gif" width="30" height="30" alt="[PUBLIC]"/>
  +      </xsl:otherwise>
  +    </xsl:choose>
  +  </xsl:template>
  +  
  +  <xsl:template name="visibility">
  +    <tr>
  +      <th>Visibility</th>
  +      <td>
  +        <xsl:choose>
  +          <xsl:when test="@visibility = 'private'">
  +            Private
  +          </xsl:when>
  +          <xsl:otherwise>
  +            Public
  +          </xsl:otherwise>
  +        </xsl:choose>
  +      </td>
  +    </tr>
     </xsl:template>
   </xsl:stylesheet>
  
  
  
  1.1                  jakarta-hivemind/hivebuild/hivedoc-xsl/spacer.gif
  
  	<<Binary file>>
  
  
  1.1                  jakarta-hivemind/hivebuild/hivedoc-xsl/private-icon.png
  
  	<<Binary file>>
  
  
  1.63      +1 -1      jakarta-hivemind/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/status.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- status.xml	25 Sep 2004 17:08:35 -0000	1.62
  +++ status.xml	26 Sep 2004 15:08:19 -0000	1.63
  @@ -37,7 +37,7 @@
           Added &lt;dependency&gt; construct providing support for dependencies between modules.
           Refactoring of RegistryBuilder: Now constructs Registry using a ModuleProvider.
         </action>
  -      <action type="add" dev="HLS">
  +      <action type="add" dev="HLS" fixes-bug="HIVEMIND-58">
           Add visibiltiy (public or private) to configuration points and service points.
         </action>
       </release>
  
  
  
  1.1                  jakarta-hivemind/src/images/private-icon.psp
  
  	<<Binary file>>
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org