Merge branch 'dev'

Conflicts:
	.gitignore
	manage.py
	requirements.txt

.bowerrc

+{
+    "directory": "core/static/libs"
+}

.gitignore

-*~
-build
-develop-eggs
-dist
-*.egg
-*.egg-info
-eggs
-.installed.cfg
-nosetests.xml
-pip-log.txt
-*.py[co]
-pylint.out
-.tox
-env
-settings_local.py
-*.swp
-*.swo
-*.index
+*.sqlite3
+celerybeat-schedule
+memopol/config.json
+
+# SASS Cache
+.sass-cache
+
+CACHE/*
+
+# Emacs backup
+
+# From https://github.com/github/gitignore/blob/master/Python.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+venv/
 ve/
-db.sqlite
-COFFEESCRIPT_CACHE
+build/
+var/
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+# Django stuff:
+*.log

INSTALL

+How to install memopol
+
+1. Create a directory containing the whole project (say ~memopol)
+2. Create a python virtualenv in ~memopol : ~memopol/ve
+3. Clone memopol main repository (http://git.laquadrature.net/memopol/memopol_political_memory) in ~memopol/memopol_political_memory
+4. Clone django-representative directory (http://git.laquadrature.net/memopol/compotista_django-representatives) in ~memopol/django-representatives
+5. Clone the last version of django-chronograph (https://bitbucket.org/wnielson/django-chronograph) in ~memopol/django-chronograph
+(It seems that the version in pip is not up to date…)
+6. Symlink ~memopol/memopol_political_memory/representatives -> ~memopol/django-representatives/representatives
+7. Symlink ~memopol/memopol_political_memory/chronograph -> ~memopol/django-chronograph/chronograph
+8. Install requierements in the virtualenv with pip install -r ~memopol//memopol_political_memory/requierements
+9. Config your database in ~memopol/memopol_political_memory/settings.py
+10. Sync the database python manage.py syncdb
+11. Import mep from a compotista instance : python manage.py update update_eu_mps
+12. Run the server
+

bower.json

+{
+  "name": "Memopol",
+  "version": "0.0.0",
+  "dependencies": {
+    "jquery": "~2.1.3",
+    "foundation": "~5.5.1"
+  }
+}

core/admin.py

+from django.contrib import admin
+
+# Register your models here.

core/models.py

+from django.db import models
+
+# Create your models here.

core/static/.gitignore

+libs

core/static/css/base.css

+@font-face{
+    font-family: 'propagandaregular';
+    src: url('../font/propagan-webfont.eot');
+    src: url('../font/propagan-webfont.eot?#iefix') format('embedded-opentype'), url('../font/propagan-webfont.woff') format('woff'), url('../font/propagan-webfont.ttf') format('truetype'), url('../font/propagan-webfont.svg#propagandaregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face{
+    font-family: 'sansus_webissimoitalic';
+    src: url('../font/sansus_webissimo-italic-webfont-webfont.eot');
+    src: url('../font/sansus_webissimo-italic-webfont-webfont.eot?#iefix') format('embedded-opentype'), url('../font/sansus_webissimo-italic-webfont-webfont.woff') format('woff'), url('../font/sansus_webissimo-italic-webfont-webfont.ttf') format('truetype'), url('../font/sansus_webissimo-italic-webfont-webfont.svg#sansus_webissimoitalic') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face{
+    font-family: 'sansus_webissimoregular';
+    src: url('../font/sansus_webissimo-regular-webfont-webfont.eot');
+    src: url('../font/sansus_webissimo-regular-webfont-webfont.eot?#iefix') format('embedded-opentype'), url('../font/sansus_webissimo-regular-webfont-webfont.woff') format('woff'), url('../font/sansus_webissimo-regular-webfont-webfont.ttf') format('truetype'), url('../font/sansus_webissimo-regular-webfont-webfont.svg#sansus_webissimoregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+td {
+    vertical-align: middle;
+}
+
+body {
+    background-color: #E5E5E5;
+    font-family: "Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;
+    font-size: 14px;
+    line-height: 1;
+}
+
+#header {
+    padding: 0px 20px;
+    height: 78px;
+    line-height: 45px;
+}
+
+.row {
+    width: 940px;
+    max-width: 100%;
+    min-width: 768px;
+    margin: 0px auto;
+}
+
+#header, #footer {
+    background: none repeat scroll 0px 0px #5B8EDC;
+    color: #FFF;
+    vertical-align: middle;
+}
+
+#header img {
+    float: left;
+    width: 74px;
+}
+
+#header h1 {
+    margin: 0px;
+}
+
+h1 {
+font-size: 44px;
+}
+
+#header h1 a {
+    line-height: 10px;
+    font-family: propagandaregular;
+    font-size: 26px;
+}
+
+#header a {
+    color: #FFF;
+    text-decoration: none;
+}
+
+#header p {
+    font-style: italic;
+    padding-left: 20px;
+    margin-bottom: 17px;
+}
+
+p {
+    font-family: "Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;
+    font-weight: normal;
+    font-size: 14px;
+    line-height: 1.6;
+    margin-bottom: 17px;
+}
+
+.nav-bar {
+    margin-top: 0px;
+    background-color: #FFF;
+    border-bottom: 1px solid #EEE;
+    height: 30px;
+    line-height: 30px;
+    height: 40px;
+    padding: 0px;
+}
+
+.nav-bar > li {
+    float: left;
+    display: block;
+    position: relative;
+    padding: 0px;
+    margin: 0px;
+    line-height: 38px;
+}
+
+.nav-bar > li > a {
+    padding: 0px 20px;
+    font-size: 14px;
+    text-decoration: none;
+    color: #000;
+}
+
+li {
+    text-decoration: none;
+    list-style: outside none none;
+}
+
+.panel.callout {
+    background: none repeat scroll 0% 0% #5B8EDC;
+    color: #FFF;
+    border-color: #2284A1;
+    box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.5) inset;
+}
+.panel {
+    background: none repeat scroll 0% 0% #F2F2F2;
+    border: 1px solid #E6E6E6;
+    margin: 0px 20px 22px;
+    padding: 20px;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-family: "Helvetica Neue","Helvetica",Helvetica,Arial,sans-serif;
+    font-weight: bold;
+    color: #222;
+    text-rendering: optimizelegibility;
+    line-height: 1.1;
+    margin-bottom: 14px;
+    margin-top: 14px;
+}
+
+h2, h3, h4 {
+    font-family: sansus_webissimoregular;
+}
+
+h2 { font-size: 2em; }
+h3 { font-size: 1.5em; }
+h3 small { font-size: 0.6em; }
+
+.column, .columns {
+    float: left;
+    min-height: 1px;
+    padding: 0px 0px;
+    position: relative;
+}
+
+.large-12.main {
+    background: white;
+    padding: 10px;
+    width: 920px;
+}
+
+.large-8 {
+    width: 66.6667%;
+} .large-4 {
+    width: 33.3333%;
+}
+
+#footer {
+    padding: 20px 0px;
+    text-align: center;
+    line-height: 20px;
+    font-size: 14px;
+}
+
+#footer ul {
+    margin-bottom: 11px;
+}
+#footer li {
+    display: inline;
+}
+#footer a {
+    color: #FFF;
+    text-decoration: underline;
+}

core/static/css/reset.css

+html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;vertical-align:baseline;background:transparent}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}:focus{outline:0}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}