From: Jan Provaznik <[email protected]>
- actually settings is almost fake, only quota setting on self-service page
works
- removed providers, users and hardware profiles links from settings index page
(links are in nav), rest of index view is same as in the old UI
- controller is a little bit chaotic now, should be splitted into more
controllers in future (generatl settings, self service settings...), but this
should be done with reworking whole settings
---
src/app/views/admin/settings/general_settings.haml | 2 +-
src/app/views/admin/settings/index.haml | 28 ++-----------------
src/app/views/admin/settings/self_service.haml | 10 +------
src/features/settings.feature | 5 ++-
4 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/src/app/views/admin/settings/general_settings.haml
b/src/app/views/admin/settings/general_settings.haml
index 43eba52..f073663 100644
--- a/src/app/views/admin/settings/general_settings.haml
+++ b/src/app/views/admin/settings/general_settings.haml
@@ -1,4 +1,4 @@
-%form
+%form{:class => 'container_16'}
.grid_16
%h1 Portal
%fieldset.clearfix
diff --git a/src/app/views/admin/settings/index.haml
b/src/app/views/admin/settings/index.haml
index 5963ec4..8a68a65 100644
--- a/src/app/views/admin/settings/index.haml
+++ b/src/app/views/admin/settings/index.haml
@@ -1,18 +1,4 @@
-%ul.tiles
- %li#providers.grid_8
- = image_tag "blnk.png", :class => "icon", :alt => ""
- %h2
- = t('.manage_providers')
- %p
- = t('.manage_providers_desc')
- = link_to t(:continue), {:controller => 'providers'}, :class => 'button'
- %li#users.grid_8
- = image_tag "blnk.png", :class => "icon", :alt => ""
- %h2
- = t('.manage_users')
- %p
- = t('.manage_users_desc')
- = link_to t(:continue), {:controller => 'users'}, :class => 'button'
+%ul.tiles{:class => 'container_16'}
%li#services.grid_8.disabled.clear
= image_tag "blnk.png", :class => "icon", :alt => ""
%h2
@@ -27,22 +13,14 @@
= t('.permissions')
%p
= t('.permissions_desc')
- = link_to t(:continue), {:controller => 'settings', :action =>
'self_service'}, :class => 'button'
- %li#hardware.grid_8.disabled
- = image_tag "blnk.png", :class => "icon", :alt => ""
- %h2
- = t('.define_hardware_profiles')
- %p
- = t('.define_hardware_profiles_desc')
- %button{:disabled => "disabled"}
- = t(:continue)
+ = link_to t(:continue), self_service_admin_settings_path, :class =>
'button'
%li#settings.grid_8
= image_tag "blnk.png", :class => "icon", :alt => ""
%h2
= t('.general_settings')
%p
= t('.general_settings_desc')
- = link_to t(:continue), {:controller => 'settings', :action =>
'general_settings'}, :class => 'button'
+ = link_to t(:continue), general_settings_admin_settings_path, :class =>
'button'
%li#locales.grid_8.disabled.clear
= image_tag "blnk.png", :class => "icon", :alt => ""
%h2
diff --git a/src/app/views/admin/settings/self_service.haml
b/src/app/views/admin/settings/self_service.haml
index 8fd9950..05235ec 100644
--- a/src/app/views/admin/settings/self_service.haml
+++ b/src/app/views/admin/settings/self_service.haml
@@ -1,12 +1,4 @@
-.actionsidebar.grid_3
- %dl
- %dd
- %a.selected Self-Service User
- %form
- = submit_tag t(:edit), :disabled => 'disabled'
- = submit_tag t(:new), :disabled => 'disabled'
-
-.grid_13
+.grid_13{:class => 'container_16'}
= error_messages_for @parent_type
%h2
= t('.self_service_default')
diff --git a/src/features/settings.feature b/src/features/settings.feature
index f41e188..c106ea8 100644
--- a/src/features/settings.feature
+++ b/src/features/settings.feature
@@ -4,8 +4,9 @@ Feature: Manage System wide Settings
I want to manage system settings
Background:
- Given I am an authorised user
- And I am logged in
+ Given I am an authorised user
+ And I am logged in
+ And I am using new UI
Scenario: Change the self service default quota
Given the default quota is set to 5
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
