@@ -47,7 +47,7 @@ xmlns:spin="&spin;"
4747xmlns:bs2=" http://graphity.org/xsl/bootstrap/2.3.2"
4848exclude-result-prefixes=" #all" >
4949
50- <xsl : template match =" rdf:RDF[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:ContentBody" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" >
50+ <xsl : template match =" rdf:RDF[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:ContentBody" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" >
5151 <div about =" {ac:absolute-path(base-uri($main-doc))}" id =" content-body" class =" container-fluid" >
5252 <xsl : apply-templates select =" key('resources', ac:absolute-path(base-uri($main-doc)))" mode =" ldh:ContentList" />
5353
@@ -56,17 +56,17 @@ exclude-result-prefixes="#all">
5656 </xsl : template >
5757
5858 <!-- hide "Create" button which otherwise would be shown because acl:Append is allowed for signup -->
59- <xsl : template match =" rdf:RDF[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:Create" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" />
59+ <xsl : template match =" rdf:RDF[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:Create" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" />
6060
6161 <!-- hide "Add data" button which otherwise would be shown because acl:Append is allowed for signup -->
62- <xsl : template match =" rdf:RDF[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:AddData" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" />
62+ <xsl : template match =" rdf:RDF[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:AddData" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" />
6363
64- <xsl : template match =" rdf:RDF[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:ModeTabs" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" />
64+ <xsl : template match =" rdf:RDF[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:ModeTabs" priority =" 2" use-when =" system-property('xsl:product-name') = 'SAXON'" />
6565
6666 <!-- disable the right nav (backlinks etc.) -->
67- <xsl : template match =" *[*][@rdf:about or @rdf:nodeID][ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:Right" use-when =" system-property('xsl:product-name') = 'SAXON'" />
67+ <xsl : template match =" *[*][@rdf:about or @rdf:nodeID][ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:Right" use-when =" system-property('xsl:product-name') = 'SAXON'" />
6868
69- <xsl : template match =" rdf:RDF[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:Row" priority =" 2" >
69+ <xsl : template match =" rdf:RDF[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:Row" priority =" 2" >
7070 <xsl : variable name =" constructors" select =" ldh:query-result(resolve-uri('ns', $ldt:base), $constructor-query || ' VALUES $Type { ' || string-join(for $type in '&foaf; Person' return '< ' || $type || '> ', ' ') || ' }')" as =" document-node()?" />
7171 <xsl : apply-templates select =" ldh:construct(map{ xs:anyURI('&foaf; Person'): $constructors//srx:result[srx:binding[@name = 'Type'] = '&foaf; Person']/srx:binding[@name = 'construct']/srx:literal/string() })" mode =" bs2:RowForm" >
7272 <xsl : with-param name =" id" select =" 'form-signup'" />
@@ -78,7 +78,7 @@ exclude-result-prefixes="#all">
7878 </xsl : apply-templates >
7979 </xsl : template >
8080
81- <!-- <xsl:template match="rdf:RDF[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)][not(key('resources-by-type', '&http;Response'))][1]" mode="bs2:Row" priority="3">
81+ <!-- <xsl:template match="rdf:RDF[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)][not(key('resources-by-type', '&http;Response'))][1]" mode="bs2:Row" priority="3">
8282 <div class="row-fluid">
8383 <div class="main offset2 span7">
8484 <div class="alert alert-success row-fluid">
@@ -100,27 +100,27 @@ exclude-result-prefixes="#all">
100100 </xsl:template>-->
101101
102102 <!-- suppress resources other than foaf:Person and cert:PublicKey -->
103- <!-- <xsl:template match="*[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)][not(key('resources-by-type', '&http;Response'))][not(rdf:type/@rdf:resource = ('&foaf;Person', '&cert;X509Certificate'))]" mode="bs2:Row" priority="2"/> -->
103+ <!-- <xsl:template match="*[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)][not(key('resources-by-type', '&http;Response'))][not(rdf:type/@rdf:resource = ('&foaf;Person', '&cert;X509Certificate'))]" mode="bs2:Row" priority="2"/> -->
104104
105105 <!-- hide resources from constructed models -->
106- <xsl : template match =" rdf:Description[not(rdf:type/@rdf:resource = ('&foaf;Person', '&adm;SignUp'))][ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:RowForm" priority =" 3" />
106+ <xsl : template match =" rdf:Description[not(rdf:type/@rdf:resource = ('&foaf;Person', '&adm;SignUp'))][ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:RowForm" priority =" 3" />
107107
108108 <!-- hide type control -->
109- <xsl : template match =" *[*][@rdf:about or @rdf:nodeID][ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:TypeControl" priority =" 2" >
109+ <xsl : template match =" *[*][@rdf:about or @rdf:nodeID][ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:TypeControl" priority =" 2" >
110110 <xsl : next-match >
111111 <xsl : with-param name =" hidden" select =" true()" />
112112 </xsl : next-match >
113113 </xsl : template >
114114
115- <xsl : template match =" *[*][@rdf:about or @rdf:nodeID][ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
115+ <xsl : template match =" *[*][@rdf:about or @rdf:nodeID][ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
116116 <xsl : next-match >
117117 <xsl : with-param name =" show-subject" select =" false()" tunnel =" yes" />
118118 <xsl : with-param name =" legend" select =" false()" />
119119 <xsl : with-param name =" required" select =" true()" />
120120 </xsl : next-match >
121121 </xsl : template >
122122
123- <!-- <xsl:template match="*[@rdf:about or @rdf:nodeID][ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]/sioc:has_parent | *[@rdf:about or @rdf:nodeID][ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]/sioc:has_container" mode="bs2:FormControl">
123+ <!-- <xsl:template match="*[@rdf:about or @rdf:nodeID][ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]/sioc:has_parent | *[@rdf:about or @rdf:nodeID][ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]/sioc:has_container" mode="bs2:FormControl">
124124 <xsl:apply-templates select="." mode="xhtml:Input">
125125 <xsl:with-param name="type" select="'hidden'"/>
126126 </xsl:apply-templates>
@@ -132,7 +132,7 @@ exclude-result-prefixes="#all">
132132 </xsl:call-template>
133133 </xsl:template>-->
134134
135- <xsl : template match =" foaf:based_near/@rdf:*[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
135+ <xsl : template match =" foaf:based_near/@rdf:*[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
136136 <xsl : param name =" id" select =" generate-id()" as =" xs:string" />
137137 <xsl : param name =" class" as =" xs:string?" />
138138 <xsl : param name =" disabled" select =" false()" as =" xs:boolean" />
@@ -195,7 +195,7 @@ exclude-result-prefixes="#all">
195195 </xsl : template >
196196
197197 <!-- make properties required -->
198- <xsl : template match =" foaf:givenName[ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:familyName[ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:mbox[ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | cert:key[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
198+ <xsl : template match =" foaf:givenName[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:familyName[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:mbox[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | cert:key[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
199199 <xsl : param name =" violations" as =" element()*" />
200200
201201 <xsl : next-match >
@@ -204,7 +204,7 @@ exclude-result-prefixes="#all">
204204 </xsl : next-match >
205205 </xsl : template >
206206
207- <xsl : template match =" cert:key/@rdf:*[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
207+ <xsl : template match =" cert:key/@rdf:*[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" >
208208 <xsl : param name =" type" select =" 'password'" as =" xs:string" />
209209 <xsl : param name =" id" as =" xs:string?" />
210210 <xsl : param name =" class" as =" xs:string?" />
@@ -246,10 +246,10 @@ exclude-result-prefixes="#all">
246246 </xsl : template >
247247
248248 <!-- do not show secretary URI input -->
249- <xsl : template match =" acl:delegates[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" />
249+ <xsl : template match =" acl:delegates[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" />
250250
251251 <!-- do not show the email hash value -->
252- <xsl : template match =" foaf:mbox_sha1sum[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" />
252+ <xsl : template match =" foaf:mbox_sha1sum[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 1" />
253253
254254 <xsl : template name =" lacl:password" >
255255 <xsl : param name =" this" select =" xs:anyURI('&lacl; password')" as =" xs:anyURI" />
@@ -291,7 +291,7 @@ exclude-result-prefixes="#all">
291291 </xsl : template >
292292
293293 <!-- hide properties -->
294- <xsl : template match =" dh:slug[ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:primaryTopic[ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:isPrimaryTopicOf[ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | cert:modulus[ac:absolute-path($ ldh:requestUri) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | cert:exponent[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 3" >
294+ <xsl : template match =" dh:slug[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:primaryTopic[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | foaf:isPrimaryTopicOf[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | cert:modulus[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)] | cert:exponent[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:FormControl" priority =" 3" >
295295 <xsl : apply-templates select =" ." mode =" xhtml:Input" >
296296 <xsl : with-param name =" type" select =" 'hidden'" />
297297 </xsl : apply-templates >
@@ -303,13 +303,13 @@ exclude-result-prefixes="#all">
303303 </xsl : apply-templates >
304304 </xsl : template >
305305
306- <xsl : template match =" *[@rdf:about = '&foaf;mbox'][ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" ac:label" priority =" 1" >
306+ <xsl : template match =" *[@rdf:about = '&foaf;mbox'][ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" ac:label" priority =" 1" >
307307 <xsl : value-of >
308308 <xsl : apply-templates select =" key('resources', 'email', document('../translations.rdf'))" mode =" ac:label" />
309309 </xsl : value-of >
310310 </xsl : template >
311311
312312 <!-- turn off additional properties -->
313- <xsl : template match =" *[ac:absolute-path($ ldh:requestUri ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:PropertyControl" priority =" 1" />
313+ <xsl : template match =" *[ac:absolute-path(ldh:request-uri() ) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode =" bs2:PropertyControl" priority =" 1" />
314314
315315</xsl : stylesheet >
0 commit comments