From 1b8a5a1e787cfb4f9c1a40947fb389194e1ed13c Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Mon, 2 Jun 2014 12:40:52 -0400 Subject: [PATCH] ui: action bar layout adjustments, "no results" text --- ui/index.html | 135 +++++++++++++++++++++++++++----------------------- 1 file changed, 72 insertions(+), 63 deletions(-) diff --git a/ui/index.html b/ui/index.html index 522621246..1df178baa 100644 --- a/ui/index.html +++ b/ui/index.html @@ -54,15 +54,15 @@
{{ input type="text" value=filter class="form-control form-control-mini" placeholder="Filter by name"}}
+
+ {{view Ember.Select content=statuses value=filterStatus class="form-control form-control-mini"}} +
-
+
-
- {{view Ember.Select content=statuses value=filterStatus class="form-control form-control-mini"}} -
@@ -261,40 +261,45 @@
{{view App.ActionBarView }} - {{#each service in filteredContent}} + {{#if filteredContent}} + {{#each service in filteredContent}} - {{#if condensedView }} + {{#if condensedView }} - {{#link-to 'services.show' service.Name tagName="div" href=false class="list-group-item list-condensed-link" }} -
-
- {{service.Name}} - - {{ service.checkMessage }} - -
- {{/link-to}} - - {{else}} - - {{#link-to 'services.show' service.Name tagName="div" href=false class="list-group-item list-link" }} -
-

- {{#link-to 'services.show' service.Name class='subtle'}}{{service.Name}}{{/link-to}} -
- {{service.checkMessage}} + {{#link-to 'services.show' service.Name tagName="div" href=false class="list-group-item list-condensed-link" }} +
+
+ {{service.Name}} + + {{ service.checkMessage }} +
-

- - {{/link-to}} + {{/link-to}} - {{/if}} + {{else}} - {{/each}} + {{#link-to 'services.show' service.Name tagName="div" href=false class="list-group-item list-link" }} +
+

+ {{#link-to 'services.show' service.Name class='subtle'}}{{service.Name}}{{/link-to}} + +

+ + {{/link-to}} + + {{/if}} + + {{/each}} + + {{else}} +

There are no services to show.

+ {{/if}}
@@ -355,40 +360,44 @@
{{view App.ActionBarView }} - {{#each node in filteredContent}} + {{#if filteredContent}} + {{#each node in filteredContent}} - {{#if condensedView }} + {{#if condensedView }} - {{#link-to 'nodes.show' node.Node tagName="div" href=false class="list-group-item list-condensed-link" }} -
-
- {{node.Node}} - - {{ node.numServices }} services - -
- {{/link-to}} - - {{else}} - - {{#link-to 'nodes.show' node.Node tagName="div" href=false class="list-group-item list-link" }} -
-

- {{node.Node}} - {{node.Address}} -
- {{node.checkMessage}} + {{#link-to 'nodes.show' node.Node tagName="div" href=false class="list-group-item list-condensed-link" }} +
+
+ {{node.Node}} + + {{ node.numServices }} services +
-

- - {{/link-to}} - {{/if}} + {{/link-to}} - {{/each}} + {{else}} + + {{#link-to 'nodes.show' node.Node tagName="div" href=false class="list-group-item list-link" }} +
+

+ {{node.Node}} + {{node.Address}} + +

+ + {{/link-to}} + {{/if}} + + {{/each}} + {{else}} +

There are no nodes to show.

+ {{/if}}