---
src/app/stylesheets/layout.scss | 10 +++++++++-
src/app/views/layouts/_catalog_dropdown.html.haml | 12 +++++-------
src/app/views/pools/_header_show.html.haml | 2 ++
src/app/views/pools/_pretty_list.html.haml | 1 +
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 575693a..aa64952 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -2289,14 +2289,22 @@ ul.deployment-array.small + ul.deployment-array.small{
background:#C4E0F0;
}
}
+
+div.catalog_link{
+ display:inline-block;
+}
+
.catalog_link{
background: url(../../images/deployment-button.png) no-repeat center;
padding: 7px 15px;
}
+
.catalog_link:hover{
background-color:#e0e0e0;
background: url(../../images/deployment-button-pressed.png) no-repeat center;
-
+ ul li {
+ list-style-type: none;
+ }
.more{
border: 1px solid #999999;
display:block;
diff --git a/src/app/views/layouts/_catalog_dropdown.html.haml
b/src/app/views/layouts/_catalog_dropdown.html.haml
index d5a2d59..837b349 100644
--- a/src/app/views/layouts/_catalog_dropdown.html.haml
+++ b/src/app/views/layouts/_catalog_dropdown.html.haml
@@ -1,7 +1,5 @@
-%li.catalog_link
- =#image_tag 'deployment-button.png'
-  
- %div.catalog_list
- %ul.more
- - catalogs.each do |catalog|
- %li.catalog= link_to catalog.name,
launch_from_catalog_deployments_path(:catalog_id => catalog.id)
\ No newline at end of file
+ 
+%div.catalog_list
+ %ul.more
+ - catalogs.each do |catalog|
+ %li.catalog= link_to catalog.name, launch_from_catalog_deployments_path(:catalog_id
=> catalog.id)
\ No newline at end of file
diff --git a/src/app/views/pools/_header_show.html.haml
b/src/app/views/pools/_header_show.html.haml
index 04a1797..51d9258 100644
--- a/src/app/views/pools/_header_show.html.haml
+++ b/src/app/views/pools/_header_show.html.haml
@@ -3,6 +3,8 @@
= [@pool.name, "#{t'pools.pool'}"].join(' ')
#obj_actions.button-container
= link_to t('deployments.new_deployment'),
launch_new_deployments_path(:pool_id => @pool.id), :class => 'button
primary', :id => 'new_deployment_button'
+ %div.catalog_link
+ = render :partial => 'layouts/catalog_dropdown', :locals =>
{:catalogs => @pool.catalogs}
.button-group
= link_to t('edit'), edit_pool_path(@pool), :class => 'button
pill', :id => 'edit_pool_button'
= button_to t('delete'), pool_path(@pool), :method => :delete, :confirm
=> t('pools.index.confirm_delete'), :class => "button pill
danger", :id => 'delete_pool_button'
diff --git a/src/app/views/pools/_pretty_list.html.haml
b/src/app/views/pools/_pretty_list.html.haml
index c540669..91093e5 100644
--- a/src/app/views/pools/_pretty_list.html.haml
+++ b/src/app/views/pools/_pretty_list.html.haml
@@ -31,6 +31,7 @@
= link_to ("#{html_escape(pool.name)} " +
"#{t'pools.index.pool_details'}" + " »").html_safe,
pool_path(pool), :class =>'pool_details'
%li
= link_to "#{t'deployments.new_deployment'}",
launch_new_deployments_path(:pool_id => pool.id), :class => 'button
primary', :id => 'new_deployment_button'
+ %li.catalog_link
= render :partial => 'layouts/catalog_dropdown', :locals =>
{:catalogs => pool.catalogs}
:javascript
--
1.7.6.4
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel