From 6d34a02911290229fb17925a37a8d250b8dc1f23 Mon Sep 17 00:00:00 2001 From: Nicolas Joyard <joyard.nicolas@gmail.com> Date: Sun, 17 Apr 2016 10:42:47 +0200 Subject: [PATCH] Add chamber icons and chamber info where applicable --- memopol/fixtures/one_representative.json | 81 +++++++++++++----- static/images/chamber-an.png | Bin 0 -> 4679 bytes static/images/chamber-ep.png | Bin 0 -> 9169 bytes static/images/chamber-sen.png | Bin 0 -> 6312 bytes static/less/base.less | 1 + static/less/chambers.less | 20 +++++ templates/base.html | 2 +- .../_representative_block.haml | 5 ++ templates/representatives/group_list.haml | 11 ++- .../representatives/representative_grid.haml | 3 + .../representatives/representative_list.haml | 6 ++ 11 files changed, 106 insertions(+), 23 deletions(-) create mode 100644 static/images/chamber-an.png create mode 100644 static/images/chamber-ep.png create mode 100644 static/images/chamber-sen.png create mode 100644 static/less/chambers.less diff --git a/memopol/fixtures/one_representative.json b/memopol/fixtures/one_representative.json index feae25c6..fab6f04f 100644 --- a/memopol/fixtures/one_representative.json +++ b/memopol/fixtures/one_representative.json @@ -60,6 +60,27 @@ "model": "representatives.website", "pk": 297 }, +{ + "fields": { + "country": null, + "name": "European Parliament", + "abbreviation": "EP" + }, + "model": "representatives.chamber", + "pk": 1 +}, +{ + "fields": { + "updated": "2015-12-27T16:03:31.046Z", + "name": "European Parliament", + "created": "2015-12-27T16:03:31.046Z", + "kind": "chamber", + "abbreviation": "EP", + "chamber": 1 + }, + "model": "representatives.group", + "pk": 1 +}, { "fields": { "updated": "2015-12-27T16:03:31.046Z", @@ -67,7 +88,8 @@ "created": "2015-12-27T16:03:31.046Z", "kind": "committee", "abbreviation": "EMPL", - "fingerprint": "7f0e6d2c3342dde2c6077e127a418a19e0e891bb" + "fingerprint": "7f0e6d2c3342dde2c6077e127a418a19e0e891bb", + "chamber": 1 }, "model": "representatives.group", "pk": 3 @@ -79,7 +101,8 @@ "created": "2015-12-27T16:03:31.100Z", "kind": "committee", "abbreviation": "JURI", - "fingerprint": "bc1a051072a9f2caf7c5c7105bccd13834b4d89d" + "fingerprint": "bc1a051072a9f2caf7c5c7105bccd13834b4d89d", + "chamber": 1 }, "model": "representatives.group", "pk": 9 @@ -91,7 +114,8 @@ "created": "2015-12-27T16:03:31.388Z", "kind": "committee", "abbreviation": "CULT", - "fingerprint": "a169e2d7e6009d3c089e4de43c0f3e0fc312fca4" + "fingerprint": "a169e2d7e6009d3c089e4de43c0f3e0fc312fca4", + "chamber": 1 }, "model": "representatives.group", "pk": 20 @@ -103,7 +127,8 @@ "created": "2015-12-27T16:03:31.402Z", "kind": "group", "abbreviation": "SD", - "fingerprint": "729890eba3ce20f90808b32110871d1fe41b53b6" + "fingerprint": "729890eba3ce20f90808b32110871d1fe41b53b6", + "chamber": 1 }, "model": "representatives.group", "pk": 21 @@ -115,7 +140,8 @@ "created": "2015-12-27T16:03:31.510Z", "kind": "committee", "abbreviation": "ITRE", - "fingerprint": "17ff1a9fe036e400612c9153c1647a8258c34d63" + "fingerprint": "17ff1a9fe036e400612c9153c1647a8258c34d63", + "chamber": 1 }, "model": "representatives.group", "pk": 23 @@ -127,7 +153,8 @@ "created": "2015-12-27T16:03:31.521Z", "kind": "committee", "abbreviation": "REGI", - "fingerprint": "7a2a03e6d40e5af34f3dc6bccd8e1900e2de3abf" + "fingerprint": "7a2a03e6d40e5af34f3dc6bccd8e1900e2de3abf", + "chamber": 1 }, "model": "representatives.group", "pk": 24 @@ -139,7 +166,8 @@ "created": "2015-12-27T16:03:31.768Z", "kind": "committee", "abbreviation": "ECON", - "fingerprint": "2da973401cd76bb56b36f3a9162cda13d2f2d8f3" + "fingerprint": "2da973401cd76bb56b36f3a9162cda13d2f2d8f3", + "chamber": 1 }, "model": "representatives.group", "pk": 30 @@ -163,7 +191,8 @@ "created": "2015-12-27T16:03:32.489Z", "kind": "group", "abbreviation": "PSE", - "fingerprint": "53961127dd190ceb0568d2290e195570ed907164" + "fingerprint": "53961127dd190ceb0568d2290e195570ed907164", + "chamber": 1 }, "model": "representatives.group", "pk": 41 @@ -175,7 +204,8 @@ "created": "2015-12-27T16:03:33.606Z", "kind": "committee", "abbreviation": "ENVI", - "fingerprint": "9d81a89ff2836afbe40dc4109b085c00bf0b1fdd" + "fingerprint": "9d81a89ff2836afbe40dc4109b085c00bf0b1fdd", + "chamber": 1 }, "model": "representatives.group", "pk": 48 @@ -187,7 +217,8 @@ "created": "2015-12-27T16:03:34.712Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "6482a4de9bdda2ae85fb71f78de0cfd49441a0e6" + "fingerprint": "6482a4de9bdda2ae85fb71f78de0cfd49441a0e6", + "chamber": 1 }, "model": "representatives.group", "pk": 64 @@ -199,7 +230,8 @@ "created": "2015-12-27T16:03:34.756Z", "kind": "group", "abbreviation": "PSE", - "fingerprint": "bdcddf45a869f242e80961303a719a3e0f29d795" + "fingerprint": "bdcddf45a869f242e80961303a719a3e0f29d795", + "chamber": 1 }, "model": "representatives.group", "pk": 67 @@ -211,7 +243,8 @@ "created": "2015-12-27T16:03:36.124Z", "kind": "committee", "abbreviation": "FEMM", - "fingerprint": "07290c78bb6679e36a5413d2b8122ff4c1477889" + "fingerprint": "07290c78bb6679e36a5413d2b8122ff4c1477889", + "chamber": 1 }, "model": "representatives.group", "pk": 77 @@ -223,7 +256,8 @@ "created": "2015-12-27T16:03:36.219Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "171567aaa5ebc7bbdcf3fa3b8a293f9ade40c03a" + "fingerprint": "171567aaa5ebc7bbdcf3fa3b8a293f9ade40c03a", + "chamber": 1 }, "model": "representatives.group", "pk": 79 @@ -235,7 +269,8 @@ "created": "2015-12-27T16:03:37.137Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "e2ece7c8073aa5d8ed32a003ecb5989eb363fe95" + "fingerprint": "e2ece7c8073aa5d8ed32a003ecb5989eb363fe95", + "chamber": 1 }, "model": "representatives.group", "pk": 86 @@ -247,7 +282,8 @@ "created": "2015-12-27T16:03:40.000Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "25ea9a5e8434c4c550c2fa4d7d8b79769f5eb8c0" + "fingerprint": "25ea9a5e8434c4c550c2fa4d7d8b79769f5eb8c0", + "chamber": 1 }, "model": "representatives.group", "pk": 97 @@ -259,7 +295,8 @@ "created": "2015-12-27T16:03:42.041Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "ae4f709686238bb59f0e8d3f1f1362d6c6777744" + "fingerprint": "ae4f709686238bb59f0e8d3f1f1362d6c6777744", + "chamber": 1 }, "model": "representatives.group", "pk": 101 @@ -271,7 +308,8 @@ "created": "2015-12-27T16:03:47.768Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "fe7cabd2bfa99251e4f9bb2d700ec2a1898c312b" + "fingerprint": "fe7cabd2bfa99251e4f9bb2d700ec2a1898c312b", + "chamber": 1 }, "model": "representatives.group", "pk": 111 @@ -283,7 +321,8 @@ "created": "2015-12-27T16:03:58.940Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "6d1f6a5bcc43f05a7cfdee1d2bc7b0d0cc5db6dc" + "fingerprint": "6d1f6a5bcc43f05a7cfdee1d2bc7b0d0cc5db6dc", + "chamber": 1 }, "model": "representatives.group", "pk": 121 @@ -295,7 +334,8 @@ "created": "2015-12-27T16:04:34.387Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "920d936c976ee2b6fff4ce760dfb154d926dc2d1" + "fingerprint": "920d936c976ee2b6fff4ce760dfb154d926dc2d1", + "chamber": 1 }, "model": "representatives.group", "pk": 141 @@ -307,7 +347,8 @@ "created": "2015-12-27T16:04:50.770Z", "kind": "delegation", "abbreviation": "", - "fingerprint": "35588fd232a2f314c16242334bad5f5190b4efae" + "fingerprint": "35588fd232a2f314c16242334bad5f5190b4efae", + "chamber": 1 }, "model": "representatives.group", "pk": 150 diff --git a/static/images/chamber-an.png b/static/images/chamber-an.png new file mode 100644 index 0000000000000000000000000000000000000000..0a43283d1167b83a79ae38c5062932e2268eee75 GIT binary patch literal 4679 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 Uqy3QFf1wYct*NI`t!@+kKSvgsc>n+a literal 0 HcmV?d00001 diff --git a/static/images/chamber-ep.png b/static/images/chamber-ep.png new file mode 100644 index 0000000000000000000000000000000000000000..4d93e9a9f0cfd984d4b386587c25ce98d57b0bef GIT binary patch literal 9169 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 CPza9z literal 0 HcmV?d00001 diff --git a/static/images/chamber-sen.png b/static/images/chamber-sen.png new file mode 100644 index 0000000000000000000000000000000000000000..7a23430901649d71904a2781e134b00e64288617 GIT binary patch literal 6312 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 literal 0 HcmV?d00001 diff --git a/static/less/base.less b/static/less/base.less index b98940ff..a1b33fbc 100644 --- a/static/less/base.less +++ b/static/less/base.less @@ -5,6 +5,7 @@ @import 'table'; @import 'legislature'; @import 'positions'; +@import 'chambers'; body { background: #E5E5E5; diff --git a/static/less/chambers.less b/static/less/chambers.less new file mode 100644 index 00000000..7cc04d76 --- /dev/null +++ b/static/less/chambers.less @@ -0,0 +1,20 @@ +.chamber-icon { + display: inline-block; + width: 1.5em; + height: 1.5em; + + vertical-align: bottom; + background-size: 100%; + + &.chamber-icon-an { + background-image: url(../images/chamber-an.png); + } + + &.chamber-icon-ep { + background-image: url(../images/chamber-ep.png); + } + + &.chamber-icon-sen { + background-image: url(../images/chamber-sen.png); + } +} diff --git a/templates/base.html b/templates/base.html index bb38eb94..f6c43a93 100644 --- a/templates/base.html +++ b/templates/base.html @@ -13,7 +13,7 @@ {% compress css %} <link rel="stylesheet" href="{% static 'libs/bootstrap/dist/css/bootstrap.min.css' %}" type="text/css" /> <link rel="stylesheet" href="{% static 'libs/fontawesome/css/font-awesome.min.css' %}" type="text/css" /> - <link rel="stylesheet" href="{% static 'libs/flag-icon-css/css/flag-icon.min.css' %}" type="text/css" /> + <link rel="stylesheet" href="{% static 'libs/flag-icon-css/css/flag-icon.min.css' %}" type="text/css" />" <link rel="stylesheet" href="{% static 'less/base.less' %}" type="text/less" /> {% endcompress %} {% compress js %} diff --git a/templates/representatives/_representative_block.haml b/templates/representatives/_representative_block.haml index ecdc69bc..769f0853 100644 --- a/templates/representatives/_representative_block.haml +++ b/templates/representatives/_representative_block.haml @@ -18,6 +18,11 @@ %th Score %td = representative.score.score|score_label + %tr + %th Chamber + %td< + %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.main_mandate.group.chamber.name %}"} + = representative.main_mandate.group.chamber|chamber_icon %tr %th Country %td< diff --git a/templates/representatives/group_list.haml b/templates/representatives/group_list.haml index bf7fc5a8..7c1cee01 100644 --- a/templates/representatives/group_list.haml +++ b/templates/representatives/group_list.haml @@ -1,16 +1,23 @@ - extends 'base.html' +- load representatives_tags + - block content %table.table - for group in object_list %tr - if group.kind != 'country' and group.kind != 'chamber' %td - %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=group.chamber.name %}"}= group.chamber.name + %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=group.chamber.name %}"} + = group.chamber|chamber_icon %td %a{'href': '{{ group.get_absolute_url }}'} - if group.abbreviation ={group.abbreviation} %td - %a{'href': '{{ group.get_absolute_url }}'}= group.name + %a{'href': '{{ group.get_absolute_url }}'}= + - if group.kind == 'chamber' + = group|chamber_icon + - else + = group.name diff --git a/templates/representatives/representative_grid.haml b/templates/representatives/representative_grid.haml index d8c1dddb..f28e9647 100644 --- a/templates/representatives/representative_grid.haml +++ b/templates/representatives/representative_grid.haml @@ -15,6 +15,9 @@ %li.name %a{'href': "{{ representative.get_absolute_url }}"} = representative.full_name + %li.chamber + %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.main_mandate.group.chamber.name %}"} + = representative.main_mandate.group.chamber|chamber_icon %li.country %a{'href': "{{ representative.country.get_absolute_url }}"} = representative.country|country_flag diff --git a/templates/representatives/representative_list.haml b/templates/representatives/representative_list.haml index 525f375c..5cb5e7f3 100644 --- a/templates/representatives/representative_list.haml +++ b/templates/representatives/representative_list.haml @@ -27,6 +27,8 @@ - trans 'Photo' %th - trans 'Name' + %th + - trans 'Chamber' %th - trans 'Country' %th @@ -44,6 +46,10 @@ %a{'href': "{{ representative.get_absolute_url }}"} = representative.full_name + %td + %a{'href': "{% url 'representatives:representative-list' group_kind='chamber' group=representative.main_mandate.group.chamber.name %}"} + = representative.main_mandate.group.chamber + %td %a{'href': "{{ representative.country.get_absolute_url }}"} = representative.country -- GitLab