Skip to content

Commit

Permalink
Stylin, bitches.
Browse files Browse the repository at this point in the history
  • Loading branch information
@excid3
excid3 committed Sep 29, 2011
1 parent dad7cbf commit de7c595
Show file tree
Hide file tree
Showing 14 changed files with 240 additions and 27 deletions.
69 changes: 47 additions & 22 deletions app/views/businesses/_form.html.erb
View file
@@ -1,6 +1,6 @@
<%= form_for(@business) do |f| %> <%= form_for(@business) do |f| %>
<% if @business.errors.any? %> <% if @business.errors.any? %>
<div id="error_explanation"> <div id="error_explanation" class="alert-message block-message error">
<h2><%= pluralize(@business.errors.count, "error") %> prohibited this business from being saved:</h2> <h2><%= pluralize(@business.errors.count, "error") %> prohibited this business from being saved:</h2>


<ul> <ul>
Expand All @@ -11,33 +11,58 @@
</div> </div>
<% end %> <% end %>


<div class="field"> <div class="clearfix">
<%= f.label :name %><br /> <%= f.label :name %>
<%= f.text_field :name %> <div class="input">
<%= f.text_field :name %>
</div>
</div> </div>
<div class="field">
<%= f.label :address %><br /> <div class="clearfix">
<%= f.text_field :address %> <%= f.label :address %>
<div class="input">
<%= f.text_field :address %>
</div>
</div> </div>
<div class="field">
<%= f.label :description %><br /> <div class="clearfix">
<%= f.text_area :description %> <%= f.label :description %>
<div class="input">
<%= f.text_area :description %>
</div>
</div> </div>
<div class="field">
<%= f.label :tag_list, "Tags" %><br /> <div class="clearfix">
<%= f.text_field :tag_list %> <%= f.label :tag_list, "Tags" %>
<div class="field"> <div class="input">
<%= f.label :website %><br /> <%= f.text_field :tag_list %>
<%= f.text_field :website %> </div>
</div> </div>
<div class="field">
<%= f.label :twitter %><br /> <div class="clearfix">
<%= f.text_field :twitter %> <%= f.label :website %>
<div class="input">
<%= f.text_field :website %>
</div>
</div> </div>
<div class="field">
<%= f.label :email %><br /> <div class="clearfix">
<%= f.text_field :email %> <%= f.label :twitter %>
<div class="input">
<div class="input-prepend">
<span class="add-on">@</span>
<%= f.text_field :twitter %>
</div>
</div>
</div> </div>

<div class="clearfix">
<%= f.label :email %>
<div class="input">
<%= f.text_field :email %>
</div>
</div>

<div class="actions"> <div class="actions">
<%= f.submit :class => "btn primary" %> <%= f.submit :class => "btn primary" %>
</div> </div>
Expand Down
4 changes: 0 additions & 4 deletions app/views/businesses/index.html.erb
View file
Expand Up @@ -13,7 +13,3 @@
</tr> </tr>
<% end %> <% end %>
</table> </table>

<br />

<%= link_to 'New Business', new_business_path %>
12 changes: 12 additions & 0 deletions app/views/devise/confirmations/new.html.erb
View file
@@ -0,0 +1,12 @@
<h2>Resend confirmation instructions</h2>

<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>

<div><%= f.label :email %><br />
<%= f.email_field :email %></div>

<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>
5 changes: 5 additions & 0 deletions app/views/devise/mailer/confirmation_instructions.html.erb
View file
@@ -0,0 +1,5 @@
<p>Welcome <%= @resource.email %>!</p>

<p>You can confirm your account through the link below:</p>

<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
8 changes: 8 additions & 0 deletions app/views/devise/mailer/reset_password_instructions.html.erb
View file
@@ -0,0 +1,8 @@
<p>Hello <%= @resource.email %>!</p>

<p>Someone has requested a link to change your password, and you can do this through the link below.</p>

<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>

<p>If you didn't request this, please ignore this email.</p>
<p>Your password won't change until you access the link above and create a new one.</p>
7 changes: 7 additions & 0 deletions app/views/devise/mailer/unlock_instructions.html.erb
View file
@@ -0,0 +1,7 @@
<p>Hello <%= @resource.email %>!</p>

