Limit vertical size of workflow thumbnails on /workflows

Mark Robinson · Mark Robinson · commit 9f0321f98f72 · 2017-02-27T14:26:20.000Z
diff --git a/src/main/java/org/commonwl/viewer/web/WorkflowController.java b/src/main/java/org/commonwl/viewer/web/WorkflowController.java
@@ -21,7 +21,6 @@
 
 import com.github.jabbalaci.graphviz.GraphViz;
 import org.apache.commons.lang.StringUtils;
-import org.apache.jena.ext.com.google.common.collect.Lists;
 import org.commonwl.viewer.domain.GithubDetails;
 import org.commonwl.viewer.domain.Workflow;
 import org.commonwl.viewer.domain.WorkflowForm;
@@ -33,13 +32,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.HandlerMapping;
@@ -81,7 +77,7 @@ public WorkflowController(WorkflowFormValidator workflowFormValidator,
      * @return The workflows view
      */
     @RequestMapping(value="/workflows")
-    public String listWorkflows(Model model, Pageable pageable) {
+    public String listWorkflows(Model model, @PageableDefault(size = 10) Pageable pageable) {
         model.addAttribute("workflows", workflowRepository.findAllByOrderByRetrievedOnDesc(pageable));
         model.addAttribute("pages", pageable);
         return "workflows";
diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
@@ -106,6 +106,11 @@ body {
     font-size: 20px;
 }
 
+.workflow-thumb {
+    width:100%;
+    max-height:300px;
+}
+
 #visualisation {
     overflow: hidden;
     padding: 0;
diff --git a/src/main/resources/templates/workflows.html b/src/main/resources/templates/workflows.html
@@ -1,3 +1,22 @@
+<!DOCTYPE html>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 
 <html xmlns:th="http://www.thymeleaf.org">
     <head>
@@ -30,7 +49,7 @@ <h1>Explore Workflows</h1>
                             <tr th:each="workflow : ${workflows}" th:with="workflowURL=@{'/workflows/github.com/' + ${workflow.retrievedFrom.owner} + '/' + ${workflow.retrievedFrom.repoName} + '/tree/' + ${workflow.retrievedFrom.branch} + '/' + ${workflow.retrievedFrom.path}}">
                                 <td>
                                     <a th:href="${workflowURL}">
-                                        <img th:src="@{'/workflows/' + ${workflow.id} + '/graph/svg'}" alt="workflow graph" style="width:100%;"/>
+                                        <img class="workflow-thumb" th:src="@{'/workflows/' + ${workflow.id} + '/graph/svg'}" alt="workflow graph" />
                                     </a>
                                 </td>
                                 <td th:text="${workflow.label}"></td>
