Skip to content

Commit 2e07769

Browse files
MarkRobboMarkRobbo
committed
Fix merge conflicts
2 parents dd10cf1 + ea9aa0a commit 2e07769

File tree

10 files changed

+43
-12
lines changed

10 files changed

+43
-12
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This is a work-in-progress [Spring Boot](http://projects.spring.io/spring-boot/) MVC application which fetches [Common Workflow Language](http://www.commonwl.org/) files from a Github repository and creates a page for it detailing the main workflow and its inputs, outputs and steps.
44

5-
[![Build Status](https://travis-ci.org/common-workflow-language/cwlviewer.svg?branch=master)](https://travis-ci.org/common-workflow-language/cwlviewer) [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/common-workflow-language/common-workflow-language?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![](https://images.microbadger.com/badges/image/commonworkflowlanguage/cwlviewer.svg)](https://microbadger.com/images/commonworkflowlanguage/cwlviewer "MicroBadger commonworkflowlanguage/cwlviewer") [![Docker image commonworkflowlanguage/cwlviewer](https://images.microbadger.com/badges/version/commonworkflowlanguage/cwlviewer.svg)](https://hub.docker.com/r/commonworkflowlanguage/cwlviewer/ "Docker Hub commonworkflowlanguage/cwlviewer")
5+
[![Build Status](https://travis-ci.org/common-workflow-language/cwlviewer.svg?branch=master)](https://travis-ci.org/common-workflow-language/cwlviewer) [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/common-workflow-language/cwlviewer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![](https://images.microbadger.com/badges/image/commonworkflowlanguage/cwlviewer.svg)](https://microbadger.com/images/commonworkflowlanguage/cwlviewer "MicroBadger commonworkflowlanguage/cwlviewer") [![Docker image commonworkflowlanguage/cwlviewer](https://images.microbadger.com/badges/version/commonworkflowlanguage/cwlviewer.svg)](https://hub.docker.com/r/commonworkflowlanguage/cwlviewer/ "Docker Hub commonworkflowlanguage/cwlviewer")
66

77

88

‎src/main/resources/static/css/main-20170517.css renamed to ‎src/main/resources/static/css/main-20170616.css

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,11 @@ pre {
6969

7070
#logo {
7171
height: 61px;
72-
margin-top: -20px;
73-
margin-left: -20px
72+
padding: 5px;
73+
}
74+
75+
#explore {
76+
padding-top: 20px;
7477
}
7578

7679
#githubURL {
@@ -170,6 +173,7 @@ pre {
170173
overflow: hidden;
171174
padding: 0;
172175
height: 500px;
176+
margin-bottom: 10px;
173177
}
174178

175179
@media (max-width: 767px) {
@@ -230,6 +234,25 @@ pre {
230234
background-color: #e5c500;
231235
}
232236

237+
.legend {
238+
list-style: none;
239+
height:30px;
240+
}
241+
.legend li { float: right; margin-right: 15px; }
242+
.legend span {
243+
border: 1px solid #ccc;
244+
float: left;
245+
width: 20px;
246+
height: 15px;
247+
margin: 2px 4px 2px 2px;
248+
}
249+
250+
.legend .inputoutputs { background-color: #94DDF4; }
251+
.legend .tools { background-color: #FAFAD2; }
252+
.legend .nestedworkflows { background-color: #F3CEA1; }
253+
.legend .defaults { background-color: #D5AEFC; }
254+
.legend .selectednode { background-color: #B9FFBB; }
255+
233256
tr.selected, .table-hover tbody tr.selected:hover td, .table-hover tbody tr.selected:hover th {
234257
background-color: #b9ffbb !important;
235258
}

‎src/main/resources/templates/fragments/error.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<meta charset="UTF-8" />
2525
<meta name="viewport" content="width=device-width, initial-scale=1" />
2626
<title>Common Workflow Language Viewer</title>
27-
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
27+
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170616.css}" href="../static/css/main-20170616.css" />
2828
<link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
2929
</head>
3030
<body>

‎src/main/resources/templates/fragments/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<html xmlns:th="http://www.thymeleaf.org">
2222
<head>
23-
<link rel="stylesheet" type="text/css" href="../../static/css/main-20170517.css" />
23+
<link rel="stylesheet" type="text/css" href="../../static/css/main-20170616.css" />
2424
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
2525
</head>
2626
<body>

‎src/main/resources/templates/fragments/header.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
<html xmlns:th="http://www.thymeleaf.org">
2222
<head>
23-
<link rel="stylesheet" type="text/css" href="../../static/css/main-20170517.css" />
23+
<link rel="stylesheet" type="text/css" href="../../static/css/main-20170616.css" />
2424
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
2525
</head>
2626
<body>
2727
<nav th:fragment="navbar" class="navbar navbar-default navbar-fixed-top">
2828
<div class="container">
2929
<div class="navbar-header">
30-
<a class="navbar-brand" href="/">
30+
<a href="/" class="navbar-left">
3131
<img id="logo" src="/img/CWL-Logo-nofonts.svg"></img>
3232
</a>
3333
<a href="/workflows" class="button navbar-toggle">Explore</a>

‎src/main/resources/templates/fragments/pagination.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<html lang="en" xmlns:th="http://www.thymeleaf.org">
2222
<head>
23-
<link rel="stylesheet" type="text/css" href="../../static/css/main-20170517.css" />
23+
<link rel="stylesheet" type="text/css" href="../../static/css/main-20170616.css" />
2424
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
2525
</head>
2626
<body>

‎src/main/resources/templates/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<meta charset="UTF-8" />
2424
<meta name="viewport" content="width=device-width, initial-scale=1" />
2525
<title>Common Workflow Language Viewer</title>
26-
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
26+
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170616.css}" href="../static/css/main-20170616.css" />
2727
<link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
2828
</head>
2929
<body>

‎src/main/resources/templates/selectworkflow.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<meta charset="UTF-8" />
2424
<meta name="viewport" content="width=device-width, initial-scale=1" />
2525
<title>Common Workflow Language Viewer</title>
26-
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
26+
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170616.css}" href="../static/css/main-20170616.css" />
2727
<link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
2828
</head>
2929
<body>

‎src/main/resources/templates/workflow.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<meta name="twitter:image" th:content="${appURL + '/workflows/' + workflow.id + '/graph/png'}" />
3030
<title th:text="${workflow.label + ' - Common Workflow Language Viewer'}">Common Workflow Language Viewer</title>
3131
<link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
32-
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
32+
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170616.css}" href="../static/css/main-20170616.css" />
3333
</head>
3434
<body th:with="githubURLPart=${workflow.retrievedFrom.getURL().replace('https://', '')}">
3535

@@ -168,6 +168,14 @@ <h2>Workflow: <span th:text="${workflow.label}">Workflow Name</span></h2>
168168
<img id="selectParents" class="graphControl" th:src="@{/img/parents-logo.svg}" src="../static/img/parents-logo.svg" alt="parents" data-tooltip="true" title="Select All Parents" />
169169
<div id="graph" data-th-attr="data-svgurl=@{'/graph/svg/' + ${githubURLPart}}"></div>
170170
</div>
171+
<ul class="legend">
172+
<li><span class="selectednode"></span> Selected</li>
173+
<li class="hidden-xs">|</li>
174+
<li><span class="defaults"></span> Default Values</li>
175+
<li><span class="nestedworkflows"></span> Nested Workflows</li>
176+
<li><span class="tools"></span> Tools</li>
177+
<li><span class="inputoutputs"></span> Inputs/Outputs</li>
178+
</ul>
171179
<div th:if="${workflow.dockerLink != null}">
172180
<h2 style="float:left;">Requires: </h2>
173181
<a th:unless="${workflow.dockerLink == 'true'}" th:href="${workflow.dockerLink}" rel="noopener" target="_blank">

‎src/main/resources/templates/workflows.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<meta charset="UTF-8" />
2424
<meta name="viewport" content="width=device-width, initial-scale=1" />
2525
<title>Common Workflow Language Viewer</title>
26-
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170517.css}" href="../static/css/main-20170517.css" />
26+
<link rel="stylesheet" type="text/css" th:href="@{/css/main-20170616.css}" href="../static/css/main-20170616.css" />
2727
<link rel="stylesheet" th:href="@{/bower_components/bootstrap/dist/css/bootstrap.min.css}" href="../static/bower_components/bootstrap/dist/css/bootstrap.min.css" />
2828
</head>
2929
<body>

0 commit comments

Comments
 (0)