Skip to content

Commit

Permalink
make things validate as HTML5
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbeer
cbeer committed Jul 3, 2013
1 parent c170261 commit 70c57e4
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 16 deletions.
10 changes: 5 additions & 5 deletions fcrepo-http-api/src/main/resources/views/common-metadata.vsl
View file
@@ -1,18 +1,18 @@

<dl>
<dt>UUID</dt> <dd>$helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.HAS_PRIMARY_IDENTIFIER)</dd>
<dt>UUID</dt> <dd>$esc.html($helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.HAS_PRIMARY_IDENTIFIER))</dd>

<dt>Created at</dt> <dd>$helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.CREATED_DATE)
by $helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.CREATED_BY)</dd>
by $esc.html($helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.CREATED_BY))</dd>

<dt>Last Modified at</dt> <dd>$helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.LAST_MODIFIED_DATE)
by $helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.LAST_MODIFIED_BY)</dd>
by $esc.html($helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.LAST_MODIFIED_BY))</dd>

<dt><h3>Children <span class="badge">$helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.HAS_CHILD_COUNT)</span></h3></dt>
<dt>Children <span class="badge">$helpers.getObjectsAsString($rdf, $topic, $rdfLexicon.HAS_CHILD_COUNT)</span></dt>
<dd>
<ol>
#foreach($quad in $helpers.getObjects($rdf, $topic, $rdfLexicon.HAS_CHILD))
<li><a href="$quad.getObject().getURI()">$helpers.getObjectTitle($rdf, $quad.getObject())</a></li>
<li><a href="$quad.getObject().getURI()">$esc.html($helpers.getObjectTitle($rdf, $quad.getObject()))</a></li>
#end
</ol>
</dd>
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/main/resources/views/common-node-header.vsl
View file
Expand Up @@ -3,6 +3,6 @@

<div class="row">
<div class="span9">
<h1>$helpers.getObjectTitle($rdf, $topic)</h1>
<h1>$esc.html($helpers.getObjectTitle($rdf, $topic))</h1>
</div>
</div>
4 changes: 2 additions & 2 deletions fcrepo-http-api/src/main/resources/views/common.vsl
View file
Expand Up @@ -10,9 +10,9 @@
</dt>
<dd>
#if($quad.getObject().isURI() && $quad.getObject().getURI().startsWith("http"))
<a href="$quad.getObject().getURI()" property="$quad.getPredicate().toString()">$quad.getObject()</a>
<a href="$quad.getObject().getURI()" property="$quad.getPredicate().toString()">$esc.html($quad.getObject())</a>
#else
<span property="$quad.getPredicate().toString()">$quad.getObject()</span>
<span property="$quad.getPredicate().toString()">$esc.html($quad.getObject())</span>
#end
#if( $quad.getPredicate().toString().equals("info:fedora/digest") )
<a href="$topic/fcr:fixity">check fixity</a>
Expand Down
1 change: 1 addition & 0 deletions fcrepo-http-api/src/main/resources/views/jcr-namespaces.vsl
View file
Expand Up @@ -2,6 +2,7 @@
#* @vtlvariable name="subjects" type="com.hp.hpl.jena.rdf.model.ResIterator" *#
#* @vtlvariable name="nodeany" type="com.hp.hpl.jena.graph.Node" *#
#* @vtlvariable name="topic" type="com.hp.hpl.jena.graph.Node" *#
<!DOCTYPE HTML>
#parse("views/common.vsl")
<html>
<head>
Expand Down
4 changes: 3 additions & 1 deletion fcrepo-http-api/src/main/resources/views/mode-root.vsl
View file
@@ -1,9 +1,11 @@
#* @vtlvariable name="uriInfo" type="javax.ws.rs.core.UriInfo" *#
#set( $title = $topic )
<!DOCTYPE HTML>
#set( $title = $helpers.getObjectTitle($rdf, $topic) )

#parse("views/common.vsl")
<html>
<head>
<title>$title</title>
#parse("views/common-head.vsl")
</head>

Expand Down
6 changes: 4 additions & 2 deletions fcrepo-http-api/src/main/resources/views/nt-file.vsl
View file
@@ -1,8 +1,10 @@
#set( $title = $topic )
<!DOCTYPE HTML>
#set( $title = $helpers.getObjectTitle($rdf, $topic) )

#parse("views/common.vsl")
<html>
<head>
<title>$title</title>
#parse("views/common-head.vsl")
</head>

