New acl:mode XPath function

XSLT fixes and cleanup

Author: namedgraph

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/acl.xsl

@@ -64,7 +64,8 @@ exclude-result-prefixes="#all">
 
     <xsl:template match="*[rdf:type/@rdf:resource = '&lacl;AuthorizationRequest']" priority="1">
         <xsl:param name="method" select="'post'" as="xs:string"/>
-        <xsl:param name="action" select="ldh:href(resolve-uri(ac:uuid() || '/', resolve-uri('acl/authorizations/', $ldt:base)), map{ '_method': 'PUT' })" as="xs:anyURI" tunnel="yes"/> <!-- create new authorization document -->
+        <!-- we're not using the form's default action so we're not tunneling the param here -->
+        <xsl:param name="action" select="ldh:href(resolve-uri(ac:uuid() || '/', resolve-uri('acl/authorizations/', $ldt:base)), map{ '_method': 'PUT' })" as="xs:anyURI"/> <!-- create new authorization document -->
         <xsl:param name="id" select="concat('form-', generate-id())" as="xs:string?"/>
         <xsl:param name="class" select="'form-horizontal'" as="xs:string?"/>
         <xsl:param name="accept-charset" select="'UTF-8'" as="xs:string?"/>

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl

@@ -78,30 +78,6 @@ exclude-result-prefixes="#all">
         </xsl:apply-templates>
     </xsl:template>
 
-<!--    <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">
-        <div class="row-fluid">
-            <div class="main offset2 span7">
-                <div class="alert alert-success row-fluid">
-                    <div class="span1">
-                        <img src="{resolve-uri('static/com/atomgraph/linkeddatahub/icons/baseline_done_white_48dp.png', $ac:contextUri)}" alt="Signup complete"/>
-                    </div>
-                    <div class="span11">
-                        <p>Congratulations! Your WebID profile has been created. You can see its data below.</p>
-                        <p>
-                            <strong>Authentication details have been sent to your email address.</strong>
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-        
-        <xsl:apply-templates select="key('resources-by-type', '&foaf;Person')[@rdf:about]" mode="#current"/>
-        <xsl:apply-templates select="key('resources-by-type', '&cert;X509Certificate')[@rdf:about]" mode="#current"/>
-    </xsl:template>-->
-    
-    <!-- suppress resources other than foaf:Person and cert:PublicKey -->
-    <!-- <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"/> -->
-
     <!-- hide resources from constructed models -->
     <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"/>
 
@@ -119,18 +95,6 @@ exclude-result-prefixes="#all">
             <xsl:with-param name="required" select="true()"/>
         </xsl:next-match>
     </xsl:template>
-
-<!--    <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">
-        <xsl:apply-templates select="." mode="xhtml:Input">
-            <xsl:with-param name="type" select="'hidden'"/>
-        </xsl:apply-templates>
-
-        <xsl:call-template name="xhtml:Input">
-            <xsl:with-param name="name" select="'ou'"/>
-            <xsl:with-param name="type" select="'hidden'"/>
-            <xsl:with-param name="value" select="resolve-uri('acl/agents/', $ldt:base)"/>
-        </xsl:call-template>
-    </xsl:template>-->
 
     <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">
         <xsl:param name="id" select="generate-id()" as="xs:string"/>

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl

@@ -103,7 +103,7 @@ exclude-result-prefixes="#all"
 
         <xsl:choose>
             <xsl:when test="$resource-uri = $about">
-                <!-- Self-reference detected - render error and return resolved context -->
+                <!-- self-reference detected - render error and return resolved context -->
                 <xsl:variable name="container" select="$context('container')" as="element()"/>
                 <xsl:for-each select="$container">
                     <xsl:result-document href="?." method="ixsl:replace-content">
@@ -115,7 +115,7 @@ exclude-result-prefixes="#all"
                 <xsl:sequence select="ixsl:resolve($context)"/>
             </xsl:when>
             <xsl:otherwise>
-                <!-- Normal processing -->
+                <!-- normal processing -->
                 <xsl:sequence select="
                     ixsl:resolve($context) =>
                         ixsl:then(ldh:object-value-thunk#1) =>

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl

@@ -110,7 +110,6 @@ exclude-result-prefixes="#all"
         <xsl:param name="container" select="." as="element()"/>
         <xsl:param name="graph" select="descendant::*[@property = '&ldh;graph']/@resource" as="xs:anyURI?"/>
         <xsl:param name="mode" select="descendant::*[@property = '&ac;mode']/@resource" as="xs:anyURI?"/>
-        <xsl:param name="refresh-content" as="xs:boolean?"/>
         <xsl:param name="show-edit-button" select="false()" as="xs:boolean?"/>
         <xsl:param name="textarea-id" select="generate-id() || '-textarea'" as="xs:string?"/>
         <xsl:param name="textarea-class" select="'span12 sparql-query-string'" as="xs:string?"/>
@@ -404,11 +403,6 @@ exclude-result-prefixes="#all"
         </xsl:for-each>
 
         <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
-
-<!--        <xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
-             update progress bar 
-            <ixsl:set-style name="width" select="'50%'" object="."/>
-        </xsl:for-each>-->
 
         <xsl:variable name="view-container" select="$container//div[contains-token(@class, 'sparql-query-results')]" as="element()"/>
         <!-- ensure the HTML structure is compatible with what view expects -->
@@ -430,7 +424,7 @@ exclude-result-prefixes="#all"
         </xsl:variable>
 
         <!-- invoke the factory -->
-        <xsl:sequence select="$factory(())"/>
+        <ixsl:promise select="$factory(())"/>
     </xsl:template>
 
     <!-- save query onclick -->
@@ -452,8 +446,9 @@ exclude-result-prefixes="#all"
         <xsl:variable name="query-type" select="ldh:query-type($query-string)" as="xs:string?"/>
         <!-- not using ldh:base-uri(.) because it goes stale when DOM is replaced -->
         <xsl:variable name="doc" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(xs:anyURI(ixsl:location())) || '`'), 'results')" as="document-node()"/>
