diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2019-04-02 19:40:04 +0200 | 
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2019-04-02 19:40:04 +0200 | 
| commit | 68718860e29f5ce1c2c10afc99c0bfeb9943d6d6 (patch) | |
| tree | 1ce99b545666995844b22fd37a9149afdc2bfbd0 | |
| parent | d90734e2ec5031c186d25259488c0ddca9bbdc00 (diff) | |
login, register; Do not doule-nest row/col classes
| -rw-r--r-- | templates/login.html.ep | 58 | ||||
| -rw-r--r-- | templates/register.html.ep | 72 | 
2 files changed, 63 insertions, 67 deletions
| diff --git a/templates/login.html.ep b/templates/login.html.ep index 8c9ad7d..58ff0ed 100644 --- a/templates/login.html.ep +++ b/templates/login.html.ep @@ -73,35 +73,33 @@  		</div>  	</div>  % } -<div class="row"> -	%= form_for '/login' => (class => 'col s12', method => 'POST') => begin -		%= csrf_field -		% if (stash('redirect_to')) { -			%= hidden_field 'redirect_to' => stash('redirect_to') -		% } -		<div class="row"> -			<div class="input-field col s12"> -				<i class="material-icons prefix">account_circle</i> -				%= text_field 'user', id => 'user', class => 'validate', required => undef, maxlength => 60, autocomplete => 'username' -				<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> +%= form_for '/login' => (method => 'POST') => begin +	%= csrf_field +	% if (stash('redirect_to')) { +		%= hidden_field 'redirect_to' => stash('redirect_to') +	% } +	<div class="row"> +		<div class="input-field col s12"> +			<i class="material-icons prefix">account_circle</i> +			%= text_field 'user', id => 'user', class => 'validate', required => undef, maxlength => 60, autocomplete => 'username' +			<label for="user">Account</label>  		</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 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> -	%= 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 diff --git a/templates/register.html.ep b/templates/register.html.ep index 5dbd599..3ac733a 100644 --- a/templates/register.html.ep +++ b/templates/register.html.ep @@ -58,45 +58,43 @@  		</div>  	</div>  % } -<div class="row"> -	%= form_for '/register' => (class => 'col s12', method => 'POST') => begin -		%= csrf_field -		<div class="row"> -			<div class="input-field col l6 m12 s12"> -				<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' -				<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> +%= form_for '/register' => (method => 'POST') => begin +	%= csrf_field +	<div class="row"> +		<div class="input-field col l6 m12 s12"> +			<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' +			<label for="account">Name (alphanumerisch)</label>  		</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 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> -	%= end -</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 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="col s12">  		<p> | 