Expand All @@ -29,7 +31,7 @@
#foreach($subject in $model.listSubjects())
#if( $subject != $topic )
<div class="well" resource="$subject.getURI()">
<h3><a href="$subject.getURI()">$helpers.getObjectTitle($rdf, $subject.asNode())</a></h3>
<h3><a href="$subject.getURI()">$esc.html($helpers.getObjectTitle($rdf, $subject.asNode()))</a></h3>
#triples($subject.asNode())
</div>
#end
Expand Down
6 changes: 4 additions & 2 deletions fcrepo-http-api/src/main/resources/views/nt-folder.vsl
View file
@@ -1,8 +1,10 @@
#set( $title = $topic )
<!DOCTYPE HTML>
#set( $title = $helpers.getObjectTitle($rdf, $topic) )

#parse("views/common.vsl")
<html>
<head>
<title>$title</title>
#parse("views/common-head.vsl")
</head>

Expand Down Expand Up @@ -32,7 +34,7 @@
#foreach($subject in $model.listSubjects())
#if( $subject != $topic )
<div class="well" resource="$subject.getURI()">
<h3><a href="$subject.getURI()">$helpers.getObjectTitle($rdf, $subject.asNode())</a></h3>
<h3><a href="$subject.getURI()">$esc.html($helpers.getObjectTitle($rdf, $subject.asNode()))</a></h3>
#triples($subject.asNode())
</div>
#end
Expand Down
6 changes: 4 additions & 2 deletions fcrepo-http-api/src/main/resources/views/nt-resource.vsl
View file
@@ -1,8 +1,10 @@
#set( $title = $topic )
<!DOCTYPE HTML>
#set( $title = $helpers.getObjectTitle($rdf, $topic) )

#parse("views/common.vsl")
<html>
<head>
<title>$title</title>
#parse("views/common-head.vsl")
</head>

Expand Down Expand Up @@ -31,7 +33,7 @@
#foreach($subject in $model.listSubjects())
#if( $subject != $topic )
<div class="well" resource="$subject.getURI()">
<h3><a href="$subject.getURI()">$helpers.getObjectTitle($rdf, $subject.asNode())</a></h3>
<h3><a href="$subject.getURI()">$esc.html($helpers.getObjectTitle($rdf, $subject.asNode()))</a></h3>
#triples($subject.asNode())
</div>
#end
Expand Down
1 change: 1 addition & 0 deletions fcrepo-http-api/src/main/resources/views/search-form.vsl
View file
@@ -1,3 +1,4 @@
<!DOCTYPE HTML>
#parse("views/common.vsl")
<html>
<head>
Expand Down
3 changes: 2 additions & 1 deletion fcrepo-http-api/src/main/resources/views/search-results.vsl
View file
Expand Up @@ -2,6 +2,7 @@
#* @vtlvariable name="subjects" type="com.hp.hpl.jena.rdf.model.ResIterator" *#
#* @vtlvariable name="nodeany" type="com.hp.hpl.jena.graph.Node" *#
#* @vtlvariable name="topic" type="com.hp.hpl.jena.graph.Node" *#
<!DOCTYPE HTML>
#parse("views/common.vsl")
<html>
<head>
Expand Down Expand Up @@ -34,7 +35,7 @@
#foreach($subject in $model.listSubjects())
#if( $subject != $topic )
<div class="well" resource="$subject.getURI()">
<h3><a href="$subject.getURI()">$helpers.getObjectTitle($rdf, $subject.asNode())</a></h3>
<h3><a href="$subject.getURI()">$esc.html($helpers.getObjectTitle($rdf, $subject.asNode()))</a></h3>
#triples($subject.asNode())
</div>
#end
Expand Down
4 changes: 4 additions & 0 deletions fcrepo-http-commons/src/main/java/org/fcrepo/responses/BaseHtmlProvider.java
View file
Expand Up @@ -55,6 +55,7 @@
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.tools.generic.EscapeTool;
import org.apache.velocity.tools.generic.FieldTool;
import org.fcrepo.RdfLexicon;
import org.fcrepo.session.SessionFactory;
Expand Down Expand Up @@ -84,6 +85,8 @@ public class BaseHtmlProvider implements MessageBodyWriter<Dataset> {
@javax.ws.rs.core.Context
UriInfo uriInfo;

private static EscapeTool escapeTool = new EscapeTool();

protected VelocityEngine velocity = new VelocityEngine();

/**
Expand Down Expand Up @@ -209,6 +212,7 @@ protected Context getContext(Dataset rdf, Node subject) {
final Context context = new VelocityContext();
context.put("rdfLexicon", fieldTool.in(RdfLexicon.class));
context.put("helpers", ViewHelpers.getInstance());
context.put("esc", escapeTool);
context.put("rdf", rdf.asDatasetGraph());

Model model = unifyDatasetModel(rdf);
Expand Down

0 comments on commit 70c57e4

Please sign in to comment.