Skip to content

Commit 1ef8d39

Browse files
scottgonzalezscottgonzalez
committed
Shuffle templates around to match UI.
1 parent 89976e5 commit 1ef8d39

1 file changed

Lines changed: 183 additions & 179 deletions

File tree

‎entries2html.xsl‎

Lines changed: 183 additions & 179 deletions
Original file line numberDiff line numberDiff line change
@@ -144,21 +144,160 @@
144144
</li>
145145
</xsl:template>
146146

147-
<xsl:template name="method-signature">
148-
<xsl:param name="method-name"/>
147+
<xsl:template name="entry-title">
148+
<xsl:param name="entry-type" select="@type"/>
149+
<xsl:param name="entry-name" select="@name"/>
149150

150-
<xsl:if test="not(contains($method-name, '.')) and $method-name != 'jQuery'">.</xsl:if>
151-
<xsl:value-of select="$method-name"/>(
152-
<xsl:if test="argument">
153-
<xsl:text> </xsl:text>
154-
<xsl:for-each select="argument">
155-
<xsl:if test="@optional"> [</xsl:if>
156-
<xsl:if test="position() &gt; 1"><xsl:text>, </xsl:text></xsl:if>
157-
<xsl:value-of select="@name"/>
158-
<xsl:if test="@optional"><xsl:text> ]</xsl:text></xsl:if>
151+
<h2 class="jq-clearfix roundTop section-title">
152+
<xsl:choose>
153+
<xsl:when test="$entry-type='method'">
154+
<span class="name">
155+
<xsl:for-each select="signature[1]">
156+
<xsl:call-template name="method-signature">
157+
<xsl:with-param name="method-name" select="$entry-name"/>
158+
</xsl:call-template>
159+
</xsl:for-each>
160+
</span>
161+
<xsl:text> </xsl:text>
162+
<span class="returns">
163+
<xsl:if test="@return != ''">
164+
<xsl:text>Returns: </xsl:text>
165+
<a class="return" href="http://api.jquery.com/Types/#{@return}">
166+
<xsl:value-of select="@return"/>
167+
</a>
168+
</xsl:if>
169+
</span>
170+
</xsl:when>
171+
<xsl:when test="$entry-type='selector'">
172+
<span>
173+
<xsl:value-of select="@name"/>
174+
<xsl:text> selector</xsl:text>
175+
</span>
176+
</xsl:when>
177+
<xsl:when test="$entry-type='property'">
178+
<span>
179+
<xsl:value-of select="@name"/>
180+
</span>
181+
<xsl:text> </xsl:text>
182+
<span class="returns">
183+
<xsl:if test="@return != ''">
184+
<xsl:text>Returns: </xsl:text>
185+
<a class="return" href="http://api.jquery.com/Types/#{@return}">
186+
<xsl:value-of select="@return"/>
187+
</a>
188+
</xsl:if>
189+
</span>
190+
</xsl:when>
191+
</xsl:choose>
192+
</h2>
193+
</xsl:template>
194+
195+
<xsl:template name="entry-body">
196+
<p class="desc"><strong>Description: </strong> <xsl:value-of select="desc"/></p>
197+
<xsl:choose>
198+
<xsl:when test="@type='selector'">
199+
<xsl:call-template name="entry-body-selector"/>
200+
</xsl:when>
201+
<xsl:when test="@type='property'">
202+
<xsl:call-template name="entry-body-property"/>
203+
</xsl:when>
204+
<xsl:when test="@type='method'">
205+
<xsl:call-template name="entry-body-method"/>
206+
</xsl:when>
207+
</xsl:choose>
208+
</xsl:template>
209+
210+
<xsl:template name="entry-body-selector">
211+
<ul class="signatures">
212+
<li class="signature">
213+
<h4 class="name">
214+
<xsl:if test="signature/added">
215+
<span class="versionAdded">
216+
version added:
217+
<a href="/category/version/{signature/added}/">
218+
<xsl:value-of select="signature/added"/>
219+
</a>
220+
</span>
221+
</xsl:if>
222+
<xsl:text>jQuery( "</xsl:text><xsl:value-of select="sample"/><xsl:text>" )</xsl:text>
223+
</h4>
224+
225+
<xsl:for-each select="signature/argument">
226+
<p class="argument">
227+
<strong><xsl:value-of select="@name"/>: </strong>
228+
<xsl:copy-of select="desc/text()|desc/*"/>
229+
</p>
230+
</xsl:for-each>
231+
</li>
232+
</ul>
233+
</xsl:template>
234+
235+
<xsl:template name="entry-body-property">
236+
<ul class="signatures">
237+
<li class="signature">
238+
<h4 class="name">
239+
<xsl:if test="signature/added">
240+
<span class="versionAdded">
241+
version added:
242+
<a href="/category/version/{signature/added}/">
243+
<xsl:value-of select="added"/>
244+
</a>
245+
</span>
246+
</xsl:if>
247+
<xsl:value-of select="@name"/>
248+
</h4>
249+
</li>
250+
</ul>
251+
</xsl:template>
252+
253+
<xsl:template name="entry-body-method">
254+
<xsl:variable name="entry-name" select="@name"/>
255+
<xsl:variable name="entry-name-trans" select="translate($entry-name,'$., ()/{}','s---')"/>
256+
257+
<ul class="signatures">
258+
<xsl:for-each select="signature">
259+
<li class="signature">
260+
<xsl:attribute name="id">
261+
<xsl:value-of select="$entry-name-trans"/>
262+
<xsl:for-each select="argument">
263+
<xsl:variable name="arg-name" select="translate(@name, ' ,.)(', '--')"/>
264+
<xsl:text>-</xsl:text><xsl:value-of select="$arg-name"/>
265+
</xsl:for-each>
266+
</xsl:attribute>
267+
268+
<h4 class="name">
269+
<xsl:if test="./added">
270+
<span class="versionAdded">
271+
version added:
272+
<a href="/category/version/{added}/">
273+
<xsl:value-of select="added"/>
274+
</a>
275+
</span>
276+
</xsl:if>
277+
<xsl:call-template name="method-signature">
278+
<xsl:with-param name="method-name" select="$entry-name"/>
279+
</xsl:call-template>
280+
</h4>
281+
282+
<xsl:for-each select="argument">
283+
<p class="argument">
284+
<strong><xsl:value-of select="@name"/>: </strong>
285+
<xsl:call-template name="render-types"/>
286+
<xsl:text>
287+
</xsl:text>
288+
<xsl:if test="@default">
289+
<div class="default-value">
290+
<strong>Default: </strong>
291+
<xsl:value-of select="@default"/>
292+
</div>
293+
</xsl:if>
294+
<xsl:copy-of select="desc/text()|desc/*"/>
295+
</p>
296+
<xsl:apply-templates select="property"/>
297+
</xsl:for-each>
298+
</li>
159299
</xsl:for-each>
160-
<xsl:text> </xsl:text>
161-
</xsl:if>)
300+
</ul>
162301
</xsl:template>
163302

