ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-25 12:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved forms and error styling

Browse source 
Revert colour changes
This commit is contained in:
Luke Barratt 2014-04-10 00:43:20 +01:00
parent 63ec5d86fa
commit 8eac4abebe
8 changed files with 106 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/_variables.scss
View file

@ -47,7 +47,9 @@ $blue: #5a9aa8;
$purple: #6a5a8c;
$gold: #FFD700;
$dark-blue: #046;
$dark-gray: #232323;
$medium-gray: #2e2e2e;
$light-blue: #F3F3FB;

31
app/assets/stylesheets/components/_flashes.scss
View file

@ -32,3 +32,34 @@
}
}
}
/*
Error Messages
*/
div#errors {
@extend .flash.error;
@include span-columns(12);
margin-bottom: em(20);
&:before {
height: 100%;
}
strong {
@include span-columns(12);
margin-bottom: em(10);
}
ul.errors {
@include span-columns(12);
li {
margin-bottom: .5em;
&:last-child {
margin-bottom: 0;
}
}
}
}

41
app/assets/stylesheets/components/_forms.scss
View file

@ -101,26 +101,35 @@ form.dark {
form.square {
@include span-columns(12);
margin: em(20) 0;
&.small {
@include span-columns(6);
}
&.medium {
@include span-columns(9);
}
&.large {
.horizontal {
@include span-columns(12);
}
margin-bottom: em(20);
> .field_with_errors:first-child,
> label {
@include span-columns(3);
}
&.small {
@include span-columns(6);
}
input {
@include span-columns(9);
&.medium {
@include span-columns(9);
}
&.large {
@include span-columns(12);
}
> .field_with_errors:first-child,
> label,
> .label {
@include span-columns(3);
padding: em(11) 0;
line-height: em(16);
}
input {
@include span-columns(9);
}
}
.controls {

4
app/assets/stylesheets/layout/_body.scss
View file

@ -1,8 +1,8 @@
body {
margin: 0;
padding: 0;
background: lighten($blue, 10);
@include background-image(linear-gradient(lighten($blue, 10), $medium-gray));
background: $dark-blue;
@include background-image(linear-gradient($dark-blue, $medium-gray));
}
%container-padded {

2
app/controllers/users_controller.rb
View file

@ -53,7 +53,7 @@ class UsersController < ApplicationController
if @user.valid? and @user.save
@user.profile = Profile.new
@user.profile.user = @user
@user.profile.save()
@user.profile.save
redirect_to action: :show, id: @user.id
save_session @user
else

2
app/views/articles/_article.html.erb
View file

@ -10,7 +10,7 @@
</div>
<div class="author">
<%= flag(article.user.country) %> <%= namelink(article.user) %> on <%= longtime article.created_at %>
<%= namelink(article.user) %> on <%= longtime article.created_at %>
</div>
<div class="actions">

11
app/views/shared/_errors.html.erb Normal file
View file

@ -0,0 +1,11 @@
<% if messages.size > 0 %>
<div id="errors">
<strong><%= t('errors.template.header') %></strong>
<ul class="errors">
<% messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
</ul>
</div>
<% end %>

59
app/views/users/new.html.erb
View file

@ -1,28 +1,35 @@
<div class="wide box">
<h2>Registration</h2>
<%= form_for @user do |f| %>
<%= f.error_messages %>
<p>
<%= f.label :username %><br />
<%= f.text_field :username %>
</p>
<p>
<%= f.label :raw_password, "Password" %><br />
<%= f.password_field :raw_password %>
</p>
<p>
<%= f.label :email %><br />
<%= f.text_field :email %>
</p>
<p>
<%= f.label :steamid %> <em>(e.g. 0:1:23456789)</em><br>
<%= f.text_field :steamid %><br />
<%= link_to "You can use this tool to find out", "/files/client/steamid_finder.exe" %>
</p>
<p>
<%= f.label :birthdate %><br />
<%= date_select :user, :birthdate, :order => [:year, :month, :day], :start_year => 1950 %>
</p>
<%= f.submit "Register" %>
<div id="registration">
<h1>Registration</h1>
<%= link_to "You can use this tool to find your SteamID.", "/files/client/steamid_finder.exe" %>
<%= form_for @user, html: { class: "square" } do |f| %>
<%= render 'shared/errors', messages: @user.errors.full_messages %>
<div class="fields">
<div class="horizontal text-field">
<%= f.label :username %>
<%= f.text_field :username %>
</div>
<div class="horizontal text-field">
<%= f.label :raw_password, "Password" %>
<%= f.password_field :raw_password %>
</div>
<div class="horizontal text-field">
<%= f.label :email %>
<%= f.text_field :email %>
</div>
<div class="horizontal text-field">
<%= f.label :steamid %>
<%= f.text_field :steamid, placeholder: "0:1:23456789" %>
</div>
<div class="horizontal">
<%= f.label :birthdate %>
<%= date_select :user, :birthdate, order: [:year, :month, :day], start_year: 1950 %>
</div>
</div>
<div class="controls submit-field">
<%= f.submit "Register" %>
</div>
<% end %>
</div>