+        <!-- TO-DO: this breaks if the query resource has not yet been loaded as part of the $doc (e.g. freshly saved) -->
         <xsl:variable name="query" select="key('resources', $about, $doc)" as="element()"/>
-
+       
         <!-- replace the query string (sp:text value) on the query resource -->
         <xsl:variable name="query" as="element()">
             <xsl:apply-templates select="$query" mode="ldh:Identity">

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/constructor.xsl

@@ -212,9 +212,6 @@ exclude-result-prefixes="#all"
                     </xsl:call-template>
                 </xsl:otherwise>
             </xsl:choose>
-
-            <!-- used by typeahead to set $Type -->
-            <!-- <input type="hidden" class="forClass" value="&rdf;Property" autocomplete="off"/> -->
         </label>
     </xsl:template>
 

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl

@@ -12,6 +12,7 @@
     <!ENTITY owl    "http://www.w3.org/2002/07/owl#">
     <!ENTITY srx    "http://www.w3.org/2005/sparql-results#">
     <!ENTITY http   "http://www.w3.org/2011/http#">
+    <!ENTITY acl    "http://www.w3.org/ns/auth/acl#">
     <!ENTITY ldt    "https://www.w3.org/ns/ldt#">
     <!ENTITY dh     "https://www.w3.org/ns/ldt/document-hierarchy#">
     <!ENTITY sh     "http://www.w3.org/ns/shacl#">
@@ -37,6 +38,7 @@ xmlns:owl="&owl;"
 xmlns:xsd="&xsd;"
 xmlns:srx="&srx;"
 xmlns:http="&http;"
+xmlns:acl="&acl;"
 xmlns:ldt="&ldt;"
 xmlns:sh="&sh;"
 xmlns:sp="&sp;"
@@ -68,6 +70,10 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="upper-case(substring($labels[1], 1, 1)) || substring($labels[1], 2)"/>
     </xsl:function>
 
+    <xsl:function name="acl:mode" as="xs:anyURI*" use-when="system-property('xsl:product-name') = 'SAXON'">
+        <xsl:sequence select="$acl:mode"/>
+    </xsl:function>
+    
     <xsl:function name="ldh:request-uri" as="xs:anyURI" use-when="system-property('xsl:product-name') = 'SAXON'">
         <xsl:sequence select="$ldh:requestUri"/>
     </xsl:function>

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl

@@ -487,13 +487,13 @@ extension-element-prefixes="ixsl"
                     <xsl:attribute name="class" select="'span12 progress progress-striped active'"/>
 
                     <div class="drag-handle">
-                        <xsl:if test="$acl:mode = '&acl;Write'">
+                        <xsl:if test="acl:mode() = '&acl;Write'">
                             <xsl:attribute name="draggable" select="'true'"/>
                         </xsl:if>
                     </div>
                     <div class="row-fluid row-block-controls" style="position: relative; top: 30px; margin-top: -30px; z-index: 1;">
                         <div class="span12">
-                            <xsl:if test="$acl:mode = '&acl;Write'">
+                            <xsl:if test="acl:mode() = '&acl;Write'">
                                 <button type="button" class="btn btn-edit pull-right" style="display: none;">
                                     <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ac:label"/>
                                 </button>
@@ -548,13 +548,13 @@ extension-element-prefixes="ixsl"
 
             <div class="span12">
                 <div class="drag-handle">
-                    <xsl:if test="$acl:mode = '&acl;Write'">
+                    <xsl:if test="acl:mode() = '&acl;Write'">
                         <xsl:attribute name="draggable" select="'true'"/>
                     </xsl:if>
                 </div>
                 <div class="row-fluid row-block-controls" style="position: relative; top: 30px; margin-top: -30px; z-index: 1;">
                     <div class="span12">
-                        <xsl:if test="$acl:mode = '&acl;Write'">
+                        <xsl:if test="acl:mode() = '&acl;Write'">
                             <button type="button" class="btn btn-edit pull-right" style="display: none;">
                                 <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ac:label"/>
                             </button>
@@ -1284,7 +1284,7 @@ extension-element-prefixes="ixsl"
 
                                     <button type="button" class="btn dropdown-toggle btn-edit-actions">
                                         <!-- only admins should see the button as only they have access to the ontologies with constructors in them -->
-                                        <xsl:if test="not($acl:mode = '&acl;Control' and exists($constructor-classes))">
+                                        <xsl:if test="not(acl:mode() = '&acl;Control' and exists($constructor-classes))">
                                             <xsl:attribute name="style" select="'display: none'"/>
                                         </xsl:if>