Skip to content

Commit 35c5fca

Browse files
namedgraphnamedgraph
committed
Application settings form is shown
New `lapp:application` property More UI labels moved to translations.rdf
1 parent 7a7ea8a commit 35c5fca

File tree

5 files changed

+119
-18
lines changed

5 files changed

+119
-18
lines changed

‎src/main/resources/com/atomgraph/linkeddatahub/lapp.ttl‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,21 @@
2323

2424
# PROPERTIES
2525

26+
:origin a owl:ObjectProperty, owl:FunctionalProperty, owl:InverseFunctionalProperty ;
27+
rdfs:domain :Application ;
28+
rdfs:range rdfs:Resource ;
29+
rdfs:label "Origin" ;
30+
rdfs:comment "The origin URI of an application, which serves as the base URI for all resources in the application's dataspace" ;
31+
rdfs:isDefinedBy : .
32+
33+
:application a owl:ObjectProperty, owl:FunctionalProperty ;
34+
rdfs:range :Application ;
35+
rdfs:label "Application" ;
36+
rdfs:comment "Links a resource to an application" ;
37+
rdfs:isDefinedBy : .
38+
2639
:adminApplication a owl:ObjectProperty, owl:FunctionalProperty, owl:InverseFunctionalProperty ;
40+
rdfs:subPropertyOf :application ;
2741
owl:inverseOf :endUserApplication ;
2842
rdfs:domain :EndUserApplication ;
2943
rdfs:range :AdminApplication ;
@@ -32,6 +46,7 @@
3246
rdfs:isDefinedBy : .
3347

3448
:endUserApplication a owl:ObjectProperty, owl:FunctionalProperty, owl:InverseFunctionalProperty ;
49+
rdfs:subPropertyOf :application ;
3550
owl:inverseOf :adminApplication ;
3651
rdfs:domain :AdminApplication ;
3752
rdfs:range :EndUserApplication ;

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

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,11 @@ LIMIT 10
362362
<xsl:value-of select="$legend-label"/>
363363
</legend>
364364

365-
<p class="text-info">Ask for access to a restricted resource by making a request. It will be reviewed by the application's administrators.</p>
365+
<p class="text-info">
366+
<xsl:value-of>
367+
<xsl:apply-templates select="key('resources', 'request-access-description', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
368+
</xsl:value-of>
369+
</p>
366370
</div>
367371

368372
<div class="modal-body">
@@ -375,10 +379,16 @@ LIMIT 10
375379

376380
<fieldset>
377381
<div>
378-
<label for="request-access-for">Request access for</label>
382+
<label for="request-access-for">
383+
<xsl:value-of>
384+
<xsl:apply-templates select="key('resources', 'request-access-for', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
385+
</xsl:value-of>
386+
</label>
379387
<select id="request-access-for" class="input-block-level">
380388
<option value="{$agent}">
381-
<xsl:value-of select="$agent"/> (me)
389+
<xsl:value-of select="$agent"/> (<xsl:value-of>
390+
<xsl:apply-templates select="key('resources', 'me', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
391+
</xsl:value-of>)
382392
</option>
383393
</select>
384394
</div>
@@ -391,8 +401,7 @@ LIMIT 10
391401
<div class="form-actions modal-footer">
392402
<button type="submit" class="{$button-class}">
393403
<xsl:value-of>
394-
<!-- <xsl:apply-templates select="key('resources', 'save', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/> -->
395-
Request
404+
<xsl:apply-templates select="key('resources', 'request', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
396405
</xsl:value-of>
397406
</button>
398407
<button type="button" class="btn btn-close">
@@ -419,7 +428,11 @@ LIMIT 10
419428
<xsl:param name="base" select="lapp:origin($this)" as="xs:anyURI"/>
420429

421430
<fieldset>
422-
<legend>URL-based access</legend>
431+
<legend>
432+
<xsl:value-of>
433+
<xsl:apply-templates select="key('resources', 'url-based-access', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
434+
</xsl:value-of>
435+
</legend>
423436
<table class="table table-striped">
424437
<colgroup>
425438
<col style="width: 55%;"/>
@@ -429,7 +442,11 @@ LIMIT 10
429442
</colgroup>
430443
<thead>
431444
<tr>
432-
<th>URL</th>
445+
<th>
446+
<xsl:value-of>
447+
<xsl:apply-templates select="key('resources', 'url', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
448+
</xsl:value-of>
449+
</th>
433450
<xsl:for-each select="$access-modes">
434451
<th>
435452
<xsl:value-of>
@@ -468,7 +485,11 @@ LIMIT 10
468485
</fieldset>
469486

