From: Jozef Zigmund <jzigm...@redhat.com>

---
 src/app/views/user_sessions/new.haml     |   18 ++++++++++++++++++
 src/app/views/user_sessions/new.html.erb |   27 ---------------------------
 2 files changed, 18 insertions(+), 27 deletions(-)
 create mode 100644 src/app/views/user_sessions/new.haml
 delete mode 100644 src/app/views/user_sessions/new.html.erb

diff --git a/src/app/views/user_sessions/new.haml 
b/src/app/views/user_sessions/new.haml
new file mode 100644
index 0000000..f98840e
--- /dev/null
+++ b/src/app/views/user_sessions/new.haml
@@ -0,0 +1,18 @@
+  .dcloud_form
+    %h2 Welcome to the Deltacloud Aggregator.  Please sign in.
+    - form_for @user_session, :url => user_session_path do |f|
+      = f.error_messages
+      %ul
+        %li
+          = f.label :login, "Username"
+          = f.text_field :login
+        %li
+          = f.label :password
+          = f.password_field :password
+      = f.check_box :remember_me
+      = f.label :remember_me
+      = f.submit "Login", :class => "submit"
+%div
+  = link_to "Don't have an account? Create one now.", |
+    {:controller => 'users', :action => 'new'},       |
+    :class => 'actionlink'                            |
diff --git a/src/app/views/user_sessions/new.html.erb 
b/src/app/views/user_sessions/new.html.erb
deleted file mode 100644
index a058b8a..0000000
--- a/src/app/views/user_sessions/new.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<%#=
-  TODO: decide if we want to have the concept of named Aggregators
-  and add that below if so
-%>
-<div class="dcloud_form">
-  <h2>Welcome to the Deltacloud Aggregator.  Please sign in.</h2>
-  <% form_for @user_session, :url => user_session_path do |f| %>
-    <%= f.error_messages %>
-    <ul>
-      <li>
-        <%= f.label :login, "Username" %>
-        <%= f.text_field :login %>
-      </li>
-      <li>
-        <%= f.label :password %>
-        <%= f.password_field :password %>
-      </li>
-    </ul>
-    <%= f.check_box :remember_me %><%= f.label :remember_me %>
-    <%= f.submit "Login", :class => "submit" %>
-  <% end %>
-  <div>
-    <%= link_to "Don't have an account? Create one now.",
-                {:controller => 'users', :action => 'new'},
-                :class => 'actionlink' %>
-  </div>
-</div>
-- 
1.7.2.2

_______________________________________________
deltacloud-devel mailing list
deltacloud-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel

Reply via email to