From 062c4ce6595aa69e267f44634748cb77f84f7e66 Mon Sep 17 00:00:00 2001 From: Nicolas Joyard <joyard.nicolas@gmail.com> Date: Fri, 17 Jun 2016 19:10:08 +0200 Subject: [PATCH] Update fixtures --- .../DossiersTest.test_dossier_detail.content | 2 +- .../DossiersTest.test_dossier_list.content | 10 +- ...oupListTest.test_active_committees.content | 12 +- ...upListTest.test_active_delegations.content | 12 +- .../GroupListTest.test_active_parties.content | 12 +- .../GroupListTest.test_all_committees.content | 12 +- ...GroupListTest.test_all_delegations.content | 12 +- .../GroupListTest.test_all_parties.content | 12 +- .../GroupListTest.test_chambers.content | 10 +- .../GroupListTest.test_country.content | 10 +- ...tativeListTest.test_filter_chamber.content | 60 +- ...tativeListTest.test_filter_country.content | 40 +- ...entativeListTest.test_filter_group.content | 40 +- ...ativeListTest.test_filter_multiple.content | 40 +- ...ntativeListTest.test_filter_search.content | 40 +- ...e1_paginateby12_active_displaylist.content | 968 ++++++++--------- ...page1_paginateby12_all_displaylist.content | 968 ++++++++--------- ...aginateby12_displaylist_searchjoly.content | 160 +-- ...e1_paginateby24_active_displaygrid.content | 52 +- ...page1_paginateby24_all_displaygrid.content | 52 +- ...est_page2_paginateby12_displaylist.content | 976 +++++++++--------- ...est_page2_paginateby24_displaylist.content | 964 ++++++++--------- 22 files changed, 2256 insertions(+), 2208 deletions(-) diff --git a/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.content b/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.content index 848d4f9f..118a0cb6 100644 --- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.content +++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.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.9ff29455e5ae.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.540ce621a9a1.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> diff --git a/memopol/tests/response_fixtures/DossiersTest.test_dossier_list.content b/memopol/tests/response_fixtures/DossiersTest.test_dossier_list.content index 5ed374c4..8cd7c395 100644 --- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_list.content +++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_list.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -126,28 +126,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_active_committees.content b/memopol/tests/response_fixtures/GroupListTest.test_active_committees.content index e3e987a3..e5a0dcb9 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_active_committees.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_active_committees.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -130,7 +130,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?&active_only=0'> all data </a> @@ -142,28 +142,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_active_delegations.content b/memopol/tests/response_fixtures/GroupListTest.test_active_delegations.content index d1a3d060..535ed9a1 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_active_delegations.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_active_delegations.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -152,7 +152,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?&active_only=0'> all data </a> @@ -164,28 +164,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_active_parties.content b/memopol/tests/response_fixtures/GroupListTest.test_active_parties.content index 612952cf..5411c42a 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_active_parties.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_active_parties.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -130,7 +130,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?&active_only=0'> all data </a> @@ -142,28 +142,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_all_committees.content b/memopol/tests/response_fixtures/GroupListTest.test_all_committees.content index 546bd141..e57acf0f 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_all_committees.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_all_committees.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -129,7 +129,7 @@ <br /> Display : - <a href='?active_only=1'> + <a href='?&active_only=1'> current legislature only </a> / all data @@ -142,28 +142,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_all_delegations.content b/memopol/tests/response_fixtures/GroupListTest.test_all_delegations.content index e0f17724..332811c7 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_all_delegations.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_all_delegations.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -151,7 +151,7 @@ <br /> Display : - <a href='?active_only=1'> + <a href='?&active_only=1'> current legislature only </a> / all data @@ -164,28 +164,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_all_parties.content b/memopol/tests/response_fixtures/GroupListTest.test_all_parties.content index b42bbb39..b2b606aa 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_all_parties.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_all_parties.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -140,7 +140,7 @@ <br /> Display : - <a href='?active_only=1'> + <a href='?&active_only=1'> current legislature only </a> / all data @@ -153,28 +153,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_chambers.content b/memopol/tests/response_fixtures/GroupListTest.test_chambers.content index 9fae21da..a25c4e75 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_chambers.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_chambers.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -97,28 +97,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/GroupListTest.test_country.content b/memopol/tests/response_fixtures/GroupListTest.test_country.content index 52aff4c6..d749e778 100644 --- a/memopol/tests/response_fixtures/GroupListTest.test_country.content +++ b/memopol/tests/response_fixtures/GroupListTest.test_country.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -142,28 +142,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?&paginate_by=96'> 96 </a> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.content index 1e9e7535..267fce10 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -174,7 +176,7 @@ <li> - <a href='?&page=2'> + <a href='?country=&search=&group=&chamber=1&page=2'> 2 </a> @@ -185,7 +187,7 @@ <li> - <a href='?&page=3'> + <a href='?country=&search=&group=&chamber=1&page=3'> 3 </a> @@ -196,7 +198,7 @@ <li> - <a href='?&page=4'> + <a href='?country=&search=&group=&chamber=1&page=4'> 4 </a> @@ -206,13 +208,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?country=&search=&group=&chamber=1&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=21'> + <a aria-label='Last' href='?country=&search=&group=&chamber=1&page=21'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -228,7 +230,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=&search=&group=&chamber=1&active_only=0'> all data </a> @@ -240,28 +242,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=&search=&group=&chamber=1&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=&search=&group=&chamber=1&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=&search=&group=&chamber=1&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=&search=&group=&chamber=1&paginate_by=96'> 96 </a> @@ -269,10 +271,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=&search=&group=&chamber=1&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=&search=&group=&chamber=1&display=list'> <i class="fa fa-th-list"></i> </a> @@ -284,7 +286,7 @@ </div> - + <div class='representative_grid'> @@ -699,7 +701,7 @@ </div> - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -718,7 +720,7 @@ <li> - <a href='?&page=2'> + <a href='?country=&search=&group=&chamber=1&page=2'> 2 </a> @@ -729,7 +731,7 @@ <li> - <a href='?&page=3'> + <a href='?country=&search=&group=&chamber=1&page=3'> 3 </a> @@ -740,7 +742,7 @@ <li> - <a href='?&page=4'> + <a href='?country=&search=&group=&chamber=1&page=4'> 4 </a> @@ -750,13 +752,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?country=&search=&group=&chamber=1&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=21'> + <a aria-label='Last' href='?country=&search=&group=&chamber=1&page=21'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -772,7 +774,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=&search=&group=&chamber=1&active_only=0'> all data </a> @@ -784,28 +786,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=&search=&group=&chamber=1&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=&search=&group=&chamber=1&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=&search=&group=&chamber=1&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=&search=&group=&chamber=1&paginate_by=96'> 96 </a> @@ -813,10 +815,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=&search=&group=&chamber=1&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=&search=&group=&chamber=1&display=list'> <i class="fa fa-th-list"></i> </a> @@ -828,6 +830,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.content index 8bcfcba4..ee177705 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -172,7 +174,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=110&search=&group=&chamber=&active_only=0'> all data </a> @@ -184,28 +186,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=110&search=&group=&chamber=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=110&search=&group=&chamber=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=110&search=&group=&chamber=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=110&search=&group=&chamber=&paginate_by=96'> 96 </a> @@ -213,10 +215,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=110&search=&group=&chamber=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=110&search=&group=&chamber=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -228,7 +230,7 @@ </div> - + <div class='representative_grid'> @@ -371,7 +373,7 @@ </div> - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -388,7 +390,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=110&search=&group=&chamber=&active_only=0'> all data </a> @@ -400,28 +402,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=110&search=&group=&chamber=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=110&search=&group=&chamber=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=110&search=&group=&chamber=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=110&search=&group=&chamber=&paginate_by=96'> 96 </a> @@ -429,10 +431,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=110&search=&group=&chamber=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=110&search=&group=&chamber=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -444,6 +446,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_group.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_group.content index ec89ac80..4e675674 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_group.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_group.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -156,7 +156,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -173,7 +175,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=&search=&group=17&chamber=&active_only=0'> all data </a> @@ -185,28 +187,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=&search=&group=17&chamber=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=&search=&group=17&chamber=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=&search=&group=17&chamber=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=&search=&group=17&chamber=&paginate_by=96'> 96 </a> @@ -214,10 +216,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=&search=&group=17&chamber=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=&search=&group=17&chamber=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -229,7 +231,7 @@ </div> - + <div class='representative_grid'> @@ -440,7 +442,7 @@ </div> - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -457,7 +459,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=&search=&group=17&chamber=&active_only=0'> all data </a> @@ -469,28 +471,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=&search=&group=17&chamber=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=&search=&group=17&chamber=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=&search=&group=17&chamber=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=&search=&group=17&chamber=&paginate_by=96'> 96 </a> @@ -498,10 +500,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=&search=&group=17&chamber=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=&search=&group=17&chamber=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -513,6 +515,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_multiple.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_multiple.content index 21ef8bbd..d78219af 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_multiple.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_multiple.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -156,7 +156,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -173,7 +175,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=110&search=e&group=17&chamber=1&active_only=0'> all data </a> @@ -185,28 +187,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=96'> 96 </a> @@ -214,10 +216,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=110&search=e&group=17&chamber=1&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=110&search=e&group=17&chamber=1&display=list'> <i class="fa fa-th-list"></i> </a> @@ -229,7 +231,7 @@ </div> - + <div class='representative_grid'> @@ -440,7 +442,7 @@ </div> - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -457,7 +459,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=110&search=e&group=17&chamber=1&active_only=0'> all data </a> @@ -469,28 +471,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=110&search=e&group=17&chamber=1&paginate_by=96'> 96 </a> @@ -498,10 +500,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=110&search=e&group=17&chamber=1&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=110&search=e&group=17&chamber=1&display=list'> <i class="fa fa-th-list"></i> </a> @@ -513,6 +515,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_search.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_search.content index d2ce383f..e1de9412 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_search.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_search.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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -172,7 +174,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=&search=am&group=&chamber=&active_only=0'> all data </a> @@ -184,28 +186,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=&search=am&group=&chamber=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=&search=am&group=&chamber=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=&search=am&group=&chamber=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=&search=am&group=&chamber=&paginate_by=96'> 96 </a> @@ -213,10 +215,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=&search=am&group=&chamber=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=&search=am&group=&chamber=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -228,7 +230,7 @@ </div> - + <div class='representative_grid'> @@ -337,7 +339,7 @@ </div> - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -354,7 +356,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?country=&search=am&group=&chamber=&active_only=0'> all data </a> @@ -366,28 +368,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?country=&search=am&group=&chamber=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?country=&search=am&group=&chamber=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?country=&search=am&group=&chamber=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?country=&search=am&group=&chamber=&paginate_by=96'> 96 </a> @@ -395,10 +397,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?country=&search=am&group=&chamber=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?country=&search=am&group=&chamber=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -410,6 +412,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_active_displaylist.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_active_displaylist.content index f962b8be..2e3fa8af 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_active_displaylist.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_active_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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -174,7 +176,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -185,7 +187,7 @@ <li> - <a href='?&page=3'> + <a href='?search=&page=3'> 3 </a> @@ -195,13 +197,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=3'> + <a aria-label='Last' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -217,7 +219,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -229,28 +231,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -258,10 +260,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -273,467 +275,467 @@ </div> - + - <table class='table'> - <tr> - <th> - Photo - </th> - <th> - Name - </th> - <th> - Chamber - </th> - <th> - Country - </th> - <th> - Group - </th> - <th> - Score - - </th> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/zigmantas-balcytis/'> - <img src='http://www.europarl.europa.eu/mepphoto/96680.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/zigmantas-balcytis/'> - Zigmantas BALÄŒYTIS - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Lithuania/'> - Lithuania [LT] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/vilija-blinkeviciute/'> - <img src='http://www.europarl.europa.eu/mepphoto/96681.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/vilija-blinkeviciute/'> - Vilija BLINKEVIÄŒIŪTÄ– - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Lithuania/'> - Lithuania [LT] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/elmar-brok/'> - <img src='http://www.europarl.europa.eu/mepphoto/1263.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/elmar-brok/'> - Elmar BROK - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Germany/'> - Germany [DE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-10</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/cristian-silviu-busoi/'> - <img src='http://www.europarl.europa.eu/mepphoto/38420.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/cristian-silviu-busoi/'> - Cristian-Silviu BUÅžOI - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Romania/'> - Romania [RO] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/david-casa/'> - <img src='http://www.europarl.europa.eu/mepphoto/28122.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/david-casa/'> - David CASA - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Malta/'> - Malta [MT] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/jean-marie-cavada/'> - <img src='http://www.europarl.europa.eu/mepphoto/28206.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/jean-marie-cavada/'> - Jean-Marie CAVADA - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/France/'> - France [FR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> - <span class="group-icon group-icon-alde"></span> ALDE - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/nikolaos-chountis/'> - <img src='http://www.europarl.europa.eu/mepphoto/26851.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/nikolaos-chountis/'> - Nikolaos CHOUNTIS - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Greece/'> - Greece [GR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Confederal%20Group%20of%20the%20European%20United%20Left%20-%20Nordic%20Green%20Left/'> - <span class="group-icon group-icon-guengl"></span> GUE/NGL - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/michael-cramer/'> - <img src='http://www.europarl.europa.eu/mepphoto/28238.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/michael-cramer/'> - Michael CRAMER - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Germany/'> - Germany [DE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> - <span class="group-icon group-icon-greensefa"></span> Greens/EFA - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/michel-dantin/'> - <img src='http://www.europarl.europa.eu/mepphoto/97296.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/michel-dantin/'> - Michel DANTIN - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/France/'> - France [FR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> + <table class='table'> + <tr> + <th> + Photo + </th> + <th> + Name + </th> + <th> + Chamber + </th> + <th> + Country + </th> + <th> + Group + </th> + <th> + Score + + </th> </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/tamas-deutsch/'> - <img src='http://www.europarl.europa.eu/mepphoto/96826.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/tamas-deutsch/'> - Tamás DEUTSCH - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Hungary/'> - Hungary [HU] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/viorica-dancila/'> - <img src='http://www.europarl.europa.eu/mepphoto/95281.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/viorica-dancila/'> - Viorica DÄ‚NCILÄ‚ - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Romania/'> - Romania [RO] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/bas-eickhout/'> - <img src='http://www.europarl.europa.eu/mepphoto/96725.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/bas-eickhout/'> - Bas EICKHOUT - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Netherlands/'> - Netherlands [NL] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> - <span class="group-icon group-icon-greensefa"></span> Greens/EFA - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - </table> - + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/zigmantas-balcytis/'> + <img src='http://www.europarl.europa.eu/mepphoto/96680.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/zigmantas-balcytis/'> + Zigmantas BALÄŒYTIS - <div class='pagination-block'> + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Lithuania/'> + Lithuania [LT] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/vilija-blinkeviciute/'> + <img src='http://www.europarl.europa.eu/mepphoto/96681.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/vilija-blinkeviciute/'> + Vilija BLINKEVIÄŒIŪTÄ– + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Lithuania/'> + Lithuania [LT] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/elmar-brok/'> + <img src='http://www.europarl.europa.eu/mepphoto/1263.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/elmar-brok/'> + Elmar BROK + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Germany/'> + Germany [DE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-10</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/cristian-silviu-busoi/'> + <img src='http://www.europarl.europa.eu/mepphoto/38420.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/cristian-silviu-busoi/'> + Cristian-Silviu BUÅžOI + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Romania/'> + Romania [RO] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/david-casa/'> + <img src='http://www.europarl.europa.eu/mepphoto/28122.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/david-casa/'> + David CASA + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Malta/'> + Malta [MT] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/jean-marie-cavada/'> + <img src='http://www.europarl.europa.eu/mepphoto/28206.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/jean-marie-cavada/'> + Jean-Marie CAVADA + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/France/'> + France [FR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> + <span class="group-icon group-icon-alde"></span> ALDE + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/nikolaos-chountis/'> + <img src='http://www.europarl.europa.eu/mepphoto/26851.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/nikolaos-chountis/'> + Nikolaos CHOUNTIS + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Greece/'> + Greece [GR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Confederal%20Group%20of%20the%20European%20United%20Left%20-%20Nordic%20Green%20Left/'> + <span class="group-icon group-icon-guengl"></span> GUE/NGL + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/michael-cramer/'> + <img src='http://www.europarl.europa.eu/mepphoto/28238.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/michael-cramer/'> + Michael CRAMER + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Germany/'> + Germany [DE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> + <span class="group-icon group-icon-greensefa"></span> Greens/EFA + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/michel-dantin/'> + <img src='http://www.europarl.europa.eu/mepphoto/97296.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/michel-dantin/'> + Michel DANTIN + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/France/'> + France [FR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/tamas-deutsch/'> + <img src='http://www.europarl.europa.eu/mepphoto/96826.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/tamas-deutsch/'> + Tamás DEUTSCH + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Hungary/'> + Hungary [HU] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/viorica-dancila/'> + <img src='http://www.europarl.europa.eu/mepphoto/95281.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/viorica-dancila/'> + Viorica DÄ‚NCILÄ‚ + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Romania/'> + Romania [RO] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/bas-eickhout/'> + <img src='http://www.europarl.europa.eu/mepphoto/96725.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/bas-eickhout/'> + Bas EICKHOUT + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Netherlands/'> + Netherlands [NL] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> + <span class="group-icon group-icon-greensefa"></span> Greens/EFA + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + </table> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -752,7 +754,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -763,7 +765,7 @@ <li> - <a href='?&page=3'> + <a href='?search=&page=3'> 3 </a> @@ -773,13 +775,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=3'> + <a aria-label='Last' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -795,7 +797,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -807,28 +809,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -836,10 +838,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -851,6 +853,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_all_displaylist.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_all_displaylist.content index 16f37906..a7608864 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_all_displaylist.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_all_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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -174,7 +176,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -185,7 +187,7 @@ <li> - <a href='?&page=3'> + <a href='?search=&page=3'> 3 </a> @@ -195,13 +197,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=3'> + <a aria-label='Last' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -216,7 +218,7 @@ <br /> Display : - <a href='?active_only=1'> + <a href='?search=&active_only=1'> current legislature only </a> / all data @@ -229,28 +231,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -258,10 +260,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -273,467 +275,467 @@ </div> - + - <table class='table'> - <tr> - <th> - Photo - </th> - <th> - Name - </th> - <th> - Chamber - </th> - <th> - Country - </th> - <th> - Group - </th> - <th> - Score - - </th> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/zigmantas-balcytis/'> - <img src='http://www.europarl.europa.eu/mepphoto/96680.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/zigmantas-balcytis/'> - Zigmantas BALÄŒYTIS - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Lithuania/'> - Lithuania [LT] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/vilija-blinkeviciute/'> - <img src='http://www.europarl.europa.eu/mepphoto/96681.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/vilija-blinkeviciute/'> - Vilija BLINKEVIÄŒIŪTÄ– - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Lithuania/'> - Lithuania [LT] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/elmar-brok/'> - <img src='http://www.europarl.europa.eu/mepphoto/1263.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/elmar-brok/'> - Elmar BROK - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Germany/'> - Germany [DE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-10</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/cristian-silviu-busoi/'> - <img src='http://www.europarl.europa.eu/mepphoto/38420.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/cristian-silviu-busoi/'> - Cristian-Silviu BUÅžOI - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Romania/'> - Romania [RO] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/david-casa/'> - <img src='http://www.europarl.europa.eu/mepphoto/28122.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/david-casa/'> - David CASA - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Malta/'> - Malta [MT] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/jean-marie-cavada/'> - <img src='http://www.europarl.europa.eu/mepphoto/28206.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/jean-marie-cavada/'> - Jean-Marie CAVADA - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/France/'> - France [FR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> - <span class="group-icon group-icon-alde"></span> ALDE - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/nikolaos-chountis/'> - <img src='http://www.europarl.europa.eu/mepphoto/26851.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/nikolaos-chountis/'> - Nikolaos CHOUNTIS - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Greece/'> - Greece [GR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Confederal%20Group%20of%20the%20European%20United%20Left%20-%20Nordic%20Green%20Left/'> - <span class="group-icon group-icon-guengl"></span> GUE/NGL - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/michael-cramer/'> - <img src='http://www.europarl.europa.eu/mepphoto/28238.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/michael-cramer/'> - Michael CRAMER - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Germany/'> - Germany [DE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> - <span class="group-icon group-icon-greensefa"></span> Greens/EFA - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/michel-dantin/'> - <img src='http://www.europarl.europa.eu/mepphoto/97296.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/michel-dantin/'> - Michel DANTIN - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/France/'> - France [FR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> + <table class='table'> + <tr> + <th> + Photo + </th> + <th> + Name + </th> + <th> + Chamber + </th> + <th> + Country + </th> + <th> + Group + </th> + <th> + Score + + </th> </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/tamas-deutsch/'> - <img src='http://www.europarl.europa.eu/mepphoto/96826.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/tamas-deutsch/'> - Tamás DEUTSCH - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Hungary/'> - Hungary [HU] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/viorica-dancila/'> - <img src='http://www.europarl.europa.eu/mepphoto/95281.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/viorica-dancila/'> - Viorica DÄ‚NCILÄ‚ - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Romania/'> - Romania [RO] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/bas-eickhout/'> - <img src='http://www.europarl.europa.eu/mepphoto/96725.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/bas-eickhout/'> - Bas EICKHOUT - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Netherlands/'> - Netherlands [NL] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> - <span class="group-icon group-icon-greensefa"></span> Greens/EFA - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - </table> - + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/zigmantas-balcytis/'> + <img src='http://www.europarl.europa.eu/mepphoto/96680.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/zigmantas-balcytis/'> + Zigmantas BALÄŒYTIS - <div class='pagination-block'> + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Lithuania/'> + Lithuania [LT] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/vilija-blinkeviciute/'> + <img src='http://www.europarl.europa.eu/mepphoto/96681.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/vilija-blinkeviciute/'> + Vilija BLINKEVIÄŒIŪTÄ– + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Lithuania/'> + Lithuania [LT] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/elmar-brok/'> + <img src='http://www.europarl.europa.eu/mepphoto/1263.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/elmar-brok/'> + Elmar BROK + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Germany/'> + Germany [DE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-10</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/cristian-silviu-busoi/'> + <img src='http://www.europarl.europa.eu/mepphoto/38420.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/cristian-silviu-busoi/'> + Cristian-Silviu BUÅžOI + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Romania/'> + Romania [RO] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/david-casa/'> + <img src='http://www.europarl.europa.eu/mepphoto/28122.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/david-casa/'> + David CASA + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Malta/'> + Malta [MT] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/jean-marie-cavada/'> + <img src='http://www.europarl.europa.eu/mepphoto/28206.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/jean-marie-cavada/'> + Jean-Marie CAVADA + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/France/'> + France [FR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> + <span class="group-icon group-icon-alde"></span> ALDE + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/nikolaos-chountis/'> + <img src='http://www.europarl.europa.eu/mepphoto/26851.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/nikolaos-chountis/'> + Nikolaos CHOUNTIS + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Greece/'> + Greece [GR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Confederal%20Group%20of%20the%20European%20United%20Left%20-%20Nordic%20Green%20Left/'> + <span class="group-icon group-icon-guengl"></span> GUE/NGL + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/michael-cramer/'> + <img src='http://www.europarl.europa.eu/mepphoto/28238.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/michael-cramer/'> + Michael CRAMER + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Germany/'> + Germany [DE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> + <span class="group-icon group-icon-greensefa"></span> Greens/EFA + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/michel-dantin/'> + <img src='http://www.europarl.europa.eu/mepphoto/97296.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/michel-dantin/'> + Michel DANTIN + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/France/'> + France [FR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/tamas-deutsch/'> + <img src='http://www.europarl.europa.eu/mepphoto/96826.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/tamas-deutsch/'> + Tamás DEUTSCH + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Hungary/'> + Hungary [HU] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/viorica-dancila/'> + <img src='http://www.europarl.europa.eu/mepphoto/95281.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/viorica-dancila/'> + Viorica DÄ‚NCILÄ‚ + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Romania/'> + Romania [RO] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/bas-eickhout/'> + <img src='http://www.europarl.europa.eu/mepphoto/96725.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/bas-eickhout/'> + Bas EICKHOUT + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Netherlands/'> + Netherlands [NL] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> + <span class="group-icon group-icon-greensefa"></span> Greens/EFA + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + </table> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -752,7 +754,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -763,7 +765,7 @@ <li> - <a href='?&page=3'> + <a href='?search=&page=3'> 3 </a> @@ -773,13 +775,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=3'> + <a aria-label='Last' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -794,7 +796,7 @@ <br /> Display : - <a href='?active_only=1'> + <a href='?search=&active_only=1'> current legislature only </a> / all data @@ -807,28 +809,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -836,10 +838,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -851,6 +853,8 @@ </div> + + </div> 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 fbc31b93..6e845dfc 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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -172,7 +174,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=joly&active_only=0'> all data </a> @@ -184,28 +186,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=joly&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=joly&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=joly&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=joly&paginate_by=96'> 96 </a> @@ -213,10 +215,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=joly&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=joly&display=list'> <i class="fa fa-th-list"></i> </a> @@ -228,71 +230,71 @@ </div> - + - <table class='table'> - <tr> - <th> - Photo - </th> - <th> - Name - </th> - <th> - Chamber - </th> - <th> - Country - </th> - <th> - Group - </th> - <th> - Score - - </th> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/eva-joly/'> - <img src='http://www.europarl.europa.eu/mepphoto/96883.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/eva-joly/'> - Eva JOLY - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/France/'> - France [FR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> - <span class="group-icon group-icon-greensefa"></span> Greens/EFA - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> + <table class='table'> + <tr> + <th> + Photo + </th> + <th> + Name + </th> + <th> + Chamber + </th> + <th> + Country + </th> + <th> + Group + </th> + <th> + Score + + </th> </tr> - - </table> - + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/eva-joly/'> + <img src='http://www.europarl.europa.eu/mepphoto/96883.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/eva-joly/'> + Eva JOLY + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/France/'> + France [FR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> + <span class="group-icon group-icon-greensefa"></span> Greens/EFA + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + </table> + - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -309,7 +311,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=joly&active_only=0'> all data </a> @@ -321,28 +323,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=joly&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=joly&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=joly&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=joly&paginate_by=96'> 96 </a> @@ -350,10 +352,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=joly&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=joly&display=list'> <i class="fa fa-th-list"></i> </a> @@ -365,6 +367,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_active_displaygrid.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_active_displaygrid.content index 52043d3e..3477c9b0 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_active_displaygrid.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_active_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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -174,7 +176,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -184,13 +186,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=2'> + <a aria-label='Last' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -206,7 +208,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -218,28 +220,28 @@ 24 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -247,10 +249,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -262,7 +264,7 @@ </div> - + <div class='representative_grid'> @@ -1085,7 +1087,7 @@ </div> - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -1104,7 +1106,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -1114,13 +1116,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=2'> + <a aria-label='Last' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -1136,7 +1138,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -1148,28 +1150,28 @@ 24 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -1177,10 +1179,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -1192,6 +1194,8 @@ </div> + + </div> diff --git a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_all_displaygrid.content b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_all_displaygrid.content index c19867a7..522587ed 100644 --- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_all_displaygrid.content +++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_all_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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,7 +155,9 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -174,7 +176,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -184,13 +186,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=2'> + <a aria-label='Last' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -205,7 +207,7 @@ <br /> Display : - <a href='?active_only=1'> + <a href='?search=&active_only=1'> current legislature only </a> / all data @@ -218,28 +220,28 @@ 24 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -247,10 +249,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -262,7 +264,7 @@ </div> - + <div class='representative_grid'> @@ -1085,7 +1087,7 @@ </div> - <div class='pagination-block'> + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> @@ -1104,7 +1106,7 @@ <li> - <a href='?&page=2'> + <a href='?search=&page=2'> 2 </a> @@ -1114,13 +1116,13 @@ <li> - <a aria-label='Next' href='?&page=2'> + <a aria-label='Next' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=2'> + <a aria-label='Last' href='?search=&page=2'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -1135,7 +1137,7 @@ <br /> Display : - <a href='?active_only=1'> + <a href='?search=&active_only=1'> current legislature only </a> / all data @@ -1148,28 +1150,28 @@ 24 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -1177,10 +1179,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -1192,6 +1194,8 @@ </div> + + </div> 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 c1d3c611..16f90ead 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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,19 +155,21 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> <li> - <a aria-label='First' href='?&page=1'> + <a aria-label='First' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-circle-left"></i> </a> </li> <li> - <a aria-label='Previous' href='?&page=1'> + <a aria-label='Previous' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-left"></i> </a> @@ -177,7 +179,7 @@ <li> - <a href='?&page=1'> + <a href='?search=&page=1'> 1 </a> @@ -198,7 +200,7 @@ <li> - <a href='?&page=3'> + <a href='?search=&page=3'> 3 </a> @@ -208,13 +210,13 @@ <li> - <a aria-label='Next' href='?&page=3'> + <a aria-label='Next' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=3'> + <a aria-label='Last' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -230,7 +232,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -242,28 +244,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -271,10 +273,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -286,479 +288,479 @@ </div> - + - <table class='table'> - <tr> - <th> - Photo - </th> - <th> - Name - </th> - <th> - Chamber - </th> - <th> - Country - </th> - <th> - Group - </th> - <th> - Score - - </th> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/ismail-ertug/'> - <img src='http://www.europarl.europa.eu/mepphoto/96842.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/ismail-ertug/'> - Ismail ERTUG - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Germany/'> - Germany [DE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">10</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/jose-manuel-fernandes/'> - <img src='http://www.europarl.europa.eu/mepphoto/96899.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/jose-manuel-fernandes/'> - José Manuel FERNANDES - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Portugal/'> - Portugal [PT] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/monika-flasikova-benova/'> - <img src='http://www.europarl.europa.eu/mepphoto/23868.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/monika-flasikova-benova/'> - Monika FLAÅ ÃKOVà BEŇOVà - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Slovakia/'> - Slovakia [SK] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/ashley-fox/'> - <img src='http://www.europarl.europa.eu/mepphoto/96957.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/ashley-fox/'> - Ashley FOX - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/United%20Kingdom/'> - United Kingdom [GB] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/European%20Conservatives%20and%20Reformists%20Group/'> - <span class="group-icon group-icon-ecr"></span> ECR - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/eider-gardiazabal-rubial/'> - <img src='http://www.europarl.europa.eu/mepphoto/96991.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/eider-gardiazabal-rubial/'> - Eider GARDIAZABAL RUBIAL - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Spain/'> - Spain [ES] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/kinga-gal/'> - <img src='http://www.europarl.europa.eu/mepphoto/28150.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/kinga-gal/'> - Kinga GÃL - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Hungary/'> - Hungary [HU] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/ildiko-gall-pelcz/'> - <img src='http://www.europarl.europa.eu/mepphoto/102886.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/ildiko-gall-pelcz/'> - Ildikó GÃLL-PELCZ - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Hungary/'> - Hungary [HU] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/marian-harkin/'> - <img src='http://www.europarl.europa.eu/mepphoto/28116.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/marian-harkin/'> - Marian HARKIN - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Ireland/'> - Ireland [IE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> - <span class="group-icon group-icon-alde"></span> ALDE - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/mary-honeyball/'> - <img src='http://www.europarl.europa.eu/mepphoto/5846.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/mary-honeyball/'> - Mary HONEYBALL - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/United%20Kingdom/'> - United Kingdom [GB] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-danger">-7</span> - - </td> + <table class='table'> + <tr> + <th> + Photo + </th> + <th> + Name + </th> + <th> + Chamber + </th> + <th> + Country + </th> + <th> + Group + </th> + <th> + Score + + </th> </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/iliana-iotova/'> - <img src='http://www.europarl.europa.eu/mepphoto/38605.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/iliana-iotova/'> - Iliana IOTOVA - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Bulgaria/'> - Bulgaria [BG] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/liisa-jaakonsaari/'> - <img src='http://www.europarl.europa.eu/mepphoto/96684.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/liisa-jaakonsaari/'> - Liisa JAAKONSAARI - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Finland/'> - Finland [FI] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/yannick-jadot/'> - <img src='http://www.europarl.europa.eu/mepphoto/96740.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/yannick-jadot/'> - Yannick JADOT - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/France/'> - France [FR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> - <span class="group-icon group-icon-greensefa"></span> Greens/EFA - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - </table> - + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/ismail-ertug/'> + <img src='http://www.europarl.europa.eu/mepphoto/96842.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/ismail-ertug/'> + Ismail ERTUG - <div class='pagination-block'> + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Germany/'> + Germany [DE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">10</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/jose-manuel-fernandes/'> + <img src='http://www.europarl.europa.eu/mepphoto/96899.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/jose-manuel-fernandes/'> + José Manuel FERNANDES + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Portugal/'> + Portugal [PT] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/monika-flasikova-benova/'> + <img src='http://www.europarl.europa.eu/mepphoto/23868.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/monika-flasikova-benova/'> + Monika FLAÅ ÃKOVà BEŇOVà + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Slovakia/'> + Slovakia [SK] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/ashley-fox/'> + <img src='http://www.europarl.europa.eu/mepphoto/96957.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/ashley-fox/'> + Ashley FOX + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/United%20Kingdom/'> + United Kingdom [GB] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/European%20Conservatives%20and%20Reformists%20Group/'> + <span class="group-icon group-icon-ecr"></span> ECR + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/eider-gardiazabal-rubial/'> + <img src='http://www.europarl.europa.eu/mepphoto/96991.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/eider-gardiazabal-rubial/'> + Eider GARDIAZABAL RUBIAL + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Spain/'> + Spain [ES] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/kinga-gal/'> + <img src='http://www.europarl.europa.eu/mepphoto/28150.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/kinga-gal/'> + Kinga GÃL + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Hungary/'> + Hungary [HU] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/ildiko-gall-pelcz/'> + <img src='http://www.europarl.europa.eu/mepphoto/102886.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/ildiko-gall-pelcz/'> + Ildikó GÃLL-PELCZ + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Hungary/'> + Hungary [HU] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/marian-harkin/'> + <img src='http://www.europarl.europa.eu/mepphoto/28116.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/marian-harkin/'> + Marian HARKIN + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Ireland/'> + Ireland [IE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> + <span class="group-icon group-icon-alde"></span> ALDE + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/mary-honeyball/'> + <img src='http://www.europarl.europa.eu/mepphoto/5846.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/mary-honeyball/'> + Mary HONEYBALL + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/United%20Kingdom/'> + United Kingdom [GB] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-danger">-7</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/iliana-iotova/'> + <img src='http://www.europarl.europa.eu/mepphoto/38605.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/iliana-iotova/'> + Iliana IOTOVA + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Bulgaria/'> + Bulgaria [BG] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/liisa-jaakonsaari/'> + <img src='http://www.europarl.europa.eu/mepphoto/96684.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/liisa-jaakonsaari/'> + Liisa JAAKONSAARI + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Finland/'> + Finland [FI] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/yannick-jadot/'> + <img src='http://www.europarl.europa.eu/mepphoto/96740.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/yannick-jadot/'> + Yannick JADOT + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/France/'> + France [FR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> + <span class="group-icon group-icon-greensefa"></span> Greens/EFA + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + </table> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> <li> - <a aria-label='First' href='?&page=1'> + <a aria-label='First' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-circle-left"></i> </a> </li> <li> - <a aria-label='Previous' href='?&page=1'> + <a aria-label='Previous' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-left"></i> </a> @@ -768,7 +770,7 @@ <li> - <a href='?&page=1'> + <a href='?search=&page=1'> 1 </a> @@ -789,7 +791,7 @@ <li> - <a href='?&page=3'> + <a href='?search=&page=3'> 3 </a> @@ -799,13 +801,13 @@ <li> - <a aria-label='Next' href='?&page=3'> + <a aria-label='Next' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-right"></i> </a> </li> <li> - <a aria-label='Last' href='?&page=3'> + <a aria-label='Last' href='?search=&page=3'> <i aria-hidden="true" class="fa fa-chevron-circle-right"></i> </a> @@ -821,7 +823,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -833,28 +835,28 @@ 12 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -862,10 +864,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -877,6 +879,8 @@ </div> + + </div> 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 f345a902..a995482e 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.9ff29455e5ae.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.540ce621a9a1.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> @@ -155,19 +155,21 @@ - <div class='pagination-block'> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> <li> - <a aria-label='First' href='?&page=1'> + <a aria-label='First' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-circle-left"></i> </a> </li> <li> - <a aria-label='Previous' href='?&page=1'> + <a aria-label='Previous' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-left"></i> </a> @@ -177,7 +179,7 @@ <li> - <a href='?&page=1'> + <a href='?search=&page=1'> 1 </a> @@ -206,7 +208,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -218,28 +220,28 @@ 24 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -247,10 +249,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -262,479 +264,479 @@ </div> - + - <table class='table'> - <tr> - <th> - Photo - </th> - <th> - Name - </th> - <th> - Chamber - </th> - <th> - Country - </th> - <th> - Group - </th> - <th> - Score - - </th> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/eva-joly/'> - <img src='http://www.europarl.europa.eu/mepphoto/96883.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/eva-joly/'> - Eva JOLY - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/France/'> - France [FR] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> - <span class="group-icon group-icon-greensefa"></span> Greens/EFA - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/jarosaw-kalinowski/'> - <img src='http://www.europarl.europa.eu/mepphoto/96771.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/jarosaw-kalinowski/'> - JarosÅ‚aw KALINOWSKI - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Poland/'> - Poland [PL] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/andrey-kovatchev/'> - <img src='http://www.europarl.europa.eu/mepphoto/97968.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/andrey-kovatchev/'> - Andrey KOVATCHEV - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Bulgaria/'> - Bulgaria [BG] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/olle-ludvigsson/'> - <img src='http://www.europarl.europa.eu/mepphoto/96673.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/olle-ludvigsson/'> - Olle LUDVIGSSON - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Sweden/'> - Sweden [SE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/sirpa-pietikainen/'> - <img src='http://www.europarl.europa.eu/mepphoto/40599.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/sirpa-pietikainen/'> - Sirpa PIETIKÄINEN - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Finland/'> - Finland [FI] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-success">5</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/frederique-ries/'> - <img src='http://www.europarl.europa.eu/mepphoto/4253.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/frederique-ries/'> - Frédérique RIES - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Belgium/'> - Belgium [BE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> - <span class="group-icon group-icon-alde"></span> ALDE - </a> - </td> - <td> - <span class="label label-success">3</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/birgit-sippel/'> - <img src='http://www.europarl.europa.eu/mepphoto/96932.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/birgit-sippel/'> - Birgit SIPPEL - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Germany/'> - Germany [DE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> - <span class="group-icon group-icon-sd"></span> SD - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/charles-tannock/'> - <img src='http://www.europarl.europa.eu/mepphoto/4521.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/charles-tannock/'> - Charles TANNOCK - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/United%20Kingdom/'> - United Kingdom [GB] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/European%20Conservatives%20and%20Reformists%20Group/'> - <span class="group-icon group-icon-ecr"></span> ECR - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/ramon-tremosa-i-balcells/'> - <img src='http://www.europarl.europa.eu/mepphoto/97203.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/ramon-tremosa-i-balcells/'> - Ramon TREMOSA i BALCELLS - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Spain/'> - Spain [ES] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> - <span class="group-icon group-icon-alde"></span> ALDE - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> + <table class='table'> + <tr> + <th> + Photo + </th> + <th> + Name + </th> + <th> + Chamber + </th> + <th> + Country + </th> + <th> + Group + </th> + <th> + Score + + </th> </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/vladimir-urutchev/'> - <img src='http://www.europarl.europa.eu/mepphoto/38601.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/vladimir-urutchev/'> - Vladimir URUTCHEV - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Bulgaria/'> - Bulgaria [BG] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> - <span class="group-icon group-icon-epp"></span> EPP - </a> - </td> - <td> - <span class="label label-danger">-15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/ivo-vajgl/'> - <img src='http://www.europarl.europa.eu/mepphoto/97019.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/ivo-vajgl/'> - Ivo VAJGL - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Slovenia/'> - Slovenia [SI] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> - <span class="group-icon group-icon-alde"></span> ALDE - </a> - </td> - <td> - <span class="label label-success">15</span> - - </td> - </tr> - - <tr class='representative_item active'> - <td class='photo'> - <a href='/legislature/representative/cecilia-wikstrom/'> - <img src='http://www.europarl.europa.eu/mepphoto/96677.jpg' width='80' /> - - </a> - </td> - <td> - <a href='/legislature/representative/cecilia-wikstrom/'> - Cecilia WIKSTRÖM - - </a> - </td> - <td> - <a href='/legislature/representative/chamber/European%20Parliament/'> - European Parliament [EP] - - </a> - </td> - <td> - <a href='/legislature/representative/country/Sweden/'> - Sweden [SE] - - </a> - </td> - <td> - <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> - <span class="group-icon group-icon-alde"></span> ALDE - </a> - </td> - <td> - <span class="label label-danger">-7</span> - - </td> - </tr> - - </table> - + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/eva-joly/'> + <img src='http://www.europarl.europa.eu/mepphoto/96883.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/eva-joly/'> + Eva JOLY - <div class='pagination-block'> + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/France/'> + France [FR] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Greens/European%20Free%20Alliance/'> + <span class="group-icon group-icon-greensefa"></span> Greens/EFA + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/jarosaw-kalinowski/'> + <img src='http://www.europarl.europa.eu/mepphoto/96771.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/jarosaw-kalinowski/'> + JarosÅ‚aw KALINOWSKI + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Poland/'> + Poland [PL] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/andrey-kovatchev/'> + <img src='http://www.europarl.europa.eu/mepphoto/97968.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/andrey-kovatchev/'> + Andrey KOVATCHEV + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Bulgaria/'> + Bulgaria [BG] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/olle-ludvigsson/'> + <img src='http://www.europarl.europa.eu/mepphoto/96673.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/olle-ludvigsson/'> + Olle LUDVIGSSON + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Sweden/'> + Sweden [SE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/sirpa-pietikainen/'> + <img src='http://www.europarl.europa.eu/mepphoto/40599.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/sirpa-pietikainen/'> + Sirpa PIETIKÄINEN + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Finland/'> + Finland [FI] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-success">5</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/frederique-ries/'> + <img src='http://www.europarl.europa.eu/mepphoto/4253.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/frederique-ries/'> + Frédérique RIES + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Belgium/'> + Belgium [BE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> + <span class="group-icon group-icon-alde"></span> ALDE + </a> + </td> + <td> + <span class="label label-success">3</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/birgit-sippel/'> + <img src='http://www.europarl.europa.eu/mepphoto/96932.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/birgit-sippel/'> + Birgit SIPPEL + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Germany/'> + Germany [DE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Progressive%20Alliance%20of%20Socialists%20and%20Democrats%20in%20the%20European%20Parliament/'> + <span class="group-icon group-icon-sd"></span> SD + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/charles-tannock/'> + <img src='http://www.europarl.europa.eu/mepphoto/4521.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/charles-tannock/'> + Charles TANNOCK + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/United%20Kingdom/'> + United Kingdom [GB] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/European%20Conservatives%20and%20Reformists%20Group/'> + <span class="group-icon group-icon-ecr"></span> ECR + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/ramon-tremosa-i-balcells/'> + <img src='http://www.europarl.europa.eu/mepphoto/97203.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/ramon-tremosa-i-balcells/'> + Ramon TREMOSA i BALCELLS + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Spain/'> + Spain [ES] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> + <span class="group-icon group-icon-alde"></span> ALDE + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/vladimir-urutchev/'> + <img src='http://www.europarl.europa.eu/mepphoto/38601.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/vladimir-urutchev/'> + Vladimir URUTCHEV + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Bulgaria/'> + Bulgaria [BG] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20European%20People's%20Party%20(Christian%20Democrats)/'> + <span class="group-icon group-icon-epp"></span> EPP + </a> + </td> + <td> + <span class="label label-danger">-15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/ivo-vajgl/'> + <img src='http://www.europarl.europa.eu/mepphoto/97019.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/ivo-vajgl/'> + Ivo VAJGL + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Slovenia/'> + Slovenia [SI] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> + <span class="group-icon group-icon-alde"></span> ALDE + </a> + </td> + <td> + <span class="label label-success">15</span> + + </td> + </tr> + + <tr class='representative_item active'> + <td class='photo'> + <a href='/legislature/representative/cecilia-wikstrom/'> + <img src='http://www.europarl.europa.eu/mepphoto/96677.jpg' width='80' /> + + </a> + </td> + <td> + <a href='/legislature/representative/cecilia-wikstrom/'> + Cecilia WIKSTRÖM + + </a> + </td> + <td> + <a href='/legislature/representative/chamber/European%20Parliament/'> + European Parliament [EP] + + </a> + </td> + <td> + <a href='/legislature/representative/country/Sweden/'> + Sweden [SE] + + </a> + </td> + <td> + <a href='/legislature/representative/group/European%20Parliament/Group%20of%20the%20Alliance%20of%20Liberals%20and%20Democrats%20for%20Europe/'> + <span class="group-icon group-icon-alde"></span> ALDE + </a> + </td> + <td> + <span class="label label-danger">-7</span> + + </td> + </tr> + + </table> + + + <div class='pagination-block'> <nav> <ul class='pagination pagination-sm'> <li> - <a aria-label='First' href='?&page=1'> + <a aria-label='First' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-circle-left"></i> </a> </li> <li> - <a aria-label='Previous' href='?&page=1'> + <a aria-label='Previous' href='?search=&page=1'> <i aria-hidden="true" class="fa fa-chevron-left"></i> </a> @@ -744,7 +746,7 @@ <li> - <a href='?&page=1'> + <a href='?search=&page=1'> 1 </a> @@ -773,7 +775,7 @@ Display : current legislature only / - <a href='?active_only=0'> + <a href='?search=&active_only=0'> all data </a> @@ -785,28 +787,28 @@ 24 ( - <a href='?paginate_by=12'> + <a href='?search=&paginate_by=12'> 12 </a> / - <a href='?paginate_by=24'> + <a href='?search=&paginate_by=24'> 24 </a> / - <a href='?paginate_by=48'> + <a href='?search=&paginate_by=48'> 48 </a> / - <a href='?paginate_by=96'> + <a href='?search=&paginate_by=96'> 96 </a> @@ -814,10 +816,10 @@ ) <span class='grid-list-selector'> - <a href='?display=grid'> + <a href='?search=&display=grid'> <i class="fa fa-th"></i> </a> - <a href='?display=list'> + <a href='?search=&display=list'> <i class="fa fa-th-list"></i> </a> @@ -829,6 +831,8 @@ </div> + + </div> -- GitLab