164303
<!-- examples -->
@@ -233,25 +372,6 @@
233372
&lt;/html&gt;
234373
</xsl:template>
235374

236-
<xsl:template match="property">
237-
<h5>
238-
<xsl:value-of select="@name" />
239-
<xsl:if test="@added"> <span class="added">(added <xsl:value-of select="@added" />)</span></xsl:if>
240-
<xsl:if test="@deprecated"> <span class="deprecated">(deprecated <xsl:value-of select="@deprecated" />)</span></xsl:if>
241-
<xsl:if test="@removed"> <span class="removed">(removed <xsl:value-of select="@removed" />)</span></xsl:if>
242-
<xsl:text>: </xsl:text>
243-
<span class="type">
244-
<xsl:call-template name="render-types" />
245-
</span>
246-
</h5>
247-
<xsl:if test="@default">
248-
<div class="default-value"><strong>Default: </strong> <xsl:value-of select="@default" /></div>
249-
</xsl:if>
250-
<p>
251-
<xsl:copy-of select="desc/text()|desc/*" />
252-
</p>
253-
</xsl:template>
254-
255375
<!--
256376
Render type(s) for an argument element.
257377
Type can either by a @type attribute or one or more <type> child elements.
@@ -335,160 +455,44 @@
335455
</xsl:choose>
336456
</xsl:template>
337457

