---
src/app/stylesheets/layout.scss | 97 +++++++++-----------
.../deployments/launch_from_catalog.html.haml | 70 ++++++---------
src/app/views/providers/edit.html.haml | 2 +-
src/config/locales/en.yml | 7 +-
src/public/javascripts/application.js | 2 +-
5 files changed, 80 insertions(+), 98 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 5375275..d9de836 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -2263,12 +2263,6 @@ ul.deployment-array.small + ul.deployment-array.small{
/********************************************* Launch from catalog elements */
/************************************************************************** */
-.catalog_info{
- text-align:center;
- h3{
- padding:20px 0px 20px 0px;
- }
-}
.catalog_list{
position: relative;
}
@@ -2323,63 +2317,60 @@ div.catalog_link{
}
}
-table.catalog_pretty {
- width: 100%;
- #border: 1px solid #ccc;
- background-color: #efefef;
- background: -moz-linear-gradient(top, #efefef 0%, #e0e0e0 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#efefef),
color-stop(100%,#e0e0e0)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #efefef 0%,#e0e0e0 100%); /*
Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #efefef 0%,#e0e0e0 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #efefef 0%,#e0e0e0 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#efefef',
endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #efefef 0%,#e0e0e0 100%); /* W3C */
+ul.catalog_pretty {
+ border: 1px solid #ccc;
-webkit-border-radius: 7px 7px 7px 7px; -moz-border-radius: 7px 7px 7px 7px;
border-radius: 7px 7px 7px 7px;
- tr {
- padding:5px;
- border-bottom: 1px solid #CCCCCC;
-
- }
-
- tr:last-child {
- border:none;
- }
+ margin: 10px 0px 10px 0px;
+ li{
+ list-style-type: none;
- td.info{
- padding:5px;
- width:80%;
- h2.catalog_entry{
- font-size: 16px;
- margin-top: 6px;
- display: inline-block;
- padding: 6px 7px 7px 44px;
- background: transparent
url('../../images/deployment_large_icon_provider.png') no-repeat 8px center;
+ &:not(:first-child){border-top: 1px solid #ccc;}
+
+ div.summary{
+ padding: 10px;
+ background-color: #efefef;
+ background: -moz-linear-gradient(top, #efefef 0%, #e0e0e0 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#efefef),
color-stop(100%,#e0e0e0)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #efefef 0%,#e0e0e0 100%); /*
Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #efefef 0%,#e0e0e0 100%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #efefef 0%,#e0e0e0 100%); /* IE10+ */
+ filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#efefef', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9
*/
+ background: linear-gradient(top, #efefef 0%,#e0e0e0 100%); /* W3C */
+
+ div.controls{
+ width: 200px;
+ float: right;
+ text-align: right;
+ display: table-cell;
+ vertical-align: middle;
+ div{ display: inline; }
+ a{ margin-right: 10px; text-decoration: none; }
+ a:after{ content: " ▼"; }
+ a:hover{ color: black; }
}
- .catalog_entry_description{
- padding-left: 44px;
- }
- }
- td.controls{
- text-align: right;
- vertical-align: middle;
- form div{
- display:inline;
+ div.info{
+ padding-left: 32px;
+ background: transparent
url('../../images/deployment_large_icon_provider.png') no-repeat left top;
+ h2{ font-size: 16px; }
+ }
}
- }
- table{
- width:90%;
- tr td{
- padding:10px;
- }
- tr th{
- padding:10px;
+ div.details.collapsible{
+ display: none;
+ background: #eee;
+ border-top: 1px solid #ccc;
+ table{
+ margin: 10px 10px 10px 42px;
+ td,th{ padding: 10px; }
+ td:first-child, th:first-child{padding-left: 0px;}
+ td:last-child, th:last-child{padding-right: 0px;}
+ th{border-bottom: 1px solid #CCCCCC;}
+ }
}
}
}
-
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Flat Table Component -- v.0.0.1 [flat_table] (flat_table.scss)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/src/app/views/deployments/launch_from_catalog.html.haml
b/src/app/views/deployments/launch_from_catalog.html.haml
index 43f84b7..8b47cbd 100644
--- a/src/app/views/deployments/launch_from_catalog.html.haml
+++ b/src/app/views/deployments/launch_from_catalog.html.haml
@@ -2,57 +2,43 @@
%header.page-header
%h1=(a)catalog.name
#obj_actions.button-container
- = link_to 'Edit', edit_catalog_path(@catalog), :class => 'button
pill', :id => 'edit_button'
-%span.catalog_info
- %h3="Choose a deployable to launch in the #{(a)catalog.pool.name} pool"
-.content
- %table.catalog_pretty
+ = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button
pill', :id => 'edit_button'
+ .corner
+%section.content-section
+ .align-center
+ %strong= t("deployments.launch_from_catalog.hint", :pool =>
@catalog.pool.name)
+ %ul.catalog_pretty
- @catalog_entries.each do |entry|
- %tr.entry_row
- %td.info
- %h2.catalog_entry=entry.name
- %div.catalog_entry_description=entry.description
- %td.controls
- =link_to "Details","#", :class => "collapse"
- =#link_to "Select","#", :class=> "button
pill"
- =button_to "Select", launch_time_params_deployments_path(:deployment
=> { :name => entry.name, :pool_id => @catalog.pool.id }, :catalog_entry_id =>
entry.id ), :class=> "button pill"
- %tr.details_row
- %td
+ %li.collapse_entity
+ .summary
+ .controls
+ = link_to
t("deplyments.launch_from_catalog.details"),"#", :class =>
"collapse"
+ = button_to t("deployments.launch_from_catalog.select"),
launch_time_params_deployments_path(:deployment => { :name => entry.name, :pool_id
=> @catalog.pool.id }, :catalog_entry_id => entry.id ), :class=> "button
pill"
+ .info
+ %h2= entry.name
+ %p= entry.description
+ .clear
+ .details.collapsible
%table
%tr
%th
- %h2 Image ID
+ %strong Image ID
%th Profile
%th HDD
%th RAM
%th ARCH
+ %th
+ %strong Deployable URI
-entry.fetch_images.each do |image|
%tr
%td
- %h2=image.id
- %td=entry.hw_profile_for_image(image.id).name
- %td=entry.hw_profile_for_image(image.id).storage
- %td=entry.hw_profile_for_image(image.id).memory
- %td=entry.hw_profile_for_image(image.id).architecture
- %td
- %h2 Deployable URI
- %span=entry.url
- %div.align-center
- %div
- =will_paginate @catalog_entries
- %div
- = link_to 'Cancel', root_path, :class => 'button pill', :id
=> 'edit_button'
+ %strong= image.id
+ %td= entry.hw_profile_for_image(image.id).name
+ %td= entry.hw_profile_for_image(image.id).storage
+ %td= entry.hw_profile_for_image(image.id).memory
+ %td= entry.hw_profile_for_image(image.id).architecture
+ %td= entry.url
-:javascript
- $(document).ready(function() {
- $('.details_row').each(function(){
- $(this).hide();
- })
- $('.entry_row').each(function(){
- var this_row = this;
- $(this).find('a.collapse').click(function(){
- $(this_row).next().toggle();
- return false;
- });
- })
- });
+ .align-center
+ %div= will_paginate @catalog_entries
+ %div= link_to t('cancel'), root_path, :class => 'button pill', :id
=> 'edit_button'
diff --git a/src/app/views/providers/edit.html.haml
b/src/app/views/providers/edit.html.haml
index e741aa2..f43931f 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -10,7 +10,7 @@
= t("providers.edit.enable_configure_providers")
= image_tag "provider_enable_hint.png"
-%section.admin-content-section.alerts
+%section.admin-content-section.alerts.collapse_entity
%header
%h2.alerts
= t("alerts_label")
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index f73e70a..841f5ab 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -176,6 +176,11 @@ en:
description: Description
image_ids: Image IDs
launch: Launch
+ launch_from_catalog:
+ profile: Profile
+ hint: Choose a deployable to launch in the "%{pool}" pool
+ details: Details
+ select: Select
new:
launch: Launch this deployment
deployable_definition: Deployable definition
@@ -556,7 +561,7 @@ en:
flash:
warning:
not_valid_or_reachable: Catalog entry XML file is either invalid or no longer
reachable at
- not_valid: Deployable url doesn't resolve valid XML file
+ not_valid: "Deployable url doesn't resolve valid XML file"
notice:
added: Catalog entry added.
updated: Catalog entry updated successfully!
diff --git a/src/public/javascripts/application.js
b/src/public/javascripts/application.js
index 8de6731..b901278 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -142,7 +142,7 @@ $.extend(Conductor, {
toggleCollapsible: function() {
$('.collapse').click(function(e) {
e.preventDefault();
- $(this).parents('section').find('.collapsible').slideToggle(80);
+
$(this).parents('.collapse_entity').find('.collapsible').slideToggle(80);
});
},
--
1.7.6.4