You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2021/05/10 08:58:23 UTC
[jena] branch main updated: Escape HTML chars
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 7cefe42 Escape HTML chars
new 0a9b1cf Merge pull request #1000 from afs/webapp
7cefe42 is described below
commit 7cefe42c5fb381caeb7defe5e5a1428becfd794f
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sun May 9 10:26:37 2021 +0100
Escape HTML chars
---
.../src/main/webapp/js/app/templates/dataset-edit.tpl | 4 ++--
.../src/main/webapp/js/app/templates/dataset-info.tpl | 6 +++---
.../src/main/webapp/js/app/templates/dataset-management.tpl | 8 ++++----
.../src/main/webapp/js/app/templates/dataset-selection-list.tpl | 8 ++++----
.../src/main/webapp/js/app/templates/dataset-selector.tpl | 4 ++--
.../src/main/webapp/js/app/templates/dataset-stats.tpl | 4 ++--
.../src/main/webapp/js/app/templates/uploadable-file.tpl | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-edit.tpl b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-edit.tpl
index 8202831..f60020f 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-edit.tpl
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-edit.tpl
@@ -10,8 +10,8 @@
<ul class="nav nav-pills nav-stacked graphs">
<% _.each( counts(), function( n, g ) { %>
<li class="">
- <a href="#" class="select-dataset" data-graph-name="<%= g %>" data-graph-size="<%= n %>">
- <%= g %> (<%= n %> triples)
+ <a href="#" class="select-dataset" data-graph-name="<%- g %>" data-graph-size="<%= n %>">
+ <%- g %> (<%= n %> triples)
</a>
</li>
<% } ); %>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-info.tpl b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-info.tpl
index 2362f2b..1119aa6 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-info.tpl
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-info.tpl
@@ -3,10 +3,10 @@
<dl class="dl-horizontal">
<% _.each( servicesDescription(), function( serviceDescription ) { %>
<dt>
- <%= serviceDescription.label %>:
+ <%- serviceDescription.label %>:
</dt>
<dd>
- <a href="<%= serviceDescription.url %>"><%= serviceDescription.url %></a>
+ <a href="<%- serviceDescription.url %>"><%- serviceDescription.url %></a>
</dd>
<% } ); %>
</dl>
@@ -24,7 +24,7 @@
<dt><span class="heading">graph name:</span></dt><dd><span class="heading">triples:</span></dd>
<% _.each( counts(), function( n, g ) { %>
<dt class="font-weight-normal">
- <%= g %>
+ <%- g %>
</dt>
<dd>
<div class="numeric"><%= n %></div>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-management.tpl b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-management.tpl
index 9a01812..5e8f7a2 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-management.tpl
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-management.tpl
@@ -14,7 +14,7 @@
<% _.each( datasets, function( ds ) { %>
<tr>
<td>
- <%= ds.name() %>
+ <%- ds.name() %>
</td>
<!-- JENA-867 temporarily disable non-functional checkbox
<td>
@@ -24,9 +24,9 @@
<td>
<div>
<!-- JENA-869 Disable download button until it works again -->
- <a class="btn btn-sm action remove btn-primary" data-ds-id='<%= ds.name() %>'><i class='fa fa-times-circle'></i> remove</a>
- <a class="btn btn-sm action backup btn-primary" data-ds-id='<%= ds.name() %>'><i class='fa fa-download'></i> backup</a>
- <a class="btn btn-sm action add-data btn-primary" href="dataset.html?tab=upload&ds=<%= ds.name() %>"><i class='fa fa-upload'></i> upload data</a>
+ <a class="btn btn-sm action remove btn-primary" data-ds-id='<%- ds.name() %>'><i class='fa fa-times-circle'></i> remove</a>
+ <a class="btn btn-sm action backup btn-primary" data-ds-id='<%- ds.name() %>'><i class='fa fa-download'></i> backup</a>
+ <a class="btn btn-sm action add-data btn-primary" href="dataset.html?tab=upload&ds=<%- ds.name() %>"><i class='fa fa-upload'></i> upload data</a>
</div>
<div class="action feedback"></a>
</td>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selection-list.tpl b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selection-list.tpl
index 7eda02d..2f20b89 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selection-list.tpl
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selection-list.tpl
@@ -5,12 +5,12 @@
<% _.each( datasets, function( ds ) { %>
<tr>
<td>
- <%= ds.name() %>
+ <%- ds.name() %>
</td>
<td>
- <a class="btn btn-sm action remove btn-primary" href="dataset.html?tab=query&ds=<%= ds.name() %>"><i class='fa fa-question-circle'></i> query</a>
- <a class="btn btn-sm action remove btn-primary" href="dataset.html?tab=upload&ds=<%= ds.name() %>"><i class='fa fa-upload'></i> add data</a>
- <a class="btn btn-sm action configure btn-primary" href="dataset.html?tab=info&ds=<%= ds.name() %>"><i class='fa fa-dashboard'></i> info</a>
+ <a class="btn btn-sm action remove btn-primary" href="dataset.html?tab=query&ds=<%- ds.name() %>"><i class='fa fa-question-circle'></i> query</a>
+ <a class="btn btn-sm action remove btn-primary" href="dataset.html?tab=upload&ds=<%- ds.name() %>"><i class='fa fa-upload'></i> add data</a>
+ <a class="btn btn-sm action configure btn-primary" href="dataset.html?tab=info&ds=<%- ds.name() %>"><i class='fa fa-dashboard'></i> info</a>
</td>
</tr>
<% }) %>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selector.tpl b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selector.tpl
index d684995..9121bd7 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selector.tpl
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-selector.tpl
@@ -5,8 +5,8 @@
<div class="select-picker-label">Dataset:</div>
<select class='selectpicker show-tick'>
<% _.each( datasets, function( ds ) { %>
- <option <%= (ds.name() === selectedDatasetName) ? "selected" : "" %>>
- <%= ds.name() %>
+ <option <%- (ds.name() === selectedDatasetName) ? "selected" : "" %>>
+ <%- ds.name() %>
</option>
<% } ); %>
</select>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-stats.tpl b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-stats.tpl
index fc3d7d9..20ef587 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-stats.tpl
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/dataset-stats.tpl
@@ -1,13 +1,13 @@
<table class="table">
<tr>
<% _.each( headings, function( h ) { %>
- <th class="text-right"><%= h %></th>
+ <th class="text-right"><%- h %></th>
<% } ); %>
</tr>
<% _.each( rows, function( row ) { %>
<tr>
<% _.each( row, function( cell ) { %>
- <td class="text-right"><%= cell %></td>
+ <td class="text-right"><%- cell %></td>
<% } ); %>
</tr>
<% } ) %>
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/uploadable-file.tpl b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/uploadable-file.tpl
index 83b8449..f73f062 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/uploadable-file.tpl
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/js/app/templates/uploadable-file.tpl
@@ -1,6 +1,6 @@
<div class="row file-description">
<div class="col-sm-3">
- <%= file.name %>
+ <%- file.name %>
</div>
<div class="col-sm-3">
<em>