From: Jozef Zigmund <[email protected]>
---
src/app/views/pool/delete.haml | 2 ++
src/app/views/pool/delete.html.erb | 2 --
src/app/views/pool/hardware_profiles.haml | 1 +
src/app/views/pool/hardware_profiles.html.erb | 1 -
src/app/views/pool/index.haml | 8 ++++++++
src/app/views/pool/index.html.erb | 8 --------
src/app/views/pool/new.haml | 14 ++++++++++++++
src/app/views/pool/new.html.erb | 15 ---------------
src/app/views/pool/realms.haml | 1 +
src/app/views/pool/realms.html.erb | 1 -
src/app/views/pool/show.haml | 12 ++++++++++++
src/app/views/pool/show.html.erb | 17 -----------------
12 files changed, 38 insertions(+), 44 deletions(-)
create mode 100644 src/app/views/pool/delete.haml
delete mode 100644 src/app/views/pool/delete.html.erb
create mode 100644 src/app/views/pool/hardware_profiles.haml
delete mode 100644 src/app/views/pool/hardware_profiles.html.erb
create mode 100644 src/app/views/pool/index.haml
delete mode 100644 src/app/views/pool/index.html.erb
create mode 100644 src/app/views/pool/new.haml
delete mode 100644 src/app/views/pool/new.html.erb
create mode 100644 src/app/views/pool/realms.haml
delete mode 100644 src/app/views/pool/realms.html.erb
create mode 100644 src/app/views/pool/show.haml
delete mode 100644 src/app/views/pool/show.html.erb
diff --git a/src/app/views/pool/delete.haml b/src/app/views/pool/delete.haml
new file mode 100644
index 0000000..6727d77
--- /dev/null
+++ b/src/app/views/pool/delete.haml
@@ -0,0 +1,2 @@
+%h1 ProviderController#delete
+%p Find me in app/views/provider_controller/delete.html.erb
diff --git a/src/app/views/pool/delete.html.erb
b/src/app/views/pool/delete.html.erb
deleted file mode 100644
index b21ec14..0000000
--- a/src/app/views/pool/delete.html.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>ProviderController#delete</h1>
-<p>Find me in app/views/provider_controller/delete.html.erb</p>
diff --git a/src/app/views/pool/hardware_profiles.haml
b/src/app/views/pool/hardware_profiles.haml
new file mode 100644
index 0000000..96fe378
--- /dev/null
+++ b/src/app/views/pool/hardware_profiles.haml
@@ -0,0 +1 @@
+= render :partial => 'hardware_profiles/list'
diff --git a/src/app/views/pool/hardware_profiles.html.erb
b/src/app/views/pool/hardware_profiles.html.erb
deleted file mode 100644
index 579d796..0000000
--- a/src/app/views/pool/hardware_profiles.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => 'hardware_profiles/list' %>
diff --git a/src/app/views/pool/index.haml b/src/app/views/pool/index.haml
new file mode 100644
index 0000000..6b5432a
--- /dev/null
+++ b/src/app/views/pool/index.haml
@@ -0,0 +1,8 @@
+- if @pools.size == 0
+ %h1 There are no pools to display
+- else
+ - @pools.each {|pool|
+ = pool.name
+ %br/
+ - }
+= link_to "Add a pool", :controller => "pool", :action => "new", :provider =>
@provider
diff --git a/src/app/views/pool/index.html.erb
b/src/app/views/pool/index.html.erb
deleted file mode 100644
index 1650cee..0000000
--- a/src/app/views/pool/index.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<% if @pools.size == 0 %>
-<h1>There are no pools to display</h1>
-<% else %>
- <%[email protected] {|pool| %>
- <%= pool.name %><br/>
- <% } %>
-<% end %>
-<%= link_to "Add a pool", :controller => "pool", :action => "new", :provider
=> @provider%>
diff --git a/src/app/views/pool/new.haml b/src/app/views/pool/new.haml
new file mode 100644
index 0000000..119a4f2
--- /dev/null
+++ b/src/app/views/pool/new.haml
@@ -0,0 +1,14 @@
+.dcloud_form
+ = error_messages_for 'pool'
+ = error_messages_for 'account'
+ %h2 Create a new Pool
+ %br/
+ - form_tag :action => 'create' do
+ %legend Pool
+ %ul
+ %li
+ %label
+ Name
+ %span Provide a descriptive name for this pool.
+ = text_field :pool, :name
+ = submit_tag "Save", :class => "submit"
diff --git a/src/app/views/pool/new.html.erb b/src/app/views/pool/new.html.erb
deleted file mode 100644
index b1e329f..0000000
--- a/src/app/views/pool/new.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="dcloud_form">
- <%= error_messages_for 'pool' %>
- <%= error_messages_for 'account' %>
-
- <h2>Create a new Pool</h2><br />
-
- <% form_tag :action => 'create' do -%>
- <legend>Pool</legend>
- <ul>
- <li><label>Name<span>Provide a descriptive name for this
pool.</span></label><%= text_field :pool, :name %></li>
- </ul>
- </fieldset>
- <%= submit_tag "Save", :class => "submit" %>
- <% end %>
-</div>
diff --git a/src/app/views/pool/realms.haml b/src/app/views/pool/realms.haml
new file mode 100644
index 0000000..31f7886
--- /dev/null
+++ b/src/app/views/pool/realms.haml
@@ -0,0 +1 @@
+= render :partial => 'realms/list'
diff --git a/src/app/views/pool/realms.html.erb
b/src/app/views/pool/realms.html.erb
deleted file mode 100644
index 3aca533..0000000
--- a/src/app/views/pool/realms.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => 'realms/list' %>
diff --git a/src/app/views/pool/show.haml b/src/app/views/pool/show.haml
new file mode 100644
index 0000000..8f066d9
--- /dev/null
+++ b/src/app/views/pool/show.haml
@@ -0,0 +1,12 @@
+:javascript
+ $(document).ready(function() {
+ $("#pool-tabs").tabs();
+ });
+#pool-tabs
+ %ul
+ %li= link_to "Instances", {:action => "list", :id => @pool.id, :ajax =>
true}
+ - if has_view_perms?
+ %li= link_to "User access", {:controller => "permissions", :action =>
"list", :pool_id => @pool.id, :ajax => true}
+ %li= link_to "Hardware Profiles", {:action => "hardware_profiles", :id =>
@pool.id, :ajax => true}
+ %li= link_to "Realms", {:action => "realms", :id => @pool.id, :ajax =>
true}
+ %li= link_to "Quota", {:controller => "quota", :action => "show", :id =>
@pool, :parent_type => "pool", :ajax => true}
diff --git a/src/app/views/pool/show.html.erb b/src/app/views/pool/show.html.erb
deleted file mode 100644
index 12e5bad..0000000
--- a/src/app/views/pool/show.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<script type="text/javascript">
- $(document).ready(function() {
- $("#pool-tabs").tabs();
- });
-</script>
-
-<div id="pool-tabs">
- <ul>
- <li><%= link_to "Instances", {:action => "list", :id => @pool.id,
:ajax => true} %></li>
- <% if has_view_perms? %>
- <li><%= link_to "User access", {:controller => "permissions",
:action => "list", :pool_id => @pool.id, :ajax => true} %></li>
- <% end %>
- <li><%= link_to "Hardware Profiles", {:action => "hardware_profiles",
:id => @pool.id, :ajax => true} %></li>
- <li><%= link_to "Realms", {:action => "realms", :id => @pool.id,
:ajax => true} %></li>
- <li><%= link_to "Quota", {:controller => "quota", :action => "show",
:id => @pool, :parent_type => "pool", :ajax => true} %></li>
- </ul>
-</div>
--
1.7.2.2
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
