Permalink
Browse files

new appskel

  • Loading branch information...
1 parent 889f188 commit ce11ceba6983a31890d1751368db5e7bc8bf4a97 @fiorix committed Dec 19, 2012
@@ -199,3 +199,9 @@ msgstr "Confirmación de registro"
msgid "Password reset"
msgstr "Nueva contraseña"
+
+msgid "Old password"
+msgstr "Contraseña anterior"
+
+msgid "This field is mandatory"
+msgstr "Este campo es obligatorio"
@@ -199,3 +199,9 @@ msgstr "Confirmação de registro"
msgid "Password reset"
msgstr "Nova senha"
+
+msgid "Old password"
+msgstr "Senha antiga"
+
+msgid "This field is mandatory"
+msgstr "Este campo é obrigatório"
@@ -4,7 +4,7 @@
body {
padding-top: 60px;
}
- .form-account {
+ .form-custom {
max-width: 300px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
@@ -17,12 +17,12 @@
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
box-shadow: 0 1px 2px rgba(0,0,0,.05);
}
- .form-account .form-account-heading,
- .form-account .checkbox {
+ .form-custom .form-custom-heading,
+ .form-custom .checkbox {
margin-bottom: 10px;
}
- .form-account input[type="text"],
- .form-account input[type="password"] {
+ .form-custom input[type="text"],
+ .form-custom input[type="password"] {
font-size: 16px;
height: auto;
margin-bottom: 15px;
@@ -32,26 +32,32 @@
{% end %}
{% block page %}
-<form class="form-account" method="post">
- <h2 class="form-account-heading">{{_("Account settings")}}</h2>
+<form class="form-custom" method="post">
+ <h2 class="form-custom-heading">{{_("Account settings")}}</h2>
<label>{{_("Name")}}</label>
- <input type="text" class="input-block-level" placeholder="{{_('Full name')}}" name="full_name" id="full_name" value="{% if fields.full_name %}{{fields.full_name}}{% end %}">
+ <input type="text" class="input-block-level" placeholder="{{_('Full name')}}" name="full_name" id="full_name" value="{{fields.full_name or ''}}">
+ {% if fields.err and "invalid_name" in fields.err %}
+ <div class="alert alert-error">{{_("Invalid name")}}<a class="close" data-dismiss="alert">×</a></div>
+ {% end %}
+
<label>{{_("Password")}}</label>
+ <input type="password" class="input-block-level" placeholder="{{_('Old password')}}" name="passwd_0">
+ {% if fields.err and "old_nomatch" in fields.err %}
+ <div class="alert alert-error">{{_("Invalid password")}}<a class="close" data-dismiss="alert">×</a></div>
+ {% elif fields.err and "old_missing" in fields.err %}
+ <div class="alert alert-error">{{_("This field is mandatory")}}<a class="close" data-dismiss="alert">×</a></div>
+ {% end %}
+
<input type="password" class="input-block-level" placeholder="{{_('New password')}}" name="passwd_1">
<input type="password" class="input-block-level" placeholder="{{_('Confirm')}}" name="passwd_2">
- {% if fields.err %}
- <div class="alert alert-error">
- {% if "invalid_name" in fields.err %}
- {{_("Invalid name")}}
- {% elif "invalid_passwd" in fields.err %}
- {{_("Invalid password")}}
- {% elif "nomatch" in fields.err %}
- {{_("Passwords don't match")}}
- {% end %}
- <a class="close" data-dismiss="alert">×</a></div>
+ {% if fields.err and "invalid_passwd" in fields.err %}
+ <div class="alert alert-error">{{_("Invalid password")}}<a class="close" data-dismiss="alert">×</a></div>
+ {% elif fields.err and "nomatch" in fields.err %}
+ <div class="alert alert-error">{{_("Passwords don't match")}}<a class="close" data-dismiss="alert">×</a></div>
{% elif fields.updated %}
- <div class="alert alert-success">{{_("Saved!")}}<a class="close" data-dismiss="alert">×</a></div>
+ <div class="alert alert-success">{{_("Saved!")}}<a class="close" data-dismiss="alert">×</a></div>
{% end %}
+
<button class="btn btn-large btn-primary" type="submit">{{_("Update")}}</button>
</form>
@@ -14,7 +14,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
- <a class="brand" href="/">$project</a>
+ <a class="brand" href="/">$modname</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="{% block dashboard_menu %}{% end %}"><a href="/dashboard">{{_("Dashboard")}}</a></li>
@@ -23,7 +23,7 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{handler.current_user["email"]}}<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="account">{{_("Account")}}</a></li>
+ <li><a href="/account">{{_("Account")}}</a></li>
<li class="dropdown-submenu">
<a tabindex="-1" href="#">{{_("Language")}}</a>
<ul class="dropdown-menu">
@@ -33,7 +33,7 @@
</ul>
</li>
<li class="divider"></li>
- <li><a href="signout">{{_("Sign out")}}</a></li>
+ <li><a href="/signout">{{_("Sign out")}}</a></li>
</ul>
</li>
</ul>
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>{% block title %}$project{% end %}</title>
+ <title>{% block title %}$modname{% end %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
@@ -55,7 +55,7 @@
<li class="active"><a href="/">{{_("Home")}}</a></li>
<li><a href="/signin">{{_("Sign in")}}</a></li>
</ul>
- <h3 class="muted">$project</h3>
+ <h3 class="muted">$modname</h3>
</div>
<hr>
@@ -7,7 +7,7 @@
background-color: #f5f5f5;
}
- .form-passwd {
+ .form-custom {
max-width: 300px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
@@ -20,12 +20,12 @@
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
box-shadow: 0 1px 2px rgba(0,0,0,.05);
}
- .form-passwd .form-passwd-heading,
- .form-passwd .checkbox {
+ .form-custom .form-custom-heading,
+ .form-custom .checkbox {
margin-bottom: 10px;
}
- .form-passwd input[type="text"],
- .form-passwd input[type="password"] {
+ .form-custom input[type="text"],
+ .form-custom input[type="password"] {
font-size: 16px;
height: auto;
margin-bottom: 15px;
@@ -54,24 +54,22 @@
<li><a href="/">{{_("Home")}}</a></li>
<li><a href="/signin">{{_("Sign in")}}</a></li>
</ul>
- <h3 class="muted">$project</h3>
+ <h3 class="muted">$modname</h3>
</div>
<hr>
-<form class="form-passwd" method="post">
- <h2 class="form-passwd-heading">{{_("Reset password")}}</h2>
- <input type="text" class="input-block-level" placeholder="{{_('Email address')}}" name="email" id="email" value="{% if fields.email %}{{fields.email}}{% end %}">
- {% if fields.err %}
- <div class="alert alert-error">
- {% if "email" in fields.err %}
- {{_("Invalid email address")}}
- {% elif "notfound" in fields.err %}
- {{_("Email address not registered")}}
- {% elif "send" in fields.err %}
- {{_("Please try again later")}}
- {% end %}
- <a class="close" data-dismiss="alert">×</a></div>
+<form class="form-custom" method="post">
+ <h2 class="form-custom-heading">{{_("Reset password")}}</h2>
+ <input type="text" class="input-block-level" placeholder="{{_('Email address')}}" name="email" id="email" value="{{fields.email or ''}}">
+ {% if fields.err and "email" in fields.err %}
+ <div class="alert alert-error">{{_("Invalid email address")}}<a class="close" data-dismiss="alert">×</a></div>
+ {% elif fields.err and "notfound" in fields.err %}
+ <div class="alert alert-error">{{_("Email address not registered")}}<a class="close" data-dismiss="alert">×</a></div>
+ {% elif fields.err and "pending" in fields.err %}
+ <div class="alert alert-error">{{_("This account is pending confirmation")}}<a class="close" data-dismiss="alert">×</a></div>
+ {% elif fields.err and "send" in fields.err %}
+ <div class="alert alert-error">{{_("Please try again later")}}<a class="close" data-dismiss="alert">×</a></div>
{% end %}
<button class="btn btn-large btn-primary" type="submit">{{_("Send")}}</button>
</form>
@@ -1 +1 @@
-$project: {{_("Password reset")}}
+$modname: {{_("Password reset")}}
@@ -37,15 +37,15 @@
<li><a href="/">{{_("Home")}}</a></li>
<li><a href="/signin">{{_("Sign in")}}</a></li>
</ul>
- <h3 class="muted">$project</h3>
+ <h3 class="muted">$modname</h3>
</div>
<hr>
<div class="jumbotron">
<h1>Done!</h1>
<p class="lead">{{_("A confirmation email has been sent to <b>%s</b> with instructions.") % email}}</p>
- <a class="btn btn-large btn-success" href="signin">Sign in</a>
+ <a class="btn btn-large btn-success" href="/signin">Sign in</a>
</div>
<hr>
@@ -7,7 +7,7 @@
background-color: #f5f5f5;
}
- .form-signin {
+ .form-custom {
max-width: 300px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
@@ -20,12 +20,12 @@
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
box-shadow: 0 1px 2px rgba(0,0,0,.05);
}
- .form-signin .form-signin-heading,
- .form-signin .checkbox {
+ .form-custom .form-custom-heading,
+ .form-custom .checkbox {
margin-bottom: 10px;
}
- .form-signin input[type="text"],
- .form-signin input[type="password"] {
+ .form-custom input[type="text"],
+ .form-custom input[type="password"] {
font-size: 16px;
height: auto;
margin-bottom: 15px;
@@ -54,14 +54,14 @@
<li><a href="/">{{_("Home")}}</a></li>
<li class="active"><a href="/signin">{{_("Sign in")}}</a></li>
</ul>
- <h3 class="muted">$project</h3>
+ <h3 class="muted">$modname</h3>
</div>
<hr>
-<form class="form-signin" method="post">
- <h2 class="form-signin-heading">{{_("Sign in")}}</h2>
- <input type="text" class="input-block-level" placeholder="{{_('Email address')}}" name="email" id="email" value="{% if fields.email %}{{fields.email}}{% end %}">
+<form class="form-custom" method="post">
+ <h2 class="form-custom-heading">{{_("Sign in")}}</h2>
+ <input type="text" class="input-block-level" placeholder="{{_('Email address')}}" name="email" id="email" value="{{fields.email or ''}}">
<input type="password" class="input-block-level" placeholder="{{_('Password')}}" name="passwd">
{% if fields.err and "auth" in fields.err %}
<div class="alert alert-error">{{_("Invalid email or password")}}<a class="close" data-dismiss="alert">×</a></div>
@@ -7,7 +7,7 @@
background-color: #f5f5f5;
}
- .form-signup {
+ .form-custom {
max-width: 300px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
@@ -20,12 +20,12 @@
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
box-shadow: 0 1px 2px rgba(0,0,0,.05);
}
- .form-signup .form-signup-heading,
- .form-signup .checkbox {
+ .form-custom .form-custom-heading,
+ .form-custom .checkbox {
margin-bottom: 10px;
}
- .form-signup input[type="text"],
- .form-signup input[type="password"] {
+ .form-custom input[type="text"],
+ .form-custom input[type="password"] {
font-size: 16px;
height: auto;
margin-bottom: 15px;
@@ -54,14 +54,14 @@
<li><a href="/">{{_("Home")}}</a></li>
<li><a href="/signin">{{_("Sign in")}}</a></li>
</ul>
- <h3 class="muted">$project</h3>
+ <h3 class="muted">$modname</h3>
</div>
<hr>
-<form class="form-signup" method="post">
- <h2 class="form-signup-heading">{{_("Sign up")}}</h2>
- <input type="text" class="input-block-level" placeholder="{{_('Email address')}}" name="email" id="email" value="{% if fields.email %}{{fields.email}}{% end %}">
+<form class="form-custom" method="post">
+ <h2 class="form-custom-heading">{{_("Sign up")}}</h2>
+ <input type="text" class="input-block-level" placeholder="{{_('Email address')}}" name="email" id="email" value="{{fields.email or ''}}">
{% if fields.err and "legal" not in fields.err %}
<div class="alert alert-error">
{% if "email" in fields.err %}
@@ -1 +1 @@
-$project: {{_("Sign up confirmation")}}
+$modname: {{_("Sign up confirmation")}}
@@ -37,15 +37,15 @@
<li><a href="/">{{_("Home")}}</a></li>
<li><a href="/signin">{{_("Sign in")}}</a></li>
</ul>
- <h3 class="muted">$project</h3>
+ <h3 class="muted">$modname</h3>
</div>
<hr>
<div class="jumbotron">
<h1>Thank you!</h1>
<p class="lead">{{_("A confirmation email has been sent to <b>%s</b> with instructions.") % email}}</p>
- <a class="btn btn-large btn-success" href="signin">Sign in</a>
+ <a class="btn btn-large btn-success" href="/signin">Sign in</a>
</div>
<hr>
@@ -2,7 +2,7 @@
debug = true
xheaders = false
xsrf_cookies = false
-cookie_secret = lKv9iRIqRIGKLyYV0fhYfUhNIRTXDEJ/mpFSEJdNJZA=
+cookie_secret = $cookie_secret
[frontend]
locale_path = frontend/locale
Oops, something went wrong.

0 comments on commit ce11ceb

Please sign in to comment.