[PATCH conductor] pool_families partials cleanup

Jirka Tomasek jtomasek at redhat.com
Tue May 22 15:04:17 UTC 2012


On 05/22/2012 03:26 PM, Jan Provaznik wrote:
> On 05/22/2012 12:43 PM, jtomasek at redhat.com wrote:
>> From: Jiri Tomasek<jtomasek at redhat.com>
>>
>> pools partials cleanup
>>
>> pools views fixes, notifications fixes
>>
>> provider_accounts partials cleanup
>>
>> provider_realms partials cleanup
>>
>> providers partials cleanup
>>
>> realms partials cleanup
>>
>> roles partials cleanup
>>
>> settings and users patials cleanup
>>
>> added basic lists styling under listing css class
>> ---
>>   src/app/controllers/pools_controller.rb            |    1 +
>>   src/app/controllers/providers_controller.rb        |    1 +
>>   src/app/controllers/realms_controller.rb           |    1 +
>>   src/app/stylesheets/_custom.scss                   |   25 -----
>>   src/app/stylesheets/layout.scss                    |   22 ++++-
>>   src/app/views/deployments/_list.html.haml          |    3 -
>>   .../views/deployments/confirm_terminate.html.haml  |    4 +-
>>   src/app/views/instances/_history.html.haml         |    2 +-
>>   src/app/views/instances/_parameters.haml           |    2 +-
>>   .../views/instances/confirm_terminate.html.haml    |    4 +-
>>   src/app/views/instances/show.html.haml             |    2 +-
>>   src/app/views/pool_families/_permissions.html.haml |    1 -
>>   src/app/views/pool_families/_properties.html.haml  |   12 ---
>>   .../views/pool_families/_section_header.html.haml  |    4 -
>>   src/app/views/pool_families/show.html.haml         |    1 -
>>   src/app/views/pools/_edit.html.haml                |    4 +-
>>   src/app/views/pools/_header_index.html.haml        |   10 --
>>   src/app/views/pools/_header_show.html.haml         |   11 ---
>>   src/app/views/pools/_new.html.haml                 |    3 +-
>>   src/app/views/pools/_permissions.html.haml         |    1 -
>>   src/app/views/pools/_section_header.html.haml      |    2 -
>>   src/app/views/pools/index.html.haml                |   10 ++-
>>   src/app/views/pools/show.html.haml                 |   16 +++-
>>   .../views/provider_accounts/_credentials.html.haml |    3 -
>>   src/app/views/provider_accounts/_history.html.haml |    3 -
>>   .../views/provider_accounts/_permissions.html.haml |    3 -
>>   .../views/provider_accounts/_properties.html.haml  |   29 ++-----
>>   .../provider_accounts/_section_header.html.haml    |    4 -
>>   src/app/views/provider_accounts/index.html.haml    |    5 +-
>>   .../views/provider_realms/_properties.html.haml    |   10 +--
>>   .../provider_realms/_section_header.html.haml      |    4 -
>>   src/app/views/providers/_page_header.html.haml     |   15 +++
>>   src/app/views/providers/_permissions.html.haml     |    1 -
>>   src/app/views/providers/_properties.html.haml      |   38 +++------
>>   src/app/views/providers/_section_header.html.haml  |   15 ---
>>   .../views/providers/confirm_terminate.html.haml    |    6 +-
>>   src/app/views/providers/edit.html.haml             |    4 +-
>>   src/app/views/providers/show.html.haml             |    2 +-
>>   src/app/views/realms/_mapping.html.haml            |   50 ++++++-----
>>   src/app/views/realms/_properties.html.haml         |   10 +--
>>   src/app/views/realms/_section_header.html.haml     |    4 -
>>   src/app/views/realms/show.html.haml                |    6 +-
>>   src/app/views/roles/_properties.html.haml          |   25 +++---
>>   src/app/views/roles/_section_header.html.haml      |    4 -
>>   src/app/views/roles/index.html.haml                |    5 +-
>>   src/app/views/roles/new.html.haml                  |    3 +-
>>   src/app/views/settings/_section_header.html.haml   |    2 -
>>   src/app/views/settings/index.html.haml             |    3 +-
>>   src/app/views/users/_properties.html.haml          |   93 
>> --------------------
>>   src/app/views/users/_section_header.html.haml      |    7 --
>>   src/app/views/users/show.html.haml                 |    7 --
>>   src/config/locales/en.yml                          |    8 +-
>>   52 files changed, 157 insertions(+), 354 deletions(-)
>>   delete mode 100644 src/app/views/pool_families/_history.html.haml
>>   delete mode 100644 src/app/views/pool_families/_permissions.html.haml
>>   delete mode 100644 src/app/views/pool_families/_properties.html.haml
>
> ^ nit:
> load_tab_captions_and_details_tab method still references 'properties' 
> tab, but this method is obviously obsoleted and the reference is not 
> used, but we might cleanup this method
>
>>   delete mode 100644 
>> src/app/views/pool_families/_section_header.html.haml
>>   delete mode 100644 src/app/views/pools/_header_index.html.haml
>>   delete mode 100644 src/app/views/pools/_header_show.html.haml
>>   delete mode 100644 src/app/views/pools/_permissions.html.haml
>>   delete mode 100644 src/app/views/pools/_section_header.html.haml
>>   delete mode 100644 
>> src/app/views/provider_accounts/_credentials.html.haml
>>   delete mode 100644 src/app/views/provider_accounts/_history.html.haml
>>   delete mode 100644 
>> src/app/views/provider_accounts/_permissions.html.haml
>>   delete mode 100644 
>> src/app/views/provider_accounts/_section_header.html.haml
>>   delete mode 100644 
>> src/app/views/provider_realms/_section_header.html.haml
>>   delete mode 100644 src/app/views/providers/_history.html.haml
>>   delete mode 100644 src/app/views/providers/_hw_profiles.html.haml
>>   create mode 100644 src/app/views/providers/_page_header.html.haml
>
> ^ this one seems to be referenced from other provider's views
>
>>   delete mode 100644 src/app/views/providers/_permissions.html.haml
>>   delete mode 100644 src/app/views/providers/_section_header.html.haml
>>   delete mode 100644 src/app/views/providers/_services.html.haml
>>   delete mode 100644 src/app/views/realms/_section_header.html.haml
>>   delete mode 100644 src/app/views/roles/_section_header.html.haml
>>   delete mode 100644 src/app/views/settings/_section_header.html.haml
>>   delete mode 100644 src/app/views/users/_properties.html.haml
>>   delete mode 100644 src/app/views/users/_section_header.html.haml
>>
>> diff --git a/src/app/controllers/pools_controller.rb 
>> b/src/app/controllers/pools_controller.rb
>> index 6eaa6f1..8ec1aa6 100644
>> --- a/src/app/controllers/pools_controller.rb
>> +++ b/src/app/controllers/pools_controller.rb
>> @@ -145,6 +145,7 @@ class PoolsController<  ApplicationController
>>     end
>>
>>     def create
>> +    @title = t('pools.create_new_pool')
>>       @pool = Pool.new(params[:pool])
>>       require_privilege(Privilege::CREATE, Pool, @pool.pool_family)
>>       @pool.quota = @quota = Quota.new
>> diff --git a/src/app/controllers/providers_controller.rb 
>> b/src/app/controllers/providers_controller.rb
>> index 41cf5d5..64a334f 100644
>> --- a/src/app/controllers/providers_controller.rb
>> +++ b/src/app/controllers/providers_controller.rb
>> @@ -97,6 +97,7 @@ class ProvidersController<  ApplicationController
>>     end
>>
>>     def create
>> +    @title = t("providers.new.new_provider")
>>       require_privilege(Privilege::CREATE, Provider)
>>       if params[:provider].has_key?(:provider_type_deltacloud_driver)
>>         provider_type = 
>> params[:provider].delete(:provider_type_deltacloud_driver)
>> diff --git a/src/app/controllers/realms_controller.rb 
>> b/src/app/controllers/realms_controller.rb
>> index 86f5b6a..1ee37d8 100644
>> --- a/src/app/controllers/realms_controller.rb
>> +++ b/src/app/controllers/realms_controller.rb
>> @@ -45,6 +45,7 @@ class RealmsController<  ApplicationController
>>     def update
>>       require_privilege(Privilege::MODIFY, Realm)
>>       @realm = FrontendRealm.find(params[:id])
>> +    @title = @realm.name || t("realms.realm")
>>
>>       if params[:commit] == "Reset"
>>         redirect_to edit_realm_url(@realm) and return
>> diff --git a/src/app/stylesheets/_custom.scss 
>> b/src/app/stylesheets/_custom.scss
>> index ec407bc..95956b2 100644
>> --- a/src/app/stylesheets/_custom.scss
>> +++ b/src/app/stylesheets/_custom.scss
>> @@ -156,31 +156,6 @@ form.generic section.services {
>>     margin-bottom: 30px;
>>   }
>>
>> -.instance_details, .confirm_instances_termination {
>> -
>> -  h3{
>> -    font-size: 22px;
>> -    font-weight: normal;
>> -    margin-bottom: 10px;
>> -  }
>> -
>> -  ul li {
>> -    list-style-type: none;
>> -    margin: 10px 15px;
>> -    font-weight: bold;
>> -    span {
>> -        font-weight: normal;
>> -    }
>> -  }
>> -
>> -  ol{
>> -    margin: 15px;
>> -    li {
>> -        margin:10px 15px;
>> -    }
>> -  }
>> -}
>> -
>>   .pagination{
>>     margin-top: 10px;
>>     text-align: center;
>> diff --git a/src/app/stylesheets/layout.scss 
>> b/src/app/stylesheets/layout.scss
>> index 1473f66..e121f34 100644
>> --- a/src/app/stylesheets/layout.scss
>> +++ b/src/app/stylesheets/layout.scss
>> @@ -118,7 +118,7 @@ Alert Flash -- v.0.0.1 [flash] (flash.scss)
>>   
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
>> */
>>
>>   #flash-hud{
>> -  width: 900px;
>> +  width: 912px;
>>     margin: 0 auto;
>>     background-color: #ddd;
>>     -webkit-border-radius: 0px 0px 7px 7px;
>> @@ -126,7 +126,6 @@ Alert Flash -- v.0.0.1 [flash] (flash.scss)
>>     border-radius: 0px 0px 7px 7px;
>>     border: 1px solid #999;
>>     padding: 8px;
>> -  margin-top: -4px;
>>
>>     a.control{
>>       float: right;
>> @@ -1560,6 +1559,7 @@ table.light_table{
>>   /* Properties table
>>      
>> ========================================================================== 
>> */
>>   table.properties_table {
>> +  margin-bottom: 10px;
>>     th {
>>       border-bottom: .1em solid #ccc;
>>       padding-bottom: .5em;
>> @@ -1567,7 +1567,6 @@ table.properties_table {
>> &:first-child {
>>         text-align: right;
>>         padding-right: 1em;
>> -      width: 18.15em;
>>       }
>> &:last-child {
>>         text-align: left;
>> @@ -2297,6 +2296,23 @@ form.generic.horizontal{
>>     dd{ font-weight: normal; }
>>   }
>>
>> +/* 
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> +Lists
>> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
>> */
>> +
>> +ul.listing, ol.listing{
>> +  margin: 15px;
>> +  li{ margin: 0px 15px; }
>> +  li + li{ margin-top: 10px; }
>> +&.no_list_style{
>> +    li{
>> +      list-style-type: none;
>> +      margin: 0px;
>> +    }
>> +    li + li{ margin-top: 10px; }
>> +  }
>> +}
>> +
>>
>>   /* 
>> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>   Page Footer -- v.0.0.1 [footer] (footer.scss)
>> diff --git a/src/app/views/deployments/_list.html.haml 
>> b/src/app/views/deployments/_list.html.haml
>> index 0164e24..7b6e40d 100644
>> --- a/src/app/views/deployments/_list.html.haml
>> +++ b/src/app/views/deployments/_list.html.haml
>> @@ -1,6 +1,3 @@
>> -- if request.xhr?
>> -  = render :partial =>  '/layouts/new_notification'
>> -
>>   - content_for :form_header do
>>     %li= restful_submit_tag "#{t'deployments.list.stop_selected'}", 
>> 'stop', multi_stop_deployments_path, 'POST', :class =>  'button', :id 
>> =>  "stop_button", 'data-none_selected' =>  
>> t('deployments.flash.error.none_selected')
>>     %li= restful_submit_tag "#{t'deployments.list.delete_selected'}", 
>> 'destroy', multi_destroy_deployments_path, 'DELETE', :class =>  
>> 'button danger', :id =>  "delete_button", 'data-none_selected' =>  
>> t('deployments.flash.error.none_selected')
>> diff --git a/src/app/views/deployments/confirm_terminate.html.haml 
>> b/src/app/views/deployments/confirm_terminate.html.haml
>> index dd43007..9585c17 100644
>> --- a/src/app/views/deployments/confirm_terminate.html.haml
>> +++ b/src/app/views/deployments/confirm_terminate.html.haml
>> @@ -2,13 +2,13 @@
>>     %h1.deployments= t "instances.confirm_terminate.terminate_instances"
>>
>>   %section.content-section
>> -  .content.confirm_instances_termination
>> +  .content
>>       .align-center
>>         %strong= 
>> t('instances.confirm_terminate.terminate_instances_description')
>>       = form_tag multi_stop_deployments_path, :method =>  :post do
>>         - @deployments_to_stop.each do |i|
>>           = hidden_field_tag 'deployments_selected[]', i.id
>> -      %ul
>> +      %ul.listing
>>           - @inaccessible_instances.each do |i|
>>             %li= i.name
>>         = link_to t('cancel'), pools_path(:view =>  'filter', 
>> :details_tab =>  'deployments'), :class =>  'button'
>> diff --git a/src/app/views/instances/_history.html.haml 
>> b/src/app/views/instances/_history.html.haml
>> index ca2ae5c..ece5015 100644
>> --- a/src/app/views/instances/_history.html.haml
>> +++ b/src/app/views/instances/_history.html.haml
>> @@ -1,4 +1,4 @@
>> -%ol
>> +%ol.listing
>>     - @events.each do |event|
>>       %li
>>         = "#{event.event_time.strftime('%d-%b-%Y %H:%M:%S')}: 
>> #{event.summary}"
>> diff --git a/src/app/views/instances/_parameters.haml 
>> b/src/app/views/instances/_parameters.haml
>> index 022b5bc..de84af7 100644
>> --- a/src/app/views/instances/_parameters.haml
>> +++ b/src/app/views/instances/_parameters.haml
>> @@ -1,4 +1,4 @@
>> -%ul
>> +%ul.listing
>>     - if @instance.instance_parameters.empty?
>>       %li= t("instances.parameters.none")
>>     - else
>> diff --git a/src/app/views/instances/confirm_terminate.html.haml 
>> b/src/app/views/instances/confirm_terminate.html.haml
>> index dc9927b..40614e9 100644
>> --- a/src/app/views/instances/confirm_terminate.html.haml
>> +++ b/src/app/views/instances/confirm_terminate.html.haml
>> @@ -2,14 +2,14 @@
>>     %h1.deployments= t ".terminate_instances"
>>
>>   %section.content-section
>> -  .content.confirm_instances_termination
>> +  .content
>>       .align-center
>>         %strong= t('.terminate_instances_description')
>>       - url = @instance ? stop_instance_path(@instance) : 
>> multi_stop_instances_path
>>       = form_tag url, :method =>  :post do
>>         - @instances_to_stop.each do |i|
>>           = hidden_field_tag 'instance_selected[]', i.id
>> -      %ul
>> +      %ul.listing
>>           - @inaccessible_instances.each do |i|
>>             %li= i.name
>>         - if @instance
>> diff --git a/src/app/views/instances/show.html.haml 
>> b/src/app/views/instances/show.html.haml
>> index 4d240c9..920c860 100644
>> --- a/src/app/views/instances/show.html.haml
>> +++ b/src/app/views/instances/show.html.haml
>> @@ -14,5 +14,5 @@
>>             %li
>>               %a{ :href =>  url_for(:details_tab =>  tab[:id]), :id 
>> =>  "details_#{tab[:id]}", :class =>  "#{'active' if 
>> @details_tab[:id] == tab[:id]}" }
>>                 = tab[:name]
>> -  .content.instance_details#tab
>> +  .content#tab
>>       = render :partial =>  @view
>> diff --git a/src/app/views/pool_families/_history.html.haml 
>> b/src/app/views/pool_families/_history.html.haml
>> deleted file mode 100644
>> index e69de29..0000000
>> diff --git a/src/app/views/pool_families/_permissions.html.haml 
>> b/src/app/views/pool_families/_permissions.html.haml
>> deleted file mode 100644
>> index e73ced3..0000000
>> --- a/src/app/views/pool_families/_permissions.html.haml
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -= render :partial =>  'permissions/permissions'
>> diff --git a/src/app/views/pool_families/_properties.html.haml 
>> b/src/app/views/pool_families/_properties.html.haml
>> deleted file mode 100644
>> index c15e40e..0000000
>> --- a/src/app/views/pool_families/_properties.html.haml
>> +++ /dev/null
>> @@ -1,12 +0,0 @@
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        = t("pool_families.pool_family_details")
>> -      %th.show
>> -  %tbody
>> -    %tr
>> -      %td
>> -        %label= t("name")
>> -      %td
>> -        = @pool_family.name
>> diff --git a/src/app/views/pool_families/_section_header.html.haml 
>> b/src/app/views/pool_families/_section_header.html.haml
>> deleted file mode 100644
>> index a36c83e..0000000
>> --- a/src/app/views/pool_families/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    = link_to 'New Pool Family', new_pool_family_url, :class =>  
>> 'button primary', :id =>  'new_pool_family_button'
>> -  %h1.pool_families Pool Families
>> diff --git a/src/app/views/pool_families/show.html.haml 
>> b/src/app/views/pool_families/show.html.haml
>> index a95af93..7233a73 100644
>> --- a/src/app/views/pool_families/show.html.haml
>> +++ b/src/app/views/pool_families/show.html.haml
>> @@ -8,7 +8,6 @@
>>
>>   %section.content-section.pool_families
>>     %header#tab-container-1
>> -    %h2.settings= #t("settings.settings")
>>       %nav.faceted
>>         %ul#tab-container-1-nav
>>           - @tabs.each do |tab|
>> diff --git a/src/app/views/pools/_edit.html.haml 
>> b/src/app/views/pools/_edit.html.haml
>> index 17b33fe..68c711c 100644
>> --- a/src/app/views/pools/_edit.html.haml
>> +++ b/src/app/views/pools/_edit.html.haml
>> @@ -2,11 +2,11 @@
>>     .obj_actions
>>       - if check_privilege(Privilege::CREATE, Pool)
>>         = link_to t('pools.new_pool'), new_pool_url, :class =>  
>> 'button primary', :id =>  'new_pool_button'
>> -  %h1.pools= @pool.name
>> +  %h1.pools= @pool.name.blank? ? t("pools.pool") : @pool.name
>>
>>   %section.content-section.user
>>     %header
>>       %h2= @title
>>
>>     .content
>> -    = render :partial =>  'form'
>> \ No newline at end of file
>> +    = render :partial =>  'form'
>> diff --git a/src/app/views/pools/_header_index.html.haml 
>> b/src/app/views/pools/_header_index.html.haml
>> deleted file mode 100644
>> index 5735208..0000000
>> --- a/src/app/views/pools/_header_index.html.haml
>> +++ /dev/null
>> @@ -1,10 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    .button-group
>> -      = pretty_filter_toggle(pools_path(:view =>  'pretty', :page 
>> =>  params[:page]), pools_path(:view =>  'filter', :page =>  
>> params[:page]))
>> -    .button-group
>> -      - if check_privilege(Privilege::CREATE, Pool)
>> -        = link_to t('pools.new_pool'), new_pool_path, { :class =>  
>> 'button primary', :id =>  'new_pool_button' }
>> -  %h1.section-index= t 'pools.index.overview'
>> -
>> -= render :partial =>  'scoreboard_index'
>> \ 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
>> deleted file mode 100644
>> index cd0d54a..0000000
>> --- a/src/app/views/pools/_header_show.html.haml
>> +++ /dev/null
>> @@ -1,11 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    - if check_privilege(Privilege::CREATE, Deployment, @pool)
>> -      = 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
>> -      - if check_privilege(Privilege::MODIFY, @pool)
>> -        = 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'
>> -  %h1.pools= @title
>> diff --git a/src/app/views/pools/_new.html.haml 
>> b/src/app/views/pools/_new.html.haml
>> index f7cebab..1918848 100644
>> --- a/src/app/views/pools/_new.html.haml
>> +++ b/src/app/views/pools/_new.html.haml
>> @@ -1,4 +1,5 @@
>> -= render :partial =>  'section_header'
>> +%header.page-header
>> +  %h1.pools= t('pools.pools')
>>
>>   %section.content-section.pools
>>     %header
>> diff --git a/src/app/views/pools/_permissions.html.haml 
>> b/src/app/views/pools/_permissions.html.haml
>> deleted file mode 100644
>> index e73ced3..0000000
>> --- a/src/app/views/pools/_permissions.html.haml
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -= render :partial =>  'permissions/permissions'
>> diff --git a/src/app/views/pools/_section_header.html.haml 
>> b/src/app/views/pools/_section_header.html.haml
>> deleted file mode 100644
>> index f25145e..0000000
>> --- a/src/app/views/pools/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -%header.page-header
>> -  %h1.pools=t('pools.pools')
>> diff --git a/src/app/views/pools/index.html.haml 
>> b/src/app/views/pools/index.html.haml
>> index 52f58a8..b69047b 100644
>> --- a/src/app/views/pools/index.html.haml
>> +++ b/src/app/views/pools/index.html.haml
>> @@ -1,5 +1,13 @@
>>   = render :partial =>  'layouts/nav_history'
>> -= render :partial =>  'header_index'
>> +%header.page-header
>> +  .obj_actions
>> +    .button-group
>> +      = pretty_filter_toggle(pools_path(:view =>  'pretty', :page 
>> =>  params[:page]),
>> +                             pools_path(:view =>  'filter', :page 
>> =>  params[:page]))
>> +    - if check_privilege(Privilege::CREATE, Pool)
>> +      = link_to t('pools.new_pool'), new_pool_path, { :class =>  
>> 'button primary', :id =>  'new_pool_button' }
>> +  %h1.section-index= t 'pools.index.overview'
>> += render :partial =>  'scoreboard_index'
>>   = render :partial =>  'alerts_index'
>>   %section.content-section.toggle-view.pools
>>     = render :partial =>  @view
>> diff --git a/src/app/views/pools/show.html.haml 
>> b/src/app/views/pools/show.html.haml
>> index 882089b..bf7b2ea 100644
>> --- a/src/app/views/pools/show.html.haml
>> +++ b/src/app/views/pools/show.html.haml
>> @@ -1,5 +1,19 @@
>>   = render :partial =>  'layouts/nav_history'
>> -= render :partial =>  'header_show'
>> +%header.page-header
>> +  .obj_actions
>> +    - if check_privilege(Privilege::CREATE, Deployment, @pool)
>> +      = 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
>> +      - if check_privilege(Privilege::MODIFY, @pool)
>> +        = 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'
>> +  %h1.pools= @title
>> +
>>   = render :partial =>  'scoreboard_show'
>>   = render :partial =>  'alerts_show'
>>
>> diff --git a/src/app/views/provider_accounts/_credentials.html.haml 
>> b/src/app/views/provider_accounts/_credentials.html.haml
>> deleted file mode 100644
>> index 6551f88..0000000
>> --- a/src/app/views/provider_accounts/_credentials.html.haml
>> +++ /dev/null
>> @@ -1,3 +0,0 @@
>> -%h3
>> -  =t 'provider_accounts.credentials.credentials_for'
>> -  = @account.name
>> diff --git a/src/app/views/provider_accounts/_history.html.haml 
>> b/src/app/views/provider_accounts/_history.html.haml
>> deleted file mode 100644
>> index 9877c8b..0000000
>> --- a/src/app/views/provider_accounts/_history.html.haml
>> +++ /dev/null
>> @@ -1,3 +0,0 @@
>> -%h3
>> -  =t'provider_accounts.history.history_for'
>> -  = @account.name
>> diff --git a/src/app/views/provider_accounts/_permissions.html.haml 
>> b/src/app/views/provider_accounts/_permissions.html.haml
>> deleted file mode 100644
>> index ba93552..0000000
>> --- a/src/app/views/provider_accounts/_permissions.html.haml
>> +++ /dev/null
>> @@ -1,3 +0,0 @@
>> -%h3
>> -  = t'provider_accounts.permissions.permissions_for'
>> -  = @account.name
>> diff --git a/src/app/views/provider_accounts/_properties.html.haml 
>> b/src/app/views/provider_accounts/_properties.html.haml
>> index 8ae9d89..d5e757f 100644
>> --- a/src/app/views/provider_accounts/_properties.html.haml
>> +++ b/src/app/views/provider_accounts/_properties.html.haml
>> @@ -1,30 +1,17 @@
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        =t'provider_accounts.properties.properties_for'
>> -        = @provider_account.name
>> -      %th.show
>> +%table.properties_table
>>     %tbody
>>       %tr
>> -      %td
>> -        %label=t'provider_accounts.properties.running_instances_quota'
>> -      %td
>> -        = @provider_account.quota.maximum_running_instances or 
>> t('provider_accounts.properties.unlimited')
>> +      %td= t'provider_accounts.properties.running_instances_quota'
>> +      %td= @provider_account.quota.maximum_running_instances or 
>> t('provider_accounts.properties.unlimited')
>>       %tr
>> -      %td
>> -        %label=t'provider_accounts.index.priority'
>> -      %td
>> -        = @provider_account.priority
>> +      %td= t'provider_accounts.index.priority'
>> +      %td= @provider_account.priority
>>       - if @account_id
>>         %tr
>> -        %td
>> -          = label_tag t('provider_accounts.properties.account_number')
>> -        %td
>> -          = @account_id
>> +        %td= t('provider_accounts.properties.account_number')
>> +        %td= @account_id
>>       %tr
>> -      %td
>> -        %label=t'provider_accounts.properties.config_server'
>> +      %td= t'provider_accounts.properties.config_server'
>>         %td
>>           - missing_config_server = @provider_account.config_server.nil?
>>           %span#config_server
>> diff --git 
>> a/src/app/views/provider_accounts/_section_header.html.haml 
>> b/src/app/views/provider_accounts/_section_header.html.haml
>> deleted file mode 100644
>> index ca4d25d..0000000
>> --- a/src/app/views/provider_accounts/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    = link_to t('provider_accounts.new.new_provider_account'), 
>> new_provider_account_url, :class =>  'button primary', :id =>  
>> 'new_provider_account_button'
>> -  %h1.provider_accounts= t'provider_accounts.index.provider_accounts'
>> diff --git a/src/app/views/provider_accounts/index.html.haml 
>> b/src/app/views/provider_accounts/index.html.haml
>> index 3fae6b6..327fef3 100644
>> --- a/src/app/views/provider_accounts/index.html.haml
>> +++ b/src/app/views/provider_accounts/index.html.haml
>> @@ -1,3 +1,6 @@
>>   = render :partial =>  'layouts/admin_nav'
>> -= render :partial =>  'section_header'
>> +%header.page-header
>> +  .obj_actions
>> +    = link_to t('provider_accounts.new.new_provider_account'), 
>> new_provider_account_url, :class =>  'button primary', :id =>  
>> 'new_provider_account_button'
>> +  %h1.provider_accounts= t'provider_accounts.index.provider_accounts'
>>   = render :partial =>  'list'
>> diff --git a/src/app/views/provider_realms/_properties.html.haml 
>> b/src/app/views/provider_realms/_properties.html.haml
>> index 11fd639..7ba72a8 100644
>> --- a/src/app/views/provider_realms/_properties.html.haml
>> +++ b/src/app/views/provider_realms/_properties.html.haml
>> @@ -1,12 +1,6 @@
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        =t 'provider_realms.show.details'
>> -      %th.show
>> +%table.properties_table
>>     %tbody
>>       %tr
>> -      %td
>> -        %label= t'provider_realms.name'
>> +      %td= t'provider_realms.name'
>>         %td
>>           = @realm.name
>> diff --git a/src/app/views/provider_realms/_section_header.html.haml 
>> b/src/app/views/provider_realms/_section_header.html.haml
>> deleted file mode 100644
>> index c4b6121..0000000
>> --- a/src/app/views/provider_realms/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    = link_to t('realms.new_realm'), new_realm_url, :class =>  
>> 'button primary', :id =>  'new_realm_button'
>> -  %h1.realms Realms
>> diff --git a/src/app/views/providers/_history.html.haml 
>> b/src/app/views/providers/_history.html.haml
>> deleted file mode 100644
>> index e69de29..0000000
>> diff --git a/src/app/views/providers/_hw_profiles.html.haml 
>> b/src/app/views/providers/_hw_profiles.html.haml
>> deleted file mode 100644
>> index e69de29..0000000
>> diff --git a/src/app/views/providers/_page_header.html.haml 
>> b/src/app/views/providers/_page_header.html.haml
>> new file mode 100644
>> index 0000000..c7d6ce9
>> --- /dev/null
>> +++ b/src/app/views/providers/_page_header.html.haml
>> @@ -0,0 +1,15 @@
>> +%header.page-header
>> +  .obj_actions
>> +    %span.label.light= t("providers.choose_a_provider")
>> +    %ul#provider_select
>> +      %li
>> +        = link_to @provider.name.blank? ? 
>> t("providers.editing_provider") : @provider.name, "javascript:void(0)"
>> +        %ul
>> +          %li= link_to "+" + 
>> t("providers.index.create_new_provider"), new_provider_path, :id =>  
>> "create_new_provider"
>> +          - @providers.each do |provider|
>> +            %li= link_to provider.name, edit_provider_path(provider)
>> +
>> +    = form_for @provider, :url =>  provider_path(@provider), :html 
>> =>  { :method =>  :put, :class =>  'generic horizontal' } do |f|
>> +      = f.hidden_field :enabled, :value =>  !@provider.enabled
>> +      = f.submit "", :confirm =>  "#{@provider.enabled ? 
>> t("providers.disable_provider") : t("providers.enable_provider")}", 
>> :class =>  "provider_toggle #{@provider.enabled ? "on" : "off"}"
>> +  %h1.providers{:class =>  @provider.enabled ? 'enabled' : 
>> 'disabled'}= @provider.name.blank? ? t("providers.editing_provider") 
>> : @provider.name
>> diff --git a/src/app/views/providers/_permissions.html.haml 
>> b/src/app/views/providers/_permissions.html.haml
>> deleted file mode 100644
>> index e73ced3..0000000
>> --- a/src/app/views/providers/_permissions.html.haml
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -= render :partial =>  'permissions/permissions'
>> diff --git a/src/app/views/providers/_properties.html.haml 
>> b/src/app/views/providers/_properties.html.haml
>> index 1280666..50bb93d 100644
>> --- a/src/app/views/providers/_properties.html.haml
>> +++ b/src/app/views/providers/_properties.html.haml
>> @@ -1,33 +1,17 @@
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        =t("catalog_entries.properties.properties_for")
>> -        = @provider.name
>> -      %th.show
>> +%table.properties_table
>>     %tbody
>>       %tr
>> -      %td
>> -        %label= t("providers.index.provider_name")
>> -      %td
>> -        = @provider.name
>> +      %td= t("providers.index.provider_name")
>> +      %td= @provider.name
>>       %tr
>> -      %td
>> -        %label= t("providers.index.provider_url")
>> -      %td
>> -        = @provider.url
>> +      %td= t("providers.index.provider_url")
>> +      %td= @provider.url
>>       %tr
>> -      %td
>> -        %label= t("providers.index.provider_type")
>> -      %td
>> -        = @provider.provider_type.name
>> +      %td= t("providers.index.provider_type")
>> +      %td= @provider.provider_type.name
>>       %tr
>> -      %td
>> -        %label= t("providers.index.x_deltacloud_driver")
>> -      %td
>> -        = @provider.provider_type.deltacloud_driver
>> +      %td= t("providers.index.x_deltacloud_driver")
>> +      %td= @provider.provider_type.deltacloud_driver
>>       %tr
>> -      %td
>> -        %label= t("providers.index.x_deltacloud_provider")
>> -      %td
>> -        = @provider.deltacloud_provider
>> +      %td= t("providers.index.x_deltacloud_provider")
>> +      %td= @provider.deltacloud_provider
>> diff --git a/src/app/views/providers/_section_header.html.haml 
>> b/src/app/views/providers/_section_header.html.haml
>> deleted file mode 100644
>> index c7d6ce9..0000000
>> --- a/src/app/views/providers/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    %span.label.light= t("providers.choose_a_provider")
>> -    %ul#provider_select
>> -      %li
>> -        = link_to @provider.name.blank? ? 
>> t("providers.editing_provider") : @provider.name, "javascript:void(0)"
>> -        %ul
>> -          %li= link_to "+" + 
>> t("providers.index.create_new_provider"), new_provider_path, :id =>  
>> "create_new_provider"
>> -          - @providers.each do |provider|
>> -            %li= link_to provider.name, edit_provider_path(provider)
>> -
>> -    = form_for @provider, :url =>  provider_path(@provider), :html 
>> =>  { :method =>  :put, :class =>  'generic horizontal' } do |f|
>> -      = f.hidden_field :enabled, :value =>  !@provider.enabled
>> -      = f.submit "", :confirm =>  "#{@provider.enabled ? 
>> t("providers.disable_provider") : t("providers.enable_provider")}", 
>> :class =>  "provider_toggle #{@provider.enabled ? "on" : "off"}"
>> -  %h1.providers{:class =>  @provider.enabled ? 'enabled' : 
>> 'disabled'}= @provider.name.blank? ? t("providers.editing_provider") 
>> : @provider.name
>> diff --git a/src/app/views/providers/_services.html.haml 
>> b/src/app/views/providers/_services.html.haml
>> deleted file mode 100644
>> index e69de29..0000000
>> diff --git a/src/app/views/providers/confirm_terminate.html.haml 
>> b/src/app/views/providers/confirm_terminate.html.haml
>> index e32f4bb..096796c 100644
>> --- a/src/app/views/providers/confirm_terminate.html.haml
>> +++ b/src/app/views/providers/confirm_terminate.html.haml
>> @@ -1,14 +1,14 @@
>>   = render :partial =>  'layouts/admin_nav'
>> -= render :partial =>  'section_header'
>> += render :partial =>  'page_header'
>>
>>   %section.content-section
>>     %header
>>       %h2= t(".disable_provider?")
>>
>> -  .content.confirm_instances_termination
>> +  .content
>>       .align-center
>>         %strong= 
>> t('instances.confirm_terminate.terminate_instances_description')
>> -    %ul
>> +    %ul.listing
>>         - @instances_to_terminate.each do |i|
>>           %li= i.name
>>       = link_to t('cancel'), edit_provider_path(@provider), :class 
>> =>  'button'
>> diff --git a/src/app/views/providers/edit.html.haml 
>> b/src/app/views/providers/edit.html.haml
>> index 90277c2..ada86a1 100644
>> --- a/src/app/views/providers/edit.html.haml
>> +++ b/src/app/views/providers/edit.html.haml
>> @@ -1,5 +1,5 @@
>>   = render :partial =>  'layouts/admin_nav'
>> -= render :partial =>  'section_header'
>> += render :partial =>  'page_header'
>>   = render :partial =>  'provider_availability'
>>
>>   - unless @provider.enabled
>> @@ -27,7 +27,7 @@
>>                 %dt.subject{ :class =>  alert[:class] }= alert[:subject]
>>                 %dd.type= link_to alert[:alert_type], alert[:path]
>>                 %dd.desc= alert[:description]
>> -/%section.content-section.provider
>> +/%section.content-section
>>   /  %header
>>   /    %h2.activity
>>   /      Activity
>> diff --git a/src/app/views/providers/show.html.haml 
>> b/src/app/views/providers/show.html.haml
>> index e273e3e..25732ee 100644
>> --- a/src/app/views/providers/show.html.haml
>> +++ b/src/app/views/providers/show.html.haml
>> @@ -1,5 +1,5 @@
>>   = render :partial =>  'layouts/admin_nav'
>> -= render :partial =>  'section_header'
>> += render :partial =>  'page_header'
>>   = render :partial =>  'provider_availability'
>>
>>   %section.content-section.provider
>> diff --git a/src/app/views/realms/_mapping.html.haml 
>> b/src/app/views/realms/_mapping.html.haml
>> index 912cf81..06ffc21 100644
>> --- a/src/app/views/realms/_mapping.html.haml
>> +++ b/src/app/views/realms/_mapping.html.haml
>> @@ -1,25 +1,31 @@
>>   = form_tag multi_destroy_realm_mappings_path(:frontend_realm_id =>  
>> @realm.id) do
>> -  - if check_privilege(Privilege::MODIFY, Realm)
>> -    - if @backend_realms and !@backend_realms.empty?
>> -      = link_to t('realms.mapping.mapping_realm'), 
>> new_realm_mapping_path(:frontend_realm_id =>  @realm.id, 
>> :realm_or_provider_type =>  'Realm'), :class =>  "button", :id =>  
>> 'mapping_to_realm_button'
>> -    - if @providers and !@providers.empty?
>> -      = link_to t('realms.mapping.mapping_provider'), 
>> new_realm_mapping_path(:frontend_realm_id =>  @realm.id, 
>> :realm_or_provider_type =>  'Provider'), :class =>  "button", :id =>  
>> 'mapping_to_provider_button'
>> -    - if @realm.realm_backend_targets and 
>> !@realm.realm_backend_targets.empty?
>> -      = submit_tag t('delete'), :id =>  'delete_mapping_button', 
>> :class =>  'button danger', :confirm =>  t("realms.show.sure_to_delete")
>> +  %header
>> +    - if check_privilege(Privilege::MODIFY, Realm)
>> +      .section-controls
>> +        - if @realm.realm_backend_targets and 
>> !@realm.realm_backend_targets.empty?
>> +          = submit_tag t('realms.list.delete_selected'), :id =>  
>> 'delete_mapping_button', :class =>  'button pill danger', :confirm 
>> =>  t("realms.show.sure_to_delete")
>> +        .button-group
>> +          - if @backend_realms and !@backend_realms.empty?
>> +            = link_to t('realms.mapping.mapping_realm'), 
>> new_realm_mapping_path(:frontend_realm_id =>  @realm.id, 
>> :realm_or_provider_type =>  'Realm'), :class =>  "button pill", :id 
>> =>  'mapping_to_realm_button'
>> +          - if @providers and !@providers.empty?
>> +            = link_to t('realms.mapping.mapping_provider'), 
>> new_realm_mapping_path(:frontend_realm_id =>  @realm.id, 
>> :realm_or_provider_type =>  'Provider'), :class =>  "button pill", 
>> :id =>  'mapping_to_provider_button'
>> +    %h2= t'realms.show.realm_mapping'
>>
>> +  .content
>> +    %fieldset
>> +      - unless @backend_provider_targets.empty?
>> +        %h3= t('realms.mapping.realm_mapped_providers', :name=>  
>> "#{@realm.name}")
>> +        %table.flat.checkbox_table
>> +          - @backend_provider_targets.each do |backend|
>> +            %tr{:class =>  cycle('nostripe','stripe')}
>> +              %td.checkbox= check_box_tag "id[]", backend.id, false, 
>> :id =>  "backend_id_#{backend.id}"
>> +              %td= backend.realm_or_provider.name
>>
>> -  - unless @backend_provider_targets.empty?
>> -    %h2= t('realms.mapping.realm_mapped_providers', :name=>  
>> "#{@realm.name}")
>> -    %table.flat.checkbox_table
>> -      - @backend_provider_targets.each do |backend|
>> -        %tr{:class =>  cycle('nostripe','stripe')}
>> -          %td= check_box_tag "id[]", backend.id, false, :id =>  
>> "backend_id_#{backend.id}"
>> -          %td= backend.realm_or_provider.name
>> -
>> -  - unless @backend_realm_targets.empty?
>> -    %h2= t('realms.mapping.realm_mapped_realms', :name=>  
>> "#{@realm.name}")
>> -    %table.flat.checkbox_table
>> -      - @backend_realm_targets.each do |backend|
>> -        %tr{:class =>  cycle('nostripe','stripe')}
>> -          %td= check_box_tag "id[]", backend.id, false, :id =>  
>> "backend_id_#{backend.id}"
>> -          %td= "#{backend.target_provider.name}: 
>> #{backend.target_realm.name}"
>> +    %fieldset
>> +      - unless @backend_realm_targets.empty?
>> +        %h3= t('realms.mapping.realm_mapped_realms', :name=>  
>> "#{@realm.name}")
>> +        %table.flat.checkbox_table
>> +          - @backend_realm_targets.each do |backend|
>> +            %tr{:class =>  cycle('nostripe','stripe')}
>> +              %td.checkbox= check_box_tag "id[]", backend.id, false, 
>> :id =>  "backend_id_#{backend.id}"
>> +              %td= "#{backend.target_provider.name}: 
>> #{backend.target_realm.name}"
>> diff --git a/src/app/views/realms/_properties.html.haml 
>> b/src/app/views/realms/_properties.html.haml
>> index 051c8aa..93856b8 100644
>> --- a/src/app/views/realms/_properties.html.haml
>> +++ b/src/app/views/realms/_properties.html.haml
>> @@ -1,12 +1,6 @@
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        =t 'realms.properties.realm_details'
>> -      %th.show
>> +%table.properties_table
>>     %tbody
>>       %tr
>> -      %td
>> -        %label= t'realms.properties.realm_name'
>> +      %td= t'realms.properties.realm_name'
>>         %td
>>           = @realm.name
>> diff --git a/src/app/views/realms/_section_header.html.haml 
>> b/src/app/views/realms/_section_header.html.haml
>> deleted file mode 100644
>> index c4b6121..0000000
>> --- a/src/app/views/realms/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    = link_to t('realms.new_realm'), new_realm_url, :class =>  
>> 'button primary', :id =>  'new_realm_button'
>> -  %h1.realms Realms
>> diff --git a/src/app/views/realms/show.html.haml 
>> b/src/app/views/realms/show.html.haml
>> index 5823a0b..205ed4d 100644
>> --- a/src/app/views/realms/show.html.haml
>> +++ b/src/app/views/realms/show.html.haml
>> @@ -20,8 +20,4 @@
>>       = render :partial =>  'properties'
>>
>>   %section.content-section.realm_mapping
>> -  %header
>> -    %h2= t'realms.show.realm_mapping'
>> -
>> -  .content
>> -    = render :partial =>  'mapping'
>> +  = render :partial =>  'mapping'
>> diff --git a/src/app/views/roles/_properties.html.haml 
>> b/src/app/views/roles/_properties.html.haml
>> index 4e14568..d44f118 100644
>> --- a/src/app/views/roles/_properties.html.haml
>> +++ b/src/app/views/roles/_properties.html.haml
>> @@ -1,20 +1,17 @@
>> -%strong=t 'roles.properties.scope'
>> -%span #{@role.scope}
>> -%table
>> +%table.properties_table
>> +  %tr
>> +    %td= t 'roles.properties.scope'
>> +    %td= @role.scope
>> +%table.properties_table
>>     %thead
>>       %tr
>> -      %th.show
>> -        =t 'roles.properties.privileges'
>> -      %th.show
>> +      %th=t 'roles.properties.privileges'
>> +      %th
>>     %tbody
>>       %tr
>> -      %td
>> -        %label= t'roles.properties.action'
>> -      %td
>> -        %label= t'roles.properties.target_type'
>> +      %td= t'roles.properties.action'
>> +      %td= t'roles.properties.target_type'
>>       - at role.privileges.each do |privilege|
>>         %tr
>> -        %td
>> -          = privilege.action
>> -        %td
>> -          = privilege.target_type
>> +        %td= privilege.action
>> +        %td= privilege.target_type
>> diff --git a/src/app/views/roles/_section_header.html.haml 
>> b/src/app/views/roles/_section_header.html.haml
>> deleted file mode 100644
>> index 9cbfe88..0000000
>> --- a/src/app/views/roles/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    = link_to t('roles.new_role'), new_role_url, :class =>  'button 
>> primary', :id =>  'new_role_button'
>> -  %h1.no-icon Roles
>> diff --git a/src/app/views/roles/index.html.haml 
>> b/src/app/views/roles/index.html.haml
>> index 3fae6b6..de141d1 100644
>> --- a/src/app/views/roles/index.html.haml
>> +++ b/src/app/views/roles/index.html.haml
>> @@ -1,3 +1,6 @@
>>   = render :partial =>  'layouts/admin_nav'
>> -= render :partial =>  'section_header'
>> +%header.page-header
>> +  .obj_actions
>> +    = link_to t('roles.new_role'), new_role_url, :class =>  'button 
>> primary', :id =>  'new_role_button'
>> +  %h1.no-icon Roles
>>   = render :partial =>  'list'
>> diff --git a/src/app/views/roles/new.html.haml 
>> b/src/app/views/roles/new.html.haml
>> index d395496..9e54d64 100644
>> --- a/src/app/views/roles/new.html.haml
>> +++ b/src/app/views/roles/new.html.haml
>> @@ -1,5 +1,6 @@
>>   = render :partial =>  'layouts/admin_nav'
>> -= render :partial =>  'section_header'
>> +%header.page-header
>> +  %h1.no-icon Roles
>>   %section.content-section.users
>>     %header
>>       %h2=t'roles.new_role'
>> diff --git a/src/app/views/settings/_section_header.html.haml 
>> b/src/app/views/settings/_section_header.html.haml
>> deleted file mode 100644
>> index 325996e..0000000
>> --- a/src/app/views/settings/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,2 +0,0 @@
>> -%header.page-header
>> -  %h1.settings=t 'settings.settings'
>> diff --git a/src/app/views/settings/index.html.haml 
>> b/src/app/views/settings/index.html.haml
>> index d0484ca..cd7bbdc 100644
>> --- a/src/app/views/settings/index.html.haml
>> +++ b/src/app/views/settings/index.html.haml
>> @@ -1,5 +1,6 @@
>>   = render :partial =>  'layouts/admin_nav'
>> -= render :partial =>  'section_header'
>> +%header.page-header
>> +  %h1.settings=t 'settings.settings'
>>
>>   %section.content-section.settings
>>     %header
>> diff --git a/src/app/views/users/_properties.html.haml 
>> b/src/app/views/users/_properties.html.haml
>> deleted file mode 100644
>> index 8648b7f..0000000
>> --- a/src/app/views/users/_properties.html.haml
>> +++ /dev/null
>> @@ -1,93 +0,0 @@
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        Personal Details
>> -      %th.show
>> -  %tbody
>> -    %tr
>> -      %td
>> -        %label Username
>> -      %td
>> -        = @user.login
>> -    %tr
>> -      %td
>> -        %label First Name
>> -      %td
>> -        = @user.first_name
>> -    %tr
>> -      %td
>> -        %label Last Name
>> -      %td
>> -        = @user.last_name
>> -    %tr
>> -      %td
>> -        %label e-mail
>> -      %td
>> -        = @user.email
>> -
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        Quota Status
>> -      %th.show
>> -  %tbody
>> -    %tr
>> -      %td
>> -        %label Maximum
>> -      %td
>> -        = @quota_resources["running_instances"].max
>> -    %tr
>> -      %td
>> -        %label Used
>> -      %td
>> -        = @quota_resources["running_instances"].used
>> -    %tr
>> -      %td
>> -        %label Available
>> -      %td
>> -        = @quota_resources["running_instances"].available
>> -
>> -%table
>> -  %thead
>> -    %tr
>> -      %th.show
>> -        Login Information
>> -      %th.show
>> -  %tbody
>> -    %tr
>> -      %td
>> -        %label Current Login IP
>> -      %td
>> -        = @user.current_login_ip
>> -    %tr
>> -      %td
>> -        %label Current Login at
>> -      %td
>> -        = @user.current_login_at
>> -    %tr
>> -      %td
>> -        %label Last Login IP
>> -      %td
>> -        = @user.last_login_ip
>> -    %tr
>> -      %td
>> -        %label Last Login at
>> -      %td
>> -        = @user.last_login_at
>> -    %tr
>> -      %td
>> -        %label Login Count
>> -      %td
>> -        = @user.login_count
>> -    %tr
>> -      %td
>> -        %label Failed Login Count
>> -      %td
>> -        = @user.failed_login_count
>> -    %tr
>> -      %td
>> -        %label Last Request at
>> -      %td
>> -        = @user.last_request_at
>> diff --git a/src/app/views/users/_section_header.html.haml 
>> b/src/app/views/users/_section_header.html.haml
>> deleted file mode 100644
>> index c798674..0000000
>> --- a/src/app/views/users/_section_header.html.haml
>> +++ /dev/null
>> @@ -1,7 +0,0 @@
>> -%header.page-header
>> -  .obj_actions
>> -    .return_to
>> -      =t'users.quick_jump'
>> -      = link_to 'Groups', "#groups"
>> -      = link_to 'Users', "#users"
>> -      = link_to 'Roles', "#roles"
>> \ No newline at end of file
>> diff --git a/src/app/views/users/show.html.haml 
>> b/src/app/views/users/show.html.haml
>> index aa9ca5b..813f32f 100644
>> --- a/src/app/views/users/show.html.haml
>> +++ b/src/app/views/users/show.html.haml
>> @@ -50,10 +50,3 @@
>>   /
>>   /  .content
>>   /    Unimplemented.
>> -/
>> -/%section.content-section.user
>> -/  %header
>> -/    %h2.roles Roles&amp; Permissions
>> -/
>> -/  .content
>> -/    = render :partial =>  'properties'
>> diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
>> index 64e7012..ea5e0ab 100644
>> --- a/src/config/locales/en.yml
>> +++ b/src/config/locales/en.yml
>> @@ -1153,10 +1153,10 @@ en:
>>         permissions_for: Permissions for
>>       properties:
>>         properties_for: Properties for
>> -      running_instances_quota: "Running instances quota:"
>> +      running_instances_quota: "Running instances quota"
>>         unlimited: unlimited
>> -      account_number: "Account number:"
>> -      config_server:  "Config Server:"
>> +      account_number: "Account number"
>> +      config_server:  "Config Server"
>>         none: None
>>         test: Test
>>         sure_to_delete: "Are you sure you want to delete this config 
>> server?"
>> @@ -1289,7 +1289,7 @@ en:
>>       list:
>>         roles_list: Roles List
>>       properties:
>> -      scope: "Scope:"
>> +      scope: "Scope"
>>         privileges: Privileges
>>         action: Action
>>         target_type: Target type
>
> ACK with 2 nits inline. Nice.
>
> Jan

Pushed together with patch that removes obsolete 
load_tab_captions_and_details_tab method from pool_families controller

Jirka



More information about the aeolus-devel mailing list