<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>

<p>Click the link below to unlock your account:</p>

<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
16 changes: 16 additions & 0 deletions app/views/devise/passwords/edit.html.erb
View file
@@ -0,0 +1,16 @@
<h2>Change your password</h2>

<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
<%= f.hidden_field :reset_password_token %>

<div><%= f.label :password, "New password" %><br />
<%= f.password_field :password %></div>

<div><%= f.label :password_confirmation, "Confirm new password" %><br />
<%= f.password_field :password_confirmation %></div>

<div><%= f.submit "Change my password" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>
12 changes: 12 additions & 0 deletions app/views/devise/passwords/new.html.erb
View file
@@ -0,0 +1,12 @@
<h2>Forgot your password?</h2>

<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>

<div><%= f.label :email %><br />
<%= f.email_field :email %></div>

<div><%= f.submit "Send me reset password instructions" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>
25 changes: 25 additions & 0 deletions app/views/devise/registrations/edit.html.erb
View file
@@ -0,0 +1,25 @@
<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! %>

<div><%= f.label :email %><br />
<%= f.email_field :email %></div>

<div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
<%= f.password_field :password %></div>

<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation %></div>

<div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
<%= f.password_field :current_password %></div>

<div><%= f.submit "Update" %></div>
<% 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 %>
30 changes: 30 additions & 0 deletions app/views/devise/registrations/new.html.erb
View file
@@ -0,0 +1,30 @@
<h2>Sign up</h2>

<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>

<div class="clearfix">
<%= f.label :email %>
<div class="input">
<%= f.email_field :email %>
</div>
</div>

<div class="clearfix">
<%= f.label :password %>
<div class="input">
<%= f.password_field :password %>
</div>
</div>

<div class="clearfix">
<%= f.label :password_confirmation %>
<div class="input">
<%= f.password_field :password_confirmation %>
</div>
</div>

<div class="actions"><%= f.submit "Sign up", :class => "btn primary" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>
38 changes: 38 additions & 0 deletions app/views/devise/sessions/new.html.erb
View file
@@ -0,0 +1,38 @@
<div class="page-header">
<h1>Sign in</h1>
</div>

<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<div class="clearfix">
<%= f.label :email %>
<div class="input">
<%= f.email_field :email %>
</div>
</div>

<div class="clearfix">
<%= f.label :password %>
<div class="input">
<%= f.password_field :password %>
</div>
</div>

<% if devise_mapping.rememberable? -%>
<div class="clearfix">
<div class="input">
<ul class="inputs-list">
<li>
<label>
<%= f.check_box :remember_me %>
<span>Remember Me</span>
</label>
</li>
</ul>
</div>
</div>
<% end -%>

<div class="actions"><%= f.submit "Sign in", :class => "btn primary" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>
25 changes: 25 additions & 0 deletions app/views/devise/shared/_links.erb
View file
@@ -0,0 +1,25 @@
<%- if controller_name != 'sessions' %>
<%= link_to "Sign in", new_session_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<%= link_to "Sign up", new_registration_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.omniauthable? %>
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
<% end -%>
12 changes: 12 additions & 0 deletions app/views/devise/unlocks/new.html.erb
View file
@@ -0,0 +1,12 @@
<h2>Resend unlock instructions</h2>

<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>

<div><%= f.label :email %><br />
<%= f.email_field :email %></div>

<div><%= f.submit "Resend unlock instructions" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>
4 changes: 3 additions & 1 deletion app/views/layouts/application.html.erb
View file
Expand Up @@ -19,7 +19,9 @@
<div class="container"> <div class="container">
<a class="brand" href="<%= root_path %>">Start Louis Map</a> <a class="brand" href="<%= root_path %>">Start Louis Map</a>
<ul class="nav"> <ul class="nav">
<li><%= link_to "Add Your Business", new_business_path %></li> <li><%= link_to "Home", root_path %></li>
<li><%= link_to "All Businesses", businesses_path %></li>
<li><%= link_to "Add Yours", new_business_path %></li>
</ul> </ul>
<p class="pull-right"> <p class="pull-right">
<% if user_signed_in? %> <% if user_signed_in? %>
Expand Down

0 comments on commit de7c595

Please sign in to comment.