338-
<xsl:template name="entry-title">
339-
<xsl:param name="entry-type" select="@type"/>
340-
<xsl:param name="entry-name" select="@name"/>
341-
342-
<h2 class="jq-clearfix roundTop section-title">
343-
<xsl:choose>
344-
<xsl:when test="$entry-type='method'">
345-
<span class="name">
346-
<xsl:for-each select="signature[1]">
347-
<xsl:call-template name="method-signature">
348-
<xsl:with-param name="method-name" select="$entry-name"/>
349-
</xsl:call-template>
350-
</xsl:for-each>
351-
</span>
352-
<xsl:text> </xsl:text>
353-
<span class="returns">
354-
<xsl:if test="@return != ''">
355-
<xsl:text>Returns: </xsl:text>
356-
<a class="return" href="http://api.jquery.com/Types/#{@return}">
357-
<xsl:value-of select="@return"/>
358-
</a>
359-
</xsl:if>
360-
</span>
361-
</xsl:when>
362-
<xsl:when test="$entry-type='selector'">
363-
<span>
364-
<xsl:value-of select="@name"/>
365-
<xsl:text> selector</xsl:text>
366-
</span>
367-
</xsl:when>
368-
<xsl:when test="$entry-type='property'">
369-
<span>
370-
<xsl:value-of select="@name"/>
371-
</span>
372-
<xsl:text> </xsl:text>
373-
<span class="returns">
374-
<xsl:if test="@return != ''">
375-
<xsl:text>Returns: </xsl:text>
376-
<a class="return" href="http://api.jquery.com/Types/#{@return}">
377-
<xsl:value-of select="@return"/>
378-
</a>
379-
</xsl:if>
380-
</span>
381-
</xsl:when>
382-
</xsl:choose>
383-
</h2>
384-
</xsl:template>
385-
386-
<xsl:template name="entry-body">
387-
<p class="desc"><strong>Description: </strong> <xsl:value-of select="desc"/></p>
388-
<xsl:choose>
389-
<xsl:when test="@type='selector'">
390-
<xsl:call-template name="entry-body-selector"/>
391-
</xsl:when>
392-
<xsl:when test="@type='property'">
393-
<xsl:call-template name="entry-body-property"/>
394-
</xsl:when>
395-
<xsl:when test="@type='method'">
396-
<xsl:call-template name="entry-body-method"/>
397-
</xsl:when>
398-
</xsl:choose>
399-
</xsl:template>
400-
401-
<xsl:template name="entry-body-selector">
402-
<ul class="signatures">
403-
<li class="signature">
404-
<h4 class="name">
405-
<xsl:if test="signature/added">
406-
<span class="versionAdded">
407-
version added:
408-
<a href="/category/version/{signature/added}/">
409-
<xsl:value-of select="signature/added"/>
410-
</a>
411-
</span>
412-
</xsl:if>
413-
<xsl:text>jQuery( "</xsl:text><xsl:value-of select="sample"/><xsl:text>" )</xsl:text>
414-
</h4>
458+
<xsl:template name="method-signature">
459+
<xsl:param name="method-name"/>
415460

