rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-04 13:14:06 +00:00
Code Issues Releases Wiki Activity

Merge branch 'Dname' into 'master'

Browse source 
Fix history et i18n

See merge request federez/re2o!207
This commit is contained in:
chirac 2018-07-29 20:16:42 +02:00
parent 12b6f74a13 4d93c6db6a
commit e5781f1416
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
machines/templates/machines/aff_dname.html
View file

@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endcomment %} {% endcomment %}
{% load acl %} {% load acl %}
{% load logs_extra %}
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@ -38,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% can_edit dname %} {% can_edit dname %}
{% include 'buttons/edit.html' with href='machines:edit-dname' id=dname.id %} {% include 'buttons/edit.html' with href='machines:edit-dname' id=dname.id %}
{% acl_end %} {% acl_end %}
{% include 'buttons/history.html' with href='machines:history' name='dname' id=dname.id %} {% history_button dname %}
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

1
machines/templates/machines/index_extension.html
View file

@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load bootstrap3 %} {% load bootstrap3 %}
{% load acl %} {% load acl %}
{% load i18n %}
{% block title %}Machines{% endblock %} {% block title %}Machines{% endblock %}