On Wed, Oct 03, 2012 at 11:59:16AM -0400, [email protected] wrote: > From: Tzu-Mainn Chen <[email protected]> > > --- > src/app/views/images/_status.html.mustache | 6 ------ > src/app/views/images/show.html.haml | 8 ++++++-- > src/config/locales/en.yml | 2 +- > 3 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/src/app/views/images/_status.html.mustache > b/src/app/views/images/_status.html.mustache > index 1495ffe..af25716 100644 > --- a/src/app/views/images/_status.html.mustache > +++ b/src/app/views/images/_status.html.mustache > @@ -38,9 +38,6 @@ > <%= t('images.show.provider') %> > </th> > <th> > - <%= t('images.show.image_uuid') %> > - </th> > - <th> > <%= t('images.show.providers_image_id') %> > </th> > <th class="image_controls"></th> > @@ -57,9 +54,6 @@ > {{account.provider_name}} > </td> > <td class="light"> > - {{provider_image.target_identifier}} > - </td> > - <td class="light"> > {{provider_image.uuid}} > </td> > <td class="image_controls light"> > diff --git a/src/app/views/images/show.html.haml > b/src/app/views/images/show.html.haml > index 7662686..cf92677 100644 > --- a/src/app/views/images/show.html.haml > +++ b/src/app/views/images/show.html.haml > @@ -17,10 +17,14 @@ > %header > %h2=t'properties' > .content > - %table > + %table.properties_table > %tbody > %tr > - %td= t('images.environment', :environment => @image.environment) > + %td= t('images.environment') > + %td= @image.environment > + %tr > + %td= t('images.show.image_uuid') > + %td= @image.uuid > > %section.content-section > %header > diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml > index e6f0b58..3902fc8 100644 > --- a/src/config/locales/en.yml > +++ b/src/config/locales/en.yml > @@ -931,7 +931,7 @@ en: > delete_failed: Unable to Delete Target Image > not_found: Target Image not found > images: > - environment: "Environment: %{environment}" > + environment: Environment > environment_header: Environment > import: > import_image: Import Image > -- > 1.7.6.5
ACK. Pushed to master. The 1.1 flag is not confirmed, so I am not cherry-picking. -- Matt
