This patch takes the first step in getting the
design closer to what Jeremy has in his mockups.
There will be significant overall changes that
will have an entire separate css patch later, so
I ignored things like having the 'cancel' link
lined up under the form buttons. However, form
layout should be more consistent to support
upcoming changes.
cucumber tests should now pass.
---
src/app/views/user_sessions/new.html.erb | 32 +++++++++++++++----------
src/app/views/users/_form.erb | 36 +++++++++++++++++++++--------
src/app/views/users/edit.html.erb | 11 ++++-----
src/app/views/users/new.html.erb | 9 ++++---
src/app/views/users/show.html.erb | 2 +-
src/public/stylesheets/dcloud.css | 9 +++----
6 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/src/app/views/user_sessions/new.html.erb
b/src/app/views/user_sessions/new.html.erb
index ee7da51..92f384c 100644
--- a/src/app/views/user_sessions/new.html.erb
+++ b/src/app/views/user_sessions/new.html.erb
@@ -1,18 +1,24 @@
-<div class="dcloud_form">
- <h2>Login</h2>
+<h2 class="greeting">Welcome to $aggregator. Please sign in.</h2>
+<div class="dcloud_form">
<% form_for @user_session, :url => user_session_path do |f| %>
<%= f.error_messages %>
- <%= f.label :login %><br />
- <%= f.text_field :login %><br />
- <br />
- <%= f.label :password %><br />
- <%= f.password_field :password %><br />
- <br />
- <%= f.check_box :remember_me %><%= f.label :remember_me %><br />
- <br />
- <%= f.submit "Login" %>
+ <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 %>
- <%= link_to 'Register', {:controller => 'users', :action => 'new'}, :class
=> 'actionlink' %>
-
+ <div>
+ <%= link_to "Don't have an account? Create one now.",
+ {:controller => 'users', :action => 'new'},
+ :class => 'actionlink' %>
+ </div>
</div>
diff --git a/src/app/views/users/_form.erb b/src/app/views/users/_form.erb
index a278d9a..4fcd98c 100644
--- a/src/app/views/users/_form.erb
+++ b/src/app/views/users/_form.erb
@@ -1,10 +1,26 @@
-<%= form.label :login %><br />
-<%= form.text_field :login %><br />
-<%= form.label :email %><br />
-<%= form.text_field :email %><br />
-<br />
-<%= form.label :password, form.object.new_record? ? nil : "Change password"
%><br />
-<%= form.password_field :password %><br />
-<br />
-<%= form.label :password_confirmation %><br />
-<%= form.password_field :password_confirmation %><br />
+<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/edit.html.erb
b/src/app/views/users/edit.html.erb
index 73fdedd..0d2de48 100644
--- a/src/app/views/users/edit.html.erb
+++ b/src/app/views/users/edit.html.erb
@@ -1,11 +1,10 @@
-<div class="dcloud_form">
- <h2>Edit My Profile</h2>
+<h2 class="greeting">Edit my profile.</h2>
+<div class="dcloud_form">
<% form_for @user, :url => account_path do |f| %>
<%= f.error_messages %>
- <%= render :partial => "form", :object => f %>
- <%= f.submit "Update" %>
+ <%= render :partial => "form", :object => f %>
+ <%= f.submit "Update", :class => "submit" %>
<% end %>
-
- <br /><%= link_to "My Profile", account_path, :class => 'actionlink' %>
+ <br /><%= link_to "Cancel", account_path, :class => 'actionlink' %>
</div>
diff --git a/src/app/views/users/new.html.erb b/src/app/views/users/new.html.erb
index d6a35e4..0027ef6 100644
--- a/src/app/views/users/new.html.erb
+++ b/src/app/views/users/new.html.erb
@@ -1,9 +1,10 @@
-<div class="dcloud_form">
- <h2>Register</h2>
+<h2 class="greeting">New Account</h2>
+<div class="dcloud_form">
<% form_for @user, :url => account_path do |f| %>
<%= f.error_messages %>
- <%= render :partial => "form", :object => f %>
- <%= f.submit "Register" %>
+ <%= 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.html.erb
b/src/app/views/users/show.html.erb
index 632b630..a505552 100644
--- a/src/app/views/users/show.html.erb
+++ b/src/app/views/users/show.html.erb
@@ -1,7 +1,7 @@
<div class="dcloud_form">
<h2>User Profile for <%=h @user.login %></h2>
<p>
- <b>Login:</b>
+ <b>Username:</b>
<%=h @user.login %>
</p>
diff --git a/src/public/stylesheets/dcloud.css
b/src/public/stylesheets/dcloud.css
index e2f47aa..96cb95c 100644
--- a/src/public/stylesheets/dcloud.css
+++ b/src/public/stylesheets/dcloud.css
@@ -14,7 +14,7 @@ fieldset {
padding: 18px 0 10px 10px;
}
-fieldset ul li input {
+ul li input {
border:2px solid #becfe4;
color:#333;
display:block;
@@ -63,7 +63,7 @@ input, select {
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
margin-top: 54px;
- width: 500px ;
+ width: 550px ;
margin-left: auto ;
margin-right: auto ;
padding: 36px;
@@ -89,7 +89,7 @@ input, select {
display: block;
float: left;
padding: 3px 0 24px 0;
- width: 160px;
+ width: 175px;
font-size: 1.4em;
color: #616161;
}
@@ -120,7 +120,6 @@ input, select {
.dcloud_form .submit {
float: right;
- margin-top: 18px;
display: inline;
clear:both;
}
@@ -263,4 +262,4 @@ ul#providers li ul li a:hover {
.instance_action_list li.first {
border-left: none;
-}
+}
\ No newline at end of file
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
