Merge pull request #26 from common-workflow-language/origin-info

Display Github link and when the workflow was downloaded

Author: MarkRobbo

src/main/java/org/commonwl/viewer/domain/Workflow.java

@@ -31,6 +31,8 @@
 import java.util.Date;
 import java.util.Map;
 
+import static java.util.Calendar.DATE;
+
 /**
  * Representation of a workflow
  */
@@ -43,7 +45,7 @@ public class Workflow {
     private String id;
 
     // Metadata
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+    @DateTimeFormat(pattern="MMM d yyyy 'at' hh:mm")
     private Date retrievedOn;
     private GithubDetails retrievedFrom;
     private Path roBundle;
@@ -55,7 +57,7 @@ public class Workflow {
     private Map<String, CWLElement> outputs;
 
     // DOT graph of the contents
-    private String dotGraph = "test";
+    private String dotGraph;
 
     public Workflow(String label, String doc, Map<String, CWLElement> inputs, Map<String, CWLElement> outputs) {
         this.label = label;

src/main/resources/static/css/main.css

@@ -38,6 +38,10 @@ body {
     padding-left: 45px;
 }
 
+#githubLogo {
+    margin-right: 5px;
+}
+
 #graph-menu {
     margin-bottom: 5px;
 }

src/main/resources/templates/workflow.html

@@ -100,6 +100,12 @@ <h4 class="modal-title" id="dotGraphLabel">Workflow DOT Graph</h4>
     <div class="row">
         <div class="col-md-12" role="main" id="main">
             <h2>Workflow: <span th:text="${workflow.label}">Workflow Name</span></h2>
+            <p>
+                <a th:href="@{'https://github.com/' + ${workflow.retrievedFrom.owner} + '/' + ${workflow.retrievedFrom.repoName} + '/tree/' + ${workflow.retrievedFrom.branch} + '/' + ${workflow.retrievedFrom.path}}" href="#" rel="noopener" target="_blank">
+                    <img id="githubLogo" src="../static/img/GitHub-Mark-32px.png" th:src="@{/img/GitHub-Mark-32px.png}" width="24" height="24" />
+                </a>
+                <i>Fetched <span th:text="${{workflow.retrievedOn}}">01/12/16 at 21:00</span></i>
+            </p>
             <p th:text="${workflow.doc}">Workflow Doc</p>
         </div>
     </div>