On 22/01/10 10:06 -0800, David Lutterkort wrote:
On Fri, 2010-01-22 at 10:59 +0100, Michal Fojtik wrote:
From: Michal Fojtik mfojtik@redhat.com
- Replaced almost every ERB view with HAML
- Fixed year in copyright (application layout)
ACK. There's a few small nits, but feel free to commit this after addressing them
I'm fixed all things:
--- server/libexec/app/views/accounts/index.html.haml | 3 ++- server/libexec/app/views/accounts/show.html.haml | 16 ++++++++++++++++ server/libexec/app/views/instances/index.html.haml | 4 ++-- server/libexec/app/views/instances/show.html.haml | 4 ++-- .../app/views/layouts/application.html.haml | 3 +-- 5 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/server/libexec/app/views/accounts/index.html.haml b/server/libexec/app/views/accounts/index.html.haml index 7aee4c9..df73d19 100644 --- a/server/libexec/app/views/accounts/index.html.haml +++ b/server/libexec/app/views/accounts/index.html.haml @@ -2,7 +2,8 @@
%table %thead - %th ID + %tr + %th ID %tbody - @accounts.each do |account| %tr diff --git a/server/libexec/app/views/accounts/show.html.haml b/server/libexec/app/views/accounts/show.html.haml index c09e63c..2688b3e 100644 --- a/server/libexec/app/views/accounts/show.html.haml +++ b/server/libexec/app/views/accounts/show.html.haml @@ -12,3 +12,19 @@ %tr %td = link_to instance_id, instance_url( instance_id ) + +%h2 Images + +%table + %thead + %tr + %th Image ID + %th Description + %tbody + %tbody + - @images.each do |image| + %tr + %td + = link_to image[:id], image_url( image[:id] ) + %td + = image[:description] diff --git a/server/libexec/app/views/instances/index.html.haml b/server/libexec/app/views/instances/index.html.haml index 6d513b6..085e6c6 100644 --- a/server/libexec/app/views/instances/index.html.haml +++ b/server/libexec/app/views/instances/index.html.haml @@ -23,9 +23,9 @@ %td = link_to instance.image_id, image_url( instance.image_id ) %td - = instance.flavor_id ? link_to(instance.flavor_id, flavor_url(instance.flavor_url)) : default + = instance.flavor_id ? link_to(instance.flavor_id, flavor_url(instance.flavor_url)) : 'default' %td - = instance.realm_id ? link_to(instance.realm_id, realm_url( instance.realm_id )) : default + = instance.realm_id ? link_to(instance.realm_id, realm_url( instance.realm_id )) : 'default' %td = instance.state %td diff --git a/server/libexec/app/views/instances/show.html.haml b/server/libexec/app/views/instances/show.html.haml index 5ef1306..5d3d435 100644 --- a/server/libexec/app/views/instances/show.html.haml +++ b/server/libexec/app/views/instances/show.html.haml @@ -17,11 +17,11 @@ %di %dt Flavor %dd - = @instance.flavor_id ? link_to(@instance.flavor_id, flavor_url(@instance.flavor_id)) ? default + = @instance.flavor_id ? link_to(@instance.flavor_id, flavor_url(@instance.flavor_id)) ? 'default' %di %dt Realm %dd - = @instance.realm_id ? link_to(@instance.realm_id, realm_url(@instance.realm_id)) ? default + = @instance.realm_id ? link_to(@instance.realm_id, realm_url(@instance.realm_id)) ? 'default' %di %dt State %dd diff --git a/server/libexec/app/views/layouts/application.html.haml b/server/libexec/app/views/layouts/application.html.haml index a218e22..1f9f47b 100644 --- a/server/libexec/app/views/layouts/application.html.haml +++ b/server/libexec/app/views/layouts/application.html.haml @@ -19,8 +19,7 @@ #driver_info Driver: #{DRIVER} #copyright - Copyright - = Time.now.year + Copyright 2009, 2010 #{link_to 'Red Hat', 'http://redhat.com%27%7D and individual contributors.