---
.../controllers/hardware_profiles_controller.rb | 12 -------
src/app/controllers/providers_controller.rb | 35 +++++++++-----------
src/app/controllers/roles_controller.rb | 8 ----
src/app/helpers/hardware_profiles_helper.rb | 12 +++++++
src/app/helpers/provider_accounts_helper.rb | 13 +++++++
src/app/helpers/realms_helper.rb | 8 ++++
src/app/helpers/roles_helper.rb | 8 ++++
src/app/stylesheets/layout.scss | 2 +
src/app/views/hardware_profiles/_list.haml | 31 +++++++----------
src/app/views/layouts/_tabpanel.haml | 2 +-
src/app/views/provider_accounts/_list.haml | 2 +-
src/app/views/realms/_list.haml | 23 +++++--------
src/app/views/roles/_list.haml | 2 +-
13 files changed, 84 insertions(+), 74 deletions(-)
create mode 100644 src/app/helpers/hardware_profiles_helper.rb
create mode 100644 src/app/helpers/provider_accounts_helper.rb
create mode 100644 src/app/helpers/realms_helper.rb
create mode 100644 src/app/helpers/roles_helper.rb
diff --git a/src/app/controllers/hardware_profiles_controller.rb
b/src/app/controllers/hardware_profiles_controller.rb
index b9ed869..8dc2bda 100644
--- a/src/app/controllers/hardware_profiles_controller.rb
+++ b/src/app/controllers/hardware_profiles_controller.rb
@@ -1,6 +1,5 @@
class HardwareProfilesController < ApplicationController
before_filter :require_user, :except => :matching_profiles
- before_filter :set_params_and_header, :only => [:index, :show]
before_filter :load_hardware_profiles, :only => [:index, :show]
before_filter :load_hardware_profile, :only => [:show]
before_filter :setup_new_hardware_profile, :only => [:new]
@@ -179,17 +178,6 @@ class HardwareProfilesController < ApplicationController
{ :name => "Minimum Value", :sort_attr => :value}]
end
- def set_params_and_header
- @header = [
- { :name => '', :sortable => false },
- { :name => t("hardware_profiles.index.hardware_profile_name"),
:sort_attr => :name },
- { :name => t("hardware_profiles.index.architecture"), :sort_attr =>
:architecture },
- { :name => t("hardware_profiles.index.memory"), :sort_attr =>
:memory},
- { :name => t("hardware_profiles.index.storage"), :sort_attr =>
:storage },
- { :name => t("hardware_profiles.index.virtual_cpu"), :sort_attr =>
:cpu},
- ]
- end
-
def load_hardware_profiles
sort_field = params[:order_field].nil? ? "name" : params[:order_field]
sort_order = params[:order_dir] == "asc" || params[:order_dir].nil? ?
"" : "desc"
diff --git a/src/app/controllers/providers_controller.rb
b/src/app/controllers/providers_controller.rb
index 303b2a1..78ec076 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -1,6 +1,5 @@
class ProvidersController < ApplicationController
before_filter :require_user
- before_filter :set_view_envs, :only => [:show, :index]
before_filter :load_providers, :only => [:index, :show, :new, :edit, :create,
:update]
def index
@@ -36,20 +35,29 @@ class ProvidersController < ApplicationController
@view = filter_view? ? 'provider_accounts/list' : 'edit' unless
params[:details_tab]
if params[:details_tab] == 'connections'
@view = filter_view? ? 'provider_accounts/list' : 'edit'
- #elsif params[:details_tab] == 'realms'
- # @realms = @provider.realms
- # @view = filter_view? ? 'realms/list' : 'realms/list'
+ elsif params[:details_tab] == 'realms'
+ @view = filter_view? ? 'realms/list' : 'realms/list'
+ elsif params[:details_tab] == 'hardware_profiles'
+ @view = filter_view? ? 'hardware_profiles/list' :
'hardware_profiles/list'
+ #elsif params[:details_tab] == 'roles'
+ # @view = filter_view? ? 'permissions/list' : 'permissions/list'
end
#TODO add links to real data for history,properties,permissions
- @tabs = [{:name => 'Connections', :view => @view, :id =>
'connections', :count => @provider.provider_accounts.count},
- # {:name => 'Realms', :view => @view, :id =>
'realms', :count => @provider.realms.count},
- # {:name => 'Hardware', :view => @view, :id =>
'hardware_profiles', :count => @provider.hardware_profiles.count},
- # {:name => 'Roles & Permissions', :view => @view, :id
=> 'roles', :count => @provider.roles.count},
+ @tabs = [{:name => 'Connectivity', :view => @view, :id =>
'connections', :count => @provider.provider_accounts.count},
+ {:name => 'Realms', :view => @view, :id =>
'realms', :count => @provider.realms.count},
+ {:name => 'Hardware', :view => @view, :id =>
'hardware_profiles', :count => @provider.hardware_profiles.count},
+ {:name => 'Roles & Permissions', :view => @view, :id =>
'roles', :count => @provider.permissions.count},
]
details_tab_name = params[:details_tab].blank? ? 'connections' :
params[:details_tab]
@details_tab = @tabs.find {|t| t[:id] == details_tab_name} ||
@tabs.first[:name].downcase
+
@provider_accounts = @provider.provider_accounts if @details_tab[:id] ==
'connections'
+ @realms = @provider.realms if @details_tab[:id] == 'realms'
+ @hardware_profiles = @provider.hardware_profiles if @details_tab[:id] ==
'hardware_profiles'
+ #@permissions = @provider.permissions if @details_tab[:id] == 'roles'
+
@view = @details_tab[:view]
+
respond_to do |format|
format.html { render :action => :edit}
format.js { render :partial => @view }
@@ -144,17 +152,6 @@ class ProvidersController < ApplicationController
end
protected
- def set_view_envs
- @header = [
- {:name => '', :sortable => false},
- {:name => t("providers.index.provider_name"), :sort_attr =>
:name},
- {:name => t("providers.index.provider_url"), :sort_attr => :name},
- {:name => t("providers.index.provider_type"), :sort_attr =>
:name},
- {:name => t("providers.index.x_deltacloud_driver"), :sort_attr =>
:name},
- {:name => t("providers.index.x_deltacloud_provider"), :sort_attr =>
:name},
- ]
- end
-
def load_providers
@providers = Provider.list_for_user(current_user, Privilege::VIEW, :order =>
:name)
end
diff --git a/src/app/controllers/roles_controller.rb
b/src/app/controllers/roles_controller.rb
index 63257dc..a50ef3d 100644
--- a/src/app/controllers/roles_controller.rb
+++ b/src/app/controllers/roles_controller.rb
@@ -1,7 +1,6 @@
class RolesController < ApplicationController
before_filter :require_user
before_filter :load_roles, :only => [:show]
- before_filter :load_params_and_headers, :only => [:index]
def index
clear_breadcrumbs
@@ -98,13 +97,6 @@ class RolesController < ApplicationController
protected
- def load_params_and_headers
- @header = [
- { :name => '', :sortable => false },
- { :name => t("roles.index.role_name"), :sortable => :name },
- ]
- end
-
def load_roles
@roles = Role.paginate(:page => params[:page] || 1,
:order => (params[:order_field] || 'name') +' '+
(params[:order_dir] || 'asc')
diff --git a/src/app/helpers/hardware_profiles_helper.rb
b/src/app/helpers/hardware_profiles_helper.rb
new file mode 100644
index 0000000..5ac51a1
--- /dev/null
+++ b/src/app/helpers/hardware_profiles_helper.rb
@@ -0,0 +1,12 @@
+module HardwareProfilesHelper
+ def hardware_profiles_header
+ [
+ { :name => '', :sortable => false },
+ { :name => t("hardware_profiles.index.hardware_profile_name"),
:sort_attr => :name },
+ { :name => t("hardware_profiles.index.architecture"), :sort_attr =>
:architecture },
+ { :name => t("hardware_profiles.index.memory"), :sort_attr =>
:memory},
+ { :name => t("hardware_profiles.index.storage"), :sort_attr =>
:storage },
+ { :name => t("hardware_profiles.index.virtual_cpu"), :sort_attr =>
:cpu}
+ ]
+ end
+end
diff --git a/src/app/helpers/provider_accounts_helper.rb
b/src/app/helpers/provider_accounts_helper.rb
new file mode 100644
index 0000000..5adfaf2
--- /dev/null
+++ b/src/app/helpers/provider_accounts_helper.rb
@@ -0,0 +1,13 @@
+module ProviderAccountsHelper
+ def provider_accounts_header
+ [
+ { :name => '', :sortable => false },
+ { :name => t("provider_accounts.index.provider_account_name"),
:sortable => false },
+ { :name => t("provider_accounts.index.username"), :sortable =>
false},
+ { :name => t("provider_accounts.index.provider_name"), :sortable =>
false },
+ { :name => t("provider_accounts.index.provider_type"), :sortable =>
false },
+ { :name => t("provider_accounts.index.quota_used"), :sortable =>
false },
+ { :name => t("provider_accounts.index.quota_limit"), :sortable =>
false }
+ ]
+ end
+end
diff --git a/src/app/helpers/realms_helper.rb b/src/app/helpers/realms_helper.rb
new file mode 100644
index 0000000..4e9e846
--- /dev/null
+++ b/src/app/helpers/realms_helper.rb
@@ -0,0 +1,8 @@
+module RealmsHelper
+ def realms_header
+ [
+ {:name => '', :sortable => false},
+ {:name => t("realms.index.realm_name"), :sort_attr => :name}
+ ]
+ end
+end
diff --git a/src/app/helpers/roles_helper.rb b/src/app/helpers/roles_helper.rb
new file mode 100644
index 0000000..d8e0713
--- /dev/null
+++ b/src/app/helpers/roles_helper.rb
@@ -0,0 +1,8 @@
+module RolesHelper
+ def roles_header
+ [
+ { :name => '', :sortable => false },
+ { :name => t("roles.index.role_name"), :sortable => :name },
+ ]
+ end
+end
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index ab6fbf4..208b78a 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -1515,6 +1515,8 @@ section.admin-content-section{
/* nav */
nav.faceted{
+ float: right;
+ margin-right: 100px;
ul{ list-style: none; display: inline-block; font-family: $font-family-primary; }
li{ display: inline-block; margin-bottom: 1px; }
li + li{ margin-left: 40px; }
diff --git a/src/app/views/hardware_profiles/_list.haml
b/src/app/views/hardware_profiles/_list.haml
index 5ac2751..08ac05a 100644
--- a/src/app/views/hardware_profiles/_list.haml
+++ b/src/app/views/hardware_profiles/_list.haml
@@ -1,19 +1,14 @@
-%section.content-section.hardware_profiles
- %header
- %h2 Hardware Profiles
- %span.label.badge.dark.count= @hardware_profiles.length
+.content
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button',
:class => 'button danger'
- .content
- - content_for :form_header do
- %li= restful_submit_tag "Delete", "destroy",
multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button',
:class => 'button danger'
-
- = filter_table(@header, @hardware_profiles) do |hwp|
- %tr{:class => cycle('nostripe','stripe')}
- %td
- - selected = params[:select] == 'all'
- = check_box_tag "hardware_profile_selected[]", hwp.id, selected, :id
=> "hardware_profile_checkbox_#{hwp.id}"
- %td= link_to hwp.name, hardware_profile_path(hwp)
- %td= hwp.architecture.to_s
- %td= hwp.memory.to_s
- %td= hwp.storage.to_s
- %td= hwp.cpu.to_s
+ = filter_table(hardware_profiles_header, @hardware_profiles) do |hwp|
+ %tr{:class => cycle('nostripe','stripe')}
+ %td
+ - selected = params[:select] == 'all'
+ = check_box_tag "hardware_profile_selected[]", hwp.id, selected, :id
=> "hardware_profile_checkbox_#{hwp.id}"
+ %td= link_to hwp.name, hardware_profile_path(hwp)
+ %td= hwp.architecture.to_s
+ %td= hwp.memory.to_s
+ %td= hwp.storage.to_s
+ %td= hwp.cpu.to_s
diff --git a/src/app/views/layouts/_tabpanel.haml b/src/app/views/layouts/_tabpanel.haml
index fac8963..4cf3760 100644
--- a/src/app/views/layouts/_tabpanel.haml
+++ b/src/app/views/layouts/_tabpanel.haml
@@ -9,4 +9,4 @@
.section-controls
-#%a.collapse{'href'=>'#'} Collapse
.content.collapsible#tab
- = render :partial => @details_tab[:view]
\ No newline at end of file
+ = render :partial => @details_tab[:view]
diff --git a/src/app/views/provider_accounts/_list.haml
b/src/app/views/provider_accounts/_list.haml
index cda508d..8696a7c 100644
--- a/src/app/views/provider_accounts/_list.haml
+++ b/src/app/views/provider_accounts/_list.haml
@@ -2,7 +2,7 @@
- content_for :form_header do
%li= restful_submit_tag "Delete", "destroy",
multi_destroy_provider_accounts_path, 'DELETE', :id => 'delete_button',
:class => 'button danger'
- = filter_table([{ :name => '', :sortable => false }, { :name =>
t("provider_accounts.index.provider_account_name"), :sortable => false }, {
:name => t("provider_accounts.index.username"), :sortable => false}, {
:name => t("provider_accounts.index.provider_name"), :sortable => false },
{ :name => t("provider_accounts.index.provider_type"), :sortable => false
}, { :name => t("provider_accounts.index.quota_used"), :sortable => false
}, { :name => t("provider_accounts.index.quota_limit"), :sortable => false
}], @provider_accounts) do |account|
+ = filter_table(provider_accounts_header, @provider_accounts) do |account|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml
index 314018a..a13dc24 100644
--- a/src/app/views/realms/_list.haml
+++ b/src/app/views/realms/_list.haml
@@ -1,15 +1,10 @@
-%section.content-section.realms
- %header
- %h2 Realms
- %span.label.badge.dark.count= @realms.length
+.content
+ - content_for :form_header do
+ %li= restful_submit_tag "Delete", "destroy",
multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- .content
- - content_for :form_header do
- %li= restful_submit_tag "Delete", "destroy",
multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
-
- = filter_table(@header, @realms) do |realm|
- %tr{:class => cycle('nostripe','stripe')}
- %td
- - selected = params[:select] == 'all'
- = check_box_tag "realm_selected[]", realm.id, selected, :id =>
"realm_checkbox_#{realm.id}"
- %td= link_to realm.name, realm_path(realm)
+ = filter_table(realms_header, @realms) do |realm|
+ %tr{:class => cycle('nostripe','stripe')}
+ %td
+ - selected = params[:select] == 'all'
+ = check_box_tag "realm_selected[]", realm.id, selected, :id =>
"realm_checkbox_#{realm.id}"
+ %td= link_to realm.name, realm_path(realm)
diff --git a/src/app/views/roles/_list.haml b/src/app/views/roles/_list.haml
index 0503717..e92be47 100644
--- a/src/app/views/roles/_list.haml
+++ b/src/app/views/roles/_list.haml
@@ -7,7 +7,7 @@
- content_for :form_header do
%li= restful_submit_tag "Delete", "destroy",
multi_destroy_roles_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
- = filter_table(@header, @roles) do |role|
+ = filter_table(roles_header, @roles) do |role|
%tr{:class => cycle('nostripe','stripe')}
%td
- selected = params[:select] == 'all'
--
1.7.6