Permalink
Browse files

Added wizard-section-labels where needed. CSS adjustments.

Tweaked styles on the About Cloud page.
  • Loading branch information...
1 parent 64277b7 commit a34f5082b8caf1533ecbe3160684899a640fd7c7 daveyates committed Oct 5, 2012
Showing with 33 additions and 25 deletions.
  1. +22 −14 static/css/eucalyptus.css
  2. +3 −3 static/help/en/console_about.html
  3. +1 −1 static/js/instance.js
  4. +7 −7 static/js/launcher.js
View
@@ -2236,6 +2236,11 @@ span.on-error {
padding-right: 10px;
}
+.advanced-link-wrapper {
+ /* For the Advanced options link under the Launch Instances button */
+ margin: 5px 13px 0 0;
+}
+
.image-type {
padding-left: 60px;
background-repeat: no-repeat;
@@ -2369,15 +2374,10 @@ span.on-error {
.wizard-section-label {
color: #02405f;
font-weight: bold;
- margin-bottom: 4px;
+ font-size: 14px;
+ margin-bottom: 10px;
}
-.wizard-subsection-label {
- color: #02405f;
- font-weight: bold;
- margin-bottom: 4px;
-}
-
.launch-wizard-section-header {
position: absolute;
top: -1px;
@@ -2465,18 +2465,26 @@ textarea.console-output {
/* ======= Euca credits ======= */
-img.euca-credits {
+.euca-credits {
+ overflow: auto;
+ margin: 25px 0;
+ height: 400px;
+ text-align: center;
+}
+
+.euca-credits img {
display: block;
- margin: auto;
+ margin: 10px auto;
}
-div.euca-credits {
- text-align: center;
- height: 400px;
- overflow: auto;
+.euca-credits p {
+ font-size: 14px;
+ font-weight: bold;
}
-ul.euca-credits {
+.euca-credits ul {
+ margin: 0 0 15px;
+ padding: 0;
list-style-type: none;
}
@@ -1,7 +1,7 @@
<div class="euca-credits">
<div class="animated" >
<img src='/images/koalas.jpeg'/>
- <span>Department 3</span>
+ <p>Department 3</p>
<ul>
<li>One</li>
<li>Two</li>
@@ -14,7 +14,7 @@
<li>Nine</li>
<li>Ten</li>
</ul>
- <span>Department 3</span>
+ <p>Department 3</p>
<ul>
<li>One</li>
<li>Two</li>
@@ -27,7 +27,7 @@
<li>Nine</li>
<li>Ten</li>
</ul>
- <span>Department 3</span>
+ <p>Department 3</p>
<ul>
<li>One</li>
<li>Two</li>
View
@@ -862,7 +862,7 @@
$header = thisObj.launchMoreDialog.find('#launch-wizard-advanced-header');
$header.children().detach();
- $header.append($('<a>').attr('href', '#').html('*'+launch_instance_section_header_advanced).click( function(e) {
+ $header.append($('<a>').attr('href', '#').html(launch_instance_section_header_advanced).click( function(e) {
var $advSection = thisObj.launchMoreDialog.find('#launch-wizard-advanced-contents');
$advSection.slideToggle('fast');
$header.toggleClass('expanded');
View
@@ -213,7 +213,7 @@
$securityBtn.append(
$('<button>').attr('id','launch-wizard-buttons-security-launch').addClass('button').html(launch_instance_btn_launch).click( function(e){
}),
- $('<div>').addClass('form-row').addClass('clearfix').append(
+ $('<div>').addClass('form-row advanced-link-wrapper').append(
$('<label>').attr('for','launch-wizard-buttons-security-advanced-link').text(or_label),
$('<a>').attr('id','launch-wizard-buttons-security-advanced-link').attr('href','#').html(launch_instance_btn_next_advanced).click( function(e){
var advSection = $launcher.find('#launch-wizard-advanced-contents');
@@ -361,8 +361,8 @@
};
this._imageTable = $table.dataTable(dtArg);
- $section.find('#filter-wrapper').prepend($('<div>').addClass('wizard-subsection-label').html(launch_instance_image_table_refine));
- $section.find('#table-wrapper').prepend($('<div>').addClass('wizard-subsection-label').html(launch_instance_image_table_header));
+ $section.find('#filter-wrapper').prepend($('<div>').addClass('wizard-section-label').html(launch_instance_image_table_refine));
+ $section.find('#table-wrapper').prepend($('<div>').addClass('wizard-section-label').html(launch_instance_image_table_header));
$.fn.dataTableExt.afnFiltering = [];
$.fn.dataTableExt.afnFiltering.push(
@@ -515,7 +515,7 @@
$az.append($('<option>').attr('value', azName).text(azName));
}
- $option.append($('<span>').html(launch_instance_type_option_header),
+ $option.append($('<div>').addClass('wizard-section-label').html(launch_instance_type_option_header),
$list);
$section.find('#launch-wizard-buttons-type-next').click(function(e) {
@@ -557,7 +557,7 @@
_makeSecuritySection : function($section) {
var thisObj = this;
var $content = $section.find('#launch-wizard-security-main-contents');
- $content.prepend($('<span>').html(launch_instance_security_header));
+ $content.prepend($('<div>').addClass('wizard-section-label').html(launch_instance_security_header));
var $keypair = $content.find('#launch-wizard-security-keypair');
var $sgroup = $content.find('#launch-wizard-security-sgroup');
@@ -746,7 +746,7 @@
var thisObj = this;
var $content = $section.find('#launch-wizard-advanced-main-contents');
if(! $content.children().first().is('span'))
- $content.prepend($('<span>').html(launch_instance_advanced_header));
+ $content.prepend($('<div>').addClass('wizard-section-label').html(launch_instance_advanced_header));
var $userdata = $content.find('#launch-wizard-advanced-userdata');
var $kernel = $content.find('#launch-wizard-advanced-kernelramdisk');
var $network = $content.find('#launch-wizard-advanced-network');
@@ -1004,7 +1004,7 @@
} /// end of addNewRow()
$storage.append(
- $('<span>').text(launch_instance_advanced_storage),
+ $('<div>').addClass('wizard-section-label').text(launch_instance_advanced_storage),
$('<div>').attr('id', 'launch-wizard-advanced-storage-table-wrapper').append(
$('<table>').append(
$('<thead>').append(

0 comments on commit a34f508

Please sign in to comment.