From: Tomas Sedovic <tsedovic(a)redhat.com>
---
src/app/controllers/realms_controller.rb | 13 +++++++++----
src/app/views/realms/_form.haml | 6 +++---
src/app/views/realms/index.haml | 3 ++-
src/app/views/realms/show.haml | 9 ++++-----
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/app/controllers/realms_controller.rb
b/src/app/controllers/realms_controller.rb
index 0d782fd..6225237 100644
--- a/src/app/controllers/realms_controller.rb
+++ b/src/app/controllers/realms_controller.rb
@@ -1,6 +1,11 @@
class RealmsController < ApplicationController
before_filter :require_user
before_filter :load_realms, :only =>[:index,:show]
+ layout 'application'
+
+ def top_section
+ :administer
+ end
def new
require_privilege(Privilege::CREATE, Realm)
@@ -59,10 +64,10 @@ class RealmsController < ApplicationController
@url_params = params.clone
@tab_captions = ['Properties', 'Mapping']
@details_tab = params[:details_tab].blank? ? 'properties' :
params[:details_tab]
- if @details_tab == 'mapping'
- @backend_realm_targets = @realm.realm_backend_targets.select {|x|
x.realm_or_provider_type == 'Realm'}
- @backend_provider_targets = @realm.realm_backend_targets.select {|x|
x.realm_or_provider_type == 'Provider'}
- end
+
+ @backend_realm_targets = @realm.realm_backend_targets.select {|x|
x.realm_or_provider_type == 'Realm'}
+ @backend_provider_targets = @realm.realm_backend_targets.select {|x|
x.realm_or_provider_type == 'Provider'}
+
respond_to do |format|
format.js do
if @url_params.delete :details_pane
diff --git a/src/app/views/realms/_form.haml b/src/app/views/realms/_form.haml
index 8c49d63..ecdf17a 100644
--- a/src/app/views/realms/_form.haml
+++ b/src/app/views/realms/_form.haml
@@ -1,6 +1,6 @@
= form.error_messages
-%fieldset.clear
+%fieldset
= form.label :name,'Realm Name :'
- = form.text_field :name, :title => 'realm_name', :value => @realm.name,
:class => "clear grid_4 alpha"
-%fieldset.clear
+ = form.text_field :name, :title => 'realm_name', :value => @realm.name
+%fieldset
= form.submit "Save", :class => "submit formbutton"
diff --git a/src/app/views/realms/index.haml b/src/app/views/realms/index.haml
index 62ccbc6..acfa09b 100644
--- a/src/app/views/realms/index.haml
+++ b/src/app/views/realms/index.haml
@@ -1,2 +1,3 @@
-- content_for :list do
+= render :partial => 'layouts/admin_header'
+%div#view
= render :partial => 'list'
diff --git a/src/app/views/realms/show.haml b/src/app/views/realms/show.haml
index 0c36221..6e0e83c 100644
--- a/src/app/views/realms/show.haml
+++ b/src/app/views/realms/show.haml
@@ -1,5 +1,4 @@
-- content_for 'list' do
- = render :partial => 'list'
-
-- content_for 'details' do
- = render :partial => 'layouts/details_pane'
+= render :partial => 'layouts/admin_header'
+%div#view
+ = render :partial => 'properties'
+ = render :partial => 'mapping'
--
1.7.4.4