added minister pictures

prsnca · Apr 27, 2014 · 0085f8d · 0085f8d
1 parent 8038872
commit 0085f8d
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git 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
@@ -1,3 +1,11 @@
 .voteType {
     text-align: center;
+}
+
+.minister-photo {
+    position: relative;
+    height: 120px;
+    width: 90px;
+    display: inline-block;
+    margin: 9px;
 }
diff --git a/committeeVotes/templates/committeeVotes/index.html b/committeeVotes/templates/committeeVotes/index.html
@@ -5,62 +5,48 @@
 <div class="container">
 
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-6">
             <h3>
                 הצעות אחרונות
             </h3>
         </div>
 
-        <div class="col-md-3">
+        <div class="col-md-6">
             <h3>
                 שרים
             </h3>
         </div>
     </div>
 
     <div class="row">
-        <div class="col-md-9">
+        <div class="col-md-6">
             <table class="table table-hover">
                 <thead>
                 <tr>
                     <th class="text-right">
                         שם ההצעה
                     </th>
-                    <th class="text-right">
-                        תוכן ההצעה
-                    </th>
+
                 </tr>
                 </thead>
                 {% for b in bills %}
 
                 <tr>
-
                     <td><a href="{% url 'detail' b.id %}">{{b.name}}</a></td>
-
-                    <td>{{b.description}}</td>
-
-
                 </tr>
                 {% endfor %}
             </table>
 
         </div>
-        <div class="col-md-3">
-
-            <table class="table table-hover">
-                <thead>
-                <th>
-                    שם השר
-                </th>
-                </thead>
-                {% for m in ministers %}
-                <tr>
-                    <td><a href="{% url 'minister' m.id %}">{{m.name}}</a></td>
-                </tr>
-                {% endfor %}
-            </table>
-        </div>
-
+        <div class="col-md-6">
+            {% for m in ministers %}
+            <div class="minister-photo">
+                <a href="{% url 'minister' m.id %}">
+                    <img src="{{ MEDIA_URL }}{{ m.photo }}-s.jpg">
+                    {{ m.name }}
+                </a>
+            </div>
+            {% endfor %}
     </div>
 
     {% endblock %}
diff --git a/committeeVotes/templates/committeeVotes/minister_detail.html b/committeeVotes/templates/committeeVotes/minister_detail.html
@@ -6,14 +6,11 @@
 
 
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-8">
             <h2>
                 {{ minister.name }}
             </h2>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-6">
+
             <h3>
                 הצבעות
             </h3>
@@ -36,6 +33,11 @@ <h3>
                 {% endfor %}
             </table>
         </div>
+    <div class="col-md-4">
+        <div class="pull-left">
+            <img src="{{ MEDIA_URL }}{{ minister.photo }}.jpg">
+        </div>
+    </div>
     </div>
 </div>
 

diff --git 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()