From: Jozef Zigmund <jzigm...@redhat.com>
---
src/app/views/cloud_accounts/_form.haml | 22 ++++++++++++++++++++++
src/app/views/cloud_accounts/_form.html.erb | 13 -------------
src/app/views/cloud_accounts/edit.haml | 6 ++++++
src/app/views/cloud_accounts/edit.html.erb | 10 ----------
src/app/views/cloud_accounts/new.haml | 8 ++++++++
src/app/views/cloud_accounts/new.html.erb | 10 ----------
6 files changed, 36 insertions(+), 33 deletions(-)
create mode 100644 src/app/views/cloud_accounts/_form.haml
delete mode 100644 src/app/views/cloud_accounts/_form.html.erb
create mode 100644 src/app/views/cloud_accounts/edit.haml
delete mode 100644 src/app/views/cloud_accounts/edit.html.erb
create mode 100644 src/app/views/cloud_accounts/new.haml
delete mode 100644 src/app/views/cloud_accounts/new.html.erb
diff --git a/src/app/views/cloud_accounts/_form.haml
b/src/app/views/cloud_accounts/_form.haml
new file mode 100644
index 0000000..42960b3
--- /dev/null
+++ b/src/app/views/cloud_accounts/_form.haml
@@ -0,0 +1,22 @@
+%fieldset
+ %legend Account
+ = hidden_field :cloud_account, :id
+ = hidden_field :cloud_account, :provider_id, :value => @provider.id
+ %ul
+ %li
+ %label
+ Label
+ %span user-visible name for the account
+ = text_field :cloud_account, :label
+ - if @cloud_account.id.nil?
+ %li
+ %label
+ UserName
+ %span UserName for the provider account you wish to add.
+ = text_field :cloud_account, :username
+ %li
+ %label
+ Password
+ %span Password for the provider account you wish to add.
+ = password_field :cloud_account, :password
+= submit_tag "Save", :class => "submit"
diff --git a/src/app/views/cloud_accounts/_form.html.erb
b/src/app/views/cloud_accounts/_form.html.erb
deleted file mode 100644
index 95f339c..0000000
--- a/src/app/views/cloud_accounts/_form.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<fieldset>
-<legend>Account</legend>
-<%= hidden_field :cloud_account, :id %>
-<%= hidden_field :cloud_account, :provider_id, :value => @provider.id %>
-<ul>
-<li><label>Label<span>user-visible name for the
account</span></label><%=text_field :cloud_account, :label %></li>
-<% if @cloud_account.id.nil? %>
-<li><label>UserName<span>UserName for the provider account you wish to
add.</span></label><%= text_field :cloud_account, :username %></li>
-<% end %>
-<li><label>Password<span>Password for the provider account you wish to
add.</span></label><%=password_field :cloud_account, :password %></li>
-</ul>
-</fieldset>
-<%= submit_tag "Save", :class => "submit" %>
diff --git a/src/app/views/cloud_accounts/edit.haml
b/src/app/views/cloud_accounts/edit.haml
new file mode 100644
index 0000000..9e16553
--- /dev/null
+++ b/src/app/views/cloud_accounts/edit.haml
@@ -0,0 +1,6 @@
+.dcloud_form
+ = error_messages_for 'cloud_account'
+ %h2 Edit Cloud Account
+ %br/
+ - form_for @cloud_account, :url => { :action => 'update' } do |form|
+ = render :partial => 'form'
diff --git a/src/app/views/cloud_accounts/edit.html.erb
b/src/app/views/cloud_accounts/edit.html.erb
deleted file mode 100644
index 3ae86aa..0000000
--- a/src/app/views/cloud_accounts/edit.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="dcloud_form">
- <%= error_messages_for 'cloud_account' %>
-
- <h2>Edit Cloud Account</h2><br />
-
- <% form_for @cloud_account, :url => { :action => 'update' } do |form| -%>
- <%= render :partial => 'form' %>
- <% end %>
-
-</div>
diff --git a/src/app/views/cloud_accounts/new.haml
b/src/app/views/cloud_accounts/new.haml
new file mode 100644
index 0000000..446fd36
--- /dev/null
+++ b/src/app/views/cloud_accounts/new.haml
@@ -0,0 +1,8 @@
+.dcloud_form
+ = error_messages_for 'account'
+ %h2 Add a new Account from this Provider
+ %br/
+ - form_for @cloud_account, :url => { :action => "create" } do |f|
+ = f.error_messages
+ = render :partial => "form", :object => f
+ = link_to "Cancel", root_path, :class => 'actionlink'
diff --git a/src/app/views/cloud_accounts/new.html.erb
b/src/app/views/cloud_accounts/new.html.erb
deleted file mode 100644
index c8e6d60..0000000
--- a/src/app/views/cloud_accounts/new.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="dcloud_form">
- <%= error_messages_for 'account' %>
-
- <h2>Add a new Account from this Provider</h2><br />
- <% form_for @cloud_account, :url => { :action => "create" } do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "form", :object => f %>
- <% end %>
- <%= link_to "Cancel", root_path, :class => 'actionlink' %>
-</div>
--
1.7.2.2
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
