For right now, we shouldn't be showing sections that don't actually work.
Implements
https://www.aeolusproject.org/redmine/issues/1914
---
src/app/views/settings/index.haml | 6 +++---
src/app/views/settings/self_service.haml | 16 ++++++++--------
src/config/locales/en.yml | 3 ++-
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/app/views/settings/index.haml b/src/app/views/settings/index.haml
index 4311b97..fa0be6f 100644
--- a/src/app/views/settings/index.haml
+++ b/src/app/views/settings/index.haml
@@ -7,7 +7,7 @@
.content
%ul.tiles{:class => 'container_16'}
- %li#services.grid_8.disabled
+ -#%li#services.grid_8.disabled
= image_tag "blnk.png", :class => "icon", :alt =>
""
%h2
= t('.define_services')
@@ -22,14 +22,14 @@
%p
= t('.permissions_desc')
= link_to t(:continue), self_service_settings_path, :class =>
'button'
- %li#settings.grid_8
+ -#%li#settings.grid_8
= image_tag "blnk.png", :class => "icon", :alt =>
""
%h2
= t('.general_settings')
%p
= t('.general_settings_desc')
= link_to t(:continue), general_settings_settings_path, :class =>
'button'
- %li#locales.grid_8.disabled
+ -#%li#locales.grid_8.disabled
= image_tag "blnk.png", :class => "icon", :alt =>
""
%h2
= t('.define_locales')
diff --git a/src/app/views/settings/self_service.haml
b/src/app/views/settings/self_service.haml
index 3e51a70..c1429e7 100644
--- a/src/app/views/settings/self_service.haml
+++ b/src/app/views/settings/self_service.haml
@@ -14,7 +14,7 @@
= t('.self_service_default')
- form_for @self_service_default_quota, :url => { :action => 'update'
} do |form|
%h3 Instances
- %fieldset.clearfix
+ -#%fieldset.clearfix
%label.grid_2.alpha Permissions:
.grid_4 My personal Instances
.grid_4 Full Instance Permission
@@ -25,7 +25,7 @@
(
%a{:href=>'#'}> Remove
)
- %fieldset.clearfix.gap
+ -#%fieldset.clearfix.gap
.grid_4.prefix_2.alpha
%select.disabled{:disabled => true}
%option
@@ -55,8 +55,8 @@
= text_field :self_service_default_quota, :maximum_running_instances, :class
=> 'grid_5'
.grid_2.la (instances)
= form.error_message_on :maximum_running_instances, 'Maximum Running
Instances '
- %h3 POOLS
- %fieldset.clearfix
+ -#%h3 POOLS
+ -#%fieldset.clearfix
%label.grid_2.alpha Permissions:
.grid_4 General Usage
.grid_4 Regular Pool User
@@ -67,7 +67,7 @@
(
%a{:href=>'#'}> Remove
)
- %fieldset.clearfix.gap
+ -#%fieldset.clearfix.gap
.grid_4.prefix_2.alpha
%select.disabled{:disabled => true}
%option
@@ -90,8 +90,8 @@
(
%a{:href=>'#'}> Add
)
- %h3 TEMPLATES
- %fieldset.clearfix
+ -#%h3 TEMPLATES
+ -#%fieldset.clearfix
%label.grid_2.alpha Permissions:
.grid_4 General Usage
.grid_4 Basic Template User
@@ -102,7 +102,7 @@
(
%a{:href=>'#'}> Remove
)
- %fieldset.clearfix.gap
+ -#%fieldset.clearfix.gap
.grid_4.prefix_2.alpha
%select.disabled{:disabled => true}
%option
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 1564983..7ec078d 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -195,7 +195,8 @@ en:
define_services: Define Services
define_services_desc: View, edit and define services that Aeolus Conductor will
offer. These services will be mapped to individual providers based on their capabilities.
permissions: Permissions
- permissions_desc: Create and edit User Treatments that are applied to users.
Treatments pair together Roles with Categories of Instances, Pools and Templates. Manage
the categories, and define and edit Roles. Roles group together sets of permissions that
are relevant to Pools, Templates and Instances.
+# permissions_desc: Create and edit User Treatments that are applied to users.
Treatments pair together Roles with Categories of Instances, Pools and Templates. Manage
the categories, and define and edit Roles. Roles group together sets of permissions that
are relevant to Pools, Templates and Instances.
+ permissions_desc: Modify self-service default quota.
self_service:
self_service_default: 'User Treatment: Self-service default'
quota: Quota
--
1.7.4.4