Skip to content

Commit 3bdd959

Browse files
MarkRobboMark Robinson
authored andcommitted
Add legend to explain colours in the graph
1 parent 288285a commit 3bdd959

File tree

9 files changed

+37
-8
lines changed

9 files changed

+37
-8
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ body {
138138
overflow: hidden;
139139
padding: 0;
140140
height: 500px;
141+
margin-bottom: 10px;
141142
}
142143

143144
@media (max-width: 767px) {
@@ -180,6 +181,26 @@ body {
180181
color: #c30000;
181182
}
182183

184+
185+
.legend {
186+
list-style: none;
187+
height:30px;
188+
}
189+
.legend li { float: right; margin-right: 15px; }
190+
.legend span {
191+
border: 1px solid #ccc;
192+
float: left;
193+
width: 20px;
194+
height: 15px;
195+
margin: 2px 4px 2px 2px;
196+
}
197+
198+
.legend .inputoutputs { background-color: #94DDF4; }
199+
.legend .tools { background-color: #FAFAD2; }
200+
.legend .nestedworkflows { background-color: #F3CEA1; }
201+
.legend .defaults { background-color: #D5AEFC; }
202+
.legend .selectednode { background-color: #B9FFBB; }
203+
183204
tr.selected, .table-hover tbody tr.selected:hover td, .table-hover tbody tr.selected:hover th {
184205
background-color: #b9ffbb !important;
185206
}

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: 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/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>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>
3535

@@ -165,6 +165,14 @@ <h2>Workflow: <span th:text="${workflow.label}">Workflow Name</span></h2>
165165
<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" />
166166
<div id="graph" data-th-attr="data-svgurl=@{'/workflows/' + ${workflow.id} + '/graph/svg'}"></div>
167167
</div>
168+
<ul class="legend">
169+
<li><span class="selectednode"></span> Selected</li>
170+
<li class="hidden-xs">|</li>
171+
<li><span class="defaults"></span> Default Values</li>
172+
<li><span class="nestedworkflows"></span> Nested Workflows</li>
173+
<li><span class="tools"></span> Tools</li>
174+
<li><span class="inputoutputs"></span> Inputs/Outputs</li>
175+
</ul>
168176
<div th:if="${workflow.dockerLink != null}">
169177
<h2 style="float:left;">Requires: </h2>
170178
<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)