Verified Commit 93db3fbb authored by erdnaxe's avatar erdnaxe 🎇

Remove Bootstrap in templates when unnecessary

parent 4ceee5e6
Pipeline #1144 passed with stage
in 2 minutes and 55 seconds
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Invoices" %}{% endblock %}
......@@ -32,4 +31,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h2>{% trans "Subscriptions" %}</h2>
{% include 'cotisations/aff_cotisations.html' with facture_list=facture_list %}
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -41,4 +40,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
{% include 'cotisations/aff_article.html' with article_list=article_list %}
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -41,4 +40,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
{% include 'cotisations/aff_banque.html' with banque_list=banque_list %}
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -41,4 +40,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
{% include 'cotisations/aff_paiement.html' with paiement_list=paiement_list %}
{% endblock %}
......@@ -23,21 +23,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Deletion of actions" %}{% endblock %}
{% block content %}
<form class="form" method="post">
{% csrf_token %}
<h4>{% blocktrans %}Warning: are you sure you want to delete this action {{ objet_name }} ( {{ objet }} )?{% endblocktrans %}</h4>
{% trans "Confirm" as tr_confirm %}
{% bootstrap_button tr_confirm button_type="submit" icon="trash" %}
<button class="btn btn-default btn-danger" type="submit">
<span class="glyphicon glyphicon-trash"></span> {% trans "Confirm" %}
</button>
</form>
<br />
<br />
<br />
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{%trans "Statistics" %}{% endblock %}
{% block title %}{% trans "Statistics" %}{% endblock %}
{% block content %}
<h2>{% trans "Actions performed" %}</h2>
{% include 'logs/aff_summary.html' with versions_list=versions_list %}
<br />
<br />
<br />
<h2>{% trans "Actions performed" %}</h2>
{% include 'logs/aff_summary.html' with versions_list=versions_list %}
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Statistics" %}{% endblock %}
{% block content %}
<h2>{% trans "General statistics" %}</h2>
{% include 'logs/aff_stats_general.html' with stats_list=stats_list %}
<br />
<br />
<br />
<h2>{% trans "General statistics" %}</h2>
{% include 'logs/aff_stats_general.html' with stats_list=stats_list %}
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Statistics" %}{% endblock %}
{% block content %}
<h2>{% trans "Actions performed" %}</h2>
{% include 'logs/aff_stats_logs.html' with revisions_list=revisions_list %}
<br />
<br />
<br />
<h2>{% trans "Actions performed" %}</h2>
{% include 'logs/aff_stats_logs.html' with revisions_list=revisions_list %}
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Statistics" %}{% endblock %}
{% block content %}
<h2>{% trans "Database statistics" %}</h2>
{% include 'logs/aff_stats_models.html' with stats_list=stats_list %}
<br />
<br />
<br />
<h2>{% trans "Database statistics" %}</h2>
{% include 'logs/aff_stats_models.html' with stats_list=stats_list %}
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Statistics" %}{% endblock %}
{% block content %}
<h2>{% trans "Statistics about users" %}</h2>
{% include 'logs/aff_stats_users.html' with stats_list=stats_list %}
<br />
<br />
<br />
<h2>{% trans "Statistics about users" %}</h2>
{% include 'logs/aff_stats_users.html' with stats_list=stats_list %}
{% endblock %}
......@@ -23,20 +23,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Deletion of machines" %}{% endblock %}
{% block content %}
<form class="form" method="post">
{% csrf_token %}
<h4>{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }} )?{% endblocktrans %}</h4>
{% trans "Confirm" as tr_confirm %}
{% bootstrap_button tr_confirm button_type="submit" icon='trash' button_class='btn-danger' %}
<button class="btn btn-default btn-danger" type="submit">
<span class="glyphicon glyphicon-trash"></span> {% trans "Confirm" %}
</button>
</form>
<br/>
<br/>
<br/>
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Machines" %}{% endblock %}
......@@ -31,7 +30,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %}
<h2>{% trans "Machines" %}</h2>
{% include 'machines/aff_machines.html' with machines_list=machines_list %}
<br/>
<br/>
<br/>
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Machines" %}{% endblock %}
......@@ -35,7 +34,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<a class="btn btn-danger btn-sm" role="button" href="{% url 'machines:del-alias' interface_id %}"><i
class="fa fa-trash"></i>{% trans " Delete one or several aliases" %}</a>
{% include 'machines/aff_alias.html' with alias_list=alias_list %}
<br/>
<br/>
<br/>
{% endblock %}
......@@ -23,8 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
{% block title %}{% trans "Machines" %}{% endblock %}
......
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -37,7 +36,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
{% acl_end %}
{% include 'machines/aff_ipv6.html' with ipv6_list=ipv6_list %}
<br/>
<br/>
<br/>
{% endblock %}
......@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......
......@@ -46,4 +46,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a>
{% acl_end %}
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load design %}
{% load i18n %}
......
......@@ -33,8 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if preferenceform %}
{% bootstrap_form_errors preferenceform %}
{% endif %}
<form class="form" method="post" enctype="multipart/form-data">
{% csrf_token %}
{% if preferenceform %}
......@@ -42,8 +40,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %}
{% bootstrap_button action_name button_type="submit" icon='ok' button_class='btn-success' %}
</form>
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "About Re2o" %}{% endblock %}
......@@ -84,7 +83,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endfor %}
</ul>
</div>
</div>
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load staticfiles %}
{% load i18n %}
......
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Search results" %}{% endblock %}
......@@ -70,8 +69,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% else %}
<h6>{% blocktrans %}(Only the first {{ max_result }} results are displayed in each category){% endblocktrans %}</h6>
{% endif %}
<br />
<br />
<br />
{% endblock %}
......@@ -48,10 +48,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Search" as tr_search %}
{% bootstrap_button tr_search button_type="submit" icon="search" %}
</form>
<br />
<br />
<br />
<br />
<br />
{% endblock %}
......@@ -35,4 +35,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Advanced search" %}
</a>
{% endblock %}
......@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-15 09:06+0200\n"
"POT-Creation-Date: 2019-04-18 22:55+0200\n"
"PO-Revision-Date: 2018-03-31 16:09+0002\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
......@@ -70,10 +70,9 @@ msgstr ""
"licenses/gpl-2.0.txt\" target=\"_blank\" rel=\"nofollow\">GPLv2</a>."
#: templates/admin/custom_index.html:11
#, fuzzy, python-format
#| msgid "Welcome to %(site_title)s"
#, python-format
msgid "Welcome to %(name_website)s"
msgstr "Bienvenue sur %(site_title)s"
msgstr "Bienvenue sur %(name_website)s"
#: templates/admin/custom_index.html:17
msgid ""
......
......@@ -167,10 +167,8 @@ msgid "switch constructor"
msgstr "constructeur de commutateur réseau"
#: topologie/models.py:449
#, fuzzy
#| msgid "switch constructor"
msgid "switch constructors"
msgstr "constructeur de commutateur réseau"
msgstr "constructeurs de commutateur réseau"
#: topologie/models.py:470
msgid "switch bay"
......
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -69,9 +68,4 @@ function toggle_graph() {
<hr>
{% acl_end %}
{% include 'topologie/aff_switch.html' with switch_list=switch_list %}
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -36,8 +35,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<hr>
{% acl_end %}
{% include 'topologie/aff_ap.html' with ap_list=ap_list %}
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -36,8 +35,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<hr>
{% acl_end %}
{% include 'topologie/aff_modules.html' with module_list=module_list modular_switchs=modular_switchs %}
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -54,8 +53,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<hr>
{% include 'topologie/aff_repr_switch.html' with port_list=port_list %}
{% include 'topologie/aff_port.html' with port_list=port_list %}
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -47,4 +46,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% acl_end %}
{% include 'topologie/aff_switch_bay.html' with switch_bay_list=switch_bay_list %}
{% endblock %}
......@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......
......@@ -51,4 +51,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Switch models and constructors" %}
</a>
{% endblock %}
......@@ -40,8 +40,5 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% massive_bootstrap_form topoform 'room,related,machine_interface,members,vlan_tagged,switch' %}
{% bootstrap_button action_name icon='ok' button_class='btn-success' %}
</form>
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Deletion of users" %}{% endblock %}
......@@ -33,11 +32,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<form class="form" method="post">
{% csrf_token %}
<h4>{% blocktrans %}Warning: are you sure you want to delete this {{ objet_name }} object ( {{ objet }} )?{% endblocktrans %}</h4>
{% trans "Confirm" as tr_confirm %}
{% bootstrap_button tr_confirm button_type="submit" icon="trash" button_class='btn-danger' %}
<button class="btn btn-default btn-danger" type="submit">
<span class="glyphicon glyphicon-trash"></span> {% trans "Confirm" %}
</button>
</form>
<br />
<br />
<br />
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Users" %}{% endblock %}
{% block content %}
<h2>{% trans "Users" %}</h2>
{% include 'users/aff_users.html' with users_list=users_list %}
<br />
<br />
<br />
<h2>{% trans "Users" %}</h2>
{% include 'users/aff_users.html' with users_list=users_list %}
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Users" %}{% endblock %}
{% block content %}
<h2>{% trans "Bans" %}</h2>
{% include 'users/aff_bans.html' with ban_list=ban_list %}
<br />
<br />
<br />
<h2>{% trans "Bans" %}</h2>
{% include 'users/aff_bans.html' with ban_list=ban_list %}
{% endblock %}
......@@ -23,16 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Users" %}{% endblock %}
{% block content %}
<h2>{% trans "Clubs" %}</h2>
{% include 'users/aff_clubs.html' with clubs_list=clubs_list %}
<br />
<br />
<br />
<h2>{% trans "Clubs" %}</h2>
{% include 'users/aff_clubs.html' with clubs_list=clubs_list %}
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Users" %}{% endblock %}
......@@ -32,4 +31,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h2>{% trans "Local email accounts" %}</h2>
{% include 'users/aff_emailaddress.html' with emailaddress_list=emailaddress_list %}
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -39,4 +38,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<br />
{% include 'users/aff_listright.html' %}
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load i18n %}
{% block title %}{% trans "Users" %}{% endblock %}
......@@ -31,8 +30,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %}
<h2>{% trans "Rights" %}</h2>
{% include 'users/aff_rights.html' %}
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load acl %}
{% load i18n %}
......@@ -36,8 +35,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:new-serviceuser' %}"><i class="fa fa-plus"></i>{% trans " Add a service user" %}</a>
{% acl_end %}
{% include 'users/aff_serviceusers.html' with serviceusers_list=serviceusers_list %}
<br />
<br />
<br />
{% endblock %}
......@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
{% endcomment %}
{% load bootstrap3 %}
{% load massive_bootstrap_form %}
{% load static %}
{% load i18n %}
......@@ -31,12 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Users" %}{% endblock %}
{% block content %}
<h3>{% trans "Your machine and your room were successfully registered. Please disconnect and reconnect your Ethernet cable to benefit from a wired connection." %}</h3>