Project

General

Profile

« Previous | Next » 

Revision 497

Added by Matt Jones over 23 years ago

Various changes to improve consistency of the MARINE and METACAT user
interfaces as presented through the XSL->HTML conversions. Eliminated
one (extraneous) copy of the rowcol.css style sheet in favor of sharing
a single css stylesheet in xmltodb/lib/style/rowcol.css. Modified all
XSL and HTML files to refer to this one CSS file, and changes the usage
of the various CSS styles so that they are consistent. Added a new
CSS style called "sectionhead" for controlling the color of section
headings and table headings. Updated build.xml to copy images without
filtering by ant, which prevents image corruption by ant. Various bug
fixes to the presentation files.

View differences:

resource.xsl
16 16 
    <html>
17 17 
    <head>
18 18 
      <link rel="stylesheet" type="text/css"
19 
       href="@html-path@/marine/rowcol.css" />
19 
       href="@html-path@/style/rowcol.css" />
20 20 
      <title>
21 21 
        <xsl:value-of select="//title" />
22 22 
      </title>
......
48 48
49 49 
      <!-- display the dataset specific field if present -->
50 50 
      <xsl:if test="count(resource/dataset/geoForm) &gt; 0">
51 
        <h2>Data Form: <xsl:value-of select="resource/dataset/geoForm" /></h2>
51 
        <h3 class="highlight">Data Form:</h3>
52 
        <xsl:value-of select="resource/dataset/geoForm" />
52 53 
      </xsl:if>
53 54
54 55 
      <!-- display the contact information -->
55 
      <h3 class="rowlight">Contacts</h3>
56 
      <h3 class="highlight">Contacts</h3>
56 57
57 58 
      <xsl:for-each select="resource/*/originator">
59 
        <u>
58 60 
        <xsl:value-of select="./individualName/salutation" />&nbsp;
59 61 
        <xsl:value-of select="./individualName/givenName" />&nbsp;
60 62 
        <xsl:value-of select="./individualName/surName" />&nbsp;
63 
        </u>
61 64 
        <br />
62 
        <b><xsl:value-of select="./roleCode" /></b><br/>
65 
        <dir>
66 
        <xsl:text>Role: </xsl:text>
67 
        <xsl:value-of select="./roleCode" /><br/>
63 68 
        <xsl:if test="count(resource/*/organizationName) &gt; 0">
64 69 
          <xsl:value-of select="./organizationName" />
65 70 
          <br />
66 71 
        </xsl:if>
67 72
68 73 
        <xsl:if test="count(./contactInfo/phone/voice) &gt; 0">
69 
          <font class="rowodd">Voice Number(s):</font>&nbsp;
74 
          Phone:&nbsp;
70 75 
          <xsl:for-each select="./contactInfo/phone/voice">
71 76 
           <xsl:value-of select="." />
72 77 
            <br />
......
74 79 
        </xsl:if>
75 80
76 81 
        <xsl:if test="count(./contactInfo/phone/facsimile) &gt; 0">
77 
          <font class="rowodd">Fax Number(s):</font>&nbsp;
82 
          Fax:&nbsp;
78 83 
          <xsl:for-each select="./contactInfo/phone/facsimile">
79 84 
            <xsl:value-of select="." />
80 85 
            <br />
......
82 87 
        </xsl:if>
83 88
84 89 
        <xsl:if test="count(./contactInfo/phone/other) &gt; 0">
85 
          <font class="rowodd">Other Number(s):</font>&nbsp;
90 
          Other phone:&nbsp;
86 91 
          <xsl:for-each select="./contactInfo/phone/other">
87 92 
            <xsl:value-of select="." />
88 93 
            &nbsp;&nbsp;
89 
            <xsl:text><font class="rowodd">Number type:</font></xsl:text>
94 
            <xsl:text>Number type:</xsl:text>
90 95 
            <xsl:value-of select="/resource/*/*/contactInfo/phone/otherType" />
91 96 
            <br />
92 97 
          </xsl:for-each>
......
113 118 
        </xsl:if>
114 119
115 120 
        <xsl:if test="count(./contactInfo/hoursOfService) &gt; 0">
116 
          <font class="rowodd">Office hourse:</font> &nbsp;
121 
          Office hourse:&nbsp;
117 122 
          <xsl:value-of select="./contactInfo/hoursOfService" />
118 123 
          <br/>
119 124 
        </xsl:if>
120 125
121 126 
        <xsl:if test="count(./contactInfo/contactInstructions) &gt; 0">
122 
          <font class="rowodd">Contact instructions:</font>&nbsp;
127 
          Contact instructions:&nbsp;
123 128 
          <xsl:value-of select="./contactInfo/contactInstructions" />
124 129 
          <br/>
125 130 
        </xsl:if>
126 131
127 132 
        <br/>
133 
        </dir>
128 134 
      </xsl:for-each>
129 135
130 
      <h3 class="rowlight">Publishing Information</h3>
131 136 
      <xsl:if test="count(resource/*/publisher) &gt; 0">
132 
        <font class="rowodd">Publisher:</font>
137 
        <h3 class="highlight">Publishing Information</h3>
138 
        Publisher:
133 139
134 140 
        <xsl:value-of select="resource/*/publisher/individualName/salutation" />
135 141 
        &nbsp;
......
142 148 
        </xsl:if>
143 149
144 150 
        <xsl:if test="count(resource/*/publisher/contactInfo/phone/voice) &gt; 0">
145 
          <font class="rowodd">Voice Number(s):</font>&nbsp;
