rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-26 06:32:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'frontend_fix_fa_footer' into 'dev'

Browse source 
Fix Font Awesome icons and footer

See merge request federez/re2o!315
This commit is contained in:
chirac 2018-09-28 14:20:00 +02:00
commit bbf77adda4
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cotisations/templates/cotisations/aff_cotisations.html
View file

@ -78,7 +78,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td> <td>
{% if facture.valid %} {% if facture.valid %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:facture-pdf' facture.id %}"> <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:facture-pdf' facture.id %}">
<i class="fa fa-file-pdf"></i> {% trans "PDF" %} <i class="fa fa-file-pdf-o"></i> {% trans "PDF" %}
</a> </a>
{% else %} {% else %}
<i class="text-danger">{% trans "Invalidated invoice" %}</i> <i class="text-danger">{% trans "Invalidated invoice" %}</i>

2
cotisations/templates/cotisations/aff_custom_invoice.html
View file

@ -76,7 +76,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% acl_end %} {% acl_end %}
{% history_button invoice %} {% history_button invoice %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:custom-invoice-pdf' invoice.id %}"> <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:custom-invoice-pdf' invoice.id %}">
<i class="fa fa-file-pdf"></i> {% trans "PDF" %} <i class="fa fa-file-pdf-o"></i> {% trans "PDF" %}
</a> </a>
</td> </td>
</tr> </tr>

2
machines/templates/machines/aff_machines.html
View file

@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td colspan="4"> <td colspan="4">
{% trans "No name" as tr_no_name %} {% trans "No name" as tr_no_name %}
{% trans "View the profile" as tr_view_the_profile %} {% trans "View the profile" as tr_view_the_profile %}
<b>{{ machine.name|default:'<i>tr_no_name</i>' }}</b> <i class="fa-angle-right"></i> <b>{{ machine.name|default:'<i>tr_no_name</i>' }}</b> <i class="fa fa-angle-right"></i>
<a href="{% url 'users:profil' userid=machine.user.id %}" title=tr_view_the_profile> <a href="{% url 'users:profil' userid=machine.user.id %}" title=tr_view_the_profile>
<i class="fa fa-user"></i> {{ machine.user }} <i class="fa fa-user"></i> {{ machine.user }}
</a> </a>

10
static/css/base.css
View file

@ -12,10 +12,10 @@ footer p {
.navbar { margin-bottom: 0; } .navbar { margin-bottom: 0; }
.pt4 { padding-top: 1.5rem!important; } .pt4 { padding-top: 1.5rem!important; }
/* Reserv space for icons and align */ /* Reserve space for icons and align */
a > i.fa { a > i.fa {
display: inline-block; display: inline-block;
width: 26px; width: 16px;
text-align: center; text-align: center;
} }
@ -64,10 +64,9 @@ a > i.fa {
} }
} }
/* Set height of the grid so .sidenav can be 100% (adjust as needed) */ /* Set height of the grid so footer stay on footer */
.row.content { .row.content {
height: 100%; min-height: 70vh;
overflow: auto;
} }
/* Set gray background color */ /* Set gray background color */
@ -111,6 +110,7 @@ a > i.fa {
.modal-dialog { .modal-dialog {
width: 1000px width: 1000px
} }
}
/* For tables with long text in cells */ /* For tables with long text in cells */

2
templates/base.html
View file

@ -223,7 +223,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a> </a>
</div> </div>
{% else %} {% else %}
<div class="panel-body">
<p>{% trans "You are not logged in." %}</p> <p>{% trans "You are not logged in." %}</p>
</div>
{% endif %} {% endif %}
</div> </div>
{% if request_user.is_authenticated %} {% if request_user.is_authenticated %}

5
templates/registration/login.html
View file

@ -32,8 +32,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<form method="post" action="{% url 'login' %}"> <form method="post" action="{% url 'login' %}">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
<button class="btn btn-success" type="submit"><span <button class="btn btn-success" type="submit">
class="glyphicon glyphicon-log-in"></span> {% trans "Log in" %}</button> <i class="fa fa-sign-in"></i> {% trans "Log in" %}
</button>
</form> </form>
<p><a class="btn btn-warning btn-sm" role="button" <p><a class="btn btn-warning btn-sm" role="button"
href="{% url 'users:reset-password' %}"> {% trans "Forgotten password?" %}</a></p> href="{% url 'users:reset-password' %}"> {% trans "Forgotten password?" %}</a></p>