416-
<xsl:for-each select="signature/argument">
417-
<p class="argument">
418-
<strong><xsl:value-of select="@name"/>: </strong>
419-
<xsl:copy-of select="desc/text()|desc/*"/>
420-
</p>
421-
</xsl:for-each>
422-
</li>
423-
</ul>
461+
<xsl:if test="not(contains($method-name, '.')) and $method-name != 'jQuery'">.</xsl:if>
462+
<xsl:value-of select="$method-name"/>(
463+
<xsl:if test="argument">
464+
<xsl:text> </xsl:text>
465+
<xsl:for-each select="argument">
466+
<xsl:if test="@optional"> [</xsl:if>
467+
<xsl:if test="position() &gt; 1"><xsl:text>, </xsl:text></xsl:if>
468+
<xsl:value-of select="@name"/>
469+
<xsl:if test="@optional"><xsl:text> ]</xsl:text></xsl:if>
470+
</xsl:for-each>
471+
<xsl:text> </xsl:text>
472+
</xsl:if>)
424473
</xsl:template>
425474

426-
<xsl:template name="entry-body-property">
427-
<ul class="signatures">
428-
<li class="signature">
429-
<h4 class="name">
430-
<xsl:if test="signature/added">
431-
<span class="versionAdded">
432-
version added:
433-
<a href="/category/version/{signature/added}/">
434-
<xsl:value-of select="added"/>
435-
</a>
436-
</span>
437-
</xsl:if>
438-
<xsl:value-of select="@name"/>
439-
</h4>
440-
</li>
441-
</ul>
442-
</xsl:template>
443475

444-
<xsl:template name="entry-body-method">
445-
<xsl:variable name="entry-name" select="@name"/>
446-
<xsl:variable name="entry-name-trans" select="translate($entry-name,'$., ()/{}','s---')"/>
447476

448-
<ul class="signatures">
449-
<xsl:for-each select="signature">
450-
<li class="signature">
451-
<xsl:attribute name="id">
452-
<xsl:value-of select="$entry-name-trans"/>
453-
<xsl:for-each select="argument">
454-
<xsl:variable name="arg-name" select="translate(@name, ' ,.)(', '--')"/>
455-
<xsl:text>-</xsl:text><xsl:value-of select="$arg-name"/>
456-
</xsl:for-each>
457-
</xsl:attribute>
458477

459-
<h4 class="name">
460-
<xsl:if test="./added">
461-
<span class="versionAdded">
462-
version added:
463-
<a href="/category/version/{added}/">
464-
<xsl:value-of select="added"/>
465-
</a>
466-
</span>
467-
</xsl:if>
468-
<xsl:call-template name="method-signature">
469-
<xsl:with-param name="method-name" select="$entry-name"/>
470-
</xsl:call-template>
471-
</h4>
472478

473-
<xsl:for-each select="argument">
474-
<p class="argument">
475-
<strong><xsl:value-of select="@name"/>: </strong>
476-
<xsl:call-template name="render-types"/>
477-
<xsl:text>
478-
</xsl:text>
479-
<xsl:if test="@default">
480-
<div class="default-value">
481-
<strong>Default: </strong>
482-
<xsl:value-of select="@default"/>
483-
</div>
484-
</xsl:if>
485-
<xsl:copy-of select="desc/text()|desc/*"/>
486-
</p>
487-
<xsl:apply-templates select="property"/>
488-
</xsl:for-each>
489-
</li>
490-
</xsl:for-each>
491-
</ul>
479+
<xsl:template match="property">
480+
<h5>
481+
<xsl:value-of select="@name" />
482+
<xsl:if test="@added"> <span class="added">(added <xsl:value-of select="@added" />)</span></xsl:if>
483+
<xsl:if test="@deprecated"> <span class="deprecated">(deprecated <xsl:value-of select="@deprecated" />)</span></xsl:if>
484+
<xsl:if test="@removed"> <span class="removed">(removed <xsl:value-of select="@removed" />)</span></xsl:if>
485+
<xsl:text>: </xsl:text>
486+
<span class="type">
487+
<xsl:call-template name="render-types" />
488+
</span>
489+
</h5>
490+
<xsl:if test="@default">
491+
<div class="default-value"><strong>Default: </strong> <xsl:value-of select="@default" /></div>
492+
</xsl:if>
493+
<p>
494+
<xsl:copy-of select="desc/text()|desc/*" />
495+
</p>
492496
</xsl:template>
493497

494498
<!--

0 commit comments

Comments
 (0)