diff --git a/committeeVotes/models.py b/committeeVotes/models.py index 789fd71..1eb650e 100644 --- a/committeeVotes/models.py +++ b/committeeVotes/models.py @@ -20,6 +20,7 @@ def __unicode__(self): class Minister(models.Model): name = models.CharField(max_length=30) + photo = models.CharField(max_length=100) def __unicode__(self): return self.name diff --git a/committeeVotes/static/site.css b/committeeVotes/static/site.css index 48b37f4..18d4cee 100644 --- a/committeeVotes/static/site.css +++ b/committeeVotes/static/site.css @@ -1,3 +1,11 @@ .voteType { text-align: center; +} + +.minister-photo { + position: relative; + height: 120px; + width: 90px; + display: inline-block; + margin: 9px; } \ No newline at end of file diff --git a/committeeVotes/templates/committeeVotes/index.html b/committeeVotes/templates/committeeVotes/index.html index 7f78773..7ad0f56 100644 --- a/committeeVotes/templates/committeeVotes/index.html +++ b/committeeVotes/templates/committeeVotes/index.html @@ -5,13 +5,13 @@
-
+

הצעות אחרונות

-
+

שרים

@@ -19,48 +19,34 @@

-
+
- + {% for b in bills %} - - - - - {% endfor %}
שם ההצעה - תוכן ההצעה -
{{b.name}}{{b.description}}
-
- - - - - - {% for m in ministers %} - - - - {% endfor %} -
- שם השר -
{{m.name}}
-
- +
+ {% for m in ministers %} + + {% endfor %}
{% endblock %} \ No newline at end of file diff --git a/committeeVotes/templates/committeeVotes/minister_detail.html b/committeeVotes/templates/committeeVotes/minister_detail.html index 7e353af..1a19c4e 100644 --- a/committeeVotes/templates/committeeVotes/minister_detail.html +++ b/committeeVotes/templates/committeeVotes/minister_detail.html @@ -6,14 +6,11 @@
-
+

{{ minister.name }}

-
-
-
-
+

הצבעות

@@ -36,6 +33,11 @@

{% endfor %}

+
+
+ +
+
diff --git a/openCommittee/settings.py b/openCommittee/settings.py index 97a37ca..8681d12 100644 --- a/openCommittee/settings.py +++ b/openCommittee/settings.py @@ -83,9 +83,12 @@ # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.6/howto/static-files/ +STATIC_ROOT = '' STATIC_URL = '/static/' +MEDIA_URL = "http://www.knesset.gov.il/mk/images/members/" + if os.environ.get('DATABASE_URL'): # Heroku import dj_database_url DATABASES['default'] = dj_database_url.config()