---
src/app/helpers/provider_accounts_helper.rb | 7 ++-
src/app/stylesheets/layout.scss | 51 +++++++++++++----------
src/app/views/layouts/_filter_table.html.haml | 2 +-
src/app/views/provider_accounts/_list.html.haml | 7 ++-
4 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/src/app/helpers/provider_accounts_helper.rb
b/src/app/helpers/provider_accounts_helper.rb
index 5adfaf2..437728a 100644
--- a/src/app/helpers/provider_accounts_helper.rb
+++ b/src/app/helpers/provider_accounts_helper.rb
@@ -1,13 +1,14 @@
module ProviderAccountsHelper
def provider_accounts_header
[
- { :name => '', :sortable => false },
+ { :name => '', :sortable => false, :class => 'checkbox'
},
+ { :name => '', :sortable => false, :class => 'alert' },
{ :name => t("provider_accounts.index.provider_account_name"),
:sortable => false },
{ :name => t("provider_accounts.index.username"), :sortable =>
false},
{ :name => t("provider_accounts.index.provider_name"), :sortable =>
false },
{ :name => t("provider_accounts.index.provider_type"), :sortable =>
false },
- { :name => t("provider_accounts.index.quota_used"), :sortable =>
false },
- { :name => t("provider_accounts.index.quota_limit"), :sortable =>
false }
+ { :name => t("provider_accounts.index.quota_used"), :sortable =>
false, :class => 'center' },
+ { :name => t("provider_accounts.index.quota_limit"), :sortable =>
false, :class => 'center' }
]
end
end
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 281a6ab..8e35745 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -1619,7 +1619,6 @@ section.admin-content-section{
margin-top: 0px;
}
- img{padding: 10px;}
}
header.admin-page-header + section.admin-content-section{margin-top: 26px;}
@@ -2254,18 +2253,20 @@ Flat Table Component -- v.0.0.1 [flat_table] (flat_table.scss)
$font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
/* padding configuration */
-$th_padding: 8px 10px 8px 10px;
-$td_padding: 8px;
+$th_padding: 8px 10px 4px 10px;
+$td_padding: 2px 10px;
/* color configuration */
-$cell_color_base: #ffffff;
-$cell_color_header: #cccccc;
+$cell_color_base: #f3f3f3;
+$cell_color_header: #d2d2d2;
$cell_color_stripe: #efefef;
$cell_color_selected: #f9fafe;
$cell_color_gradient: 5%;
$cell_header_text_color: #666666;
+$cell_anchor_text_color: #3286B8;
+
/* useful mixins */
@mixin gradient-bg($from, $to){
background-color: $cell_color_base;
@@ -2318,21 +2319,26 @@ form.filterable-data{
/* Flat Table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
table.flat, form.filterable-data table{
- border-collapse: separate;
+ border-collapse: collapse;
font-family: $font-family-primary;
/* header */
th{
@include gradient-bg($cell_color_base, $cell_color_header);
- text-align: center;
+ text-align: left;
font-size: 11px;
color: $cell_header_text_color;
font-weight: bold;
text-shadow: 0px 1px 0px #ffffff;
padding: $th_padding;
- border-bottom: 1px solid #D6DADD;
- border-left: 1px solid darken(#E9EAEC, $cell_color_gradient);
+ vertical-align: middle;
+ border: 1px solid #bfbfbf;
+ border-top: none;
+
+ &.checkbox{ width: 21px; text-align: center; }
+ &.alert{ width: 16px; text-align: center; }
+ &.center{ text-align: center;}
}
th.ignore{
@@ -2350,28 +2356,29 @@ table.flat, form.filterable-data table{
td{
$cell_color_end: darken($cell_color_base, $cell_color_gradient);
border-spacing: 0px;
- text-align: center;
+ text-align: left;
padding: $td_padding;
+ vertical-align: middle;
border-top: 1px solid #fff;
font-size: 12px;
color: #333;
- @include gradient-bg($cell_color_base, $cell_color_end);
- border-top: 1px solid #fff;
- border-left: 1px solid #fff;
- border-bottom: 1px solid darken($cell_color_end, $cell_color_gradient);
- border-right: 1px solid darken($cell_color_end, $cell_color_gradient);
- }
+ background: #FAFAFA;
+ border: 1px solid #d1d1d1;
+
+ a{
+ color: $cell_anchor_text_color;
+ text-decoration: none;
+ &:hover{ text-decoration: underline; }
+ }
- tr{
- height: 30px;
+ &.checkbox{ width: 21px; text-align: center; }
+ &.alert{ width: 16px; text-align: center; }
+ &.center{ text-align: center;}
}
tr.stripe{
td{
- $cell_color_end: darken($cell_color_stripe, $cell_color_gradient);
- @include gradient-bg($cell_color_stripe, $cell_color_end);
- border-bottom: 1px solid darken($cell_color_stripe, $cell_color_gradient);
- border-right: 1px solid darken($cell_color_stripe, $cell_color_gradient);
+ background: #F3F3F3;
}
}
diff --git a/src/app/views/layouts/_filter_table.html.haml
b/src/app/views/layouts/_filter_table.html.haml
index 8a36b92..c7fbbe2 100644
--- a/src/app/views/layouts/_filter_table.html.haml
+++ b/src/app/views/layouts/_filter_table.html.haml
@@ -24,7 +24,7 @@
%table.checkbox_table
%thead
- columns.each do |column|
- %th
+ %th{:class => column[:class]}
= column[:name]
= rows.collect {|row| capture_haml(row, &block)}.to_s.html_safe
diff --git a/src/app/views/provider_accounts/_list.html.haml
b/src/app/views/provider_accounts/_list.html.haml
index 4223baa..e8604e7 100644
--- a/src/app/views/provider_accounts/_list.html.haml
+++ b/src/app/views/provider_accounts/_list.html.haml
@@ -5,12 +5,13 @@
= filter_table(provider_accounts_header, @provider_accounts) do |account|
%tr{:class => cycle('nostripe','stripe')}
- %td
+ %td{:class => 'checkbox'}
- selected = params[:select] == 'all'
= check_box_tag "accounts_selected[]", account.id, selected, :id =>
"account_checkbox_#{account.id}"
+ %td{:class => 'alert'}= #image_tag
"sb_icon_instance_failure.png"
%td= link_to account.name, provider_provider_account_path(@provider, account)
%td= account.credentials_hash['username']
%td= account.provider.name
%td= account.provider.provider_type.name
- %td= number_to_percentage account.quota.percentage_used, :precision => 0
- %td= account.quota.maximum_running_instances or 'unlimited'
+ %td{:class => 'center'}= number_to_percentage
account.quota.percentage_used, :precision => 0
+ %td{:class => 'center'}= account.quota.maximum_running_instances or
'unlimited'
--
1.7.6