Zorba

Merge lp:~zorba-coders/zorba/fixes_xqdoc into lp:zorba

  1. fixes_xqdoc
  2. Merge into trunk
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 10587
Merged at revision: 10587
Proposed branch: lp:~zorba-coders/zorba/fixes_xqdoc
Merge into: lp:zorba
Diff against target: 159 lines (+45/-33)
2 files modified
doc/zorba/xqdoc/templates/main.html (+36/-24)
modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq (+9/-9)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fixes_xqdoc
Reviewer Review Type Date Requested Status
Daniel Turcanu (community) Approve
Sorin Marian Nasoi Approve
Review via email: mp+86417@code.launchpad.net

Commit message

Fixed the title for the links of the functions in the function summary table.
Fixed the function parameters.
Small fixes for better XHTML 1.0 conformance.

Description of the change

Fixed the title for the links of the functions in the function summary table.
Fixed the function parameters.
Small fixes for better XHTML 1.0 conformance.

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) :
review: Approve
Revision history for this message
Daniel Turcanu (danielturcanu) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fixes_xqdoc-2011-12-20T15-27-14.76Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fixes_xqdoc-2011-12-20T15-27-14.76Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/zorba/xqdoc/templates/main.html'
2--- doc/zorba/xqdoc/templates/main.html 2011-10-07 08:28:43 +0000
3+++ doc/zorba/xqdoc/templates/main.html 2011-12-20 15:25:23 +0000
4@@ -1,11 +1,11 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6 <html>
7 <head>
8- <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
9+ <meta content="text/html; charset=utf-8" http-equiv="content-type" />
10 <meta content="public" http-equiv="CACHE-CONTROL" />
11 <meta content="-1" http-equiv="Expires" />
12 <link rel="stylesheet" type="text/css" href="styles/main.css" />
13- <link rel="stylesheet" href="styles/jquery.treeview.css" />
14+ <link rel="stylesheet" href="styles/jquery.treeview.css" type="text/css" />
15 <script type="text/javascript" src="lib/jquery.js"></script>
16 <script type="text/javascript" src="lib/jquery.cookie.js"></script>
17 <script type="text/javascript" src="lib/jquery.treeview.js"></script>
18@@ -16,25 +16,37 @@
19 <link type="text/css" rel="stylesheet" href="styles/shCore.css"/>
20 <link type="text/css" rel="stylesheet" href="styles/shThemeDefault.css"/>
21 <link type="text/css" rel="stylesheet" href="styles/shThemeXQuery.css"/>
22- <script type="text/javascript">
23- SyntaxHighlighter.all()
24- </script>
25- <script type="text/javascript">
26- jQuery(document).ready(function() {
27- $("#documentation").treeview({
28- control: "#treecontrol",
29- animated: "fast",
30- collapsed: true,
31- unique: false,
32- persist: "cookie"
33- });
34- });
35- </script>
36- <script src="http://www.google.com/js/gweb/analytics/autotrack.js"></script>
37- <script>//
38- new gweb.analytics.AutoTrack({profile: 'UA-4281090-1'});
39- //</script>
40- </head>
41+<script type="text/javascript">
42+//<![CDATA[
43+SyntaxHighlighter.all()
44+//]]>
45+</script>
46+ <script type="text/javascript">
47+//<![CDATA[
48+jQuery(document).ready(function() {
49+$("#documentation").treeview({
50+control: "#treecontrol",
51+animated: "fast",
52+collapsed: true,
53+unique: false,
54+persist: "cookie"
55+});
56+});
57+//]]>
58+</script>
59+ <script type="text/javascript" src="http://www.google.com/js/gweb/analytics/autotrack.js"></script>
60+<script type="text/javascript">
61+//<![CDATA[
62+new gweb.analytics.AutoTrack({profile: 'UA-4281090-1'});
63+//]]>
64+</script>
65+<style type="text/css">
66+/*<![CDATA[*/
67+ div.c2 {clear:both;}
68+ li.c1 {width:102px !important;}
69+/*]]>*/
70+</style>
71+</head>
72 <body>
73 <div id="header">
74 <div class="innerheader text-left">
75@@ -63,8 +75,8 @@
76 <div id="main">
77 <div id="leftMenu" >
78 <div id="treecontrol">
79- <a title="Collapse the entire tree below" href="#"><img src="images/minus.gif" /> Collapse All</a>
80- <a title="Expand the entire tree below" href="#"><img src="images/plus.gif" /> Expand All</a>
81+ <a title="Collapse the entire tree below" href="#"><img src="images/minus.gif" alt="minus"/> Collapse All</a>
82+ <a title="Expand the entire tree below" href="#"><img src="images/plus.gif" alt="plus"/> Expand All</a>
83 </div>
84 </div>
85 <div id="rightcontent" />
86@@ -89,7 +101,7 @@
87 (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
88 })();
89 </script>
90- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
91+ <noscript><p>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></p></noscript>
92 <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
93 </div>
94 </div>
95
96=== modified file 'modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq'
97--- modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2011-10-26 15:03:03 +0000
98+++ modules/com/zorba-xquery/www/modules/xqdoc2xhtml/index.xq 2011-12-20 15:25:23 +0000
99@@ -957,22 +957,22 @@
100 {if(contains($type, "updating")) then
101 <a href="{$xquSpec}"
102 title="updating"
103- target="_blank"><img src="{concat($imagesPath, "Updating.gif")}" /></a>
104+ target="_blank"><img src="{concat($imagesPath, "Updating.gif")}" alt="Updating"/></a>
105 else ()}
106 {if(contains($type, "sequential")) then
107 <a href="{$xqsSpec}"
108 title="sequential"
109- target="_blank"><img src="{concat($imagesPath, "Sequential.gif")}" /></a>
110+ target="_blank"><img src="{concat($imagesPath, "Sequential.gif")}" alt="Sequential"/></a>
111 else ()}
112 {if(contains($type, "nondeterministic ")) then
113 <a href="{$ZorbaOptAndAnn}"
114 title="%ann:nondeterministic"
115- target="_blank"><img src="{concat($imagesPath, "Nondeterministic.gif")}" /></a>
116+ target="_blank"><img src="{concat($imagesPath, "Nondeterministic.gif")}" alt="Nondeterministic"/></a>
117 else ()}
118 {if(contains($type, "variadic")) then
119 <a title="A function annotated with the http://www.zorba-xquery.com/annotations:variadic annotation is a function of indefinite arity, i.e. one that accepts a variable number of arguments."
120 href="{$ZorbaOptAndAnn}"
121- target="_blank"><img src="{concat($imagesPath, "Variadic.gif")}" /></a>
122+ target="_blank"><img src="{concat($imagesPath, "Variadic.gif")}" alt="Variadic"/></a>
123 else ()}
124 {if(contains($type, "streamable")) then
125 <a href="{$ZorbaOptAndAnn}" title="A function annotated with the http://www.zorba-xquery.com/annotations:streamable annotation is
126@@ -983,10 +983,10 @@
127 However, the disadvantage is that a streamable string can only be consumed exactly once.
128 If a streamable string is consumed more than once, an error is raised.
129 In order to enable multiple consumers of a streamable string, the string:materialize function can be used
130- to materialize the entire contents in an (regular) xs:string item." target="_blank"><img src="{concat($imagesPath, "Streamable.gif")}" /></a>
131+ to materialize the entire contents in an (regular) xs:string item." target="_blank"><img src="{concat($imagesPath, "Streamable.gif")}" alt="Streamable"/></a>
132 else ()}
133 {if(contains($type, "external")) then
134- <a href="{$xqExternal}" title="external" target="_blank"><img src="{concat($imagesPath, "External.gif")}" /></a>
135+ <a href="{$xqExternal}" title="external" target="_blank"><img src="{concat($imagesPath, "External.gif")}" alt="External"/></a>
136 else ()}
137 </span>
138 };
139@@ -1374,9 +1374,9 @@
140 <td>
141 <tt>{
142 if ($isDeprecated) then
143- <span class="functName"><del><a href="#{$name}-{$param-number}" title="{normalize-space($description)}">{$name}</a></del></span>
144+ <span class="functName"><del><a href="#{$name}-{$param-number}" title="{$shortDescription}">{$name}</a></del></span>
145 else
146- <span class="functName"><a href="#{$name}-{$param-number}" title="{normalize-space($description)}">{$name}</a></span>
147+ <span class="functName"><a href="#{$name}-{$param-number}" title="{$shortDescription}">{$name}</a></span>
148 }{xqdoc2html:split-function-signature($paramsAndReturn)}<br /><span class="padding">{$shortDescription}</span>
149 </tt>
150 </td>
151@@ -1531,7 +1531,7 @@
152 if (exists($params)) then
153 (<div class="subsubsection">Parameters:</div>,
154 <ul>
155- {for $param in $params return <li>{data($param)}</li>}
156+ {for $param in $params return <li>{$param/node()}</li>}
157 </ul>)
158 else ()
159 };

Subscribers

People subscribed via source and target branches