[PATCH conductor] BZ790901 Link to instance detail from deployment detail pretty view
Maros Zatko
mzatko at redhat.com
Thu Feb 16 19:19:47 UTC 2012
On 02/16/2012 02:38 PM, jtomasek at redhat.com wrote:
> From: Jiri Tomasek<jtomasek at redhat.com>
>
> ---
> src/app/stylesheets/layout.scss | 2 +-
> .../views/deployments/_pretty_view_show.html.haml | 10 ++++++----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
> index fa8def9..9c1173f 100644
> --- a/src/app/stylesheets/layout.scss
> +++ b/src/app/stylesheets/layout.scss
> @@ -2548,10 +2548,10 @@ ul.instances-array{
> display: table;
> margin: 0 auto;
> list-style: none;
> - font-size: 11px;
>
> li{
> float: left;
> + margin-left: 4px;
> }
> }
> }
> diff --git a/src/app/views/deployments/_pretty_view_show.html.haml b/src/app/views/deployments/_pretty_view_show.html.haml
> index 3cf6de3..f40284c 100644
> --- a/src/app/views/deployments/_pretty_view_show.html.haml
> +++ b/src/app/views/deployments/_pretty_view_show.html.haml
> @@ -2,7 +2,7 @@
> - @deployment.instances.ascending_by_name.each do |instance|
> %li.instance
> %h3.name
> - = instance.name
> + = link_to instance.name, instance
> %hr
> %dl.statistics
> %ul
> @@ -17,7 +17,8 @@
> %dd= instance.state
> - if instance.instance_key
> %li
> - = link_to t('deployments.pretty_view_show.download_key'), key_instance_path(instance)
> + %dt
> + %dd= link_to t('deployments.pretty_view_show.download_key'), key_instance_path(instance)
> %hr
> .actions
> %ul
> @@ -33,7 +34,7 @@
> %script#instanceTemplate{:type => 'text/x-jquery-tmpl'}
> :plain
> <li class="instance">
> -<h3 class="name">${name}</h3>
> +<h3 class="name"><a href="#{instance_path('replace_id').sub('replace_id', '${id}')}">${name}</a></h3>
> <hr>
> <dl class="statistics">
> <ul>
> @@ -57,7 +58,8 @@
> </li>
> {{if has_key}}
> <li>
> -<a href="#{key_instance_path('replace_id').sub('replace_id', '${id}')}">#{t('deployments.pretty_view_show.download_key')}</a>
> +<dt/>
> +<dd><a href="#{key_instance_path('replace_id').sub('replace_id', '${id}')}">#{t('deployments.pretty_view_show.download_key')}</a></dd>
> </li>
> {{/if}}
> </ul>
wfm, ACK
More information about the aeolus-devel
mailing list