470487
<fieldset>
471-
<legend>Class-based access</legend>
488+
<legend>
489+
<xsl:value-of>
490+
<xsl:apply-templates select="key('resources', 'class-based-access', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
491+
</xsl:value-of>
492+
</legend>
472493
<table class="table table-striped">
473494
<colgroup>
474495
<col style="width: 55%;"/>
@@ -478,7 +499,11 @@ LIMIT 10
478499
</colgroup>
479500
<thead>
480501
<tr>
481-
<th>Class name</th>
502+
<th>
503+
<xsl:value-of>
504+
<xsl:apply-templates select="key('resources', 'class-name', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
505+
</xsl:value-of>
506+
</th>
482507
<xsl:for-each select="$access-modes">
483508
<th>
484509
<xsl:value-of>
@@ -652,10 +677,9 @@ LIMIT 10
652677

653678
<div class="control-group required">
654679
<input type="hidden" name="pu" value="&owl;sameAs"/>
655-
<!-- TO-DO: localize label -->
656680
<label class="control-label" for="same-as-resource">
657681
<xsl:value-of>
658-
Same as
682+
<xsl:apply-templates select="key('resources', 'same-as', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
659683
</xsl:value-of>
660684
</label>
661685
<div class="controls">
@@ -715,17 +739,21 @@ LIMIT 10
715739

716740
<xsl:template match="button[contains-token(@class, 'btn-app-settings')]" mode="ixsl:onclick">
717741
<xsl:param name="method" select="'patch'" as="xs:string"/>
718-
<xsl:variable name="app" select="ixsl:get(ixsl:window(), 'LinkedDataHub.apps')//rdf:Description[lapp:origin/@rdf:resource = lapp:origin(ldt:base())]" as="element()"/>
719742
<xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
720743

721744
<ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
722745

723746
<xsl:for-each select="$content-body">
724747
<xsl:result-document href="?." method="ixsl:append-content">
725-
<div class="modal modal-constructor fade in">
748+
<div class="modal modal-constructor fade in">
726749
<div class="modal-header">
727750
<button type="button" class="close">&#215;</button>
728-
<h3>Application Settings</h3>
751+
752+
<legend>
753+
<xsl:value-of>
754+
<xsl:apply-templates select="key('resources', 'application-settings', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
755+
</xsl:value-of>
756+
</legend>
729757
</div>
730758
<div class="modal-body">
731759
<!-- to be injected -->
@@ -736,13 +764,12 @@ LIMIT 10
736764

737765
<xsl:variable name="modal" select="$content-body/div[contains-token(@class, 'modal')][last()]" as="element()"/>
738766
<xsl:variable name="block" select="$modal/div[contains-token(@class, 'modal-body')]" as="element()"/>
739-
740767
<xsl:variable name="request" select="map{ 'method': 'GET', 'href': resolve-uri('settings', ldt:base()), 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
741768
<xsl:variable name="context" as="map(*)" select="
742769
map{
743770
'request': $request,
744771
'block': $block,
745-
'about': $app/@rdf:about,
772+
'about': $lapp:application,
746773
'method': $method
747774
}"/>
748775
<ixsl:promise select="
@@ -1126,7 +1153,11 @@ LIMIT 10
11261153
<xsl:for-each select="$container[not(./div[contains-token(@class, 'endpoint-classes')])]">
11271154
<xsl:result-document href="?." method="ixsl:append-content">
11281155
<div class="control-group required endpoint-classes">
1129-
<label class="control-label">Classes</label>
1156+
<label class="control-label">
1157+
<xsl:value-of>
1158+
<xsl:apply-templates select="key('resources', 'classes', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
1159+
</xsl:value-of>
1160+
</label>
11301161
<div class="controls"></div>
11311162
</div>
11321163
</xsl:result-document>
@@ -1181,7 +1212,11 @@ LIMIT 10
11811212
<xsl:for-each select="$container//div[contains-token(@class, 'endpoint-classes')]/div">
11821213
<xsl:result-document href="?." method="ixsl:replace-content">
11831214
<div class="alert alert-block">
1184-
<strong>Error during query execution:</strong>
1215+
<strong>
1216+
<xsl:value-of>
1217+
<xsl:apply-templates select="key('resources', 'error-during-query', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
1218+
</xsl:value-of>
1219+
</strong>
11851220
<pre>
11861221
<xsl:value-of select="$message"/>
11871222
</pre>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ LIMIT 100
377377
//&lt;![CDATA[
378378
</xsl:text>
379379
<![CDATA[
380+
var appUri = ]]><xsl:value-of select="'&quot;' || $lapp:Application//*[lapp:origin/@rdf:resource = $lapp:origin]/@rdf:about || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
380381
var baseUri = ]]><xsl:value-of select="'&quot;' || $ldt:base || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
381382
var absolutePath = ]]><xsl:value-of select="'&quot;' || ac:absolute-path(ldh:base-uri(.)) || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
382383
var ontologyUri = ]]><xsl:value-of select="'&quot;' || $ldt:ontology || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
@@ -442,6 +443,7 @@ LIMIT 100
442443
const servicesRequestUri = "]]></xsl:text><xsl:value-of select="$app-request-uri"/><xsl:text disable-output-escaping="yes"><![CDATA[";
443444
const stylesheetParams = {
444445
"Q{https://w3id.org/atomgraph/client#}contextUri": contextUri, // servlet context URI
446+
"Q{https://w3id.org/atomgraph/linkeddatahub/apps#}application": appUri,
445447
"Q{https://www.w3.org/ns/ldt#}base": baseUri,
446448
"Q{https://www.w3.org/ns/ldt#}ontology": ontologyUri,
447449
"Q{http://www.w3.org/ns/sparql-service-description#}endpoint": endpointUri,

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,4 +419,52 @@
419419
<rdf:Description rdf:nodeID="remove-stmt">
420420
<rdfs:label xml:lang="en-US">Remove this statement</rdfs:label>
421421
</rdf:Description>
422+
<rdf:Description rdf:nodeID="application-settings">
423+
<rdfs:label xml:lang="en-US">Application settings</rdfs:label>
424+
<rdfs:label xml:lang="es-ES">Ajustes de aplicación</rdfs:label>
425+
</rdf:Description>
426+
<rdf:Description rdf:nodeID="request-access-description">
427+
<rdfs:label xml:lang="en-US">Ask for access to a restricted resource by making a request. It will be reviewed by the application's administrators.</rdfs:label>
428+
<rdfs:label xml:lang="es-ES">Solicite acceso a un recurso restringido haciendo una solicitud. Será revisada por los administradores de la aplicación.</rdfs:label>
429+
</rdf:Description>
430+
<rdf:Description rdf:nodeID="request-access-for">
431+
<rdfs:label xml:lang="en-US">Request access for</rdfs:label>
432+
<rdfs:label xml:lang="es-ES">Solicitar acceso para</rdfs:label>
433+
</rdf:Description>
434+
<rdf:Description rdf:nodeID="me">
435+
<rdfs:label xml:lang="en-US">me</rdfs:label>
436+
<rdfs:label xml:lang="es-ES">yo</rdfs:label>
437+
</rdf:Description>
438+
<rdf:Description rdf:nodeID="request">
439+
<rdfs:label xml:lang="en-US">Request</rdfs:label>
440+
<rdfs:label xml:lang="es-ES">Solicitar</rdfs:label>
441+
</rdf:Description>
442+
<rdf:Description rdf:nodeID="url-based-access">
443+
<rdfs:label xml:lang="en-US">URL-based access</rdfs:label>
444+
<rdfs:label xml:lang="es-ES">Acceso basado en URL</rdfs:label>
445+
</rdf:Description>
446+
<rdf:Description rdf:nodeID="url">
447+
<rdfs:label xml:lang="en-US">URL</rdfs:label>
448+
<rdfs:label xml:lang="es-ES">URL</rdfs:label>
449+
</rdf:Description>
450+
<rdf:Description rdf:nodeID="class-based-access">
451+
<rdfs:label xml:lang="en-US">Class-based access</rdfs:label>
452+
<rdfs:label xml:lang="es-ES">Acceso basado en clase</rdfs:label>
453+
</rdf:Description>
454+
<rdf:Description rdf:nodeID="class-name">
455+
<rdfs:label xml:lang="en-US">Class name</rdfs:label>
456+
<rdfs:label xml:lang="es-ES">Nombre de clase</rdfs:label>
457+
</rdf:Description>
458+
<rdf:Description rdf:nodeID="same-as">
459+
<rdfs:label xml:lang="en-US">Same as</rdfs:label>
460+
<rdfs:label xml:lang="es-ES">Igual a</rdfs:label>
461+
</rdf:Description>
462+
<rdf:Description rdf:nodeID="classes">
463+
<rdfs:label xml:lang="en-US">Classes</rdfs:label>
464+
<rdfs:label xml:lang="es-ES">Clases</rdfs:label>
465+
</rdf:Description>
466+
<rdf:Description rdf:nodeID="error-during-query">
467+
<rdfs:label xml:lang="en-US">Error during query execution:</rdfs:label>
468+
<rdfs:label xml:lang="es-ES">Error durante la ejecución de la consulta:</rdfs:label>
469+
</rdf:Description>
422470
</rdf:RDF>

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ extension-element-prefixes="ixsl"
115115
<xsl:include href="bootstrap/2.3.2/client/block/query.xsl"/>
116116

117117
<xsl:param name="ac:contextUri" as="xs:anyURI"/>
118+
<xsl:param name="lapp:application" as="xs:anyURI"/>
118119
<xsl:param name="ldt:base" as="xs:anyURI"/>
119120
<xsl:param name="ldh:requestUri" select="xs:anyURI(ixsl:location())" as="xs:anyURI"/>
120121
<xsl:param name="ldt:ontology" as="xs:anyURI"/> <!-- used in default.xsl -->

0 commit comments

Comments
 (0)