This patch removes styles that we no longer need. In addition, it drops more of the ovirt legacy -- some layouts and helpers that we don't use anywhere in the current code.
(this is a rebased version of a patch that was sent before and got lost in the rush)
From: Tomas Sedovic tsedovic@redhat.com
--- src/app/controllers/application_controller.rb | 6 - src/app/helpers/application_helper.rb | 127 -------- src/app/views/layouts/_notification.rhtml | 2 +- src/app/views/layouts/help-and-content.rhtml | 6 - src/app/views/layouts/popup-error.rhtml | 1 - src/app/views/layouts/popup.rhtml | 2 +- src/app/views/layouts/selection.rhtml | 26 -- src/app/views/layouts/tabs-and-content.rhtml | 15 - src/public/stylesheets/cloud/layout.css | 307 ------------------ src/public/stylesheets/components.css | 47 ++-- src/public/stylesheets/dcloud.css | 182 ++++++------ src/public/stylesheets/default.css | 233 -------------- src/public/stylesheets/facebox.css | 8 +- src/public/stylesheets/layout.css | 423 +++---------------------- 14 files changed, 165 insertions(+), 1220 deletions(-) delete mode 100644 src/app/views/layouts/help-and-content.rhtml delete mode 100644 src/app/views/layouts/selection.rhtml delete mode 100644 src/app/views/layouts/tabs-and-content.rhtml delete mode 100644 src/public/stylesheets/cloud/layout.css delete mode 100644 src/public/stylesheets/default.css
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 3c22383..a563d57 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -113,14 +113,8 @@ class ApplicationController < ActionController::Base def html_error_page(title, msg) @title = title @errmsg = msg - @ajax = params[:ajax] - @nolayout = params[:nolayout] if @layout render :layout => 'aggregator' - elsif @ajax - render :template => 'layouts/popup-error', :layout => 'tabs-and-content' - elsif @nolayout - render :template => 'layouts/popup-error', :layout => 'help-and-content' else render :template => 'layouts/popup-error', :layout => 'popup' end diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 4565fb0..f7b96af 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -19,110 +19,8 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will be available for all controllers.
-require 'rubygems' -gem 'rails' -require 'erb' - module ApplicationHelper
- def text_field_with_label(label, obj, meth, opts = {}, divopts = {}) - opts[:class] = "textfield_effect" - opts[:style]="width:250px;" unless opts[:style] - divsclass = "" - if divopts[:class] - divclass = " class=#{divopts[:class]}" - end - %{ - <div class="field_title"><label for="#{obj}_#{meth}">#{_(label)}</label></div> - <div class="form_field"#{divclass}>#{text_field obj, meth, opts}#{divopts[:afterfield] if divopts[:afterfield]}</div> - } - end - - def select_with_label(label, obj, meth, coll, opts={}) - opts[:class] = "dropdown_effect" - opts[:style]="width:320px;" unless opts[:style] - %{ - <div class="field_title"><label for="#{obj}_#{meth}">#{_(label)}</label></div> - <div class="form_field">#{select obj, meth, coll, opts}</div> - } - end - - def select_tag_with_label(label, name, select_options, opts={}) - opts[:class] = "dropdown_effect" - opts[:style]="width:320px;" unless opts[:style] - %{ - <div class="field_title"><label for="#{name}">#{_(label)}</label></div> - <div class="form_field">#{select_tag name, options_for_select(select_options), opts}</div> - } - end - - def hidden_field_with_label(label, obj, meth, display) - %{ - <div class="i"><label for="#{obj}_#{meth}">#{_(label)}</label> - #{hidden_field obj, meth}<span class="hidden">#{display}</span></div> - } - end - - def hidden_field_tag_with_label(label, name, value, display) - %{ - <div class="i"><label for="#{name}">#{_(label)}</label> - #{hidden_field_tag name, value}<span class="hidden">#{display}</span></div> - } - end - - def check_box_tag_with_label(label, name, value = "1", checked = false) - %{ - <div class="i">#{check_box_tag name, value, checked} - <label for="#{name}">#{_(label)}</label></div> - } - end - - def radio_button_tag_with_label(label, name, value = "1", checked = false) - %{ - <div class="i"><label for="#{name}">#{_(label)}</label> - #{radio_button_tag name, value, checked}</div> - } - end - - # expects hash of labels => actions - def multi_button_popup_footer(buttons = {}) - buttons_html = "" - buttons.each{ |label, action| - buttons_html+="<div class="button">" + - " <div class="button_left_blue"></div>" + - " <div class="button_middle_blue"><a href="#" onclick="#{action}">#{label}</a></div>" + - " <div class="button_right_blue"></div>" + - "</div>" - } - - %{ - <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0; float: left; width: 97%;"> - <div class="button"> - <div class="button_left_grey"></div> - <div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">Cancel</a></div> - <div class="button_right_grey"></div> - </div> - #{buttons_html} - </div> - } - end - - def popup_footer(action, label) - multi_button_popup_footer({label => action}) - end - - def ok_footer - %{ - <div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0;"> - <div class="button"> - <div class="button_left_grey"></div> - <div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">OK</a></div> - <div class="button_right_grey"></div> - </div> - </div> - } - end - def confirmation_dialog(div_id, text, action) %{ <div id="#{div_id}" style="display:none;"> @@ -147,31 +45,6 @@ module ApplicationHelper } end
- def timeout_flash(name) - %{ - <script type="text/javascript"> - // <![CDATA[ - var closeFlash = function() {$('#{name}').setStyle({'display':'none'})}; - setTimeout(closeFlash, 1000 * 45); - // ]]> - </script> - } - end - - def focus(field_name) - %{ - <script type="text/javascript"> - // <![CDATA[ - Field.activate('#{field_name}'); - // ]]> - </script> - } - end - - def flash_path(source) - compute_public_path(source, 'swfs', 'swf') - end - def number_to_duration(input_num) input_int = input_num.to_i hours_to_seconds = [input_int/3600 % 24, diff --git a/src/app/views/layouts/_notification.rhtml b/src/app/views/layouts/_notification.rhtml index b969739..a260c3c 100644 --- a/src/app/views/layouts/_notification.rhtml +++ b/src/app/views/layouts/_notification.rhtml @@ -28,4 +28,4 @@ <% if flash[:notice] %> <div class="success"><ul><li><%= flash[:notice] %></li></ul></div> <% end %> -</div> \ No newline at end of file +</div> diff --git a/src/app/views/layouts/help-and-content.rhtml b/src/app/views/layouts/help-and-content.rhtml deleted file mode 100644 index a8279f1..0000000 --- a/src/app/views/layouts/help-and-content.rhtml +++ /dev/null @@ -1,6 +0,0 @@ -<div id="help-div"> - <%= link_to image_tag("icon_help.png"), - {:controller => 'help', :action => @help_section, :anchor => @anchor}, - :id=>"help-link", :popup => true, :title => "Help" %> -</div> -<%= yield %> diff --git a/src/app/views/layouts/popup-error.rhtml b/src/app/views/layouts/popup-error.rhtml index 5c67bed..8e58a31 100644 --- a/src/app/views/layouts/popup-error.rhtml +++ b/src/app/views/layouts/popup-error.rhtml @@ -2,4 +2,3 @@ <%= @title %> <%- end -%> <%= @errmsg %> -<%= ok_footer unless @ajax or @nolayout %> diff --git a/src/app/views/layouts/popup.rhtml b/src/app/views/layouts/popup.rhtml index 55dda58..b67e5da 100644 --- a/src/app/views/layouts/popup.rhtml +++ b/src/app/views/layouts/popup.rhtml @@ -3,5 +3,5 @@ <div class="header"><%= yield :title -%></div> <div><%= yield :description -%></div> </div> -<%= yield %> +<%= yield %> </div> diff --git a/src/app/views/layouts/selection.rhtml b/src/app/views/layouts/selection.rhtml deleted file mode 100644 index 1f313d7..0000000 --- a/src/app/views/layouts/selection.rhtml +++ /dev/null @@ -1,26 +0,0 @@ -<div class="selection_title"><%= yield :title -%></div> - - <% tools = yield :action_links -%> - <% if tools %> -<!-- FIXME: for the love of pete, are we really using a list just to insert a separator?? - This needs to be cleaned up as soon as somone has time. It should be a horizontal list - for the links (tools), with this separator set as a left background on the first item. ---> - <ul class="selection_tools"> - <li> - <%= image_tag "icon_separator.png", :style=>"vertical-align: middle;" %> - </li> - <%= tools -%> - </ul> - <% end %> - <div class="clear_row"/> - <div class="selection_left"> - <%= yield %> - </div> - -<% right = yield :right -%> -<% if right %> - <div class="selection_right"> - <%= right -%> - </div> -<% end %> diff --git a/src/app/views/layouts/tabs-and-content.rhtml b/src/app/views/layouts/tabs-and-content.rhtml deleted file mode 100644 index 82e6ea1..0000000 --- a/src/app/views/layouts/tabs-and-content.rhtml +++ /dev/null @@ -1,15 +0,0 @@ -<div id="side-toolbar" class="header_menu_wrapper"> - <%= render :partial => '/layouts/side_toolbar' %> -</div> -<div id="side"> - <%= render :partial => '/layouts/main_nav' %> -</div> -<div id="main"> - <div id="content_area"> - <div id="help-div"> - <%= link_to image_tag("icon_help.png"), - {:controller => 'help', :action => @help_section, :anchor => @anchor}, - :id=>"help-link", :popup => true, :title => "Help" %> - </div> - </div> -</div> diff --git a/src/public/stylesheets/cloud/layout.css b/src/public/stylesheets/cloud/layout.css deleted file mode 100644 index 521d8a8..0000000 --- a/src/public/stylesheets/cloud/layout.css +++ /dev/null @@ -1,307 +0,0 @@ -/* ------ General Layout ------ */ - -html {min-width:640px;} - -#head h1 a { - background:transparent url(../../images/mystery_cloud.png) no-repeat scroll 20px 50%; - /* - TODO: change this back to a real logo when we have one. - */ - display:block; - height:59px; - overflow:hidden; - text-decoration:none; - text-indent:-9999px; - width:87px; -} - -#login-box { - display:block; - line-height:3.75ex; - position:absolute; - right:4ex; - text-align:right; - top:12px; -} - -#login-box a { - color: #337ACC; -} - -/* Make buttons look like links */ -.button_as_link { - background: none; - color: #666666; - border: none; - cursor: pointer; -} - -#navcontainer { - height:40px; -} - -#navcontainer ul { - padding-left: 0; - margin-left: 0; - background-color: #fff; - color: #afb2bd; - float: left; - width: 100%; -} - -#navcontainer ul li { display: inline; } - -#navcontainer ul li a { - padding: 12px 20px; - border-top: solid 2px transparent; - background: #fff; - color: #afb2bd; - font-weight: bold; - text-decoration: none; - text-transform: uppercase; - float: left; -} - -#navcontainer ul li a:hover { - background: #fff; - color: #989ba7; -} - -#navcontainer ul li a.current { - border-top: solid 2px #337acc; - background: #e0eeff url(../../images/tab_bg.png) repeat-x; - color: #404552; -} - -#content {margin-left:0;} - -#content table{width:100%;} - -/* #content table tr.odd {background:#eef2f2;} */ - -#content table tr:hover {background: #fdfef1;} - -#content table th, #content table td { - border:1px solid #E1E1E3; - border-right: 0; - border-left: 0; - padding:0; - text-align:left; -} - -#content table th {background: none;border-top: none;} - -#content table div { - padding: 0.5ex; -} - -#content table th a { - display: block; - text-decoration: none; -} - -#content table th a:hover { - text-decoration: underline; -} - -.sortup { - background: transparent url('../../images/Sort_up_11.png') top center no-repeat !important; -} - -.sortdown { - background: transparent url('../../images/Sort_down_11.png') top center no-repeat !important; -} - -.sortable:hover {/* background-color: #DDDDDD !important; */} - -.selected {background: #fbf0a7 !important;} - -.center {text-align:center;} - -.pagination {padding-top: 1ex;} - -#list-view {margin-bottom:2em;} - - -#detail-view { - border-top: 2px solid #CECECE; -} - -#graph { - border: 1px solid #EFEFEF; - margin-bottom: 1.5ex; - height: 15ex; -} - -#submit_for_list { - float: right; - background: none; - border: 0; - color: #337ACC; - cursor: pointer; - margin-right:12px; - font-size: 1em; - text-decoration: underline; -} - -input#submit_for_list { - margin:12px 16px 0 0; - padding:0; -} - -#detail_header { - background-color: #EFEFEF; - height: 5em; - margin-bottom: 1em; -} - -#detail_header h3 { - color:#666666; - margin: 8px 12px 12px 16px; - display:inline-block; - font-size: 1.2em; -} - - -/* ----- Backgrounds for states ----- */ -.state-container { - margin-left:5px; - text-indent:12px; -} - -.task-canceled {background:url(../../images/icon-canceled-11px.png) left center no-repeat;} -.task-failed {background:url(../../images/icon-failed-11px.png) left center no-repeat;} -.task-finished {background:url(../../images/icon-finished-11px.png) left center no-repeat;} -.task-paused {background:url(../../images/icon-paused-11px.png) left center no-repeat;} -.task-queued {background:url(../../images/icon-queued-11px.png) left center no-repeat;} -.task-running {background:url(../../images/icon-running-11px.png) left center no-repeat;} -.instance-unreachable {background:url(../../images/icon_unknown_11px.png) left center no-repeat;} -.instance-stopped {background:url(../../images/icon_stop_11px.png) left center no-repeat;} -.instance-suspended {background:url(../../images/icon_suspend_11px.png) left center no-repeat;} -.instance-saved {background:url(../../images/icon_save_11px.png) left center no-repeat;} -.instance-create_failed {background:url(../../images/icon_failed_11px.png) left center no-repeat;} -.instance-invalid {background:url(../../images/icon_warning_11px.png) left center no-repeat;} -.instance-pending {background:url(../../images/icon_queued_11px.png) left center no-repeat;} -.instance-running {background:url(../../images/icon_start_11px.png) left center no-repeat;} -.instance-creating {background:url(../../images/icon_startup_11px.png) left center no-repeat;} - - -/* ----- Actions Toolbar -------- */ -#toolbar { - background: #e3eaf2; - border-top: 1px solid #d1dfee; - border-bottom: 1px solid #d1d7de; - margin-bottom: 1em; -} - -#toolbar img { - margin: 0; -} - -#toolbar ul{ - list-style: none; - margin:0; - padding:0; -} - -#toolbar li { - display: inline-block; - position: relative; - color: #666666; - padding: 8px 16px; -} - -#toolbar li:hover { - background: #337ACC; -} - -#toolbar li:hover > .button_as_link { - color: #FFFFFF; -} - -#toolbar li.current { /* This is not really needed right now, but will be useful when we add filters. */ - background: #4B95B8; -} - -#toolbar li ul { - display: none; - position: absolute; - top: 1em; - left: 0; - background: #bec7e0; /* #F0F0F0; */ - padding: 4px; -} - -#toolbar li ul li { - display: block; - white-space: nowrap; - padding-right: 1em; -} - -#toolbar li > ul { - top: auto; - left: auto; -} - -#toolbar li:hover ul {display: block;} - -/****** Notification styles ******/ -#notification { - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; - position: absolute; - z-index: 1; - top: 2em; - left: 35%; - margin: 0 auto; - padding: 1.5em; - background: #337ACC; - border: solid 0.2em; -} - -.error-align {left: 25% !important;} - -#notification > div { - margin-bottom: 1em; -} - -#notification h4 { - text-indent: 3em; -} - -#close-notify { - position: absolute; - right: 0.2em; - top: 0.2em; - width:11px; - height:11px; - background: url(../../images/closebox-11px.png) no-repeat; -} - -.success { - width: 100%; - background:url(../../images/icon_conf_success.png) left center no-repeat #CCFFCC; - border: solid 0.2em green; - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; -} - -.success li, .error li { - margin-left:3em; -} - -.error { - width: 100%; - background:url(../../images/icon_conf_error.png) left center no-repeat #EC9999; - border: solid 0.2em red; - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; -} - -.warning { - width: 100%; - background:url(../../images/icon_conf_warning.png) left center no-repeat #FFFFCC; - border: solid 0.2em yellow; - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; -} diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css index 64df832..88ab05b 100644 --- a/src/public/stylesheets/components.css +++ b/src/public/stylesheets/components.css @@ -1,17 +1,17 @@ /* header style */
.header_logo { - position:absolute; - top:10px; - left:10px; + position:absolute; + top:10px; + left:10px; color: #B5B5B5; }
.header_logo span { - text-transform: uppercase; - margin-left: 5px; - font-weight: bold; - letter-spacing: -0.02em; + text-transform: uppercase; + margin-left: 5px; + font-weight: bold; + letter-spacing: -0.02em; }
ul.nav { @@ -23,10 +23,10 @@ ul.nav { }
ul.nav li { - display: inline; - font-size: 120%; - padding: 3px 15px; - color : #b3b3b3; + display: inline; + font-size: 120%; + padding: 3px 15px; + color : #b3b3b3; }
ul.nav li a { @@ -35,18 +35,18 @@ ul.nav li a { }
ul.nav li.selected { - background: #cbd6db !important; - border-radius: 16px; - -moz-border-radius: 16px; - -webkit-border-radius: 16px; - -moz-box-shadow: 0 1px 1px #efefef; + background: #cbd6db !important; + border-radius: 16px; + -moz-border-radius: 16px; + -webkit-border-radius: 16px; + -moz-box-shadow: 0 1px 1px #efefef; }
ul.nav li:hover { - background: #dedede; - border-radius: 16px; - -moz-border-radius: 16px; - -webkit-border-radius: 16px; + background: #dedede; + border-radius: 16px; + -moz-border-radius: 16px; + -webkit-border-radius: 16px; }
.header_menu_wrapper { @@ -83,13 +83,6 @@ ul.nav li:hover { float: left; }
-#search-form{ - float: left; -} - -#help-link { -} - /* dashboard style */ .dashboard_column{ float: left; diff --git a/src/public/stylesheets/dcloud.css b/src/public/stylesheets/dcloud.css index 0183a55..b643754 100644 --- a/src/public/stylesheets/dcloud.css +++ b/src/public/stylesheets/dcloud.css @@ -1,133 +1,133 @@ /* Styles for forms */ form { - border: none; - margin: 0; - padding: 0; - display: inline-block; + border: none; + margin: 0; + padding: 0; + display: inline-block; }
fieldset { - border: 3px solid #efeff0; - border-right: none; - border-left: none; - border-bottom: none; - padding: 18px 0 10px 10px; + border: 3px solid #efeff0; + border-right: none; + border-left: none; + border-bottom: none; + padding: 18px 0 10px 10px; }
ul li input { - border:2px solid #becfe4; - color:#333; - display:block; - float:left; - outline-color:-moz-use-text-color; - outline-style:none; - outline-width:medium; - padding:3px; - width:302px;} + border:2px solid #becfe4; + color:#333; + display:block; + float:left; + outline-color:-moz-use-text-color; + outline-style:none; + outline-width:medium; + padding:3px; + width:302px;}
legend { - text-transform: uppercase; - color: #9a9a9a; - font-weight: bold; + text-transform: uppercase; + color: #9a9a9a; + font-weight: bold; }
input, select { - font-family: "Lucida Grande","Luxi Sans","Bitstream Vera Sans","Trebuchet MS",helvetica,verdana,arial,sans-serif; - font-size: 1.4em; + font-family: "Lucida Grande","Luxi Sans","Bitstream Vera Sans","Trebuchet MS",helvetica,verdana,arial,sans-serif; + font-size: 1.4em; }
.fieldWithErrors { - display:inline-block; - padding: 3px; - background: #fff7b2; - border: 3px solid #fff7b2; + display:inline-block; + padding: 3px; + background: #fff7b2; + border: 3px solid #fff7b2; }
.errorExplanation { - margin: 0 0 24px 0; - padding: 9px; - background: #fff7b2; - color: #867a5e; - -moz-border-radius: 3px; + margin: 0 0 24px 0; + padding: 9px; + background: #fff7b2; + color: #867a5e; + -moz-border-radius: 3px; }
#errorExplanation h2 { - font-size: 14px; - font-weight: bold; - color: #867a5e; + font-size: 14px; + font-weight: bold; + color: #867a5e; }
.dcloud_form { - background: #e8e8e8; - border: solid 8px #f5f5f5; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - margin-top: 54px; - width: 550px ; - margin-left: auto ; - margin-right: auto ; - padding: 36px; + background: #e8e8e8; + border: solid 8px #f5f5f5; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + margin-top: 54px; + width: 550px ; + margin-left: auto ; + margin-right: auto ; + padding: 36px; }
.dcloud_form h2 { - font-size: 1.9em; - font-weight: normal; - color: #43728e; - margin: 0 0 24px 0; - padding: 0; + font-size: 1.9em; + font-weight: normal; + color: #43728e; + margin: 0 0 24px 0; + padding: 0; }
.dcloud_form ul { - list-style-image: none; - list-style-position: outside; - list-style-type: none; - margin: 0; - padding: 0; + list-style-image: none; + list-style-position: outside; + list-style-type: none; + margin: 0; + padding: 0; }
.dcloud_form ul label { - display: block; - float: left; - padding: 3px 0 24px 0; - width: 175px; - font-size: 1.4em; - color: #616161; + display: block; + float: left; + padding: 3px 0 24px 0; + width: 175px; + font-size: 1.4em; + color: #616161; }
.dcloud_form ul label span { - display: block; - float: left; - width: 160px; - font-size: .8em; - color: #9a9a9a; + display: block; + float: left; + width: 160px; + font-size: .8em; + color: #9a9a9a; }
.dcloud_form ul li { - clear:both; + clear:both; }
.dcloud_form .txtfield { - border:2px solid #becfe4; - color:#333; - display:block; - float:left; - outline-color:-moz-use-text-color; - outline-style:none; - outline-width:medium; - padding:3px; - width:318px; + border:2px solid #becfe4; + color:#333; + display:block; + float:left; + outline-color:-moz-use-text-color; + outline-style:none; + outline-width:medium; + padding:3px; + width:318px; }
.dcloud_form .submit { - float: right; - display: inline; - clear:both; + float: right; + display: inline; + clear:both; }
/* Styles for table */ #content_area table { - width:100%; - border-collapse: collapse; + width:100%; + border-collapse: collapse; }
#content_area table th, #content_area table td { @@ -156,10 +156,10 @@ input, select { }
.actionlink { - color: #0075c0 !important; - line-height: 36px; - font-size: 14px; - padding-left: 18px; + color: #0075c0 !important; + line-height: 36px; + font-size: 14px; + padding-left: 18px; }
ul#providers + a.actionlink { @@ -168,13 +168,13 @@ ul#providers + a.actionlink { }
.submit_link { - background: none; - border:0; - text-decoration: underline; - color: #0075c0; - line-height: 36px; - font-size: 14px; - padding-left: 10px; + background: none; + border:0; + text-decoration: underline; + color: #0075c0; + line-height: 36px; + font-size: 14px; + padding-left: 10px; }
.submit_link:hover {cursor:pointer;} diff --git a/src/public/stylesheets/default.css b/src/public/stylesheets/default.css deleted file mode 100644 index 911d795..0000000 --- a/src/public/stylesheets/default.css +++ /dev/null @@ -1,233 +0,0 @@ -* { font-family: "Arial", "Bitstream Vera Sans", "Liberation Sans", sans-serif; } -body { padding: 0px; margin: 0px auto; font-size: 12pt; margin: 0px; } - -a { color: #0066dd; background-color: inherit; } -a:visited { color: #0066dd; background-color: inherit; } -a:hover { color: #0066dd; background-color: inherit; } - -table, td, tr, th { margin: 0px; padding: 0px; border-collapse: collapse; } -hr { height: 1px; border: none; border-top: 1px solid #bbbbbb; margin: 14px 0px; } - -#wrapper, #logoHeader { width: 976px; text-align: left; margin: 0px auto; position: relative;} -/* ========= HEADER ========== */ - -#headerFade { height: 55px; background: #000 url("/images/header-fade.png") repeat-x scroll top left; } -#greenLine { height: 4px; background-color: #82aa32; } -#darkGreenLine { height: 1px; background-color: #688828; } - -#loginStatus { font-size: 12pt; color: #ffffff; position: absolute; right: 10px; bottom: 10px; } -#loginStatus a { color: #fff; } - -/* ========= TABLE ========== */ - -#main { width: 976px; } -#main td { vertical-align: top; } - -/* ========= TREE ========== */ - -#left { width: 164px; background: #ffffff url("/images/left-fade.png") repeat-y scroll top right; border-left: 10px solid #fff;} -#tree { font-size: 10pt; } -#tree a { display: block; width: 90%; } -#tree a:hover { background-color: #fff; } -#tree a.selected { background-color: #fff; } -#dashboard { padding: 0.5em 0em; } -div.group { margin-left: 0.2em; } -div.group a { padding-top: 0.2em; padding-bottom: 0.2em; } -a.pool { font-weight: bold; } -a.map { margin-left: 4px; } -a.collection { margin-left: 12px; } - -/* ========= CENTER ========== */ -#center { width: 570px; padding: 0px 10px; } - -.heading { font-size: 14pt; padding: 10px 0px; font-weight: bold; } -#data { border-top: 2px solid #777777; } -strong.header { display: block; background-color: #dddddd; border: 1px solid #bbbbbb; padding: 4px; font-size: 9pt; } -div.hardware-item { border: 1px solid #bbb; padding: 4px; } - -/* ========= DATA TABLE ========== */ - -#data, .dataTable { display: table; width: 100%; } -#data div.inside, .dataTable div.inside { display: table-row; } -#dataTableWrapper, div.data-table-column { display: table-cell; margin: 0; } -div.data-table-column { padding: 0em; font-size: 10pt; } -div.data-table-column div { font-size: 9pt; } -.dataTable { margin-bottom: 1em; } - -#dataTableWrapper { padding-top: 20px; } - -h2.title { background-color: #f2f2f2; display: block; } - -.data-section { border: 1px solid #bbbbbb; margin-bottom: 0.5em; } -.data-section-header { background-color: #e5e5e5; border-bottom: 1px solid #bbbbbb; padding: 0.2em; font-size: 9pt; padding: 4px;} -.data-section-stats { padding: 10px; color: #999; font-size: 9pt; } -.data-section-table { display: table; border-right: 1px solid #bbbbbb; border-top: 1px solid #bbbbbb; width: 20em;} -.data-section-table .inside { display: table-row; } -.data-section-table .odd { background-color: #f9f9f9; } -.data-section-table .odd .data-section-table-cell { border-top: 1px solid #dedede; border-bottom: 1px solid #dedede; } -.data-section-table-header, .data-section-table-footer { color: #4c4d50; font-size: 8pt; display: table-cell; background-color: #e5e5e5; } -.data-section-table-header { border-bottom: 1px solid #bbbbbb; padding-left: 0.2em; } -.data-section-table-cell { display: table-cell; } -.data-section-table-footer { border-top: 1px solid #bbbbbb; } -.data-section-table input, .data-section-table select { font-size: 8pt; } - -/* ========= RIGHT ========== */ - -#right { width: 222px; } -#right .heading { background-color: #fff; } -.tools { border-top: 2px solid #777777; padding: 10px; margin-bottom: 10px; color: #000; background-color: #efefef;} -.tools h3 { border: none; font-size: 10pt; } - -label { display: block; font-size: small; color: #333; } -img { border: none; } -h2 { margin-top: 0em; } -h3 { position: relative; border-bottom: 1px solid #999; margin-bottom: 0.5em; } -span.amp { font-family: "Luxi Mono", monospace; font-size: small; } -span.unit { font-family: "Luxi Mono", monospace; font-size: small; } - -form { display: inline; margin: 0em; padding: 0em; } -form.button-to div { display: inline; } -option.other { color: #999; } - -#content { margin: 1em; margin-left: auto; margin-right: auto; text-align: left; width: 50em; } -#header { border-bottom: 2px solid #001833; margin-bottom: 1em; } -#footer { border-top: 1px dotted #001833; margin-top: 1em; text-align: center; font-size: small; padding: 1em; } - -/* ========= FLASH ========== */ - -div.alertbox { text-align: center; margin: 7px 0px; } -div.flash { padding: 7px 20px 7px 7px; position: relative; } -div.flash a.flash-close { position: absolute; right: 10px; top: 9px; } -#errmsg { background-color: #ff7f7f; border: 1px solid #cc0000; color: #111; padding: 0.3em 1em; } -#notice { font-weight: bold; background-color: #ffffcc; border: 1px solid #fee4aa; } -div.flash a { text-decoration: none; } - - -/* ========= INPUTS ========== */ - -div.i { margin: 0.7em 0em; } - -input[type="text"], input[type="password"], textarea { - border: 1px solid #001833; - background-color: #fafafa; - color: #222; -} - -input[type="text"]:focus { background-color: #fdfdfd; } -input[type="password"]:focus { background-color: #fdfdfd; } -textarea:focus { background-color: #fdfdfd; } - -input[type="text"], input[type="password"] { - font-size: 15pt; - font-family: sans-serif; - padding: 0.2em; - font-weight: bold; -} - -textarea { height: 10em; } - -input[type="submit"] { - font-size: 12pt; - font-weight: bold; - padding: 0 1em 0.1em 1em; - background-color:#0066dd; - color: #fff; - border: 2px outset #0066dd; -} - -input[type="submit"]:hover { - background-color: #084fa1; -} - - -/* ========= ACTION LINKS ========== */ - -div.actions { font-size: 9pt; margin-bottom: 15px; } -div.actions a { display: block; margin-bottom: 5px; font-weight: bold; } - -a.edit { color: #ff9933; } -a.create { color: #82aa32; } -a.remove { color: #cc0000; } -a.list, a.show { font-weight: bold; } - -option.remove { font-weight: bold; color: #cc0000; } - -/* ========= TABLE LISTS ========== */ - -table.listing { font-size: 9pt; width: 100%; border: 1px solid #bbbbbb; margin: 0em; padding: 0em; border-collapse: collapse;} -table.listing tr { padding: 0em; margin: 0em; border: 1px solid #bbbbbb; } -table.listing th { font-size: 9pt; padding: 7px 1px; text-align: center; font-weight: normal; color: #333; background-color: #eeeeee; } -table.listing th.empty { } -table.listing td { margin: 0em; padding: 10px 2px; color: #000; text-align: center; } -table.listing tr.even td { background-color: #f9f9f9; } -table.listing td .secondary { color: #999; font-size: 80%; } - -/* ========= TASKS ========== */ - -ul.tasks { list-style: none; margin: 0em; padding: 0em; font-size: 10pt; } -ul.tasks li.task { margin: 0.5em 0em; padding: 0.25em 0em; padding-left: 0.5em; border: 1px solid transparent; border-left: 0.5em solid #3465a4; } -ul.tasks li.task:hover { border: 1px solid #3465a4; border-left: 0.5em solid #3465a4; } -li.task a.description { } -li.task span.state { color: #666; } - - - -/* ======= DECENT SCAFFOLD DEFAULTS ======= */ - -pre { - background-color: #eee; - padding: 10px; - font-size: 11px; -} - -.fieldWithErrors { - border: 2px solid red; -} - -#errorExplanation { - border: 1px solid #c00;; - padding-bottom: 1.5em; - margin-bottom: 2em; - background-color: #f0f0f0; -} - -#errorExplanation h2 { - text-align: left; - font-weight: bold; - padding: 0.5em; - font-size: small; - background-color: #c00; - color: #fff; -} - -#errorExplanation p { - color: #333; - margin: 1em; -} - -#errorExplanation ul li { - font-size: small; - list-style: square; -} - -div.uploadStatus { - margin: 5px; -} - -div.progressBar { - margin: 5px; -} - -div.progressBar div.border { - background-color: #fff; - border: 1px solid grey; - width: 100%; -} - -div.progressBar div.background { - background-color: #333; - height: 18px; - width: 0%; -} - - diff --git a/src/public/stylesheets/facebox.css b/src/public/stylesheets/facebox.css index e8268a0..1825bea 100644 --- a/src/public/stylesheets/facebox.css +++ b/src/public/stylesheets/facebox.css @@ -40,8 +40,6 @@ }
#facebox .body { - /*padding: 10px;*/ - /*border: #999999 solid 1px;*/ background: #fff; width: 370px; } @@ -97,7 +95,7 @@
.facebox_timfooter { - background: url(../images/fb_footer.jpg) repeat-x; - height: 37px; + background: url(../images/fb_footer.jpg) repeat-x; + height: 37px; padding: 9px 9px 0 9px; -} \ No newline at end of file +} diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css index 3ab4d6e..872440d 100644 --- a/src/public/stylesheets/layout.css +++ b/src/public/stylesheets/layout.css @@ -1,8 +1,8 @@ @charset "UTF-8";
/**************** - html elements -**/ +html elements + **/
html { /*overflow: hidden;*/ @@ -19,11 +19,10 @@ body { width: 100%; height: 100%; background-color:#333333; - font-size: 90%; + font-size: 90%; }
-img -{ +img { border-style: none; }
@@ -34,15 +33,15 @@ h2, h3 { font-weight: normal; }
-/************************** - oVirt layout components -**/ +/************************** +oVirt layout components + **/
#header { padding: 0; margin: 0; position: absolute; - top: 0px; + top: 0px; left: 0px; width: 100%; height: 90px; @@ -50,23 +49,17 @@ h2, h3 { background:#535353 url(../images/bg_header.png) repeat-x top; }
-.header_image { - position:absolute; - top:10px; - left:10px; -} - -#side { +#side { padding: 5px 0 0 5px; margin: 0; - position: absolute; + position: absolute; top: 70px; left: 0px; bottom: 0px; - overflow: auto; - width: 224px; + overflow: auto; + width: 224px; background-color:#FFFFFF; - border-right: 1px #CCCCCC solid; + border-right: 1px #CCCCCC solid; }
#side h3 { @@ -77,69 +70,19 @@ h2, h3 { }
-#side-toolbar{ - float:none; - position:absolute; - bottom:0px; -} - #main { padding: 0; margin-left: 0; - position: absolute; + position: absolute; top: 70px; left: 230px; right: 0px; bottom: 0px; overflow: auto; - background-color:#FFFFFF; + background-color:#FFFFFF; border-left:#CCCCCC solid 0px; }
-#navigation-tabs{ - height: 30px; - position: absolute; - top: -30px; -} - -#content-area { -} - -.toolbar { - margin: 1px 0 1px 0; - background: #CCCCCC url(../images/bg_navtoolbar.png) repeat-x top; - height: 31px; - border-left: #FFFFFF solid 1px; - border-top: #FFFFFF solid 1px; - border-bottom: #FFFFFF solid 1px; - border-right: #B4B4B4 solid 1px; - } - -.breadcrumb_main { - padding: 0; - margin: 40px 0 0 10px; - float:left; - color:#B5B5B5; -} -.breadcrumb_main a:link { color: #B5B5B5; text-decoration: underline; } -.breadcrumb_main a:active { color: #B5B5B5; text-decoration: underline; } -.breadcrumb_main a:visited { color: #B5B5B5; text-decoration: underline; } -.breadcrumb_main a:hover { color: #FFFFFF; text-decoration: none; } - -.breadcrumb_currentpage { - color:#FFFFFF; - font-size: 130%; -} - - /* ----- General Effects ----- */ -.clickable {cursor:pointer;} - -.open {background:url(../images/dir_open.png) left center no-repeat;} - -.closed {background:url(../images/dir_closed.png) left center no-repeat;} - -.hidden {display:none;} - /* ----- Right side of Header -------- */
.header_info { @@ -156,68 +99,41 @@ h2, h3 { .header_info a:visited { color: #000; text-decoration: none; } .header_info a:hover { color: #000; text-decoration: none; }
-#help-div { - position: fixed; - top: 10px; - right: 10px; -} - -.headeritem { - margin-left:5px; -} - - #textfield_effect { - border-width: 1px; - border-style: solid; - border-color: #7A7A7A; - padding-left: 5px; - background: #4A4A4A; - font-size: 100%; - color: #FFFFFF; - width: 100px; - height: 16px; -} -#searchbox-button{ - vertical-align: middle; -} - - -.panel_header { - padding: 5px 0 0 10px; - margin: 0; - height: 23px; + border-width: 1px; + border-style: solid; + border-color: #7A7A7A; + padding-left: 5px; + background: #4A4A4A; + font-size: 100%; color: #FFFFFF; - font-size: 110%; - border-left: 1px solid #93B2C4; - background: #000000 url(../images/bg_toolbarheader.png) repeat-x top; + width: 100px; + height: 16px; }
- - /* ----- Blue Tabbed Navigation -------- */ .ui-tabs-nav { - margin:0; - padding: 0; - background: none; - list-style-type: none; - float: left; - font-size: 110%; + margin:0; + padding: 0; + background: none; + list-style-type: none; + float: left; + font-size: 110%; } .ui-tabs-nav li { - margin: 0 1px 0 1px; - padding: 0; - float: left; + margin: 0 1px 0 1px; + padding: 0; + float: left; } .ui-tabs-nav a { - float:left; - padding: 0 15px 0 15px; - color: #CCCCCC; - text-decoration: none; - line-height: 2.3; - height: 24px; - text-align: center; - background: none; + float:left; + padding: 0 15px 0 15px; + color: #CCCCCC; + text-decoration: none; + line-height: 2.3; + height: 24px; + text-align: center; + background: none;
} .ui-tabs-nav a:hover {color:#FFFFFF; border-bottom: 5px solid #537585;} @@ -226,174 +142,19 @@ h2, h3 {
.ui-tabs-hide {/*display:none;*/}
-/* ----- Panel Contents -------- */ - -.panel_summary { - padding:0; - margin:0; - height: 100px; - background: #E5E5E5; -} - -.data_section { - overflow: auto; - position: absolute; - top: 28px; - bottom: 191px; - right: 0px; - left: 0px; -} - -.data_section_summary { - padding: 20px 0 0 20px; - overflow: hidden; - position: absolute; - top: 0px; - bottom: 170px; - right: 0px; - left: 0px; - overflow: auto; -} - .summary_title { - font-size: 160%; - } - - .summary_subtitle { - clear: both; - font-size: 130%; - } - -.scrollable { - overflow: scroll; - height: 100%; -} - -.selection_detail { - margin: 0; - position:absolute; - bottom:0px; - left: 0px; - right: 0px; - height: 170px; - background: #DEE7EB; - border-top: #CCCCCC solid 1px; - overflow: auto; - padding: 10px 10px 10px 15px; -} - -.selection_left { - float:left; -} - -.selection_title { - font-size: 120%; - font-weight:bold; - padding-bottom: 10px; - float: left; -} - -.selection_tools { - background:transparent none repeat scroll 0%; - color:#000000; - float:left; - line-height:1.7; - list-style-type:none; - margin:0; - padding:0; - text-align:center; - text-decoration:none; -} -.selection_tools li { - float:left; - margin:0pt 1px; - padding:0pt; -} -.selection_tools img { -} -.selection_tools a { - background:transparent none repeat scroll 0%; - color:#000000; - float:left; - line-height:1.7; - padding:0pt 8px; - text-align:center; - text-decoration:none; -} -.selection_tools a:hover { - -moz-border-radius: 2px; - background:#B0CBDE none repeat scroll 0%; -} -.selection_key { - text-align:right; - float:left; - color:#666666; -} - -.selection_value { - text-align:left; - float:left; - padding: 0 0 0 10px; -} - -.selection_right { - float: right; - padding-right: 10px; -} - - .selection_right_title { - padding: 4px 4px 4px 6px; - background: #F0F0F0; - float: left; -} - - .selection_right_table { - height: 128px; - overflow:auto; - clear:both; - } - - /* ----- Selection Detail Tabbed Navigation -------- */ -.selection_tab_nav { - margin:0; - padding: 0; - background: #F0F0F0; - list-style-type: none; - float: right; -} -.selection_tab_nav li { - margin: 0 1px 0 1px; - padding: 0; - float: left; -} -.selection_tab_nav a { - float:left; - padding: 0 8px; - text-decoration: none; - text-align: center; - background: none; - color:#000000; - line-height: 1.7; - -} -.selection_tab_nav a:hover {background:#E3E3E3;} - - - - - /* ----- PopUp Dialog -------- */
.dialog_title { - background:#DEE7EB; - padding:15px; + background:#DEE7EB; + padding:15px; width:600px; }
.dialog_title_small { - background:#DEE7EB; + background:#DEE7EB; padding:15px; - min-width: 500px; + min-width: 500px; }
.header { @@ -406,12 +167,6 @@ h2, h3 { height: 350px; }
-.popup_body { - background: #FFFFFF; - overflow: auto; - height: 350px; -} - .confirm_dialog_title { width:400px; padding: 15px; @@ -430,69 +185,16 @@ h2, h3 { padding: 5px 9px 0 0; }
-.dialog_form { - margin: 15px; - background: #FFFFFF; -} - -.dialog_tree { - height: 200px; - overflow: auto; -} - -.form_heading { - font-size:1.15em; - color: #666666; - border-top:#CCCCCC 1px dotted; - padding: 1.2em 0em 1em 1.5em; -} - -.field_title { - font-size: 105%; - /*font-weight:bold;*/ -} - -.field_helptext { font-size: 90%; color: #666666; } - -.textfield_effect { - padding: 2px 0 0 2px; - border-width: 1px; - border-style: solid; - border-color: #999999; - font-size: 105%; - width: 200px; - height: 20px; -} - -.dropdown_effect { - border-width: 1px; - border-style: solid; - border-color: #999999; - font-size: 105%; - height: 20px; -} - -.form_field { - margin-bottom:12px; - margin-top:2px; - padding-right:10px; -} - -.clear_row { - clear:both; - height: 5px; -} - .button { padding: 0 0 0 2px; float:right; }
-.button_left_blue { - background:url(../images/button_left.png) no-repeat; - width: 6px; - height: 29px; - float: left; + .button_left_blue { + background:url(../images/button_left.png) no-repeat; + width: 6px; + height: 29px; + float: left; } .button_middle_blue { background:url(../images/button_middle.png) repeat-x; @@ -546,30 +248,3 @@ h2, h3 { color:#333333; padding: 2px; } - - -/* This file skins sliders */ - -.ui-slider { width: 200px; height: 23px; position: relative; background-repeat: no-repeat; background-position: center center; } -.ui-slider-handle { position: absolute; z-index: 1; height: 23px; width: 12px; top: 0px; left: 0px; background-image: url(images/slider-handle.gif); cursor: move;} -.ui-slider-handle-active { /*border: 1px dotted #CCCCCC;*/} -.ui-slider-disabled .ui-slider-handle { opacity: 0.5; filter: alpha(opacity=50); } -.ui-slider-range { position: absolute; background: #50A029; opacity: 0.3; filter: alpha(opacity=30); width: 100%; height: 100%; } - -/* Default slider backgrounds */ -.ui-slider, .ui-slider-1 { background-image: url(images/slider-bg-1.png); cursor: pointer;} -.ui-slider-2 { background-image: url(images/slider-bg-2.png); } - - - -#slider_callout { background: #FFFFFF; height: 45px; width: 38px; overflow: hidden; position: absolute; top: -50px; margin-left:-10px; padding: 8px 0px 0px 0px; font-family: "Myriad Pro"; color: #284a6e; font-weight: bold; text-align: center;} - -.slider_value { background: #FFFFFF; font-size:105%; padding-left:5px; float:left;} -.slider_minlabel { float:left; padding:4px 4px 4px 0;} -.slider_maxlabel { float:left; padding:4px;} - -#storage tree container div -.storage_tree_container { - overflow:auto; - border:#CCCCCC solid 1px; -}
ACK, couple notes inline.
Jan
On 07/01/2010 07:21 PM, tsedovic@redhat.com wrote:
From: Tomas Sedovictsedovic@redhat.com
src/app/controllers/application_controller.rb | 6 - src/app/helpers/application_helper.rb | 127 -------- src/app/views/layouts/_notification.rhtml | 2 +- src/app/views/layouts/help-and-content.rhtml | 6 - src/app/views/layouts/popup-error.rhtml | 1 - src/app/views/layouts/popup.rhtml | 2 +- src/app/views/layouts/selection.rhtml | 26 -- src/app/views/layouts/tabs-and-content.rhtml | 15 - src/public/stylesheets/cloud/layout.css | 307 ------------------ src/public/stylesheets/components.css | 47 ++-- src/public/stylesheets/dcloud.css | 182 ++++++------ src/public/stylesheets/default.css | 233 -------------- src/public/stylesheets/facebox.css | 8 +- src/public/stylesheets/layout.css | 423 +++---------------------- 14 files changed, 165 insertions(+), 1220 deletions(-) delete mode 100644 src/app/views/layouts/help-and-content.rhtml delete mode 100644 src/app/views/layouts/selection.rhtml delete mode 100644 src/app/views/layouts/tabs-and-content.rhtml delete mode 100644 src/public/stylesheets/cloud/layout.css delete mode 100644 src/public/stylesheets/default.css
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 3c22383..a563d57 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -113,14 +113,8 @@ class ApplicationController< ActionController::Base def html_error_page(title, msg) @title = title @errmsg = msg
- @ajax = params[:ajax]
- @nolayout = params[:nolayout] if @layout render :layout => 'aggregator'
- elsif @ajax
render :template => 'layouts/popup-error', :layout => 'tabs-and-content'
- elsif @nolayout
render :template => 'layouts/popup-error', :layout => 'help-and-content' else render :template => 'layouts/popup-error', :layout => 'popup' end
diff --git a/src/app/helpers/application_helper.rb b/src/app/helpers/application_helper.rb index 4565fb0..f7b96af 100644 --- a/src/app/helpers/application_helper.rb +++ b/src/app/helpers/application_helper.rb @@ -19,110 +19,8 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will be available for all controllers.
-require 'rubygems' -gem 'rails' -require 'erb'
module ApplicationHelper
def text_field_with_label(label, obj, meth, opts = {}, divopts = {})
opts[:class] = "textfield_effect"
opts[:style]="width:250px;" unless opts[:style]
divsclass = ""
if divopts[:class]
divclass = " class=#{divopts[:class]}"
end
%{
-<div class="field_title"><label for="#{obj}_#{meth}">#{_(label)}</label></div> -<div class="form_field"#{divclass}>#{text_field obj, meth, opts}#{divopts[:afterfield] if divopts[:afterfield]}</div>
}
- end
- def select_with_label(label, obj, meth, coll, opts={})
- opts[:class] = "dropdown_effect"
- opts[:style]="width:320px;" unless opts[:style]
- %{
-<div class="field_title"><label for="#{obj}_#{meth}">#{_(label)}</label></div> -<div class="form_field">#{select obj, meth, coll, opts}</div>
}
- end
- def select_tag_with_label(label, name, select_options, opts={})
- opts[:class] = "dropdown_effect"
- opts[:style]="width:320px;" unless opts[:style]
- %{
-<div class="field_title"><label for="#{name}">#{_(label)}</label></div> -<div class="form_field">#{select_tag name, options_for_select(select_options), opts}</div>
}
- end
- def hidden_field_with_label(label, obj, meth, display)
- %{
-<div class="i"><label for="#{obj}_#{meth}">#{_(label)}</label>
#{hidden_field obj, meth}<span class="hidden">#{display}</span></div>
}
- end
- def hidden_field_tag_with_label(label, name, value, display)
- %{
-<div class="i"><label for="#{name}">#{_(label)}</label>
#{hidden_field_tag name, value}<span class="hidden">#{display}</span></div>
}
- end
- def check_box_tag_with_label(label, name, value = "1", checked = false)
- %{
-<div class="i">#{check_box_tag name, value, checked} -<label for="#{name}">#{_(label)}</label></div>
}
- end
- def radio_button_tag_with_label(label, name, value = "1", checked = false)
- %{
-<div class="i"><label for="#{name}">#{_(label)}</label>
#{radio_button_tag name, value, checked}</div>
}
- end
- # expects hash of labels => actions
- def multi_button_popup_footer(buttons = {})
buttons_html = ""
buttons.each{ |label, action|
buttons_html+="<div class=\"button\">" +
"<div class=\"button_left_blue\"></div>" +
"<div class=\"button_middle_blue\"><a href=\"#\" onclick=\"#{action}\">#{label}</a></div>" +
"<div class=\"button_right_blue\"></div>" +
"</div>"
}
- %{
-<div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0; float: left; width: 97%;"> -<div class="button"> -<div class="button_left_grey"></div> -<div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">Cancel</a></div> -<div class="button_right_grey"></div> -</div>
#{buttons_html}
-</div>
- }
- end
- def popup_footer(action, label)
- multi_button_popup_footer({label => action})
- end
- def ok_footer
- %{
-<div style="background: url(#{image_path "fb_footer.jpg"}) repeat-x; height: 37px; text-align:right; padding: 9px 9px 0 0;"> -<div class="button"> -<div class="button_left_grey"></div> -<div class="button_middle_grey"><a href="#" onclick="$(document).trigger('close.facebox')">OK</a></div> -<div class="button_right_grey"></div> -</div> -</div>
}
- end
- def confirmation_dialog(div_id, text, action) %{ <div id="#{div_id}" style="display:none;">
@@ -147,31 +45,6 @@ module ApplicationHelper } end
- def timeout_flash(name)
- %{
-<script type="text/javascript">
- //<![CDATA[
var closeFlash = function() {$('#{name}').setStyle({'display':'none'})};
setTimeout(closeFlash, 1000 * 45);
- // ]]>
-</script>
- }
- end
- def focus(field_name)
- %{
-<script type="text/javascript">
- //<![CDATA[
Field.activate('#{field_name}');
- // ]]>
-</script>
- }
- end
- def flash_path(source)
- compute_public_path(source, 'swfs', 'swf')
- end
- def number_to_duration(input_num) input_int = input_num.to_i hours_to_seconds = [input_int/3600 % 24,
diff --git a/src/app/views/layouts/_notification.rhtml b/src/app/views/layouts/_notification.rhtml index b969739..a260c3c 100644 --- a/src/app/views/layouts/_notification.rhtml +++ b/src/app/views/layouts/_notification.rhtml @@ -28,4 +28,4 @@ <% if flash[:notice] %> <div class="success"><ul><li><%= flash[:notice] %></li></ul></div> <% end %> -</div> \ No newline at end of file +</div> diff --git a/src/app/views/layouts/help-and-content.rhtml b/src/app/views/layouts/help-and-content.rhtml deleted file mode 100644 index a8279f1..0000000 --- a/src/app/views/layouts/help-and-content.rhtml +++ /dev/null @@ -1,6 +0,0 @@ -<div id="help-div"> -<%= link_to image_tag("icon_help.png"),
{:controller => 'help', :action => @help_section, :anchor => @anchor},
:id=>"help-link", :popup => true, :title => "Help" %>
-</div> -<%= yield %> diff --git a/src/app/views/layouts/popup-error.rhtml b/src/app/views/layouts/popup-error.rhtml index 5c67bed..8e58a31 100644 --- a/src/app/views/layouts/popup-error.rhtml +++ b/src/app/views/layouts/popup-error.rhtml @@ -2,4 +2,3 @@ <%= @title %> <%- end -%> <%= @errmsg %> -<%= ok_footer unless @ajax or @nolayout %>
This drops "OK" button in popup errors. In fact, we don't handle errors on client side yet, so removing this button should be OK.
diff --git a/src/app/views/layouts/popup.rhtml b/src/app/views/layouts/popup.rhtml index 55dda58..b67e5da 100644 --- a/src/app/views/layouts/popup.rhtml +++ b/src/app/views/layouts/popup.rhtml @@ -3,5 +3,5 @@ <div class="header"><%= yield :title -%></div> <div><%= yield :description -%></div>
</div> -<%= yield %> +<%= yield %> </div> diff --git a/src/app/views/layouts/selection.rhtml b/src/app/views/layouts/selection.rhtml deleted file mode 100644 index 1f313d7..0000000 --- a/src/app/views/layouts/selection.rhtml +++ /dev/null @@ -1,26 +0,0 @@ -<div class="selection_title"><%= yield :title -%></div> - -<% tools = yield :action_links -%> -<% if tools %> -<!-- FIXME: for the love of pete, are we really using a list just to insert a separator?? - This needs to be cleaned up as soon as somone has time. It should be a horizontal list - for the links (tools), with this separator set as a left background on the first item. ---> -<ul class="selection_tools"> -<li> -<%= image_tag "icon_separator.png", :style=>"vertical-align: middle;" %> -</li> -<%= tools -%> -</ul> -<% end %> -<div class="clear_row"/> -<div class="selection_left"> -<%= yield %> -</div> - -<% right = yield :right -%> -<% if right %> -<div class="selection_right"> -<%= right -%> -</div> -<% end %> diff --git a/src/app/views/layouts/tabs-and-content.rhtml b/src/app/views/layouts/tabs-and-content.rhtml deleted file mode 100644 index 82e6ea1..0000000 --- a/src/app/views/layouts/tabs-and-content.rhtml +++ /dev/null @@ -1,15 +0,0 @@ -<div id="side-toolbar" class="header_menu_wrapper"> -<%= render :partial => '/layouts/side_toolbar' %> -</div> -<div id="side"> -<%= render :partial => '/layouts/main_nav' %> -</div> -<div id="main"> -<div id="content_area"> -<div id="help-div"> -<%= link_to image_tag("icon_help.png"), - {:controller => 'help', :action => @help_section, :anchor => @anchor}, - :id=>"help-link", :popup => true, :title => "Help" %> -</div> -</div> -</div> diff --git a/src/public/stylesheets/cloud/layout.css b/src/public/stylesheets/cloud/layout.css deleted file mode 100644 index 521d8a8..0000000 --- a/src/public/stylesheets/cloud/layout.css +++ /dev/null @@ -1,307 +0,0 @@ -/* ------ General Layout ------ */ - -html {min-width:640px;} - -#head h1 a { - background:transparent url(../../images/mystery_cloud.png) no-repeat scroll 20px 50%; - /* - TODO: change this back to a real logo when we have one. - */ - display:block; - height:59px; - overflow:hidden; - text-decoration:none; - text-indent:-9999px; - width:87px; -} - -#login-box { - display:block; - line-height:3.75ex; - position:absolute; - right:4ex; - text-align:right; - top:12px; -} - -#login-box a { - color: #337ACC; -} - -/* Make buttons look like links */ -.button_as_link { - background: none; - color: #666666; - border: none; - cursor: pointer; -} - -#navcontainer { - height:40px; -} - -#navcontainer ul { - padding-left: 0; - margin-left: 0; - background-color: #fff; - color: #afb2bd; - float: left; - width: 100%; -} - -#navcontainer ul li { display: inline; } - -#navcontainer ul li a { - padding: 12px 20px; - border-top: solid 2px transparent; - background: #fff; - color: #afb2bd; - font-weight: bold; - text-decoration: none; - text-transform: uppercase; - float: left; -} - -#navcontainer ul li a:hover { - background: #fff; - color: #989ba7; -} - -#navcontainer ul li a.current { - border-top: solid 2px #337acc; - background: #e0eeff url(../../images/tab_bg.png) repeat-x; - color: #404552; -} - -#content {margin-left:0;} - -#content table{width:100%;} - -/* #content table tr.odd {background:#eef2f2;} */ - -#content table tr:hover {background: #fdfef1;} - -#content table th, #content table td { - border:1px solid #E1E1E3; - border-right: 0; - border-left: 0; - padding:0; - text-align:left; -} - -#content table th {background: none;border-top: none;} - -#content table div { - padding: 0.5ex; -} - -#content table th a { - display: block; - text-decoration: none; -} - -#content table th a:hover { - text-decoration: underline; -} - -.sortup { - background: transparent url('../../images/Sort_up_11.png') top center no-repeat !important; -} - -.sortdown { - background: transparent url('../../images/Sort_down_11.png') top center no-repeat !important; -} - -.sortable:hover {/* background-color: #DDDDDD !important; */} - -.selected {background: #fbf0a7 !important;} - -.center {text-align:center;} - -.pagination {padding-top: 1ex;} - -#list-view {margin-bottom:2em;} - - -#detail-view { - border-top: 2px solid #CECECE; -} - -#graph { - border: 1px solid #EFEFEF; - margin-bottom: 1.5ex; - height: 15ex; -} - -#submit_for_list { - float: right; - background: none; - border: 0; - color: #337ACC; - cursor: pointer; - margin-right:12px; - font-size: 1em; - text-decoration: underline; -} - -input#submit_for_list { - margin:12px 16px 0 0; - padding:0; -} - -#detail_header { - background-color: #EFEFEF; - height: 5em; - margin-bottom: 1em; -} - -#detail_header h3 { - color:#666666; - margin: 8px 12px 12px 16px; - display:inline-block; - font-size: 1.2em; -} - - -/* ----- Backgrounds for states ----- */ -.state-container { - margin-left:5px; - text-indent:12px; -} - -.task-canceled {background:url(../../images/icon-canceled-11px.png) left center no-repeat;} -.task-failed {background:url(../../images/icon-failed-11px.png) left center no-repeat;} -.task-finished {background:url(../../images/icon-finished-11px.png) left center no-repeat;} -.task-paused {background:url(../../images/icon-paused-11px.png) left center no-repeat;} -.task-queued {background:url(../../images/icon-queued-11px.png) left center no-repeat;} -.task-running {background:url(../../images/icon-running-11px.png) left center no-repeat;} -.instance-unreachable {background:url(../../images/icon_unknown_11px.png) left center no-repeat;} -.instance-stopped {background:url(../../images/icon_stop_11px.png) left center no-repeat;} -.instance-suspended {background:url(../../images/icon_suspend_11px.png) left center no-repeat;} -.instance-saved {background:url(../../images/icon_save_11px.png) left center no-repeat;} -.instance-create_failed {background:url(../../images/icon_failed_11px.png) left center no-repeat;} -.instance-invalid {background:url(../../images/icon_warning_11px.png) left center no-repeat;} -.instance-pending {background:url(../../images/icon_queued_11px.png) left center no-repeat;} -.instance-running {background:url(../../images/icon_start_11px.png) left center no-repeat;} -.instance-creating {background:url(../../images/icon_startup_11px.png) left center no-repeat;} - - -/* ----- Actions Toolbar -------- */ -#toolbar { - background: #e3eaf2; - border-top: 1px solid #d1dfee; - border-bottom: 1px solid #d1d7de; - margin-bottom: 1em; -} - -#toolbar img { - margin: 0; -} - -#toolbar ul{ - list-style: none; - margin:0; - padding:0; -} - -#toolbar li { - display: inline-block; - position: relative; - color: #666666; - padding: 8px 16px; -} - -#toolbar li:hover { - background: #337ACC; -} - -#toolbar li:hover> .button_as_link { - color: #FFFFFF; -} - -#toolbar li.current { /* This is not really needed right now, but will be useful when we add filters. */ - background: #4B95B8; -} - -#toolbar li ul { - display: none; - position: absolute; - top: 1em; - left: 0; - background: #bec7e0; /* #F0F0F0; */ - padding: 4px; -} - -#toolbar li ul li { - display: block; - white-space: nowrap; - padding-right: 1em; -} - -#toolbar li> ul { - top: auto; - left: auto; -} - -#toolbar li:hover ul {display: block;} - -/****** Notification styles ******/ -#notification { - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; - position: absolute; - z-index: 1; - top: 2em; - left: 35%; - margin: 0 auto; - padding: 1.5em; - background: #337ACC; - border: solid 0.2em; -} - -.error-align {left: 25% !important;} - -#notification> div { - margin-bottom: 1em; -} - -#notification h4 { - text-indent: 3em; -} - -#close-notify { - position: absolute; - right: 0.2em; - top: 0.2em; - width:11px; - height:11px; - background: url(../../images/closebox-11px.png) no-repeat; -} - -.success { - width: 100%; - background:url(../../images/icon_conf_success.png) left center no-repeat #CCFFCC; - border: solid 0.2em green; - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; -} - -.success li, .error li { - margin-left:3em; -} - -.error { - width: 100%; - background:url(../../images/icon_conf_error.png) left center no-repeat #EC9999; - border: solid 0.2em red; - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; -} - -.warning { - width: 100%; - background:url(../../images/icon_conf_warning.png) left center no-repeat #FFFFCC; - border: solid 0.2em yellow; - -webkit-border-radius: 0.2em; - -moz-border-radius: 0.2em; -} diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css index 64df832..88ab05b 100644 --- a/src/public/stylesheets/components.css +++ b/src/public/stylesheets/components.css @@ -1,17 +1,17 @@ /* header style */
.header_logo {
- position:absolute;
- top:10px;
- left:10px;
position:absolute;
top:10px;
left:10px; color: #B5B5B5; }
.header_logo span {
- text-transform: uppercase;
- margin-left: 5px;
- font-weight: bold;
- letter-spacing: -0.02em;
text-transform: uppercase;
margin-left: 5px;
font-weight: bold;
letter-spacing: -0.02em; }
ul.nav {
@@ -23,10 +23,10 @@ ul.nav { }
ul.nav li {
- display: inline;
- font-size: 120%;
- padding: 3px 15px;
- color : #b3b3b3;
display: inline;
font-size: 120%;
padding: 3px 15px;
color : #b3b3b3; }
ul.nav li a {
@@ -35,18 +35,18 @@ ul.nav li a { }
ul.nav li.selected {
- background: #cbd6db !important;
- border-radius: 16px;
- -moz-border-radius: 16px;
- -webkit-border-radius: 16px;
- -moz-box-shadow: 0 1px 1px #efefef;
background: #cbd6db !important;
border-radius: 16px;
-moz-border-radius: 16px;
-webkit-border-radius: 16px;
-moz-box-shadow: 0 1px 1px #efefef; }
ul.nav li:hover {
- background: #dedede;
- border-radius: 16px;
- -moz-border-radius: 16px;
- -webkit-border-radius: 16px;
background: #dedede;
border-radius: 16px;
-moz-border-radius: 16px;
-webkit-border-radius: 16px; }
.header_menu_wrapper {
@@ -83,13 +83,6 @@ ul.nav li:hover { float: left; }
-#search-form{
- float: left;
-}
-#help-link { -}
- /* dashboard style */ .dashboard_column{ float: left;
diff --git a/src/public/stylesheets/dcloud.css b/src/public/stylesheets/dcloud.css index 0183a55..b643754 100644 --- a/src/public/stylesheets/dcloud.css +++ b/src/public/stylesheets/dcloud.css @@ -1,133 +1,133 @@ /* Styles for forms */ form {
- border: none;
- margin: 0;
- padding: 0;
- display: inline-block;
border: none;
margin: 0;
padding: 0;
display: inline-block; }
fieldset {
- border: 3px solid #efeff0;
- border-right: none;
- border-left: none;
- border-bottom: none;
- padding: 18px 0 10px 10px;
border: 3px solid #efeff0;
border-right: none;
border-left: none;
border-bottom: none;
padding: 18px 0 10px 10px; }
ul li input {
- border:2px solid #becfe4;
- color:#333;
- display:block;
- float:left;
- outline-color:-moz-use-text-color;
- outline-style:none;
- outline-width:medium;
- padding:3px;
- width:302px;}
border:2px solid #becfe4;
color:#333;
display:block;
float:left;
outline-color:-moz-use-text-color;
outline-style:none;
outline-width:medium;
padding:3px;
width:302px;}
legend {
- text-transform: uppercase;
- color: #9a9a9a;
- font-weight: bold;
text-transform: uppercase;
color: #9a9a9a;
font-weight: bold; }
input, select {
- font-family: "Lucida Grande","Luxi Sans","Bitstream Vera Sans","Trebuchet MS",helvetica,verdana,arial,sans-serif;
- font-size: 1.4em;
font-family: "Lucida Grande","Luxi Sans","Bitstream Vera Sans","Trebuchet MS",helvetica,verdana,arial,sans-serif;
font-size: 1.4em; }
.fieldWithErrors {
- display:inline-block;
- padding: 3px;
- background: #fff7b2;
- border: 3px solid #fff7b2;
display:inline-block;
padding: 3px;
background: #fff7b2;
border: 3px solid #fff7b2; }
.errorExplanation {
- margin: 0 0 24px 0;
- padding: 9px;
- background: #fff7b2;
- color: #867a5e;
- -moz-border-radius: 3px;
margin: 0 0 24px 0;
padding: 9px;
background: #fff7b2;
color: #867a5e;
-moz-border-radius: 3px; }
#errorExplanation h2 {
- font-size: 14px;
- font-weight: bold;
- color: #867a5e;
font-size: 14px;
font-weight: bold;
color: #867a5e; }
.dcloud_form {
- background: #e8e8e8;
- border: solid 8px #f5f5f5;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- margin-top: 54px;
- width: 550px ;
- margin-left: auto ;
- margin-right: auto ;
- padding: 36px;
background: #e8e8e8;
border: solid 8px #f5f5f5;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
margin-top: 54px;
width: 550px ;
margin-left: auto ;
margin-right: auto ;
padding: 36px; }
.dcloud_form h2 {
- font-size: 1.9em;
- font-weight: normal;
- color: #43728e;
- margin: 0 0 24px 0;
- padding: 0;
font-size: 1.9em;
font-weight: normal;
color: #43728e;
margin: 0 0 24px 0;
padding: 0; }
.dcloud_form ul {
- list-style-image: none;
- list-style-position: outside;
- list-style-type: none;
- margin: 0;
- padding: 0;
list-style-image: none;
list-style-position: outside;
list-style-type: none;
margin: 0;
padding: 0; }
.dcloud_form ul label {
- display: block;
- float: left;
- padding: 3px 0 24px 0;
- width: 175px;
- font-size: 1.4em;
- color: #616161;
display: block;
float: left;
padding: 3px 0 24px 0;
width: 175px;
font-size: 1.4em;
color: #616161; }
.dcloud_form ul label span {
- display: block;
- float: left;
- width: 160px;
- font-size: .8em;
- color: #9a9a9a;
display: block;
float: left;
width: 160px;
font-size: .8em;
color: #9a9a9a; }
.dcloud_form ul li {
- clear:both;
clear:both; }
.dcloud_form .txtfield {
- border:2px solid #becfe4;
- color:#333;
- display:block;
- float:left;
- outline-color:-moz-use-text-color;
- outline-style:none;
- outline-width:medium;
- padding:3px;
- width:318px;
border:2px solid #becfe4;
color:#333;
display:block;
float:left;
outline-color:-moz-use-text-color;
outline-style:none;
outline-width:medium;
padding:3px;
width:318px; }
.dcloud_form .submit {
- float: right;
- display: inline;
- clear:both;
float: right;
display: inline;
clear:both; }
/* Styles for table */ #content_area table {
- width:100%;
- border-collapse: collapse;
width:100%;
border-collapse: collapse; }
#content_area table th, #content_area table td {
@@ -156,10 +156,10 @@ input, select { }
.actionlink {
- color: #0075c0 !important;
- line-height: 36px;
- font-size: 14px;
- padding-left: 18px;
color: #0075c0 !important;
line-height: 36px;
font-size: 14px;
padding-left: 18px; }
ul#providers + a.actionlink {
@@ -168,13 +168,13 @@ ul#providers + a.actionlink { }
.submit_link {
- background: none;
- border:0;
- text-decoration: underline;
- color: #0075c0;
- line-height: 36px;
- font-size: 14px;
- padding-left: 10px;
background: none;
border:0;
text-decoration: underline;
color: #0075c0;
line-height: 36px;
font-size: 14px;
padding-left: 10px; }
.submit_link:hover {cursor:pointer;}
diff --git a/src/public/stylesheets/default.css b/src/public/stylesheets/default.css deleted file mode 100644 index 911d795..0000000 --- a/src/public/stylesheets/default.css +++ /dev/null @@ -1,233 +0,0 @@ -* { font-family: "Arial", "Bitstream Vera Sans", "Liberation Sans", sans-serif; } -body { padding: 0px; margin: 0px auto; font-size: 12pt; margin: 0px; }
-a { color: #0066dd; background-color: inherit; } -a:visited { color: #0066dd; background-color: inherit; } -a:hover { color: #0066dd; background-color: inherit; }
-table, td, tr, th { margin: 0px; padding: 0px; border-collapse: collapse; } -hr { height: 1px; border: none; border-top: 1px solid #bbbbbb; margin: 14px 0px; }
-#wrapper, #logoHeader { width: 976px; text-align: left; margin: 0px auto; position: relative;} -/* ========= HEADER ========== */
-#headerFade { height: 55px; background: #000 url("/images/header-fade.png") repeat-x scroll top left; } -#greenLine { height: 4px; background-color: #82aa32; } -#darkGreenLine { height: 1px; background-color: #688828; }
-#loginStatus { font-size: 12pt; color: #ffffff; position: absolute; right: 10px; bottom: 10px; } -#loginStatus a { color: #fff; }
-/* ========= TABLE ========== */
-#main { width: 976px; } -#main td { vertical-align: top; }
-/* ========= TREE ========== */
-#left { width: 164px; background: #ffffff url("/images/left-fade.png") repeat-y scroll top right; border-left: 10px solid #fff;} -#tree { font-size: 10pt; } -#tree a { display: block; width: 90%; } -#tree a:hover { background-color: #fff; } -#tree a.selected { background-color: #fff; } -#dashboard { padding: 0.5em 0em; } -div.group { margin-left: 0.2em; } -div.group a { padding-top: 0.2em; padding-bottom: 0.2em; } -a.pool { font-weight: bold; } -a.map { margin-left: 4px; } -a.collection { margin-left: 12px; }
-/* ========= CENTER ========== */ -#center { width: 570px; padding: 0px 10px; }
-.heading { font-size: 14pt; padding: 10px 0px; font-weight: bold; } -#data { border-top: 2px solid #777777; } -strong.header { display: block; background-color: #dddddd; border: 1px solid #bbbbbb; padding: 4px; font-size: 9pt; } -div.hardware-item { border: 1px solid #bbb; padding: 4px; }
-/* ========= DATA TABLE ========== */
-#data, .dataTable { display: table; width: 100%; } -#data div.inside, .dataTable div.inside { display: table-row; } -#dataTableWrapper, div.data-table-column { display: table-cell; margin: 0; } -div.data-table-column { padding: 0em; font-size: 10pt; } -div.data-table-column div { font-size: 9pt; } -.dataTable { margin-bottom: 1em; }
-#dataTableWrapper { padding-top: 20px; }
-h2.title { background-color: #f2f2f2; display: block; }
-.data-section { border: 1px solid #bbbbbb; margin-bottom: 0.5em; } -.data-section-header { background-color: #e5e5e5; border-bottom: 1px solid #bbbbbb; padding: 0.2em; font-size: 9pt; padding: 4px;} -.data-section-stats { padding: 10px; color: #999; font-size: 9pt; } -.data-section-table { display: table; border-right: 1px solid #bbbbbb; border-top: 1px solid #bbbbbb; width: 20em;} -.data-section-table .inside { display: table-row; } -.data-section-table .odd { background-color: #f9f9f9; } -.data-section-table .odd .data-section-table-cell { border-top: 1px solid #dedede; border-bottom: 1px solid #dedede; } -.data-section-table-header, .data-section-table-footer { color: #4c4d50; font-size: 8pt; display: table-cell; background-color: #e5e5e5; } -.data-section-table-header { border-bottom: 1px solid #bbbbbb; padding-left: 0.2em; } -.data-section-table-cell { display: table-cell; } -.data-section-table-footer { border-top: 1px solid #bbbbbb; } -.data-section-table input, .data-section-table select { font-size: 8pt; }
-/* ========= RIGHT ========== */
-#right { width: 222px; } -#right .heading { background-color: #fff; } -.tools { border-top: 2px solid #777777; padding: 10px; margin-bottom: 10px; color: #000; background-color: #efefef;} -.tools h3 { border: none; font-size: 10pt; }
-label { display: block; font-size: small; color: #333; } -img { border: none; } -h2 { margin-top: 0em; } -h3 { position: relative; border-bottom: 1px solid #999; margin-bottom: 0.5em; } -span.amp { font-family: "Luxi Mono", monospace; font-size: small; } -span.unit { font-family: "Luxi Mono", monospace; font-size: small; }
-form { display: inline; margin: 0em; padding: 0em; } -form.button-to div { display: inline; } -option.other { color: #999; }
-#content { margin: 1em; margin-left: auto; margin-right: auto; text-align: left; width: 50em; } -#header { border-bottom: 2px solid #001833; margin-bottom: 1em; } -#footer { border-top: 1px dotted #001833; margin-top: 1em; text-align: center; font-size: small; padding: 1em; }
-/* ========= FLASH ========== */
-div.alertbox { text-align: center; margin: 7px 0px; } -div.flash { padding: 7px 20px 7px 7px; position: relative; } -div.flash a.flash-close { position: absolute; right: 10px; top: 9px; } -#errmsg { background-color: #ff7f7f; border: 1px solid #cc0000; color: #111; padding: 0.3em 1em; } -#notice { font-weight: bold; background-color: #ffffcc; border: 1px solid #fee4aa; } -div.flash a { text-decoration: none; }
-/* ========= INPUTS ========== */
-div.i { margin: 0.7em 0em; }
-input[type="text"], input[type="password"], textarea {
- border: 1px solid #001833;
- background-color: #fafafa;
- color: #222;
-}
-input[type="text"]:focus { background-color: #fdfdfd; } -input[type="password"]:focus { background-color: #fdfdfd; } -textarea:focus { background-color: #fdfdfd; }
-input[type="text"], input[type="password"] {
- font-size: 15pt;
- font-family: sans-serif;
- padding: 0.2em;
- font-weight: bold;
-}
-textarea { height: 10em; }
-input[type="submit"] {
- font-size: 12pt;
- font-weight: bold;
- padding: 0 1em 0.1em 1em;
- background-color:#0066dd;
- color: #fff;
- border: 2px outset #0066dd;
-}
-input[type="submit"]:hover {
- background-color: #084fa1;
-}
-/* ========= ACTION LINKS ========== */
-div.actions { font-size: 9pt; margin-bottom: 15px; } -div.actions a { display: block; margin-bottom: 5px; font-weight: bold; }
-a.edit { color: #ff9933; } -a.create { color: #82aa32; } -a.remove { color: #cc0000; } -a.list, a.show { font-weight: bold; }
-option.remove { font-weight: bold; color: #cc0000; }
-/* ========= TABLE LISTS ========== */
-table.listing { font-size: 9pt; width: 100%; border: 1px solid #bbbbbb; margin: 0em; padding: 0em; border-collapse: collapse;} -table.listing tr { padding: 0em; margin: 0em; border: 1px solid #bbbbbb; } -table.listing th { font-size: 9pt; padding: 7px 1px; text-align: center; font-weight: normal; color: #333; background-color: #eeeeee; } -table.listing th.empty { } -table.listing td { margin: 0em; padding: 10px 2px; color: #000; text-align: center; } -table.listing tr.even td { background-color: #f9f9f9; } -table.listing td .secondary { color: #999; font-size: 80%; }
-/* ========= TASKS ========== */
-ul.tasks { list-style: none; margin: 0em; padding: 0em; font-size: 10pt; } -ul.tasks li.task { margin: 0.5em 0em; padding: 0.25em 0em; padding-left: 0.5em; border: 1px solid transparent; border-left: 0.5em solid #3465a4; } -ul.tasks li.task:hover { border: 1px solid #3465a4; border-left: 0.5em solid #3465a4; } -li.task a.description { } -li.task span.state { color: #666; }
-/* ======= DECENT SCAFFOLD DEFAULTS ======= */
-pre {
- background-color: #eee;
- padding: 10px;
- font-size: 11px;
-}
-.fieldWithErrors {
- border: 2px solid red;
-}
-#errorExplanation {
- border: 1px solid #c00;;
- padding-bottom: 1.5em;
- margin-bottom: 2em;
- background-color: #f0f0f0;
-}
-#errorExplanation h2 {
- text-align: left;
- font-weight: bold;
- padding: 0.5em;
- font-size: small;
- background-color: #c00;
- color: #fff;
-}
-#errorExplanation p {
- color: #333;
- margin: 1em;
-}
-#errorExplanation ul li {
- font-size: small;
- list-style: square;
-}
-div.uploadStatus {
- margin: 5px;
-}
-div.progressBar {
- margin: 5px;
-}
-div.progressBar div.border {
- background-color: #fff;
- border: 1px solid grey;
- width: 100%;
-}
-div.progressBar div.background {
- background-color: #333;
- height: 18px;
- width: 0%;
-}
diff --git a/src/public/stylesheets/facebox.css b/src/public/stylesheets/facebox.css index e8268a0..1825bea 100644 --- a/src/public/stylesheets/facebox.css +++ b/src/public/stylesheets/facebox.css
If we drop ok_footer, then facebox is used only in confirmation_dialog helper method and this confirmation_dialog is not used anywhere. So I think it's possible to remove confirmation_dialog and facebox.(js|css). Could be separate patch.
@@ -40,8 +40,6 @@ }
#facebox .body {
- /*padding: 10px;*/
- /*border: #999999 solid 1px;*/ background: #fff; width: 370px; }
@@ -97,7 +95,7 @@
.facebox_timfooter {
- background: url(../images/fb_footer.jpg) repeat-x;
- height: 37px;
- background: url(../images/fb_footer.jpg) repeat-x;
- height: 37px; padding: 9px 9px 0 9px;
-} \ No newline at end of file +} diff --git a/src/public/stylesheets/layout.css b/src/public/stylesheets/layout.css index 3ab4d6e..872440d 100644 --- a/src/public/stylesheets/layout.css +++ b/src/public/stylesheets/layout.css @@ -1,8 +1,8 @@ @charset "UTF-8";
/****************
- html elements
-**/ +html elements
**/
html { /*overflow: hidden;*/
@@ -19,11 +19,10 @@ body { width: 100%; height: 100%; background-color:#333333;
- font-size: 90%;
- font-size: 90%; }
-img -{ +img { border-style: none; }
@@ -34,15 +33,15 @@ h2, h3 { font-weight: normal; }
-/**************************
- oVirt layout components
-**/ +/************************** +oVirt layout components
**/
#header { padding: 0; margin: 0; position: absolute;
- top: 0px;
- top: 0px; left: 0px; width: 100%; height: 90px;
@@ -50,23 +49,17 @@ h2, h3 { background:#535353 url(../images/bg_header.png) repeat-x top; }
-.header_image {
- position:absolute;
- top:10px;
- left:10px;
-}
-#side { +#side { padding: 5px 0 0 5px; margin: 0;
- position: absolute;
- position: absolute; top: 70px; left: 0px; bottom: 0px;
- overflow: auto;
- width: 224px;
- overflow: auto;
- width: 224px; background-color:#FFFFFF;
- border-right: 1px #CCCCCC solid;
border-right: 1px #CCCCCC solid; }
#side h3 {
@@ -77,69 +70,19 @@ h2, h3 { }
-#side-toolbar{
- float:none;
- position:absolute;
- bottom:0px;
-}
- #main { padding: 0; margin-left: 0;
- position: absolute;
- position: absolute; top: 70px; left: 230px; right: 0px; bottom: 0px; overflow: auto;
- background-color:#FFFFFF;
- background-color:#FFFFFF; border-left:#CCCCCC solid 0px; }
-#navigation-tabs{
- height: 30px;
- position: absolute;
- top: -30px;
-}
-#content-area { -}
-.toolbar {
- margin: 1px 0 1px 0;
- background: #CCCCCC url(../images/bg_navtoolbar.png) repeat-x top;
- height: 31px;
- border-left: #FFFFFF solid 1px;
- border-top: #FFFFFF solid 1px;
- border-bottom: #FFFFFF solid 1px;
- border-right: #B4B4B4 solid 1px;
- }
-.breadcrumb_main {
- padding: 0;
- margin: 40px 0 0 10px;
- float:left;
- color:#B5B5B5;
-} -.breadcrumb_main a:link { color: #B5B5B5; text-decoration: underline; } -.breadcrumb_main a:active { color: #B5B5B5; text-decoration: underline; } -.breadcrumb_main a:visited { color: #B5B5B5; text-decoration: underline; } -.breadcrumb_main a:hover { color: #FFFFFF; text-decoration: none; }
-.breadcrumb_currentpage {
- color:#FFFFFF;
- font-size: 130%;
-}
- /* ----- General Effects ----- */
-.clickable {cursor:pointer;}
-.open {background:url(../images/dir_open.png) left center no-repeat;}
-.closed {background:url(../images/dir_closed.png) left center no-repeat;}
-.hidden {display:none;}
/* ----- Right side of Header -------- */
.header_info {
@@ -156,68 +99,41 @@ h2, h3 { .header_info a:visited { color: #000; text-decoration: none; } .header_info a:hover { color: #000; text-decoration: none; }
-#help-div {
- position: fixed;
- top: 10px;
- right: 10px;
-}
-.headeritem {
- margin-left:5px;
-}
- #textfield_effect {
- border-width: 1px;
- border-style: solid;
- border-color: #7A7A7A;
- padding-left: 5px;
- background: #4A4A4A;
- font-size: 100%;
- color: #FFFFFF;
- width: 100px;
- height: 16px;
-} -#searchbox-button{
- vertical-align: middle;
-}
-.panel_header {
- padding: 5px 0 0 10px;
- margin: 0;
- height: 23px;
- border-width: 1px;
- border-style: solid;
- border-color: #7A7A7A;
- padding-left: 5px;
- background: #4A4A4A;
- font-size: 100%; color: #FFFFFF;
- font-size: 110%;
- border-left: 1px solid #93B2C4;
- background: #000000 url(../images/bg_toolbarheader.png) repeat-x top;
- width: 100px;
- height: 16px; }
- /* ----- Blue Tabbed Navigation -------- */ .ui-tabs-nav {
- margin:0;
- padding: 0;
- background: none;
- list-style-type: none;
- float: left;
- font-size: 110%;
- margin:0;
- padding: 0;
- background: none;
- list-style-type: none;
- float: left;
- font-size: 110%; } .ui-tabs-nav li {
- margin: 0 1px 0 1px;
- padding: 0;
- float: left;
- margin: 0 1px 0 1px;
- padding: 0;
- float: left; } .ui-tabs-nav a {
- float:left;
- padding: 0 15px 0 15px;
- color: #CCCCCC;
- text-decoration: none;
- line-height: 2.3;
- height: 24px;
- text-align: center;
- background: none;
float:left;
padding: 0 15px 0 15px;
color: #CCCCCC;
text-decoration: none;
line-height: 2.3;
height: 24px;
text-align: center;
background: none;
} .ui-tabs-nav a:hover {color:#FFFFFF; border-bottom: 5px solid #537585;}
@@ -226,174 +142,19 @@ h2, h3 {
.ui-tabs-hide {/*display:none;*/}
-/* ----- Panel Contents -------- */
-.panel_summary {
- padding:0;
- margin:0;
- height: 100px;
- background: #E5E5E5;
-}
-.data_section {
- overflow: auto;
- position: absolute;
- top: 28px;
- bottom: 191px;
- right: 0px;
- left: 0px;
-}
-.data_section_summary {
- padding: 20px 0 0 20px;
- overflow: hidden;
- position: absolute;
- top: 0px;
- bottom: 170px;
- right: 0px;
- left: 0px;
- overflow: auto;
-}
.summary_title {
font-size: 160%;
}
Class "summary_title" is referenced from test/functional /interface_test.rb (selenium test).
.summary_subtitle {
clear: both;
font-size: 130%;
}
-.scrollable {
- overflow: scroll;
- height: 100%;
-}
-.selection_detail {
- margin: 0;
- position:absolute;
- bottom:0px;
- left: 0px;
- right: 0px;
- height: 170px;
- background: #DEE7EB;
- border-top: #CCCCCC solid 1px;
- overflow: auto;
- padding: 10px 10px 10px 15px;
-}
-.selection_left {
- float:left;
-}
-.selection_title {
- font-size: 120%;
- font-weight:bold;
- padding-bottom: 10px;
- float: left;
-}
-.selection_tools {
- background:transparent none repeat scroll 0%;
- color:#000000;
- float:left;
- line-height:1.7;
- list-style-type:none;
- margin:0;
- padding:0;
- text-align:center;
- text-decoration:none;
-} -.selection_tools li {
- float:left;
- margin:0pt 1px;
- padding:0pt;
-} -.selection_tools img { -} -.selection_tools a {
- background:transparent none repeat scroll 0%;
- color:#000000;
- float:left;
- line-height:1.7;
- padding:0pt 8px;
- text-align:center;
- text-decoration:none;
-} -.selection_tools a:hover {
- -moz-border-radius: 2px;
- background:#B0CBDE none repeat scroll 0%;
-} -.selection_key {
- text-align:right;
- float:left;
- color:#666666;
-}
-.selection_value {
- text-align:left;
- float:left;
- padding: 0 0 0 10px;
-}
-.selection_right {
- float: right;
- padding-right: 10px;
-}
- .selection_right_title {
- padding: 4px 4px 4px 6px;
- background: #F0F0F0;
- float: left;
-}
- .selection_right_table {
- height: 128px;
- overflow:auto;
- clear:both;
- }
- /* ----- Selection Detail Tabbed Navigation -------- */
-.selection_tab_nav {
- margin:0;
- padding: 0;
- background: #F0F0F0;
- list-style-type: none;
- float: right;
-} -.selection_tab_nav li {
- margin: 0 1px 0 1px;
- padding: 0;
- float: left;
-} -.selection_tab_nav a {
- float:left;
- padding: 0 8px;
- text-decoration: none;
- text-align: center;
- background: none;
- color:#000000;
- line-height: 1.7;
-} -.selection_tab_nav a:hover {background:#E3E3E3;}
/* ----- PopUp Dialog -------- */
.dialog_title {
background:#DEE7EB;
padding:15px;
background:#DEE7EB;
padding:15px; width:600px; }
.dialog_title_small {
- background:#DEE7EB;
- background:#DEE7EB; padding:15px;
- min-width: 500px;
min-width: 500px; }
.header {
@@ -406,12 +167,6 @@ h2, h3 { height: 350px; }
-.popup_body {
- background: #FFFFFF;
- overflow: auto;
- height: 350px;
-}
- .confirm_dialog_title { width:400px; padding: 15px;
@@ -430,69 +185,16 @@ h2, h3 { padding: 5px 9px 0 0; }
-.dialog_form {
- margin: 15px;
- background: #FFFFFF;
-}
-.dialog_tree {
- height: 200px;
- overflow: auto;
-}
-.form_heading {
- font-size:1.15em;
- color: #666666;
- border-top:#CCCCCC 1px dotted;
- padding: 1.2em 0em 1em 1.5em;
-}
-.field_title {
- font-size: 105%;
- /*font-weight:bold;*/
-}
-.field_helptext { font-size: 90%; color: #666666; }
-.textfield_effect {
- padding: 2px 0 0 2px;
- border-width: 1px;
- border-style: solid;
- border-color: #999999;
- font-size: 105%;
- width: 200px;
- height: 20px;
-}
-.dropdown_effect {
- border-width: 1px;
- border-style: solid;
- border-color: #999999;
- font-size: 105%;
- height: 20px;
-}
-.form_field {
- margin-bottom:12px;
- margin-top:2px;
- padding-right:10px;
-}
-.clear_row {
- clear:both;
- height: 5px;
-}
- .button { padding: 0 0 0 2px; float:right; }
-.button_left_blue {
- background:url(../images/button_left.png) no-repeat;
- width: 6px;
- height: 29px;
- float: left;
- .button_left_blue {
- background:url(../images/button_left.png) no-repeat;
- width: 6px;
- height: 29px;
- float: left; } .button_middle_blue { background:url(../images/button_middle.png) repeat-x;
@@ -546,30 +248,3 @@ h2, h3 { color:#333333; padding: 2px; }
-/* This file skins sliders */
-.ui-slider { width: 200px; height: 23px; position: relative; background-repeat: no-repeat; background-position: center center; } -.ui-slider-handle { position: absolute; z-index: 1; height: 23px; width: 12px; top: 0px; left: 0px; background-image: url(images/slider-handle.gif); cursor: move;} -.ui-slider-handle-active { /*border: 1px dotted #CCCCCC;*/} -.ui-slider-disabled .ui-slider-handle { opacity: 0.5; filter: alpha(opacity=50); } -.ui-slider-range { position: absolute; background: #50A029; opacity: 0.3; filter: alpha(opacity=30); width: 100%; height: 100%; }
-/* Default slider backgrounds */ -.ui-slider, .ui-slider-1 { background-image: url(images/slider-bg-1.png); cursor: pointer;} -.ui-slider-2 { background-image: url(images/slider-bg-2.png); }
-#slider_callout { background: #FFFFFF; height: 45px; width: 38px; overflow: hidden; position: absolute; top: -50px; margin-left:-10px; padding: 8px 0px 0px 0px; font-family: "Myriad Pro"; color: #284a6e; font-weight: bold; text-align: center;}
-.slider_value { background: #FFFFFF; font-size:105%; padding-left:5px; float:left;} -.slider_minlabel { float:left; padding:4px 4px 4px 0;} -.slider_maxlabel { float:left; padding:4px;}
-#storage tree container div -.storage_tree_container {
- overflow:auto;
- border:#CCCCCC solid 1px;
-}
deltacloud-devel@lists.fedorahosted.org