David Price

Merge branch 'master' into ddr-colalign

1 -<ui:call ui:template="{= ?template }" arg:report="{= ?report }"> 1 +<ui:call ui:template="{= ?template }" arg:report="{= ?report }">
2 - <ui:if ui:condition="{= spr:rowCount(?rs) &gt; 0 }"> 2 + <ui:if ui:condition="{= spr:rowCount(?rs) &gt; 0 }">
3 - <div> 3 + <div>
4 - <hr /> 4 + <hr />
5 - <ui:setContext ui:queryGraph="&lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt;"> 5 + <ui:setContext ui:queryGraph="&lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt;">
6 - <h2>{= ui:label(?template) }</h2> 6 + <h2>{= ui:label(?template) }</h2>
7 - </ui:setContext> 7 + </ui:setContext>
8 - <table class="ddrTable"> 8 + <table class="ddrTable">
9 - <ui:setContext ui:queryGraph="&lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt;"> 9 + <ui:setContext ui:queryGraph="&lt;http://www.reportinghub.no/ep/spin/ddr-tables&gt;">
10 - <tr class="ddrTR"> 10 + <tr class="ddrTR">
11 - <ui:forEach ui:resultSet="{# 11 + <ui:forEach ui:resultSet="{#
12 - SELECT ?header 12 + SELECT ?header
13 - WHERE { 13 + WHERE {
14 - ?template rhspin:tableHeaders ?list . 14 + ?template rhspin:tableHeaders ?list .
15 - ?list &lt;http://jena.hpl.hp.com/ARQ/list#member&gt; ?header . 15 + ?list &lt;http://jena.hpl.hp.com/ARQ/list#member&gt; ?header .
16 - } 16 + }
17 - }"> 17 + }">
18 - <th class="ddrTH"><ui:parse ui:str="{= html:encodeBRs(spif:replaceAll(?header, ' ', '&nbsp;')) }" /></th> 18 + <th class="ddrTH" style="{= IF(fn:starts-with(?header, '*'), 'text-align: left', ?none) }"
19 - </ui:forEach> 19 + let:h="{= IF(fn:starts-with(?header, '*'), fn:substring(?header, 2), ?header) }"><ui:parse ui:str="{= html:encodeBRs(spif:replaceAll(?h, ' ', '&nbsp;')) }" /></th>
20 - </tr> 20 + </ui:forEach>
21 - </ui:setContext> 21 + </tr>
22 - <ui:forEach ui:resultSet="{# SELECT ?row ?rowIndex WHERE { ?rs spr:rowIndices ?rowIndex } }"> 22 + </ui:setContext>
23 - <tr class="ddrTR"> 23 + <ui:forEach ui:resultSet="{# SELECT ?row ?rowIndex WHERE { ?rs spr:rowIndices ?rowIndex } }">
24 - <ui:forEach ui:resultSet="{# SELECT ?cell WHERE { (?rs ?rowIndex) spr:rowCells (?cell ?cellIndex) } }"> 24 + <tr class="ddrTR">
25 - <td class="ddrTD">{= ?cell }</td> 25 + <ui:forEach ui:resultSet="{# SELECT ?cell WHERE { (?rs ?rowIndex) spr:rowCells (?cell ?cellIndex) } }">
26 - </ui:forEach> 26 + <td class="ddrTD">{= ?cell }</td>
27 - </tr> 27 + </ui:forEach>
28 - </ui:forEach> 28 + </tr>
29 - </table> 29 + </ui:forEach>
30 - <br /> 30 + </table>
31 - </div> 31 + <br />
32 - </ui:if> 32 + </div>
33 + </ui:if>
33 </ui:call> 34 </ui:call>
...\ No newline at end of file ...\ No newline at end of file
......