Skip to content

M
memopol
Commit 68113a46 authored by Nicolas Joyard's avatar Nicolas Joyard
Browse files
Options

Switch all icons to fontawesome

parent 5b49001f
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 117 deletions
bin/install_client_deps.sh
View file @ 68113a46
......@@ -37,7 +37,6 @@ set -e
mkdir -p ${DEST}
downloadFromGithub jquery jquery/jquery 2.1.4
downloadFromGithub fontawesome FortAwesome/Font-Awesome v4.3.0
downloadFromGithub flag-icon-css lipis/flag-icon-css 0.7.1
echo "* Done."
memopol/settings.py
View file @ 68113a46
......@@ -85,6 +85,7 @@ INSTALLED_APPS = (
'bootstrap3',
'datetimewidget',
'django_filters',
'fontawesome',
'rest_framework',
'taggit',
# ---
......
memopol/tests/response_fixtures/DossierListTest.test_cards.content
View file @ 68113a46
......@@ -11,21 +11,21 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Proposals">
<span class="glyphicon glyphicon-pencil"></span>
<i class="fa fa-pencil" title=""></i>
<span class="badge">45</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Recommendations">
<span class="glyphicon glyphicon-eye-open"></span>
<i class="fa fa-eye" title=""></i>
<span class="badge">45</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......@@ -65,21 +65,21 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Proposals">
<span class="glyphicon glyphicon-pencil"></span>
<i class="fa fa-pencil" title=""></i>
<span class="badge">13</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Recommendations">
<span class="glyphicon glyphicon-eye-open"></span>
<i class="fa fa-eye" title=""></i>
<span class="badge">11</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......@@ -119,21 +119,21 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Proposals">
<span class="glyphicon glyphicon-pencil"></span>
<i class="fa fa-pencil" title=""></i>
<span class="badge">2</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Recommendations">
<span class="glyphicon glyphicon-eye-open"></span>
<i class="fa fa-eye" title=""></i>
<span class="badge">2</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">2</span>
</span>
......@@ -175,21 +175,21 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Proposals">
<span class="glyphicon glyphicon-pencil"></span>
<i class="fa fa-pencil" title=""></i>
<span class="badge">2</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Recommendations">
<span class="glyphicon glyphicon-eye-open"></span>
<i class="fa fa-eye" title=""></i>
<span class="badge">2</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">2</span>
</span>
......@@ -231,21 +231,21 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Proposals">
<span class="glyphicon glyphicon-pencil"></span>
<i class="fa fa-pencil" title=""></i>
<span class="badge">1</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Recommendations">
<span class="glyphicon glyphicon-eye-open"></span>
<i class="fa fa-eye" title=""></i>
<span class="badge">1</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">2</span>
</span>
......@@ -291,7 +291,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......@@ -335,7 +335,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......@@ -379,7 +379,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......@@ -421,7 +421,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......@@ -463,7 +463,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......@@ -501,7 +501,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Proposals">
<span class="glyphicon glyphicon-pencil"></span>
<i class="fa fa-pencil" title=""></i>
<span class="badge">1</span>
</span>
......@@ -510,7 +510,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Documents">
<span class="glyphicon glyphicon-file"></span>
<i class="fa fa-file" title=""></i>
<span class="badge">1</span>
</span>
......
memopol/tests/response_fixtures/DossierRecommendationsTest.test_proposals.content
View file @ 68113a46
......@@ -13,7 +13,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
100.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - CMP"><span class="glyphicon glyphicon-info-sign"></span></a>
100.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - CMP"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -42,7 +42,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 108(rect) et 109(rect)"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 108(rect) et 109(rect)"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -71,7 +71,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 10 et 90"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 10 et 90"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -100,7 +100,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 30"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 30"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -129,7 +129,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 52"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 52"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -158,7 +158,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 7 et 88"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 7 et 88"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -187,7 +187,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 83"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 83"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -216,7 +216,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 8 et 89"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 8 et 89"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -245,7 +245,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 92"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 92"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -274,7 +274,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation État d'Urgence - Amdt 97"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation État d'Urgence - Amdt 97"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -303,7 +303,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
5.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Renvoi en comission"><span class="glyphicon glyphicon-info-sign"></span></a>
5.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Renvoi en comission"><i class="fa fa-info-circle" title=""></i></a>
</td>
......
memopol/tests/response_fixtures/RepresentativeDetailTest.test_details.content
View file @ 68113a46
......@@ -30,20 +30,20 @@
<a class="label label-primary" href="http://www2.assemblee-nationale.fr/deputes/fiche/OMC_PA330357" target="_blank">
<span class="glyphicon glyphicon-user"></span>
<i class="fa fa-institution" title=""></i>
Parliament page
</a>
<a class="label label-primary" href="http://www.olivierdussopt.fr" target="_blank">
<span class="glyphicon glyphicon-link"></span>
<i class="fa fa-link" title=""></i>
Website
</a>
<a class="label label-primary" href="mailto:odussopt@assemblee-nationale.fr">
<b>@</b>
<i class="fa fa-at" title=""></i>
E-mail
</a>
......@@ -54,14 +54,14 @@
<span class="label label-primary" data-placement="bottom" data-toggle="tooltip" title="1 Rue Sadi Carnot – Annonay 07100, France">
<span class="glyphicon glyphicon-envelope"></span>
<i class="fa fa-envelope" title=""></i>
Other address
</span>
<span class="label label-primary" data-placement="bottom" data-toggle="tooltip" title="126 Rue de l'Université – Paris 75355, France">
<span class="glyphicon glyphicon-envelope"></span>
<i class="fa fa-envelope" title=""></i>
Assemblée nationale
</span>
......
memopol/tests/response_fixtures/RepresentativePositionsTest.test_no_positions.content
View file @ 68113a46
......@@ -2,7 +2,7 @@
No public position has been recorded yet.
<br/><br/>
<a aria-controls="add-position-form" aria-expanded="false" class="btn btn-primary hidden-print" data-target="#add-position-form" data-toggle="modal">
<span class="glyphicon glyphicon-bullhorn"></span>
<i class="fa fa-bullhorn" title=""></i>
Add a public position
</a>
</p>
\ No newline at end of file
memopol/tests/response_fixtures/RepresentativeVotesTest.test_votes.content
View file @ 68113a46
......@@ -2,7 +2,7 @@
<th class="text-center">Proposal</th>
<th class="text-center">Recommendation</th>
<th class="text-center">Vote</th>
<th class="text-center nowrap">Points <a data-placement="top" data-toggle="tooltip" title="Score is negative or positive depending on whether the representative voted as recommended"><span class="glyphicon glyphicon-info-sign"></span></a>
<th class="text-center nowrap">Points <a data-placement="top" data-toggle="tooltip" title="Score is negative or positive depending on whether the representative voted as recommended"><i class="fa fa-info-circle" title=""></i></a>
</th>
</tr>
---
......@@ -19,7 +19,7 @@
<th class="text-center">Proposal</th>
<th class="text-center">Recommendation</th>
<th class="text-center">Vote</th>
<th class="text-center nowrap">Points <a data-placement="top" data-toggle="tooltip" title="Score is negative or positive depending on whether the representative voted as recommended"><span class="glyphicon glyphicon-info-sign"></span></a>
<th class="text-center nowrap">Points <a data-placement="top" data-toggle="tooltip" title="Score is negative or positive depending on whether the representative voted as recommended"><i class="fa fa-info-circle" title=""></i></a>
</th>
</tr>
---
......@@ -117,7 +117,7 @@
<th class="text-center">Proposal</th>
<th class="text-center">Recommendation</th>
<th class="text-center">Vote</th>
<th class="text-center nowrap">Points <a data-placement="top" data-toggle="tooltip" title="Score is negative or positive depending on whether the representative voted as recommended"><span class="glyphicon glyphicon-info-sign"></span></a>
<th class="text-center nowrap">Points <a data-placement="top" data-toggle="tooltip" title="Score is negative or positive depending on whether the representative voted as recommended"><i class="fa fa-info-circle" title=""></i></a>
</th>
</tr>
---
......
memopol/tests/response_fixtures/ThemeListTest.test_cards.content
View file @ 68113a46
......@@ -13,7 +13,7 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Dossiers">
<span class="glyphicon glyphicon-book"></span>
<i class="fa fa-book" title=""></i>
<span class="badge">3</span>
</span>
......@@ -43,21 +43,21 @@
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Links">
<span class="glyphicon glyphicon-link"></span>
<i class="fa fa-link" title=""></i>
<span class="badge">2</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Dossiers">
<span class="glyphicon glyphicon-book"></span>
<i class="fa fa-book" title=""></i>
<span class="badge">4</span>
</span>
<span class="label label-default" data-placement="bottom" data-toggle="tooltip" title="Proposals">
<span class="glyphicon glyphicon-pencil"></span>
<i class="fa fa-pencil" title=""></i>
<span class="badge">13</span>
</span>
......
memopol/tests/response_fixtures/ThemeProposalsTest.test_proposals.content
View file @ 68113a46
......@@ -25,7 +25,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
100.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - CMP"><span class="glyphicon glyphicon-info-sign"></span></a>
100.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - CMP"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -66,7 +66,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 108(rect) et 109(rect)"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 108(rect) et 109(rect)"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -107,7 +107,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 10 et 90"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 10 et 90"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -148,7 +148,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 30"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 30"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -231,7 +231,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 52"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 52"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -272,7 +272,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 7 et 88"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 7 et 88"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -313,7 +313,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 83"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 83"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -354,7 +354,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 8 et 89"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 8 et 89"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -395,7 +395,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 92"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Amdt 92"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -436,7 +436,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation État d'Urgence - Amdt 97"><span class="glyphicon glyphicon-info-sign"></span></a>
10.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation État d'Urgence - Amdt 97"><i class="fa fa-info-circle" title=""></i></a>
</td>
......@@ -477,7 +477,7 @@
<td class="text-center"><i class="fa fa-thumbs-down text-default" title="against"></i></td>
<td class="text-center">
5.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Renvoi en comission"><span class="glyphicon glyphicon-info-sign"></span></a>
5.0 <a data-placement="top" data-toggle="tooltip" title="Prorogation de l'État d'Urgence - Renvoi en comission"><i class="fa fa-info-circle" title=""></i></a>
</td>
......
setup.py
View file @ 68113a46
......@@ -16,6 +16,7 @@ setup(name='political-memory',
'django-compressor>=1,<2',
'django-datetime-widget>=0.9,<1.0',
'django-filter>=0.13,<0.14',
'django-fontawesome>=0.2,<0.3',
'django-representatives-votes==0.0.24',
'django-representatives==0.0.34',
'django-rql-filter>=0.1.3,<0.2',
......
templates/_base_intro.html
View file @ 68113a46
{% load i18n %}
{% load bootstrap3 %}
{% load fontawesome %}
{% load staticfiles %}
<div id="intro">
......@@ -19,7 +19,7 @@
<div class="row">
<div class="col-sm-12 text-center">
<a class="btn btn-primary hidden-print" data-toggle="modal" data-target="#add-position-form" aria-expanded="false" aria-controls="add-position-form">
{% bootstrap_icon "bullhorn" %}
{% fontawesome_icon "bullhorn" %}
{% trans "Add a public position" %}
</a>
</div>
......
templates/_base_search.html
View file @ 68113a46
{% load i18n memopol_tags %}
{% load fontawesome %}
<form class="form-horizontal hidden-print" method="GET" action="{% url "representative-list" %}">
<div class="input-group">
<label class="sr-only" for="search">{% trans "Search for representatives" %}</label>
<input type="text" class="form-control" name="search" placeholder="{% trans "Search for representatives" %}" id="search" value="{{ filter.data.search }}">
<span class="input-group-btn">
<button class="btn btn-primary" type="submit">
<span class="glyphicon glyphicon-search"></span>
{% fontawesome_icon "search" %}
</button>
</span>
</div>
......
templates/_filter_form.html deleted 100644 → 0
View file @ 5b49001f
{% load bootstrap3 %}
<form class=""filter-form" action="{{action}}" method="get">
{% bootstrap_form form=form bound_css_class="filter-form-group" %}
{% buttons %}
<button type="submit" class"btn btn-primary">
{% bootstrap_icon "filter" %} Filter
</button>
{% endbuttons %}
{% if csv %}
{% buttons %}
<button type="submit" name="csv" class="btn btn-default">
{% bootstrap_icon "download-alt" %} Download as CSV
</button>
{% endbuttons %}
{% endif %}
</form>
templates/base.html
View file @ 68113a46
<!DOCTYPE html>
{% load cache %}
{% load i18n %}
{% load fontawesome %}
{% load staticfiles %}
<html lang="en">
<head>
......@@ -14,10 +15,11 @@
<meta name="viewport" content="width=device-width" />
<title>{% block title %}Home - Political Memory{% endblock %}</title>
{% fontawesome_stylesheet %}
{% load compress %}
{% compress css %}
<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'libs/fontawesome/css/font-awesome.min.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'libs/flag-icon-css/css/flag-icon.min.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'css/custom.css' %}" type="text/css" />
{% endcompress %}
......
templates/blocks/_dossier_list.html
View file @ 68113a46
{% load i18n %}
{% load bootstrap3 %}
{% load fontawesome %}
{% load memopol_tags %}
<div class="row card-list">
......@@ -17,21 +17,21 @@
{% if dossier.nb_proposals > 0 %}
<span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="{% trans 'Proposals' %}">
{% bootstrap_icon "pencil" %}
{% fontawesome_icon "pencil" %}
<span class="badge">{{ dossier.nb_proposals }}</span>
</span>
{% endif %}
{% if dossier.nb_recommendations > 0 %}
<span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="{% trans 'Recommendations' %}">
{% bootstrap_icon "eye-open" %}
{% fontawesome_icon "eye" %}
<span class="badge">{{ dossier.nb_recommendations }}</span>
</span>
{% endif %}
{% if dossier.nb_documents > 0 %}
<span class="label label-default" data-toggle="tooltip" data-placement="bottom" title="{% trans 'Documents' %}">
{% bootstrap_icon "file" %}
{% fontawesome_icon "file" %}
<span class="badge">{{ dossier.nb_documents }}</span>
</span>
{% endif %}
......
templates/blocks/_position_list.html
View file @ 68113a46
{% load i18n %}
{% load bootstrap3 %}
{% load fontawesome %}
{% load humanize %}
{% load representatives_positions_tags %}
......@@ -13,7 +13,7 @@
{% trans "No public position has been recorded yet." %}
<br><br>
<a class="btn btn-primary hidden-print" data-toggle="modal" data-target="#add-position-form" aria-expanded="false" aria-controls="add-position-form">
{% bootstrap_icon "bullhorn" %}
{% fontawesome_icon "bullhorn" %}
{% trans "Add a public position" %}
</a>
</p>
......
templates/blocks/_proposal_list.html
View file @ 68113a46
{% load i18n %}
{% load bootstrap3 %}
{% load fontawesome %}
{% load memopol_tags %}
{% comment %}
......@@ -55,7 +55,7 @@
{% if proposal.recommendation %}
<td class="text-center">{{ proposal.recommendation.recommendation|position_icon }}</td>
<td class="text-center">
{{ proposal.recommendation.weight }}&nbsp;<a data-toggle="tooltip" data-placement="top" title="{{ proposal.recommendation.title }}">{% bootstrap_icon "info-sign" %}</a>
{{ proposal.recommendation.weight }}&nbsp;<a data-toggle="tooltip" data-placement="top" title="{{ proposal.recommendation.title }}">{% fontawesome_icon "info-circle" %}</a>
</td>
{% else %}
<td class="text-center" colspan="2">
......
templates/blocks/listheader.html
View file @ 68113a46
{% load bootstrap3 %}
{% load fontawesome %}
{% load i18n %}
<div class="container-fluid" id="listheader">
......@@ -11,7 +11,7 @@
<div class="col-sm-4 text-right">
{% if csv %}
<a class="btn btn-default" role="button" href="?{{ csv_querystring.urlencode }}&csv">
{% bootstrap_icon "download-alt" %}
{% fontawesome_icon "download" %}
{% trans "Download CSV" %}
</a>
{% endif %}
......
templates/home.html
View file @ 68113a46
{% extends "base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% load fontawesome %}
{% load staticfiles %}
{% block content %}
......@@ -25,11 +25,11 @@
<h3>{% trans "More information" %}</h3>
<div class="btn-group">
<a class="btn btn-primary" target="_blank" href="http://www.memopol.org/">
{% bootstrap_icon "bookmark" %}
{% fontawesome_icon "bookmark" %}
{% trans "Memopol blog" %}
</a>
<a class="btn btn-primary" target="_blank" href="http://memopol.rtfd.org/">
{% bootstrap_icon "info-sign" %}
{% fontawesome_icon "info-circle" %}
{% trans "Documentation" %}
</a>
</div>
......@@ -39,11 +39,11 @@
<h3>{% trans "Contact us" %}</h3>
<div class="btn-group">
<a class="btn btn-primary" target="_blank" href="https://twitter.com/memopol2">
<img class="social-icon" src="{% static 'images' %}/social-twitter.png">
{% fontawesome_icon "twitter" %}
{% trans "Twitter" %}
</a>
<a class="btn btn-primary" target="_blank" href="https://webchat.freenode.net/?nick=memopol-user-...&channels=lqdn-memopol&prompt=1">
{% bootstrap_icon "comment" %}
{% fontawesome_icon "commenting" %}
{% trans "IRC Channel" %}
</a>
</div>
......@@ -53,11 +53,11 @@
<h3>{% trans "Contributing" %}</h3>
<div class="btn-group">
<a class="btn btn-default" target="_blank" href="https://github.com/political-memory/political_memory">
{% bootstrap_icon "cog" %}
{% fontawesome_icon "git" %}
{% trans "Code repository" %}
</a>
<a class="btn btn-default" target="_blank" href="https://github.com/political-memory/political_memory/issues/new">
{% bootstrap_icon "warning-sign" %}
{% fontawesome_icon "bug" %}
{% trans "Report an issue" %}
</a>
</div>
......
templates/memopol_themes/theme_list.html
View file @ 68113a46
{% extends "base.html" %}
{% load bootstrap3 %}
{% load fontawesome %}
{% load i18n %}
{% load humanize %}
......@@ -29,28 +29,28 @@