Skip to content
This repository has been archived by the owner on Aug 30, 2024. It is now read-only.

Commit

Permalink
Added wizard-section-labels where needed. CSS adjustments.
Browse files Browse the repository at this point in the history 
Tweaked styles on the About Cloud page.
  • Loading branch information
daveyates committed Oct 5, 2012
1 parent 64277b7 commit a34f508
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 25 deletions.
36 changes: 22 additions & 14 deletions static/css/eucalyptus.css
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2236,6 +2236,11 @@ span.on-error {
padding-right: 10px; padding-right: 10px;
} }


.advanced-link-wrapper {
/* For the Advanced options link under the Launch Instances button */
margin: 5px 13px 0 0;
}

.image-type { .image-type {
padding-left: 60px; padding-left: 60px;
background-repeat: no-repeat; background-repeat: no-repeat;
Expand Down Expand Up @@ -2369,15 +2374,10 @@ span.on-error {
.wizard-section-label { .wizard-section-label {
color: #02405f; color: #02405f;
font-weight: bold; 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 { .launch-wizard-section-header {
position: absolute; position: absolute;
top: -1px; top: -1px;
Expand Down Expand Up @@ -2465,18 +2465,26 @@ textarea.console-output {


/* ======= Euca credits ======= */ /* ======= Euca credits ======= */


img.euca-credits { .euca-credits {
overflow: auto;
margin: 25px 0;
height: 400px;
text-align: center;
}

.euca-credits img {
display: block; display: block;
margin: auto; margin: 10px auto;
} }


div.euca-credits { .euca-credits p {
text-align: center; font-size: 14px;
height: 400px; font-weight: bold;
overflow: auto;
} }


ul.euca-credits { .euca-credits ul {
margin: 0 0 15px;
padding: 0;
list-style-type: none; list-style-type: none;
} }


Expand Down
6 changes: 3 additions & 3 deletions static/help/en/console_about.html
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="euca-credits"> <div class="euca-credits">
<div class="animated" > <div class="animated" >
<img src='/images/koalas.jpeg'/> <img src='/images/koalas.jpeg'/>
<span>Department 3</span> <p>Department 3</p>
<ul> <ul>
<li>One</li> <li>One</li>
<li>Two</li> <li>Two</li>
Expand All @@ -14,7 +14,7 @@
<li>Nine</li> <li>Nine</li>
<li>Ten</li> <li>Ten</li>
</ul> </ul>
<span>Department 3</span> <p>Department 3</p>
<ul> <ul>
<li>One</li> <li>One</li>
<li>Two</li> <li>Two</li>
Expand All @@ -27,7 +27,7 @@
<li>Nine</li> <li>Nine</li>
<li>Ten</li> <li>Ten</li>
</ul> </ul>
<span>Department 3</span> <p>Department 3</p>
<ul> <ul>
<li>One</li> <li>One</li>
<li>Two</li> <li>Two</li>
Expand Down
2 changes: 1 addition & 1 deletion static/js/instance.js
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@


$header = thisObj.launchMoreDialog.find('#launch-wizard-advanced-header'); $header = thisObj.launchMoreDialog.find('#launch-wizard-advanced-header');
$header.children().detach(); $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'); var $advSection = thisObj.launchMoreDialog.find('#launch-wizard-advanced-contents');
$advSection.slideToggle('fast'); $advSection.slideToggle('fast');
$header.toggleClass('expanded'); $header.toggleClass('expanded');
Expand Down
14 changes: 7 additions & 7 deletions static/js/launcher.js
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
$securityBtn.append( $securityBtn.append(
$('<button>').attr('id','launch-wizard-buttons-security-launch').addClass('button').html(launch_instance_btn_launch).click( function(e){ $('<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), $('<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){ $('<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'); var advSection = $launcher.find('#launch-wizard-advanced-contents');
Expand Down Expand Up @@ -361,8 +361,8 @@
}; };
this._imageTable = $table.dataTable(dtArg); this._imageTable = $table.dataTable(dtArg);


$section.find('#filter-wrapper').prepend($('<div>').addClass('wizard-subsection-label').html(launch_instance_image_table_refine)); $section.find('#filter-wrapper').prepend($('<div>').addClass('wizard-section-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('#table-wrapper').prepend($('<div>').addClass('wizard-section-label').html(launch_instance_image_table_header));


$.fn.dataTableExt.afnFiltering = []; $.fn.dataTableExt.afnFiltering = [];
$.fn.dataTableExt.afnFiltering.push( $.fn.dataTableExt.afnFiltering.push(
Expand Down Expand Up @@ -515,7 +515,7 @@
$az.append($('<option>').attr('value', azName).text(azName)); $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); $list);


$section.find('#launch-wizard-buttons-type-next').click(function(e) { $section.find('#launch-wizard-buttons-type-next').click(function(e) {
Expand Down Expand Up @@ -557,7 +557,7 @@
_makeSecuritySection : function($section) { _makeSecuritySection : function($section) {
var thisObj = this; var thisObj = this;
var $content = $section.find('#launch-wizard-security-main-contents'); 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 $keypair = $content.find('#launch-wizard-security-keypair');
var $sgroup = $content.find('#launch-wizard-security-sgroup'); var $sgroup = $content.find('#launch-wizard-security-sgroup');


Expand Down Expand Up @@ -746,7 +746,7 @@
var thisObj = this; var thisObj = this;
var $content = $section.find('#launch-wizard-advanced-main-contents'); var $content = $section.find('#launch-wizard-advanced-main-contents');
if(! $content.children().first().is('span')) 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 $userdata = $content.find('#launch-wizard-advanced-userdata');
var $kernel = $content.find('#launch-wizard-advanced-kernelramdisk'); var $kernel = $content.find('#launch-wizard-advanced-kernelramdisk');
var $network = $content.find('#launch-wizard-advanced-network'); var $network = $content.find('#launch-wizard-advanced-network');
Expand Down Expand Up @@ -1004,7 +1004,7 @@
} /// end of addNewRow() } /// end of addNewRow()


$storage.append( $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( $('<div>').attr('id', 'launch-wizard-advanced-storage-table-wrapper').append(
$('<table>').append( $('<table>').append(
$('<thead>').append( $('<thead>').append(
Expand Down

0 comments on commit a34f508

Please sign in to comment.