-
Notifications
You must be signed in to change notification settings - Fork 151
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
106 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,53 @@ | ||
| <h2>Edit <%= resource_name.to_s.humanize %></h2> | ||
|
|
||
| <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> | ||
| <%= devise_error_messages! %> | ||
|
|
||
| <p><%= f.label :email %><br /> | ||
| <%= f.email_field :email %></p> | ||
|
|
||
| <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br /> | ||
| <%= f.password_field :password %></p> | ||
|
|
||
| <p><%= f.label :password_confirmation %><br /> | ||
| <%= f.password_field :password_confirmation %></p> | ||
|
|
||
| <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br /> | ||
| <%= f.password_field :current_password %></p> | ||
|
|
||
| <p><%= f.submit "Update" %></p> | ||
| <% end %> | ||
|
|
||
| <h3>Cancel my account</h3> | ||
|
|
||
| <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p> | ||
|
|
||
| <%= link_to "Back", :back %> | ||
| <section class="C no"> | ||
| <header> | ||
| <%= back_button :back %> | ||
| <div class="C-header_right"> | ||
| <%= link_to "Cancel Account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %> | ||
| </div> | ||
| <h1>Edit <%= resource_name.to_s.humanize %>'s Account</h1> | ||
| </header> | ||
| <div class="C-cont"> | ||
| <article> | ||
|
|
||
| <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> | ||
| <%= devise_error_messages! %> | ||
|
|
||
| <fieldset> | ||
| <div class="field"> | ||
| <%= f.label :email %> | ||
| <div class="inputs"> | ||
| <%= f.email_field :email %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :password, "New password" %> | ||
| <div class="inputs"> | ||
| <i>(leave blank if you don't want to change your password)</i> | ||
| <%= f.password_field :password %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :password_confirmation, "Confirm new password" %> | ||
| <div class="inputs"> | ||
| <%= f.password_field :password_confirmation %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :current_password %> | ||
| <div class="inputs"> | ||
| <i>(we need your current password to confirm your changes)</i> | ||
| <%= f.password_field :current_password %> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="submit_bar actions"> | ||
| <%= f.submit "Update Account" %> | ||
| </div> | ||
|
|
||
| <% end %> | ||
|
|
||
| </article> | ||
| <div class="clear"></div> | ||
| </div> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,56 @@ | ||
| <% content_for :title, "Register New Account" %> | ||
| <div class="COLFR width25x75"> | ||
| <div class="col1"> | ||
| <section class="C no"> | ||
| <header> | ||
| <h1>New Account</h1> | ||
| </header> | ||
| <div class="C-cont"> | ||
| <article> | ||
| <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> | ||
| <%= devise_error_messages! %> | ||
|
|
||
| <div class="fields"> | ||
| <div class="field"> | ||
| <%= f.label :first_name %> | ||
| <div class="inputs"> | ||
| <%= f.text_field :first_name %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :last_name %> | ||
| <div class="inputs"> | ||
| <%= f.text_field :last_name %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :email %> | ||
| <div class="inputs"> | ||
| <%= f.email_field :email %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :password %> | ||
| <div class="inputs"> | ||
| <%= f.password_field :password %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :password_confirmation, "Confirm Password" %> | ||
| <div class="inputs"> | ||
| <%= f.password_field :password_confirmation %> | ||
| </div> | ||
| </div> | ||
| <section class="C no"> | ||
| <header> | ||
| <%= back_button :back %> | ||
| <h1>Register Account</h1> | ||
| </header> | ||
| <div class="C-cont"> | ||
| <article> | ||
|
|
||
| <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> | ||
| <%= devise_error_messages! %> | ||
|
|
||
| <fieldset> | ||
| <div class="field"> | ||
| <%= f.label :first_name %> | ||
| <div class="inputs"> | ||
| <%= f.text_field :first_name %> | ||
| </div> | ||
|
|
||
| <div class="submit_bar actions"> | ||
| <%= f.submit "Register Account" %> | ||
| <div class="clear"></div> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :last_name %> | ||
| <div class="inputs"> | ||
| <%= f.text_field :last_name %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :email %> | ||
| <div class="inputs"> | ||
| <%= f.email_field :email %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :password %> | ||
| <div class="inputs"> | ||
| <%= f.password_field :password %> | ||
| </div> | ||
| </div> | ||
| <div class="field"> | ||
| <%= f.label :password_confirmation, "Confirm Password" %> | ||
| <div class="inputs"> | ||
| <%= f.password_field :password_confirmation %> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="submit_bar actions"> | ||
| <%= f.submit "Register Account" %> | ||
| | ||
| <%= render :partial => "devise/shared/links" %> | ||
| </div> | ||
|
|
||
| <% end %> | ||
|
|
||
| </article> | ||
| <div class="clear"></div> | ||
| </div> | ||
| </section> | ||
| </div> | ||
|
|
||
| <div class="col2"> | ||
| <section class="C no"> | ||
| <header></header> | ||
| <div class="C-cont"> | ||
| <article> | ||
| <h1>What is Concerto?</h1> | ||
|
|
||
| </article> | ||
| <div class="clear"></div> | ||
| </div> | ||
| </section> | ||
| <% end %> | ||
|
|
||
| </article> | ||
| <div class="clear"></div> | ||
| </div> | ||
| <div class="clear"></div> | ||
| </div> | ||
| </section> |