On 11/03/2011 12:19 PM, Jirka Tomasek wrote:
---
src/app/controllers/permissions_controller.rb | 2 +-
src/app/stylesheets/layout.scss | 1 +
src/app/views/permissions/_form.html.haml | 4 ++--
src/app/views/permissions/_new.html.haml | 16 ++++++++--------
src/app/views/permissions/new.html.haml | 2 ++
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/app/controllers/permissions_controller.rb
b/src/app/controllers/permissions_controller.rb
index 6a6a597..12e3ed6 100644
--- a/src/app/controllers/permissions_controller.rb
+++ b/src/app/controllers/permissions_controller.rb
@@ -39,7 +39,7 @@ class PermissionsController< ApplicationController
@summary_text = t("permissions.new.choose_global_role")
else
@return_text = "#{(a)permission_object.name}
#{(a)permission_object.class}"
- @summary_text = t('permissions.new.choose_roles')+
"#{(a)permission_object.class}"
+ @summary_text = t('permissions.new.choose_roles')+ "
#{(a)permission_object.class}"
end
load_headers
load_users
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index f96711a..28175a7 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -1051,6 +1051,7 @@ nav#administer_nav {
-moz-border-radius: 7px 7px 0px 0px;
border-radius: 7px 7px 0px 0px;
padding-top: 7px;
+ min-height: 71px;
ul{
display: table;
diff --git a/src/app/views/permissions/_form.html.haml
b/src/app/views/permissions/_form.html.haml
index 1927288..2a07c88 100644
--- a/src/app/views/permissions/_form.html.haml
+++ b/src/app/views/permissions/_form.html.haml
@@ -2,8 +2,8 @@
= hidden_field_tag :permission_object_type, @permission_object.class.name
= hidden_field_tag :permission_object_id, @permission_object.id
= hidden_field_tag :path_prefix, @path_prefix
- = link_to t('cancel'), @return_path, :class => 'button danger'
- = restful_submit_tag t('permissions.form.grant_access'), "create",
permissions_path, 'POST', :id => 'save_button'
+ %li= restful_submit_tag t('permissions.form.grant_access'),
"create", permissions_path, 'POST', :id => 'save_button',
:class => 'button'
+ %li= link_to t('cancel'), @return_path, :class => 'button danger'
= filter_table(@header, @users) do |user|
%tr{:class => cycle('nostripe','stripe')}
%td
diff --git a/src/app/views/permissions/_new.html.haml
b/src/app/views/permissions/_new.html.haml
index b4d376b..4c9ec68 100644
--- a/src/app/views/permissions/_new.html.haml
+++ b/src/app/views/permissions/_new.html.haml
@@ -1,14 +1,14 @@
-%header.page-header
+%header.admin-page-header
%h1{:class => controller.controller_name}=
t'permissions.form.grant_access'
#obj_actions.button-group
= t'return_to'
- = link_to @return_text, @return_path, :class => 'button primary', :id
=> 'new_pool_button'
- .corner
-
-%section.content-section.pools
- = @summary_text
- %header
- %h2= t'users.users'
+ = link_to @return_text, @return_path, :class => 'rounded-link', :id
=> 'new_pool_button'
+%section.admin-content-section.pools
+ .align-center
+ %strong= @summary_text
.content
+ %header
+ %h2#users.users= t'users.users'
+
= render :partial => 'form'
diff --git a/src/app/views/permissions/new.html.haml
b/src/app/views/permissions/new.html.haml
index 8a73c70..5ba57c1 100644
--- a/src/app/views/permissions/new.html.haml
+++ b/src/app/views/permissions/new.html.haml
@@ -1,3 +1,5 @@
- if @permission_object == BasePermissionObject.general_permission_scope
= render :partial => 'layouts/admin_nav'
+- else
+ %nav#administer_nav
= render :partial => 'new'
Self ACK and pushed