From: Jozef Zigmund <jzigm...@redhat.com>
---
src/app/views/users/_form.erb | 26 ------------------------
src/app/views/users/_form.haml | 19 +++++++++++++++++
src/app/views/users/edit.haml | 8 +++++++
src/app/views/users/edit.html.erb | 9 --------
src/app/views/users/new.haml | 7 ++++++
src/app/views/users/new.html.erb | 9 --------
src/app/views/users/show.haml | 25 +++++++++++++++++++++++
src/app/views/users/show.html.erb | 40 -------------------------------------
8 files changed, 59 insertions(+), 84 deletions(-)
delete mode 100644 src/app/views/users/_form.erb
create mode 100644 src/app/views/users/_form.haml
create mode 100644 src/app/views/users/edit.haml
delete mode 100644 src/app/views/users/edit.html.erb
create mode 100644 src/app/views/users/new.haml
delete mode 100644 src/app/views/users/new.html.erb
create mode 100644 src/app/views/users/show.haml
delete mode 100644 src/app/views/users/show.html.erb
diff --git a/src/app/views/users/_form.erb b/src/app/views/users/_form.erb
deleted file mode 100644
index 4fcd98c..0000000
--- a/src/app/views/users/_form.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<ul>
- <li>
- <%= form.label :login, "Choose a username" %>
- <%= form.text_field :login %>
- </li>
- <li>
- <%= form.label :password, form.object.new_record? ? "Choose a password" :
"Change password" %>
- <%= form.password_field :password %>
- </li>
- <li>
- <%= form.label :password_confirmation, "Confirm password" %>
- <%= form.password_field :password_confirmation %>
- </li>
- <li>
- <%= form.label :first_name %>
- <%= form.text_field :first_name %>
- </li>
- <li>
- <%= form.label :last_name %>
- <%= form.text_field :last_name %>
- </li>
- <li>
- <%= form.label :email %>
- <%= form.text_field :email %>
- </li>
-</ul>
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
new file mode 100644
index 0000000..7c4ee81
--- /dev/null
+++ b/src/app/views/users/_form.haml
@@ -0,0 +1,19 @@
+%ul
+ %li
+ = form.label :login, "Choose a username"
+ = form.text_field :login
+ %li
+ = form.label :password, form.object.new_record? ? "Choose a password" :
"Change password"
+ = form.password_field :password
+ %li
+ = form.label :password_confirmation, "Confirm password"
+ = form.password_field :password_confirmation
+ %li
+ = form.label :first_name
+ = form.text_field :first_name
+ %li
+ = form.label :last_name
+ = form.text_field :last_name
+ %li
+ = form.label :email
+ = form.text_field :email
diff --git a/src/app/views/users/edit.haml b/src/app/views/users/edit.haml
new file mode 100644
index 0000000..7654866
--- /dev/null
+++ b/src/app/views/users/edit.haml
@@ -0,0 +1,8 @@
+.dcloud_form
+ %h2 Edit my profile.
+ - form_for @user, :url => account_path do |f|
+ = f.error_messages
+ = render :partial => "form", :object => f
+ = f.submit "Update", :class => "submit"
+ %br/
+ = link_to "Cancel", account_path, :class => 'actionlink'
diff --git a/src/app/views/users/edit.html.erb
b/src/app/views/users/edit.html.erb
deleted file mode 100644
index 79e1a1c..0000000
--- a/src/app/views/users/edit.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="dcloud_form">
- <h2>Edit my profile.</h2>
- <% form_for @user, :url => account_path do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "form", :object => f %>
- <%= f.submit "Update", :class => "submit" %>
- <% end %>
- <br /><%= link_to "Cancel", account_path, :class => 'actionlink' %>
-</div>
diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml
new file mode 100644
index 0000000..600cee3
--- /dev/null
+++ b/src/app/views/users/new.haml
@@ -0,0 +1,7 @@
+.dcloud_form
+ %h2 New Account
+ - form_for @user, :url => account_path do |f|
+ = f.error_messages
+ = render :partial => "form", :object => f
+ = f.submit "Create Account", :class => "submit"
+ = link_to "Cancel", root_path, :class => 'actionlink'
diff --git a/src/app/views/users/new.html.erb b/src/app/views/users/new.html.erb
deleted file mode 100644
index e88cd12..0000000
--- a/src/app/views/users/new.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="dcloud_form">
- <h2>New Account</h2>
- <% form_for @user, :url => account_path do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "form", :object => f %>
- <%= f.submit "Create Account", :class => "submit" %>
- <% end %>
- <%= link_to "Cancel", root_path, :class => 'actionlink' %>
-</div>
diff --git a/src/app/views/users/show.haml b/src/app/views/users/show.haml
new file mode 100644
index 0000000..6afa2cd
--- /dev/null
+++ b/src/app/views/users/show.haml
@@ -0,0 +1,25 @@
+.dcloud_form
+ %h2
+ User Profile for #{h @user.login}
+ %p
+ %b Username:
+ = h @user.login
+ %p
+ %b Login count:
+ = h @user.login_count
+ %p
+ %b Last request at:
+ = h @user.last_request_at
+ %p
+ %b Last login at:
+ = h @user.last_login_at
+ %p
+ %b Current login at:
+ = h @user.current_login_at
+ %p
+ %b Last login ip:
+ = h @user.last_login_ip
+ %p
+ %b Current login ip:
+ = h @user.current_login_ip
+ = link_to 'Edit', edit_account_path, :class => 'actionlink'
diff --git a/src/app/views/users/show.html.erb
b/src/app/views/users/show.html.erb
deleted file mode 100644
index a505552..0000000
--- a/src/app/views/users/show.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="dcloud_form">
- <h2>User Profile for <%=h @user.login %></h2>
-<p>
- <b>Username:</b>
- <%=h @user.login %>
-</p>
-
-<p>
- <b>Login count:</b>
- <%=h @user.login_count %>
-</p>
-
-<p>
- <b>Last request at:</b>
- <%=h @user.last_request_at %>
-</p>
-
-<p>
- <b>Last login at:</b>
- <%=h @user.last_login_at %>
-</p>
-
-<p>
- <b>Current login at:</b>
- <%=h @user.current_login_at %>
-</p>
-
-<p>
- <b>Last login ip:</b>
- <%=h @user.last_login_ip %>
-</p>
-
-<p>
- <b>Current login ip:</b>
- <%=h @user.current_login_ip %>
-</p>
-
-
-<%= link_to 'Edit', edit_account_path, :class => 'actionlink' %>
-</div>
--
1.7.2.2
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