151 
          Phone:&nbsp;
146 152 
          <xsl:for-each select="resource/*/publisher/contactInfo/phone/voice">
147 153 
           <xsl:value-of select="." />
148 154 
            <br />
......
150 156 
        </xsl:if>
151 157
152 158 
        <xsl:if test="count(resource/*/publisher/contactInfo/phone/facsimile) &gt; 0">
153 
          <font class="rowodd">Fax Number(s):</font>&nbsp;
159 
          Fax:&nbsp;
154 160 
          <xsl:for-each select="resource/*/publisher/contactInfo/phone/facsimile">
155 161 
            <xsl:value-of select="." />
156 162 
            <br />
......
158 164 
        </xsl:if>
159 165
160 166 
        <xsl:if test="count(resource/*/publisher/contactInfo/phone/other) &gt; 0">
161 
          <font class="rowodd">Other Number(s):</font>&nbsp;
167 
          Other phone:&nbsp;
162 168 
          <xsl:for-each select="resource/*/publisher/contactInfo/phone/other">
163 169 
            <xsl:value-of select="." />
164 170 
            &nbsp;&nbsp;
......
208 214
209 215 
        <xsl:if
210 216 
         test="count(resource/*/publisher/contactInfo/hoursOfService) &gt; 0">
211 
          <font class="rowodd">Office hourse:</font> &nbsp;
217 
          Office hours:&nbsp;
212 218 
          <xsl:value-of
213 219 
           select="resource/*/publisher/contactInfo/hoursOfService" />
214 220 
          <br/>
......
216 222
217 223 
        <xsl:if
218 224 
         test="count(resource/*/publisher/contactInfo/contactInstructions) &gt; 0">
219 
          <font class="rowodd">Contact instructions:</font>&nbsp;
225 
          Contact instructions:&nbsp;
220 226 
          <xsl:value-of
221 227 
           select="resource/*/publisher/contactInfo/contactInstructions" />
222 228 
          <br/>
......
224 230 
      </xsl:if>
225 231
226 232 
      <xsl:if test="count(resource/*/pubdate) &gt; 0">
227 
        <font class="rowodd">Publishing Date:</font>
233 
        Publishing Date:
228 234 
        &nbsp; <xsl:value-of select="resource/*/pubdate" /><br/>
229 235 
      </xsl:if>
230 236
231 237 
      <xsl:if test="count(resource/*/pubplace) &gt; 0">
232 
        <font class="rowodd">Publishing Place:</font>
238 
        Publishing Place:
233 239 
        &nbsp; <xsl:value-of select="resource/*/pubplace" />
234 240 
        <br/>
235 241 
      </xsl:if>
236 242
237 243 
      <xsl:if test="count(resource/*/series) &gt; 0">
238 
        <font class="rowodd">Series:</font> &nbsp; <xsl:value-of select="resource/*/series" /><br/>
244 
        Series:&nbsp; <xsl:value-of select="resource/*/series" /><br/>
239 245 
      </xsl:if>
240 246
241 
      <h3 class="rowlight">Other Information</h3>
242 247 
      <xsl:if test="count(resource/*/additionalInfo) &gt; 0">
243 
        <font class="rowodd">Additional Information: </font>
248 
        <h3 class="highlight">Other Information</h3>
249 
        Additional Information:
244 250 
        &nbsp; <xsl:value-of select="resource/*/additionalInfo" /><br/>
245 251 
      </xsl:if>
246 252
247 253 
      <xsl:if test="count(resource/*/abstract) &gt; 0">
248 
        <font class="rowodd">Abstract:</font>
249 
        &nbsp; <xsl:value-of select="resource/*/abstract" /><br/>
254 
        <h3 class="highlight">Abstract</h3>
255 
        <xsl:value-of select="resource/*/abstract" /><br/>
250 256 
      </xsl:if>
251 257
252 258 
      <xsl:for-each select="resource/*/url">
253 
        <font class="rowodd">URL:</font> &nbsp;
259 
        URL:&nbsp;
254 260 
        <a>
255 261 
        <xsl:attribute name="href">
256 262 
          <xsl:value-of select="./URL" />
......
261 267 
      <br/>
262 268
263 269 
      <xsl:if test="count(resource/*/keywordInfo) &gt; 0">
264 
        <h3 class="rowlight">Keywords</h3>
265 
        <table width="50%" border="1">
266 
        <tr class="rowodd">
270 
        <h3 class="highlight">Keywords</h3>
271 
        <table width="50%" border="0">
272 
        <tr class="sectionhead">
267 273 
          <th>Keyword</th><th>Keyword Type</th><th>Keyword Thesauri</th>
268 274 
        </tr>
269 275
......
271 277 
          <tr valign="top">
272 278 
            <xsl:attribute name="class">
273 279 
              <xsl:choose>
274 
                <xsl:when test="position() mod 2 = 1">rowwhite</xsl:when>
275 
                <xsl:when test="position() mod 2 = 0">rowlight</xsl:when>
280 
                <xsl:when test="position() mod 2 = 1">rowodd</xsl:when>
281 
                <xsl:when test="position() mod 2 = 0">roweven</xsl:when>
276 282 
              </xsl:choose>
277 283 
            </xsl:attribute>
278 284 
            <td>
279 
              <xsl:value-of select="./keyword"/>, &nbsp;
285 
              <xsl:value-of select="./keyword"/>
280 286 
            </td>
281 287 
            <td>
282 288 
              <xsl:value-of select="./keywordType"/>

Also available in: Unified diff