Merge pull request #69 from common-workflow-language/twitter-summary-card

MarkRobbo · web-flow · commit 8072b42022ff · 2017-02-28T15:55:59.000Z
Twitter summary card support
diff --git a/src/main/java/org/commonwl/viewer/services/DotWriter.java b/src/main/java/org/commonwl/viewer/services/DotWriter.java
@@ -57,7 +57,7 @@ public void writeGraph(Workflow workflow) throws IOException {
 
         // Overall graph style
         writeLine("  graph [");
-        writeLine("    bgcolor = \"transparent\"");
+        writeLine("    bgcolor = \"#eeeeee\"");
         writeLine("    color = \"black\"");
         writeLine("    fontsize = \"10\"");
         writeLine("    labeljust = \"left\"");
diff --git a/src/main/java/org/commonwl/viewer/services/WorkflowRepository.java b/src/main/java/org/commonwl/viewer/services/WorkflowRepository.java
@@ -33,7 +33,6 @@ public interface WorkflowRepository extends PagingAndSortingRepository<Workflow,
     // Finds a workflow model in the database based on where it was retrieved from
     Workflow findByRetrievedFrom(GithubDetails retrievedFrom);
 
-    // Get the first 10 workflows
     Page<Workflow> findAllByOrderByRetrievedOnDesc(Pageable pageable);
 
 }
diff --git a/src/main/java/org/commonwl/viewer/web/WorkflowController.java b/src/main/java/org/commonwl/viewer/web/WorkflowController.java
@@ -137,7 +137,8 @@ public ModelAndView newWorkflowFromGithubURL(@Valid WorkflowForm workflowForm, B
      * @return The workflow view with the workflow as a model
      */
     @RequestMapping(value="/workflows/github.com/{owner}/{repoName}/tree/{branch}/**")
-    public ModelAndView getWorkflowByGithubDetails(@PathVariable("owner") String owner,
+    public ModelAndView getWorkflowByGithubDetails(@Value("${applicationURL}") String applicationURL,
+                                                   @PathVariable("owner") String owner,
                                                    @PathVariable("repoName") String repoName,
                                                    @PathVariable("branch") String branch,
                                                    HttpServletRequest request) {
@@ -181,7 +182,7 @@ public ModelAndView getWorkflowByGithubDetails(@PathVariable("owner") String own
         }
 
         // Display this model along with the view
-        return new ModelAndView("workflow", "workflow", workflowModel);
+        return new ModelAndView("workflow", "workflow", workflowModel).addObject("appURL", applicationURL);
 
     }
 
@@ -239,7 +240,8 @@ public FileSystemResource getGraphAsSvg(@Value("${graphvizStorage}") String grap
             gv.decreaseDpi();
             gv.decreaseDpi();
             gv.decreaseDpi();
-            gv.writeGraphToFile(gv.getGraph(workflowModel.getDotGraph(), "svg", "dot"), out.getAbsolutePath());
+            gv.writeGraphToFile(gv.getGraph(workflowModel.getDotGraph()
+                    .replace("bgcolor = \"#eeeeee\"", "bgcolor = \"transparent\""), "svg", "dot"), out.getAbsolutePath());
         }
 
         // Output the graph image
diff --git a/src/main/resources/templates/workflow.html b/src/main/resources/templates/workflow.html
@@ -22,6 +22,11 @@
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:site" content="@commonwl" />
+    <meta name="twitter:title" th:content="${'CWL Workflow: ' + workflow.label}" />
+    <meta name="twitter:description" th:if="${workflow.doc != null}" th:content="${workflow.doc}" />
+    <meta name="twitter:image" th:content="${appURL + '/workflows/' + workflow.id + '/graph/png'}" />
     <title>Common Workflow Language Viewer</title>
     <link rel="stylesheet" type="text/css" th:href="@{/css/main.css}" href="../static/css/main.css" />
     <link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public interface WorkflowRepository extends PagingAndSortingRepository<Workflow,`
`33`	`33`	`// Finds a workflow model in the database based on where it was retrieved from`
`34`	`34`	`Workflow findByRetrievedFrom(GithubDetails retrievedFrom);`
`35`	`35`
`36`		`- // Get the first 10 workflows`
`37`	`36`	`Page<Workflow> findAllByOrderByRetrievedOnDesc(Pageable pageable);`
`38`	`37`
`39`	`38`	`}`