mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-01 05:21:11 +00:00
mainly css improvements
This commit is contained in:
Thomas Citharel
parent
f2321633b9
commit
698eda739e
8 changed files with 54 additions and 32 deletions
|
|
@ -85,7 +85,7 @@ class Poche
|
|||
if ($email != "") { // if email is filled
|
||||
if (SEND_CONFIRMATION_EMAIL && function_exists('mail')) {
|
||||
|
||||
// if internal registration
|
||||
// if internal registration from config screen
|
||||
$body_internal = _('Hi,') . "\r\n\r\n" . sprintf(_('Someone just created a wallabag account for you on %1$s.'), Tools::getPocheUrl()) .
|
||||
"\r\n\r\n" . sprintf(_('Your login is %1$s.'), $newUsername) ."\r\n\r\n" .
|
||||
_('Note : The password has been chosen by the person who created your account. Get in touch with that person to know your password and change it as soon as possible') . "\r\n\r\n" .
|
||||
|
|
@ -96,6 +96,7 @@ class Poche
|
|||
$body = sprintf(_('Hi, %1$s'), $newUsername) . "\r\n\r\n" .
|
||||
sprintf(_('You\'ve just created a wallabag account on %1$s.'), Tools::getPocheUrl()) .
|
||||
"\r\n\r\n" . _("Have fun with it !");
|
||||
|
||||
$body = $internalRegistration ? $body_internal : $body;
|
||||
|
||||
$body = wordwrap($body, 70, "\r\n"); // cut lines with more than 70 caracters (MIME standard)
|
||||
|
|
@ -105,6 +106,7 @@ class Poche
|
|||
"From: " . $newUsername . "@" . gethostname() . "\r\n")) {
|
||||
Tools::logm('The user ' . $newUsername . ' has been emailed');
|
||||
$this->messages->add('i', sprintf(_('The new user %1$s has been sent an email at %2$s. You may have to check spam folder.'), $newUsername, $email));
|
||||
Tools::redirect('?');
|
||||
|
||||
} else {
|
||||
Tools::logm('A problem has been encountered while sending an email');
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
@define ('PDF', FALSE);
|
||||
|
||||
// registration
|
||||
@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
|
||||
@define ('SEND_CONFIRMATION_EMAIL', FALSE);
|
||||
@define ('ALLOW_REGISTER', TRUE);
|
||||
|
||||
// display or not print link in article view
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -369,8 +369,8 @@ msgstr "Mark all the entries as read"
|
|||
msgid "Return home"
|
||||
msgstr "Return home"
|
||||
|
||||
msgid "Back to top"
|
||||
msgstr "Back to top"
|
||||
msgid "back"
|
||||
msgstr "back"
|
||||
|
||||
msgid "Mark as read"
|
||||
msgstr "Mark as read"
|
||||
|
|
@ -435,6 +435,9 @@ msgstr "Save a Link"
|
|||
msgid "back to home"
|
||||
msgstr "Back to Home"
|
||||
|
||||
msgid "back to login"
|
||||
msgstr "back to login"
|
||||
|
||||
msgid "toggle mark as read"
|
||||
msgstr "Toggle mark as read"
|
||||
|
||||
|
|
@ -705,8 +708,12 @@ msgstr ""
|
|||
"The new user %1$s has been sent an email at %2$s. You may have to check spam "
|
||||
"folder."
|
||||
|
||||
msgid "A problem has been encountered while sending the confirmation email"
|
||||
msgstr "A problem has been encountered while sending an confirmation email"
|
||||
msgid ""
|
||||
"A problem has been encountered while sending the confirmation email, but the "
|
||||
"user was created."
|
||||
msgstr ""
|
||||
"A problem has been encountered while sending an confirmation email, but the "
|
||||
"user was created."
|
||||
|
||||
msgid "The server did not authorize sending a confirmation email"
|
||||
msgstr "The server did not authorize sending a confirmation email"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -67,6 +67,9 @@ msgstr "Se connecter"
|
|||
msgid "back to home"
|
||||
msgstr "retour à l'accueil"
|
||||
|
||||
msgid "back"
|
||||
msgstr "retour"
|
||||
|
||||
msgid "favorites"
|
||||
msgstr "favoris"
|
||||
|
||||
|
|
@ -357,6 +360,9 @@ msgstr "Tweet"
|
|||
msgid "Email"
|
||||
msgstr "E-mail"
|
||||
|
||||
msgid "Email (not required)"
|
||||
msgstr "E-mail (non requis)"
|
||||
|
||||
msgid "shaarli"
|
||||
msgstr "Shaarli"
|
||||
|
||||
|
|
@ -835,8 +841,12 @@ msgstr ""
|
|||
msgid "A problem has been encountered while sending the confirmation email"
|
||||
msgstr "Un problème a été rencontré lors de l'envoi de l'email de confirmation"
|
||||
|
||||
msgid "The server did not authorize sending a confirmation email"
|
||||
msgstr "Le serveur n'autorise pas l'envoi d'un email de confirmation"
|
||||
msgid ""
|
||||
"The server did not authorize sending a confirmation email, but the user was "
|
||||
"created."
|
||||
msgstr ""
|
||||
"Le serveur n'autorise pas l'envoi d'un email de confirmation, mais "
|
||||
"l'utilisateur a été créé."
|
||||
|
||||
msgid ""
|
||||
"The user was created, but no email was sent because email was not filled in"
|
||||
|
|
|
|||
|
|
@ -26,14 +26,14 @@
|
|||
<div class="row mts txtcenter">
|
||||
<button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
|
||||
</div>
|
||||
{% if constant('ALLOW_REGISTER') == 1 %}
|
||||
<div class="register">
|
||||
<a href="?registerform">{% trans "Register" %}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
</fieldset>
|
||||
<input type="hidden" name="returnurl" value="{{ referer }}">
|
||||
<input type="hidden" name="token" value="{{ token }}">
|
||||
</form>
|
||||
{% endif %}
|
||||
{% if constant('ALLOW_REGISTER') == 1 %}
|
||||
<div class="register">
|
||||
<a href="?registerform">{% trans "Register" %}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,28 @@
|
|||
{% extends "layout-login.twig" %}
|
||||
{% block content %}
|
||||
|
||||
<form method="post" action="?register">
|
||||
<h2>{% trans 'Add user' %}</h2>
|
||||
<form method="post" action="?register">
|
||||
<fieldset class="w500p">
|
||||
<div class="row">
|
||||
<label class="col w150p" for="newusername">{% trans 'Login' %}</label>
|
||||
<input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
|
||||
<input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label class="col w150p" for="newuseremail">{% trans 'Email' %}</label>
|
||||
<input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
|
||||
</div>
|
||||
<div class="row mts txtcenter">
|
||||
<button type="submit">{% trans "Register" %}</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
<fieldset class="w500p">
|
||||
<div class="row">
|
||||
<label class="col w150p" for="newusername">{% trans 'Login' %}</label>
|
||||
<input class="col" type="text" id="newusername" name="newusername" placeholder="{% trans 'Login' %}" required>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label class="col w150p" for="password4newuser">{% trans "Password" %}</label>
|
||||
<input class="col" type="password" id="password4newuser" name="password4newuser" placeholder="{% trans 'Password' %}" required>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label class="col w150p" for="newuseremail">{% trans 'Email (not required)' %}</label>
|
||||
<input class="col" type="email" id="newuseremail" name="newuseremail" placeholder="{% trans 'Email' %}">
|
||||
</div>
|
||||
<div class="row mts txtcenter">
|
||||
<button type="submit">{% trans "Register" %}</button>
|
||||
</div>
|
||||
<div class="register">
|
||||
<a href="?">{% trans "Back" %}</a>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
Loading…
Reference in a new issue