globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Various UI mobile fix

Browse source
This commit is contained in:
Éloi Rivard 2021-07-01 09:55:40 +02:00
parent e090723b46
commit 00386ef482
4 changed files with 49 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
canaille/templates/forgotten-password.html
View file

@ -33,6 +33,9 @@
{{ form.hidden_tag() if form.hidden_tag }} {{ form.hidden_tag() if form.hidden_tag }}
{{ sui.render_field(form.login, icon="user") }} {{ sui.render_field(form.login, icon="user") }}
<div class="ui right aligned container">
<div class="ui stackable buttons">
<a type="button" class="ui right floated button" href="{{ url_for('account.login') }}">{{ _("Login page") }}</a>
<button type="submit" class="ui right floated {% if request.method != "POST" or form.errors %}primary {% endif %}button"> <button type="submit" class="ui right floated {% if request.method != "POST" or form.errors %}primary {% endif %}button">
{% if request.method == "POST" %} {% if request.method == "POST" %}
{{ _("Send again") }} {{ _("Send again") }}
@ -40,7 +43,8 @@
{{ _("Send") }} {{ _("Send") }}
{% endif %} {% endif %}
</button> </button>
<a type="button" class="ui right floated button" href="{{ url_for('account.login') }}">{{ _("Login page") }}</a> </div>
</div>
</form> </form>
</div> </div>
</div> </div>

6
canaille/templates/login.html
View file

@ -34,8 +34,12 @@
{{ sui.render_field(form.password, icon="lock") }} {{ sui.render_field(form.password, icon="lock") }}
{% endif %} {% endif %}
<button type="submit" class="ui right floated primary button">{{ _("Continue") }}</button> <div class="ui right aligned container">
<div class="ui stackable buttons">
<a type="button" class="ui right floated button" href="{{ url_for('account.forgotten') }}">{{ _("Forgotten password") }}</a> <a type="button" class="ui right floated button" href="{{ url_for('account.forgotten') }}">{{ _("Forgotten password") }}</a>
<button type="submit" class="ui right floated primary button">{{ _("Continue") }}</button>
</div>
</div>
</form> </form>
</div> </div>
{% endblock %} {% endblock %}

8
canaille/templates/password.html
View file

@ -31,9 +31,13 @@
{{ form.hidden_tag() if form.hidden_tag }} {{ form.hidden_tag() if form.hidden_tag }}
{{ sui.render_field(form.password, icon="lock") }} {{ sui.render_field(form.password, icon="lock") }}
<button type="submit" class="ui right floated primary button">{{ _("Sign in") }}</button> <div class="ui right aligned container">
<a type="button" class="ui right floated button" href="{{ url_for('account.forgotten') }}">{{ _("Forgotten password") }}</a> <div class="ui stackable buttons">
<a type="button" class="ui right floated button" href="{{ url_for('account.login') }}">{{ _("I am not %(username)s", username=username) }}</a> <a type="button" class="ui right floated button" href="{{ url_for('account.login') }}">{{ _("I am not %(username)s", username=username) }}</a>
<a type="button" class="ui right floated button" href="{{ url_for('account.forgotten') }}">{{ _("Forgotten password") }}</a>
<button type="submit" class="ui right floated primary button">{{ _("Sign in") }}</button>
</div>
</div>
</form> </form>
</div> </div>
{% endblock %} {% endblock %}

23
canaille/templates/profile.html
View file

@ -153,14 +153,8 @@
{% endif %} {% endif %}
<button type="submit" class="ui right floated primary button" name="action" value="edit" id="edit"> <div class="ui right aligned container">
{{ _("Submit") }} <div class="ui stackable buttons">
</button>
{% if user.admin and edited_user and user.uid != edited_user.uid %}
<a href="{{ url_for('account.impersonate', username=edited_user.uid[0]) }}" class="ui right floated basic button" name="action" value="impersonate" id="impersonate">
{{ _("Impersonate") }}
</a>
{% endif %}
{% if user.moderator and edited_user or self_deletion %} {% if user.moderator and edited_user or self_deletion %}
<button type="submit" class="ui right floated basic negative button confirm" name="action" value="delete" id="delete"> <button type="submit" class="ui right floated basic negative button confirm" name="action" value="delete" id="delete">
{% if user.uid != edited_user.uid %} {% if user.uid != edited_user.uid %}
@ -170,6 +164,19 @@
{% endif %} {% endif %}
</button> </button>
{% endif %} {% endif %}
{% if user.admin and edited_user and user.uid != edited_user.uid %}
<a href="{{ url_for('account.impersonate', username=edited_user.uid[0]) }}" class="ui right floated basic button" name="action" value="impersonate" id="impersonate">
{{ _("Impersonate") }}
</a>
{% endif %}
<button type="submit" class="ui right floated primary button" name="action" value="edit" id="edit">
{{ _("Submit") }}
</button>
</div>
</div>
</form> </form>
</div> </div>
{% endblock %} {% endblock %}