From: Tomas Sedovic <[email protected]>
This adds tabs to the provider page and adds a confirmation dialog box before
deleting a provider.
---
src/app/controllers/application_controller.rb | 1 +
src/app/controllers/provider_controller.rb | 4 ++++
src/app/views/provider/settings.html.erb | 4 ++++
src/app/views/provider/show.html.erb | 23 +++++++++++++++++------
src/public/stylesheets/dcloud.css | 6 +++---
5 files changed, 29 insertions(+), 9 deletions(-)
create mode 100644 src/app/views/provider/settings.html.erb
diff --git a/src/app/controllers/application_controller.rb
b/src/app/controllers/application_controller.rb
index 84f8a89..3c22383 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -40,6 +40,7 @@ class ApplicationController < ActionController::Base
rescue_from PartialSuccessError, :with => :handle_partial_success_error
def choose_layout
+ return nil if params[:ajax]
if(params[:component_layout])
return (ENV["RAILS_ENV"] != "production")?'components/' <<
params[:component_layout]:'aggregator'
end
diff --git a/src/app/controllers/provider_controller.rb
b/src/app/controllers/provider_controller.rb
index 7a4cefc..8ba84fe 100644
--- a/src/app/controllers/provider_controller.rb
+++ b/src/app/controllers/provider_controller.rb
@@ -67,4 +67,8 @@ class ProviderController < ApplicationController
require_privilege(Privilege::PROVIDER_VIEW, @provider)
end
+ def settings
+ @provider = Provider.find(params[:id])
+ end
+
end
diff --git a/src/app/views/provider/settings.html.erb
b/src/app/views/provider/settings.html.erb
new file mode 100644
index 0000000..806fada
--- /dev/null
+++ b/src/app/views/provider/settings.html.erb
@@ -0,0 +1,4 @@
+<% form_tag({ :action => 'destroy' }, {:onsubmit => "return confirm('Really
delete the provider?');"}) do %>
+ <%= hidden_field :provider, :id %>
+ <%= submit_tag "Delete Provider", :class => "submit_link" %>
+<% end %>
diff --git a/src/app/views/provider/show.html.erb
b/src/app/views/provider/show.html.erb
index f4213a9..81f288e 100644
--- a/src/app/views/provider/show.html.erb
+++ b/src/app/views/provider/show.html.erb
@@ -1,7 +1,18 @@
-<%= link_to "Realms", {:action => "realms", :id => @provider.id},
:class=>"actionlink"%>
-<%= link_to "Accounts", {:action => "accounts", :id => @provider.id},
:class=>"actionlink"%>
-<%= link_to "User access", {:controller => "permissions", :action => "list",
:provider_id => @provider.id}, :class=>"actionlink" if has_view_perms? %>
-<% form_tag :action => 'destroy' do %>
- <%=hidden_field :provider, :id %>
- <%= submit_tag "Delete Provider", :class => "submit_link" %>
+<% content_for :scripts do %>
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("#provider-tabs").tabs();
+ });
+ </script>
<% end %>
+
+<div id="provider-tabs">
+ <ul>
+ <li><%= link_to "Accounts", {:action => "accounts", :id => @provider.id,
:ajax => true} %></li>
+ <li><%= link_to "Realms", {:action => "realms", :id => @provider.id,
:ajax => true } %></li>
+ <% if has_view_perms? %>
+ <li><%= link_to "User access", {:controller => "permissions", :action
=> "list", :provider_id => @provider.id, :ajax => true } %></li>
+ <% end %>
+ <li><%= link_to "Settings", {:action => "settings", :id => @provider.id,
:ajax => true} %></li>
+ </ul>
+</div>
diff --git a/src/public/stylesheets/dcloud.css
b/src/public/stylesheets/dcloud.css
index 16943b2..d68f156 100644
--- a/src/public/stylesheets/dcloud.css
+++ b/src/public/stylesheets/dcloud.css
@@ -156,7 +156,7 @@ input, select {
}
.actionlink {
- color: #0075c0;
+ color: #0075c0 !important;
line-height: 36px;
font-size: 14px;
padding-left: 18px;
@@ -294,10 +294,10 @@ a.button_link {
-webkit-border-radius: 5px;
}
-#dashboard-tabs {
+#dashboard-tabs, #provider-tabs {
border: none;
}
-#dashboard-tabs ul {
+#dashboard-tabs ul, #provider-tabs ul {
float: none;
}
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
