login, register; Do not doule-nest row/col classes

This commit is contained in:
Daniel Friesel 2019-04-02 19:40:04 +02:00
parent d90734e2ec
commit 68718860e2
2 changed files with 63 additions and 67 deletions

View file

@ -73,35 +73,33 @@
</div> </div>
</div> </div>
% } % }
<div class="row"> %= form_for '/login' => (method => 'POST') => begin
%= form_for '/login' => (class => 'col s12', method => 'POST') => begin %= csrf_field
%= csrf_field % if (stash('redirect_to')) {
% if (stash('redirect_to')) { %= hidden_field 'redirect_to' => stash('redirect_to')
%= hidden_field 'redirect_to' => stash('redirect_to') % }
% } <div class="row">
<div class="row"> <div class="input-field col s12">
<div class="input-field col s12"> <i class="material-icons prefix">account_circle</i>
<i class="material-icons prefix">account_circle</i> %= text_field 'user', id => 'user', class => 'validate', required => undef, maxlength => 60, autocomplete => 'username'
%= text_field 'user', id => 'user', class => 'validate', required => undef, maxlength => 60, autocomplete => 'username' <label for="user">Account</label>
<label for="user">Account</label>
</div>
<div class="input-field col s12">
<i class="material-icons prefix">lock</i>
%= password_field 'password', id => 'password', class => 'validate', required => undef, autocomplete => 'current-password'
<label for="password">Passwort</label>
</div>
</div> </div>
<div class="row"> <div class="input-field col s12">
<div class="col s3 m3 l3"> <i class="material-icons prefix">lock</i>
</div> %= password_field 'password', id => 'password', class => 'validate', required => undef, autocomplete => 'current-password'
<div class="col s6 m6 l6 center-align"> <label for="password">Passwort</label>
<button class="btn waves-effect waves-light" type="submit" name="action" value="login">
Anmelden
<i class="material-icons right">send</i>
</button>
</div>
<div class="col s3 m3 l3">
</div>
</div> </div>
%= end </div>
</div> <div class="row">
<div class="col s3 m3 l3">
</div>
<div class="col s6 m6 l6 center-align">
<button class="btn waves-effect waves-light" type="submit" name="action" value="login">
Anmelden
<i class="material-icons right">send</i>
</button>
</div>
<div class="col s3 m3 l3">
</div>
</div>
%= end

View file

@ -58,45 +58,43 @@
</div> </div>
</div> </div>
% } % }
<div class="row"> %= form_for '/register' => (method => 'POST') => begin
%= form_for '/register' => (class => 'col s12', method => 'POST') => begin %= csrf_field
%= csrf_field <div class="row">
<div class="row"> <div class="input-field col l6 m12 s12">
<div class="input-field col l6 m12 s12"> <i class="material-icons prefix">account_circle</i>
<i class="material-icons prefix">account_circle</i> %= text_field 'user', id => 'account', class => 'validate', required => undef, pattern => '[0-9a-zA-Z_-]+', maxlength => 60, autocomplete => 'username'
%= text_field 'user', id => 'account', class => 'validate', required => undef, pattern => '[0-9a-zA-Z_-]+', maxlength => 60, autocomplete => 'username' <label for="account">Name (alphanumerisch)</label>
<label for="account">Name (alphanumerisch)</label>
</div>
<div class="input-field col l6 m12 s12">
<i class="material-icons prefix">email</i>
%= email_field 'email', id => 'email', class => 'validate', required => undef, maxlength => 250
<label for="email">Mail-Adresse</label>
</div>
<div class="input-field col l6 m12 s12">
<i class="material-icons prefix">lock</i>
%= password_field 'password', id => 'password', class => 'validate', required => undef, minlength => 8, autocomplete => 'new-password'
<label for="password">Passwort</label>
</div>
<div class="input-field col l6 m12 s12">
<i class="material-icons prefix">lock</i>
%= password_field 'password2', id => 'password2', class => 'validate', required => undef, minlength => 8, autocomplete => 'new-password'
<label for="password2">Passwort wiederholen</label>
</div>
</div> </div>
<div class="row"> <div class="input-field col l6 m12 s12">
<div class="col s3 m3 l3"> <i class="material-icons prefix">email</i>
</div> %= email_field 'email', id => 'email', class => 'validate', required => undef, maxlength => 250
<div class="col s6 m6 l6 center-align"> <label for="email">Mail-Adresse</label>
<button class="btn waves-effect waves-light" type="submit" name="action" value="register">
Registrieren
<i class="material-icons right">send</i>
</button>
</div>
<div class="col s3 m3 l3">
</div>
</div> </div>
%= end <div class="input-field col l6 m12 s12">
</div> <i class="material-icons prefix">lock</i>
%= password_field 'password', id => 'password', class => 'validate', required => undef, minlength => 8, autocomplete => 'new-password'
<label for="password">Passwort</label>
</div>
<div class="input-field col l6 m12 s12">
<i class="material-icons prefix">lock</i>
%= password_field 'password2', id => 'password2', class => 'validate', required => undef, minlength => 8, autocomplete => 'new-password'
<label for="password2">Passwort wiederholen</label>
</div>
</div>
<div class="row">
<div class="col s3 m3 l3">
</div>
<div class="col s6 m6 l6 center-align">
<button class="btn waves-effect waves-light" type="submit" name="action" value="register">
Registrieren
<i class="material-icons right">send</i>
</button>
</div>
<div class="col s3 m3 l3">
</div>
</div>
%= end
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<p> <p>