---
src/app/stylesheets/aggregator.scss | 57 +++++++++++++++++++------
src/app/views/instance/index.haml | 80 +++++++++++++++++++++--------------
2 files changed, 91 insertions(+), 46 deletions(-)
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index 6fa2c26..da6a074 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -37,7 +37,6 @@ input,textarea {
input[type="search"] {
@include border-radius(20px);
padding: 4px 30px 4px 10px;
- width: 80%;
&:focus {
padding: 3px 29px 3px 9px;
}
@@ -58,6 +57,7 @@ input,textarea {
input.grid_1 { width: 40px !important; }
input.grid_2 { width: 90px !important; }
input.grid_3 { width: 150px !important; }
+ .grid_3 input[type="search"] { width: 118px; }
input.grid_4 { width: 210px !important; }
input.grid_5 { width: 270px !important; }
@@ -128,16 +128,12 @@ input[type='submit'],button,.button {
}
}
-h1 { font-size: 140%; text-transform: uppercase; }
-h2 {
- font-size: 130%;
- text-transform: uppercase;
- color: $headercl;
-}
+h1,h2,h3,h4,h5 { text-transform: uppercase; color: $headercl; font-weight:
bold; }
+h1 { font-size: 140%; }
+h2 { font-size: 130%; }
h3 {
font-size: 120%;
- text-transform: uppercase;
&.gap {
margin-top: 3em;
}
@@ -148,7 +144,7 @@ h4 {
margin-bottom: 4px;
}
}
-h5 { font-size: 100%; text-transform: uppercase; }
+h5 { font-size: 80%; }
.clear {
clear: both;
@@ -159,9 +155,8 @@ h5 { font-size: 100%; text-transform: uppercase; }
margin-bottom: 2em;
}
-.la {
- text-align: left;
-}
+.la { text-align: left; }
+.ra { text-align: right; }
.twocolumn {
@include column-count(2);
@@ -170,6 +165,7 @@ h5 { font-size: 100%; text-transform: uppercase; }
.placeholder { margin-bottom: 2em; }
.disabled { opacity: 0.4; }
+.nomargin { margin: 0; }
/* TABLES */
@@ -247,6 +243,9 @@ table {
}
}
}
+ &.gap {
+ margin-bottom: 7em;
+ }
}
.action {
@@ -271,11 +270,11 @@ table {
font-size: 110%;
font-weight: bold;
margin: 3px 0 20px;
- padding:14px 20px 12px;
+ padding:14px 10px 12px;
text-transform: uppercase;
}
dd {
- margin: 0 0 0 20px;
+ margin: 0 0 0 10px;
font-size: 110%;
position: relative;
a {
@@ -287,6 +286,12 @@ table {
color: $dcprimary;
}
}
+ h5 {
+ margin: 3em 0 .5em 0;
+ &:first-child {
+ margin: 0 0 .5em 0;
+ }
+ }
ul {
display: block;
li {
@@ -436,6 +441,7 @@ ul.block {
}
input[type="search"] {
border-color: $headerbg;
+ width: 80%;
}
}
a {
@@ -738,6 +744,29 @@ legend {
}
}
+/* search forms */
+
+.search {
+ position: relative;
+ button {
+ position: absolute;
+ width: 16px; height: 16px;
+ text-indent: -200em;
+ right: 8px; top: 50%;
+ margin: -8px 0 0;
+ background-position: 0 0;
+ border: none;
+ padding: 0;
+ &:hover {
+ box-shadow: none;
+ -webkit-shadow: none;
+ -moz-box-shadow: none;
+ }
+ }
+ input[type="search"] {
+ float: right; /* webkit adds an extra padding and makes the widget
narrower */
+ }
+}
/* WIZARD TILES */
ul.tiles {
diff --git a/src/app/views/instance/index.haml
b/src/app/views/instance/index.haml
index f38e218..9488929 100644
--- a/src/app/views/instance/index.haml
+++ b/src/app/views/instance/index.haml
@@ -9,38 +9,54 @@
{:name => 'STARTED BY', :sort_attr => 'users.last_name'}, |
] |
+- form_tag(:action => 'instance_action') do
+ .actionsidebar.grid_3
+ %dl
+ %dt Actions
+ %dd
+ %h5 Control Instances
+ %ul
+ %li.delete
+ %span
+ = submit_tag "Shutdown", :name => "shutdown", :class => "icon"
-%h2 POOL STATUS
-TODO (include michal's pool partial)
+ %dd
+ %h5 Manage Instances
+ %ul
+ %li.info
+ %span
+ = submit_tag "Instance Details", :name => "instance_details",
:class => "icon"
-%h2 INSTANCES BY POOL
-- form_tag(:action => 'instance_action') do
- %ul
- %li ACTIONS
- %li CONTROL INSTANCES
- %li= submit_tag "Shutdown", :name => "shutdown"
- %hr
- %li MANAGE INSTANCES
- %li= submit_tag "Instance Details", :name => "instance_details"
- - @pools.each do |pool|
- %hr
- = pool.name
- = submit_tag "Launch Instance", :name => "launch_instance_#{pool.id}"
- Show All
- %table
- = sortable_table_header(columns)
- %tbody
- - if not instances = @sorted_instances_by_pool[pool.id] or
instances.empty?
- %tr
- %td{:colspan => 8} No Instances
- - else
- - instances.each do |inst|
+ .grid_13
+ %h2 Pool Status
+
+ %h2 Instances by Pool
+ - @pools.each do |pool|
+ %h4.grid_4.alpha.nomargin= pool.name
+ .grid_2
+ = submit_tag "Launch Instance", :name => "launch_instance_#{pool.id}"
+ .grid_4
+ %input{:type => "radio"}
+ %label Show All
+ %input{:type => "radio"}
+ %label Summary View
+ .search.grid_3.omega
+ %input{:type => "search", :placeholder => "Search Instance"}
+ %button.action Search
+ %table.gap
+ = sortable_table_header(columns)
+ %tbody
+ - if not instances = @sorted_instances_by_pool[pool.id] or
instances.empty?
%tr
- %td= check_box_tag 'id[]'
- %td=inst.state
- %td= inst.name
- %td= inst.hardware_profile.name
- %td= inst.template.name
- %td= inst.public_ip_addresses
- %td= inst.cloud_account ? inst.cloud_account.provider.name : ''
- %td= "#{inst.owner.first_name} #{inst.owner.last_name}" # TODO,
there is "started by" in comps pdf, but we don't save this info
+ %td{:colspan => 8} No Instances
+ - else
+ - instances.each do |inst|
+ %tr
+ %td= check_box_tag 'id[]'
+ %td=inst.state
+ %td= inst.name
+ %td= inst.hardware_profile.name
+ %td= inst.template.name
+ %td= inst.public_ip_addresses
+ %td= inst.cloud_account ? inst.cloud_account.provider.name : ''
+ %td= "#{inst.owner.first_name} #{inst.owner.last_name}" #
TODO, there is "started by" in comps pdf, but we don't save this info
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
