Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Political Memory
memopol
Commits
b9802f2d
Commit
b9802f2d
authored
Jun 13, 2016
by
njoyard
Committed by
GitHub
Jun 13, 2016
Browse files
Merge pull request #90 from political-memory/country-flags
Add country flags (and import template tags)
parents
bbf10045
d900f7fe
Changes
7
Hide whitespace changes
Inline
Side-by-side
memopol/tests/response_fixtures/GroupListTest.test_country/content
View file @
b9802f2d
...
...
@@ -190,8 +190,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Austria/'
>
Austria
<span
class=
"flag-icon flag-icon-at"
></span>
Austria
</a>
</td>
...
...
@@ -209,8 +208,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Belgium/'
>
Belgium
<span
class=
"flag-icon flag-icon-be"
></span>
Belgium
</a>
</td>
...
...
@@ -228,8 +226,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Bulgaria/'
>
Bulgaria
<span
class=
"flag-icon flag-icon-bg"
></span>
Bulgaria
</a>
</td>
...
...
@@ -247,8 +244,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Cyprus/'
>
Cyprus
<span
class=
"flag-icon flag-icon-cy"
></span>
Cyprus
</a>
</td>
...
...
@@ -266,8 +262,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Czech%20Republic/'
>
Czech Republic
<span
class=
"flag-icon flag-icon-cz"
></span>
Czech Republic
</a>
</td>
...
...
@@ -285,8 +280,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Denmark/'
>
Denmark
<span
class=
"flag-icon flag-icon-dk"
></span>
Denmark
</a>
</td>
...
...
@@ -304,8 +298,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Estonia/'
>
Estonia
<span
class=
"flag-icon flag-icon-ee"
></span>
Estonia
</a>
</td>
...
...
@@ -323,8 +316,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Finland/'
>
Finland
<span
class=
"flag-icon flag-icon-fi"
></span>
Finland
</a>
</td>
...
...
@@ -342,8 +334,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/France/'
>
France
<span
class=
"flag-icon flag-icon-fr"
></span>
France
</a>
</td>
...
...
@@ -361,8 +352,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Germany/'
>
Germany
<span
class=
"flag-icon flag-icon-de"
></span>
Germany
</a>
</td>
...
...
@@ -380,8 +370,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Greece/'
>
Greece
<span
class=
"flag-icon flag-icon-gr"
></span>
Greece
</a>
</td>
...
...
@@ -399,8 +388,7 @@
<td>
<a
href=
'/legislature/representative/country/European%20Parliament/Hungary/'
>
Hungary
<span
class=
"flag-icon flag-icon-hu"
></span>
Hungary
</a>
</td>
...
...
templates/representatives/_representative_block.haml
View file @
b9802f2d
-
load
memopol_tags
-
load
representatives_tags
-
load
representatives_recommendations_tags
-
load
humanize
...
...
templates/representatives/group_list.haml
View file @
b9802f2d
-
extends
'base.html'
-
load
memopol_tags
-
load
representatives_tags
-
block
content
...
...
@@ -25,6 +24,8 @@
%a
{
'href'
:
"{% group_url group %}"
}=
-
if
group
.
kind
==
'chamber'
=
group
|
chamber_icon
-
elif
group
.
kind
==
'country'
=
group
|
country_flag
-
elif
group
.
kind
==
'group'
=
group
|
group_long_icon
-
else
...
...
templates/representatives/representative_detail.haml
View file @
b9802f2d
...
...
@@ -2,8 +2,6 @@
-
load
humanize
-
load
memopol_tags
-
load
representatives_tags
-
load
representatives_votes_tags
-
load
representatives_recommendations_tags
-
block
head
...
...
templates/representatives/representative_grid.haml
View file @
b9802f2d
-
extends
'representatives/representative_list.html'
-
load
memopol_tags
-
load
representatives_tags
-
load
representatives_recommendations_tags
-
block
list
...
...
templates/representatives/representative_list.haml
View file @
b9802f2d
...
...
@@ -2,7 +2,6 @@
-
load
i18n
-
load
memopol_tags
-
load
representatives_tags
-
load
representatives_recommendations_tags
-
block
content
...
...
templates/representatives_votes/dossier_detail.haml
View file @
b9802f2d
-
extends
"base.html"
-
load
i18n
-
load
representatives_votes
_tags
-
load
memopol
_tags
-
block
content
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment