Merge branch 'master' of github.com:aesthaddicts/OpenData

This commit is contained in:
Arne Schlüter 2015-02-09 09:49:51 +01:00
commit 8bcb3c62f9
2 changed files with 21 additions and 7 deletions

View file

@ -87,12 +87,21 @@ def get_categories(article_body):
"""
bad_words = {
'antisemit': 'antisemitism',
'homophob': 'homophobia',
'jud': 'antisemitism',
'jüd': 'antisemitism',
'homo': 'homophobia',
'schwul': 'homophobia',
'lesb': 'homophobia',
'trans': 'homophobia',
'sexis': 'sexism',
'rassis': 'racism'
'frauenfeind': 'sexism',
'rassis': 'racism',
'fremdenfeind': 'racism',
'flüchtling': 'racism',
'migrant': 'racism'
}
found_categories = [bad_words[key] for key in bad_words
if key in article_body.lower()]
found_categories = set([bad_words[key] for key in bad_words
if key in article_body.lower()])
return found_categories
def get_geoloc(query):

View file

@ -90,7 +90,8 @@ a {
text-decoration: none;
color: #ddd;
text-align: center;
transition: background .3s ease;
-webkit-transition: background .3s ease;
transition: background .3s ease;
}
.year-filter a:hover {
@ -108,7 +109,8 @@ a {
.category-filter li {
margin: 12px 0;
opacity: .5;
transition: opacity .3s ease;
-webkit-transition: opacity .3s ease;
transition: opacity .3s ease;
}
.category-filter li.active {
@ -166,6 +168,7 @@ a {
width: 100%;
top: 0;
left: 0;
background: -webkit-linear-gradient(top right, rgba(255,255,255,.2), white 50%);
background: linear-gradient(to bottom left, rgba(255,255,255,.2), white 50%);
display: table-cell;
vertical-align: center;
@ -177,7 +180,9 @@ a {
left: 50%;
width: 90%;
max-width: 1024px;
transform: translate(-50%,-50%);
-webkit-transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%);
transform: translate(-50%,-50%);
}
#overlay h1 {