diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content
index 14b521b8b53c3f4f849c64586bb02d3bb2aacc5d..20cf6f9caba487f2f5bc914d2b13341ec14ed27a 100644
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/content
@@ -10,7 +10,7 @@
- The Political Memory of </title>
- <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.0eebcec6fcc2.css" type="text/css" />
+ <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.6aeeaa87703d.css" type="text/css" />
<script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script>
@@ -252,7 +252,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -288,7 +288,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -324,7 +324,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -360,7 +360,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -396,7 +396,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -432,7 +432,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</td>
<td>
@@ -468,7 +468,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Confederal%20Group%20of%20the%20European%20United%20Left%20-%20Nordic%20Green%20Left/'>
- GUE/NGL
+ <span class="group-icon group-icon-guengl"></span> GUE/NGL
</a>
</td>
<td>
@@ -504,7 +504,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</td>
<td>
@@ -540,7 +540,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -576,7 +576,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -612,7 +612,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -648,7 +648,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</td>
<td>
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/status_code b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/status_code
deleted file mode 100644
index ae4ee13c08e7628701b925b8962108bd7643bf6e..0000000000000000000000000000000000000000
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist/status_code
+++ /dev/null
@@ -1 +0,0 @@
-200
\ No newline at end of file
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content
index bdf0d669f14a1e3f1923238e8e3d3cbd713b11f0..e7de597296e9b05d54adb41e60d32b69d6ed5d45 100644
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/content
@@ -10,7 +10,7 @@
- The Political Memory of </title>
- <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.0eebcec6fcc2.css" type="text/css" />
+ <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.6aeeaa87703d.css" type="text/css" />
<script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script>
@@ -207,7 +207,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</td>
<td>
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/status_code b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/status_code
deleted file mode 100644
index ae4ee13c08e7628701b925b8962108bd7643bf6e..0000000000000000000000000000000000000000
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly/status_code
+++ /dev/null
@@ -1 +0,0 @@
-200
\ No newline at end of file
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content
index c8241d12a81bdc56fbefb17d01f3bc461488eb27..9acdba75952ac3aa5c79e5207097fbebdd85a212 100644
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/content
@@ -10,7 +10,7 @@
- The Political Memory of </title>
- <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.0eebcec6fcc2.css" type="text/css" />
+ <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.6aeeaa87703d.css" type="text/css" />
<script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script>
@@ -217,7 +217,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -251,7 +251,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -285,7 +285,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -319,7 +319,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -353,7 +353,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -387,7 +387,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</li>
<li class='score'>
@@ -421,7 +421,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Confederal%20Group%20of%20the%20European%20United%20Left%20-%20Nordic%20Green%20Left/'>
- GUE/NGL
+ <span class="group-icon group-icon-guengl"></span> GUE/NGL
</a>
</li>
<li class='score'>
@@ -455,7 +455,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</li>
<li class='score'>
@@ -489,7 +489,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -523,7 +523,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -557,7 +557,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -591,7 +591,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</li>
<li class='score'>
@@ -625,7 +625,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -659,7 +659,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -693,7 +693,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -727,7 +727,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/European%20Conservatives%20and%20Reformists%20Group/'>
- ECR
+ <span class="group-icon group-icon-ecr"></span> ECR
</a>
</li>
<li class='score'>
@@ -761,7 +761,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -795,7 +795,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -829,7 +829,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</li>
<li class='score'>
@@ -863,7 +863,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</li>
<li class='score'>
@@ -897,7 +897,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -931,7 +931,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -965,7 +965,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</li>
<li class='score'>
@@ -999,7 +999,7 @@
</li>
<li class='mandate'>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</li>
<li class='score'>
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/status_code b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/status_code
deleted file mode 100644
index ae4ee13c08e7628701b925b8962108bd7643bf6e..0000000000000000000000000000000000000000
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_displaygrid/status_code
+++ /dev/null
@@ -1 +0,0 @@
-200
\ No newline at end of file
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content
index b537199f27f0f7f730649c074f4bdc7fbdf1d9a4..5f7c8f0944233325b18a0c529c1f909cdc6c5f2c 100644
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/content
@@ -10,7 +10,7 @@
- The Political Memory of </title>
- <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.0eebcec6fcc2.css" type="text/css" />
+ <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.6aeeaa87703d.css" type="text/css" />
<script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script>
@@ -265,7 +265,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -301,7 +301,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -337,7 +337,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -373,7 +373,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/European%20Conservatives%20and%20Reformists%20Group/'>
- ECR
+ <span class="group-icon group-icon-ecr"></span> ECR
</a>
</td>
<td>
@@ -409,7 +409,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -445,7 +445,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -481,7 +481,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -517,7 +517,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</td>
<td>
@@ -553,7 +553,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -589,7 +589,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -625,7 +625,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -661,7 +661,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</td>
<td>
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/status_code b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/status_code
deleted file mode 100644
index ae4ee13c08e7628701b925b8962108bd7643bf6e..0000000000000000000000000000000000000000
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist/status_code
+++ /dev/null
@@ -1 +0,0 @@
-200
\ No newline at end of file
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content
index 9e7f43f41a20a25f0736cd58a8dec952100f4065..02e261dd653dc15655acc6d736390085f13c4cf9 100644
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/content
@@ -10,7 +10,7 @@
- The Political Memory of </title>
- <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.0eebcec6fcc2.css" type="text/css" />
+ <link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.6aeeaa87703d.css" type="text/css" />
<script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script>
@@ -241,7 +241,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'>
- Greens/EFA
+ <span class="group-icon group-icon-greensefa"></span> Greens/EFA
</a>
</td>
<td>
@@ -277,7 +277,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -313,7 +313,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -349,7 +349,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -385,7 +385,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -421,7 +421,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</td>
<td>
@@ -457,7 +457,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>
- SD
+ <span class="group-icon group-icon-sd"></span> SD
</a>
</td>
<td>
@@ -493,7 +493,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/European%20Conservatives%20and%20Reformists%20Group/'>
- ECR
+ <span class="group-icon group-icon-ecr"></span> ECR
</a>
</td>
<td>
@@ -529,7 +529,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</td>
<td>
@@ -565,7 +565,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'>
- EPP
+ <span class="group-icon group-icon-epp"></span> EPP
</a>
</td>
<td>
@@ -601,7 +601,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</td>
<td>
@@ -637,7 +637,7 @@
</td>
<td>
<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'>
- ALDE
+ <span class="group-icon group-icon-alde"></span> ALDE
</a>
</td>
<td>
diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/status_code b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/status_code
deleted file mode 100644
index ae4ee13c08e7628701b925b8962108bd7643bf6e..0000000000000000000000000000000000000000
--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist/status_code
+++ /dev/null
@@ -1 +0,0 @@
-200
\ No newline at end of file
diff --git a/memopol/tests/test_representatives_detail.py b/memopol/tests/test_representatives_detail.py
index 1fda7e34fcab796e9206a46690dc22c6c31d5fa9..5f29b3c606cf525bd02d17ddcc69f77b888d9755 100644
--- a/memopol/tests/test_representatives_detail.py
+++ b/memopol/tests/test_representatives_detail.py
@@ -36,6 +36,7 @@ class RepresentativeDetailTest(UrlGetTestMixin, TestCase):
def test_current_mandate_display(self):
expected = ''.join((
"<a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'>", # noqa
+ "<span class='group-icon group-icon-sd'></span>",
"Member of Group of the Progressive Alliance of Socialists and Democrats in the European Parliament", # noqa
"</a>",
))
diff --git a/setup.py b/setup.py
index 5167093f3542a93cf4ea6399bd073b8ce06113c4..37e46b9d4c52ef983298a61e2a754278bad3ecb4 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(name='political-memory',
'django-datetime-widget>=0.9,<1.0',
'django-filter>=0.11,<0.12',
'django-representatives-votes==0.0.15',
- 'django-representatives==0.0.19',
+ 'django-representatives==0.0.21',
'django-taggit>=0.17,<0.18',
'django>=1.8,<1.9',
'djangorestframework>=3.2.0,<3.3.0',
diff --git a/static/images/group-alde.png b/static/images/group-alde.png
new file mode 100644
index 0000000000000000000000000000000000000000..54a14180b83b5e2ee6db9d5c86e265c181275d6b
Binary files /dev/null and b/static/images/group-alde.png differ
diff --git a/static/images/group-ecr.png b/static/images/group-ecr.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee0047af28c6ce7b4c8c2d4aad9d4be71210b88f
Binary files /dev/null and b/static/images/group-ecr.png differ
diff --git a/static/images/group-efdd.png b/static/images/group-efdd.png
new file mode 100644
index 0000000000000000000000000000000000000000..58802b1c8a3a3abda90ef784c3a5781c3fbc4e94
Binary files /dev/null and b/static/images/group-efdd.png differ
diff --git a/static/images/group-enf.png b/static/images/group-enf.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5c59ce9fbdae7e68364ba551f302994fefc5109
Binary files /dev/null and b/static/images/group-enf.png differ
diff --git a/static/images/group-epp.png b/static/images/group-epp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad3b977fe45670b2c85ebc4c4836b2f2b6459eb5
Binary files /dev/null and b/static/images/group-epp.png differ
diff --git a/static/images/group-greensefa.png b/static/images/group-greensefa.png
new file mode 100644
index 0000000000000000000000000000000000000000..14965a3e24a75732f3cffaf2beab8c01b3b20e56
Binary files /dev/null and b/static/images/group-greensefa.png differ
diff --git a/static/images/group-guengl.png b/static/images/group-guengl.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdccff1c9b2b004f66b6e20450eb321330304b54
Binary files /dev/null and b/static/images/group-guengl.png differ
diff --git a/static/images/group-sd.png b/static/images/group-sd.png
new file mode 100644
index 0000000000000000000000000000000000000000..20e36c73315a72a416304f34a62b756af03e26e6
Binary files /dev/null and b/static/images/group-sd.png differ
diff --git a/static/less/base.less b/static/less/base.less
index a1b33fbc270ca6cab4463fa9a4f688e2cf1a80fc..214f4d142fa675637c94d5014abe22ba4e5533da 100644
--- a/static/less/base.less
+++ b/static/less/base.less
@@ -6,6 +6,7 @@
@import 'legislature';
@import 'positions';
@import 'chambers';
+@import 'groups';
body {
background: #E5E5E5;
diff --git a/static/less/groups.less b/static/less/groups.less
new file mode 100644
index 0000000000000000000000000000000000000000..442a8a08338d40e1365034e7512dfb19a9b3bbea
--- /dev/null
+++ b/static/less/groups.less
@@ -0,0 +1,33 @@
+.group-icon {
+ display: inline-block;
+ width: 1.5em;
+ height: 1.5em;
+
+ vertical-align: bottom;
+ background-size: 100%;
+
+ &.group-icon-alde {
+ background-image: url(../images/group-alde.png);
+ }
+ &.group-icon-ecr {
+ background-image: url(../images/group-ecr.png);
+ }
+ &.group-icon-enf {
+ background-image: url(../images/group-enf.png);
+ }
+ &.group-icon-efdd {
+ background-image: url(../images/group-efdd.png);
+ }
+ &.group-icon-epp {
+ background-image: url(../images/group-epp.png);
+ }
+ &.group-icon-guengl {
+ background-image: url(../images/group-guengl.png);
+ }
+ &.group-icon-greensefa {
+ background-image: url(../images/group-greensefa.png);
+ }
+ &.group-icon-sd {
+ background-image: url(../images/group-sd.png);
+ }
+}
diff --git a/templates/representatives/_representative_block.haml b/templates/representatives/_representative_block.haml
index e4d2a4c1892875a652765e812c5897286e5aedae..a02a9be782f4d76391457b09e04f48c526618d26 100644
--- a/templates/representatives/_representative_block.haml
+++ b/templates/representatives/_representative_block.haml
@@ -32,8 +32,7 @@
%th Party
%td<
%a{:href => "{{ representative.main_mandate.group.get_absolute_url }}"}
- {{ representative.main_mandate.role }} of
- {{ representative.main_mandate.group.name }}
+ = representative.main_mandate|mandate_icon
%tr
%th Biography
%td<
diff --git a/templates/representatives/group_list.haml b/templates/representatives/group_list.haml
index 7c1cee018b34962a607ebf5aaba4fa0dc42c0fbd..0e41d42f83e615555c9b666e38fe36e604fbc42f 100644
--- a/templates/representatives/group_list.haml
+++ b/templates/representatives/group_list.haml
@@ -19,5 +19,7 @@
%a{'href': '{{ group.get_absolute_url }}'}=
- if group.kind == 'chamber'
= group|chamber_icon
+ - elif group.kind == 'group'
+ = group|group_long_icon
- else
= group.name
diff --git a/templates/representatives/representative_grid.haml b/templates/representatives/representative_grid.haml
index 5ec3681e2c139dfa3d869c2ed4e031b8fdb3c8bb..f9270e0e54cdd2d27b526a7c185c1c0df02f6c18 100644
--- a/templates/representatives/representative_grid.haml
+++ b/templates/representatives/representative_grid.haml
@@ -23,6 +23,6 @@
= representative.country|country_flag
%li.mandate
%a{'href': "{{ representative.main_mandate.group.get_absolute_url }}"}
- = representative.main_mandate.group.abbreviation
+ = representative.main_mandate.group|group_icon
%li.score
= representative.score.score|score_label
diff --git a/templates/representatives/representative_list.haml b/templates/representatives/representative_list.haml
index 43f9db068ab0d1825f83a4493ad42434d3de42ff..5a6c2993eacfb46a3f8c097762f4631bf52d3a6e 100644
--- a/templates/representatives/representative_list.haml
+++ b/templates/representatives/representative_list.haml
@@ -56,7 +56,7 @@
%td
%a{'href': "{{ representative.main_mandate.group.get_absolute_url }}"}
- = representative.main_mandate.group.abbreviation
+ = representative.main_mandate.group|group_icon
%td
= representative.score.score|score_label