From: Tomas Sedovic <[email protected]>
---
src/app/controllers/settings_controller.rb | 7 +++++++
src/app/stylesheets/aggregator.scss | 2 +-
src/app/views/settings/general_settings.haml | 1 +
src/app/views/settings/index.haml | 12 ++++--------
4 files changed, 13 insertions(+), 9 deletions(-)
create mode 100644 src/app/views/settings/general_settings.haml
diff --git a/src/app/controllers/settings_controller.rb
b/src/app/controllers/settings_controller.rb
index 6048cb5..b040f7f 100644
--- a/src/app/controllers/settings_controller.rb
+++ b/src/app/controllers/settings_controller.rb
@@ -42,6 +42,13 @@ class SettingsController < ApplicationController
@self_service_default_quota =
MetadataObject.lookup(SELF_SERVICE_DEFAULT_QUOTA)
end
+ def general_settings
+ if !is_admin?
+ raise PermissionError.new('You have insufficient privileges to perform
action.')
+ return
+ end
+ end
+
def update
KEYS.each do |key|
if params[key]
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index 95d4464..5afcb26 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -681,7 +681,7 @@ ul.tiles {
top: 0; left: 0;
}
}
- button {
+ button, a.button {
float: right;
}
.disabled {
diff --git a/src/app/views/settings/general_settings.haml
b/src/app/views/settings/general_settings.haml
new file mode 100644
index 0000000..2254222
--- /dev/null
+++ b/src/app/views/settings/general_settings.haml
@@ -0,0 +1 @@
+%h2 TODO: implement 3190 here
diff --git a/src/app/views/settings/index.haml
b/src/app/views/settings/index.haml
index c359289..09914bc 100644
--- a/src/app/views/settings/index.haml
+++ b/src/app/views/settings/index.haml
@@ -5,8 +5,7 @@
= t('.general_settings')
%p
= t('.general_settings_desc')
- %button
- = t(:continue)
+ = link_to t(:continue), {:controller => 'settings', :action =>
'general_settings'}, :class => 'button'
%li#locales.grid_8.disabled
%img{:alt => "", :class => "icon", :src => "/images/blnk.png"}
%h2
@@ -21,8 +20,7 @@
= t('.manage_users')
%p
= t('.manage_users_desc')
- %button
- = t(:continue)
+ = link_to t(:continue), {:controller => 'users'}, :class => 'button'
%li#hardware.grid_8.disabled
%img{:alt => "", :class => "icon", :src => "/images/blnk.png"}
%h2
@@ -37,8 +35,7 @@
= t('.manage_providers')
%p
= t('.manage_providers_desc')
- %button
- = t(:continue)
+ = link_to t(:continue), {:controller => 'provider'}, :class => 'button'
%li#services.grid_8.disabled
%img{:alt => "", :class => "icon", :src => "/images/blnk.png"}
%h2
@@ -53,5 +50,4 @@
= t('.permissions')
%p
= t('.permissions_desc')
- %button
- = t(:continue)
+ = link_to t(:continue), {:controller => 'settings', :action =>
'self_service'}, :class => 'button'
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
