Started fragment template

Miel Vander Sande · Miel Vander Sande · commit f160c7c14e00 · 2015-12-16T14:47:18.000+01:00
diff --git a/src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java b/src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java
@@ -3,8 +3,6 @@
 import com.google.gson.JsonObject;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
 import freemarker.template.TemplateException;
 import java.io.File;
 import java.io.FileReader;
@@ -13,10 +11,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map.Entry;
-import java.util.function.Consumer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
diff --git a/src/org/linkeddatafragments/views/HtmlWriter.java b/src/org/linkeddatafragments/views/HtmlWriter.java
@@ -15,6 +15,7 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import org.linkeddatafragments.datasource.IDataSource;
@@ -39,10 +40,12 @@ public void write(OutputStream outputStream, HashMap<String, IDataSource> dataSo
         Template temp = cfg.getTemplate("index.ftl.html");
         
         Map data = new HashMap();
-        data.put("assetsPath", "css/");
+        data.put("assetsPath", "assets/");
         data.put("header", datasource.getTitle());
         data.put("datasources", dataSources);
         data.put("content", "");
+        data.put("date", new Date());
+
         
         data.put("controls", fragment.getControls());
         data.put("metadata", fragment.getMetadata());
diff --git a/views/base.ftl.html b/views/base.ftl.html
@@ -3,13 +3,7 @@
 <html lang="en" prefix="hydra: http://www.w3.org/ns/hydra/core# void: http://rdfs.org/ns/void#">
 <head>
   <meta charset="utf-8">
-    <title>
-    <#attempt>
-    ${ title || header }
-    <#recover>
-    'Linked Data Fragments Server'
-    </#attempt>
-    </title>
+    <title>${ (title || header)!"Linked Data Fragments Server" }</title>
   <link rel="stylesheet" href="${ assetsPath }style" />
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:700italic,400,700|Droid+Sans+Mono" type="text/css" />
   <meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1">
@@ -33,7 +27,7 @@ <h1><a href="/">
   <footer>
     <p>
       Powered by a <a href="https://github.com/LinkedDataFragments/Server.java" target="_blank">Linked Data Fragments Server</a>
-      ©2013–2015 Multimedia Lab – iMinds – Ghent University
+      ©2013–${date?string.yyyy} Multimedia Lab – iMinds – Ghent University
     </p>
   </footer>
 </body>
diff --git a/views/index.ftl.html b/views/index.ftl.html
@@ -6,8 +6,10 @@ <h2>Available datasets</h2>
   <dl class="datasets">
     <#list datasources?keys as datasourceName>
         <dt><a href="/${datasourceName}">${datasources[datasourceName].getTitle() }</a></dt>
-        <dd>${ datasources[datasourceName].getDescription() }</dd>
+        <dd>${ datasources[datasourceName].getDescription()!"" }</dd>
     </#list>
   </dl>
   <p>The current dataset <em class="dataset">index</em> contains metadata about these datasets.</p>
 </div>
+
+<#include "fragment.ftl.html">
