Updated forms style [#11 state:resolved]

s2j1h · Oct 17, 2010 · 7ef2f18 · 7ef2f18
1 parent eb78a9b
commit 7ef2f18
Show file tree

Hide file tree

Showing 10 changed files with 1,074 additions and 34 deletions.
diff --git a/app/helpers/feedbacks_helper.rb b/app/helpers/feedbacks_helper.rb
@@ -27,11 +27,11 @@ def feedback_form()
    html = ""
    html << "<div id='dialog-feedback-form' title='Give feedback' style='display:none'><p>Please leave us feedback, it's really appreciated.</p><p class='validateTips'>All form fields are required.</p><form id='feedback-form'><p>"
    html <<  label_tag('subject')
-   html << ":" 
+   html << ":<br/>" 
    html <<  select_tag('subject_feedback', '<option selected="selected">Problem</option><option>Question</option><option>Suggestion</option><option>Other</option>' , :class => 'text ui-widget-content')
    html <<  "</p> <p>"
    html <<  label_tag('email')
-   html <<  ":"
+   html <<  ":<br/>"
    if current_user
     html << text_field_tag('email_feedback', current_user.email,:class => 'text ui-widget-content')
    else
@@ -40,7 +40,7 @@ def feedback_form()
    html <<  "</p><p>"
    html <<  label_tag('comment')
    html << ":<br />"
-   html <<  text_area_tag('comment_feedback', nil, :cols => 35, :rows => 10,  :class => 'text ui-widget-content')
+   html <<  text_area_tag('comment_feedback', nil, :cols => 35, :rows => 7,  :class => 'text ui-widget-content')
    html <<  "</p>  </form> </div>"
 
    html << "<div id='dialog-feedback-ajax' title='Give feedback' style='display:none'><span id='dialog-feedback-ajax-span'></span></div>"

diff --git a/app/views/feedbacks/new.html.erb b/app/views/feedbacks/new.html.erb
@@ -7,11 +7,11 @@
 </p>
 <% end %>
 <p>
-	<%= f.label 'subject' %>
+  <%= f.label 'subject' %>:<br/>
 	<%= f.select 'subject', ['Problem', 'Suggestion', 'Question', 'Other'] %>
 </p>
 <p>
-   <%= f.label 'email' %>
+   <%= f.label 'email' %>:<br/>
    <%= f.text_field 'email' %>
 </p>
 <p>

diff --git a/app/views/identities/edit.html.erb b/app/views/identities/edit.html.erb
@@ -68,28 +68,28 @@
   <%= f.error_messages %>
 
 <p>
-<%= f.label :name %>: <span class="hideme"><%= @identity.name%></span> <span class="editme" style="display:none"><%= f.text_field :name %></span>
+<%= f.label :name %><span class="require">*</span>:  <span class="hideme"><%= @identity.name%></span> <span class="editme" style="display:none"><br /><%= f.text_field :name %></span>
 </p>
 <p>
-  <%= f.label :url %>: <span class="hideme"><%= @identity.url%></span> <span class="editme" style="display:none"><%= f.text_field :url %></span>
+<%= f.label :url %>:  <span class="hideme"><%= @identity.url%></span> <span class="editme" style="display:none"><br /><%= f.text_field :url %></span>
 </p>
 <p>
-<%= f.label :login %>: <span class="hideme"><%= @identity.login%></span> <span class="editme" style="display:none"><%= f.text_field :login %></span>
+  <%= f.label :login %><span class="require">*</span>:  <span class="hideme"><%= @identity.login%></span> <span class="editme" style="display:none"><br /><%= f.text_field :login %></span>
 </p>
 <p>
-  <%= f.label :password %>: <span class="hideme"><%= @identity.password%></span> <span class="editme" style="display:none"><%= f.text_field :password %></span>
+  <%= f.label :password %><span class="require">*</span>:  <span class="hideme"><%= @identity.password%></span> <span class="editme" style="display:none"><br /><%= f.text_field :password %></span>
 </p>
 <p>
   <%= f.label :comment %>:<br />
   <span class="hideme"><%= @identity.comment%></span> <span class="editme" style="display:none"><%= f.text_area :comment , :rows => '3', :cols => '30'%></span>
 </p>
 
   <p class="editme" style="display:none">
-    <%= label_tag :secretkey %>: <%= password_field_tag :secretkey %>
+    <%= label_tag :secretkey %><span class="require">*</span>: <br /><%= password_field_tag :secretkey %>
   </p>
 
 
-  <p class="editme" style="display:none">
+  <p class="editme" style="display:none" id="submit-button">
     <%= f.submit 'Update' %>
   </p>
 <% end %>

diff --git a/app/views/identities/new.html.erb b/app/views/identities/new.html.erb
@@ -6,25 +6,25 @@
   <%= f.error_messages %>
 
   <p>
-    <%= f.label :name %>: <%= f.text_field :name %>
+    <%= f.label :name %><span class="require">*</span> : <br /><%= f.text_field :name %>
   </p>
   <p>
-    <%= f.label :url %>: <%= f.text_field :url %>
+    <%= f.label :url %>: <br /><%= f.text_field :url %>
   </p>
   <p>
-    <%= f.label :login %>: <%= f.text_field :login %>
+    <%= f.label :login %><span class="require">*</span>: <br /><%= f.text_field :login %>
   </p>
   <p>
-    <%= f.label :password %>: <%= f.password_field :password %>
+    <%= f.label :password %><span class="require">*</span>: <br /><%= f.password_field :password %>
   </p>
   <p>
-    <%= f.label :comment %>: <%= f.text_area :comment, :rows => "3", :cols => '30' %>
+    <%= f.label :comment %>: <br /><%= f.text_area :comment, :rows => "3", :cols => '30' %>
   </p>
   <p>
-    <%= label_tag :secretkey %>: <%= password_field_tag :secretkey %>
+    <%= label_tag :secretkey %><span class="require">*</span>: <br /><%= password_field_tag :secretkey %>
   </p>
 
-  <p>
+  <p id="submit-button">
     <%= f.submit 'Create' %>
   </p>
 <% end %>

diff --git a/app/views/password_resets/edit.html.erb b/app/views/password_resets/edit.html.erb
@@ -5,10 +5,10 @@
 
 <% form_for @user, :url => password_reset_path, :method => :put do |f| %>
   <%= f.error_messages %>
-  <%= f.label :password %><br />
+  <%= f.label :password %><span class="require">*</span>:<br />
   <%= f.password_field :password %><br />
   <br />
-  <%= f.label :password_confirmation %><br />
+  <%= f.label :password_confirmation %><span class="require">*</span>:<br />
   <%= f.password_field :password_confirmation %><br />
   <br />
   <%= f.submit "Update my password and log me in" %>

diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -4,19 +4,19 @@
 <% form_for @user do |f| %>
   <%= f.error_messages %>
   <p>
-  <h2><%= @user.username %></h2>
+  <h2>Hello, <%= @user.username %></h2>
   </p>
   <p>
-    <%= f.label :email %>:<%= f.text_field :email %>
+    <%= f.label :email %><span class="require">*</span>:<br/><%= f.text_field :email %>
   </p>
   <p>
-    <%= f.label :password %>: <%= f.password_field :password %>
+  <%= f.label :password %><span class="require">*</span>:<br/><%= f.password_field :password %>
     <i>Leave blank to keep the same password</i>
   </p>
  <p>
-    <%= f.label :password_confirmation %>: <%= f.password_field :password_confirmation %>
+<%= f.label :password_confirmation %><span class="require">*</span>:<br/><%= f.password_field :password_confirmation %>
   </p>
-  <p><%= f.submit "Submit" %> or <%= link_to 'Cancel', identities_path %> </p>
+  <p id="submit-button"><%= f.submit "Submit" %> or <%= link_to 'Cancel', identities_path %> </p>
 
 <% end %>
 
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
@@ -4,31 +4,32 @@
 <% form_for @user do |f| %>
   <%= f.error_messages %>
   <p>
-    <%= f.label :username %><br />
+    <%= f.label :username %><span class="require">*</span>:<br />
     <%= f.text_field :username %>
   </p>
   <p>
-    <%= f.label :email %><br />
+    <%= f.label :email %><span class="require">*</span>:<br />
     <%= f.text_field :email %>
   </p>
   <p>
-    <%= f.label :password %><br />
+    <%= f.label :password %><span class="require">*</span>:<br />
     <%= f.password_field :password %>
   </p>
  <p>
-    <%= f.label :password_confirmation %><br />
+    <%= f.label :password_confirmation %><span class="require">*</span>:<br />
     <%= f.password_field :password_confirmation %>
   </p>
 
   <p>
-    <%= f.label :secretkey %><br />
+    <%= f.label :secretkey %><span class="require">*</span>:<br />
     <%= f.password_field :secretkey %>
+    <i>Don't forget it - this key will encrypt all your data</i>
   </p>
 
   <p>
-    <%= f.label :secretkey_confirmation %><br />
+    <%= f.label :secretkey_confirmation %><span class="require">*</span>:<br />
     <%= f.password_field :secretkey_confirmation %>
   </p>
 
-  <p><%= f.submit "Submit" %> or <%= link_to 'Cancel', '/' %></p>
+  <p id="submit-button"><%= f.submit "Submit" %> or <%= link_to 'Cancel', '/' %></p>
 <% end %>
diff --git a/db/development.sqlite3 b/db/development.sqlite3