From 07119585f04dc2aabe7a4a2a65ccba57ef2999d3 Mon Sep 17 00:00:00 2001 From: runnabro Date: Tue, 21 Mar 2017 17:56:31 -0700 Subject: [PATCH 1/2] add markup for compose and testing --- views/web-panel.hbs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/views/web-panel.hbs b/views/web-panel.hbs index 9721dd6..cbc19a1 100644 --- a/views/web-panel.hbs +++ b/views/web-panel.hbs @@ -1,8 +1,9 @@ {{!< layout}} {{#if instance}} {{#if isTestingOnly}} -
Tests {{{testResults}}} {{{repoName}}}/{{{instanceName}}}.
-
View on Runnable
+
{{{instanceName}}}
+
Tests: {{{testResults}}}
+
Manage on Runnable
{{else}} {{#if status}} {{!-- @@ -12,14 +13,14 @@ "red" "gray" --}} -
{{{ state }}} {{{repoName}}}/{{{instanceName}}}.
-
View output
-
Manage on Runnable
+
{{{instanceName}}}
+
Tests: Passed
+
Manage on Runnable
{{else}} {{!-- if no status (between building and running) --}} -
{{{ state }}} {{{repoName}}}/{{{instanceName}}}
-
View output
-
Manage on Runnable
+
{{{instanceName}}}
+
Tests: Passed
+
Manage on Runnable
{{/if}} {{/if}} {{/if}} From 18b09cd64c6bd296c9f74b815038a761c3e8d9d5 Mon Sep 17 00:00:00 2001 From: runnabro Date: Tue, 21 Mar 2017 19:44:40 -0700 Subject: [PATCH 2/2] update markup for compose and testing --- public/css/addon.css | 19 ++++++++++++++++++- views/web-panel.hbs | 44 ++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 23 deletions(-) diff --git a/public/css/addon.css b/public/css/addon.css index 237081e..7847dac 100644 --- a/public/css/addon.css +++ b/public/css/addon.css @@ -2,6 +2,24 @@ body { background: #fff; } +section + section { + margin-top: 9px; +} + +.section-manage { + margin-left: 17px; +} + +.container { + display: inline-block; +} + +.container + .container::before { + content: ','; + display: inline-block; + padding-right: 4px; +} + .icon-status { margin-left: 2px; margin-right: 6px; @@ -13,5 +31,4 @@ body { .link { display: inline-block; - margin-top: 9px; } diff --git a/views/web-panel.hbs b/views/web-panel.hbs index cbc19a1..afdc922 100644 --- a/views/web-panel.hbs +++ b/views/web-panel.hbs @@ -1,29 +1,29 @@ {{!< layout}} {{#if instance}} - {{#if isTestingOnly}} -
{{{instanceName}}}
-
Tests: {{{testResults}}}
-
Manage on Runnable
- {{else}} - {{#if status}} - {{!-- - possible status colors: - "green" - "orange" - "red" - "gray" - --}} -
{{{instanceName}}}
-
Tests: Passed
-
Manage on Runnable
- {{else}} - {{!-- if no status (between building and running) --}} -
{{{instanceName}}}
-
Tests: Passed
-
Manage on Runnable
- {{/if}} + {{!-- staging containers --}} +
+ {{#each container}} + + {{/each}} +
+ + {{!-- conditionally show test results --}} + {{#if testResults}} +
+ + {{{testResults}}} +
{{/if}} + + {{!-- manage on runnable url --}} +
+ Manage on Runnable +
{{/if}} + {{#unless instance}}
🔭 {{{text}}}
Go to Runnable