Commits

Anonymous committed 492686a Merge

merged

  • Participants
  • Parent commits 4b41da7, 3654f6c

Comments (0)

Files changed (4)

File sitemedia/css/style.css

 	float:left;
 	background:url(/sitemedia/pics/btn_dropshadow.gif) no-repeat;
 }
+
+ul.sponsors li {
+    list-style-type:none;
+}
+
+table.schdeule tr {
+    height: 4em;
+}
+
+table.schedule tr td.time {
+    vertical-align: top;
+    padding-top: 0px;
+    background: #eeeeee;
+    border-bottom: #aaaaaa solid 1px;
+}

File templates/base.html

         {% get_sponsormenu %}
             {% for p in stmn %}
         <h5>{{ p.head }}</h5>
-        <ul>
+        <ul class="sponsors">
         {% for mn in p.spn %}
         <li >
         <a href="{{ mn.address }}"><img src="{{mn.logo.url|thumbnail:" width=120"}}" width="120" /></a>

File templates/web/displayschedule.html

 
     {% for conf_day,day in schedule_data %}
       <h3>Schedule on {{ conf_day.confdate|date:"d F,Y" }}</h3>
-      <table style="border: #000 solid 1px; text-align: center;">
+      <table style="border: #000 solid 1px; text-align: center;" class="schedule">
     <tr>
           <th>
         Time
         </tr>
       {% for time_int,time_slot in day %}
            <tr>
-         <td valign="top">{{ time_int }}</td>      
+         <td class="time">{{ time_int }}</td>      
           {% for hall in time_slot %}
             {% if hall %}
               {% ifnotequal hall 1 %}
                 {% for item, num_slots in hall %}
-                  <td style="background: {% if item.talk.get_colour %}{{ item.talk.get_colour }} {% else %} #FFFFFFF {% endif %};" rowspan="{{ num_slots }}">
+                  <td style="background: {% if item.talk.get_colour %}{{ item.talk.get_colour }} {% else %} #CCCCCC {% endif %};" rowspan="{{ num_slots }}">
                 <a href= "{% url talk_by_id id=item.talk.id %}">
                   {{ item.talk.title }}
                 </a>

File web/templatetags/base_utils.py

         for spon in self.sponstypes:
             spons = {}
             spons['head'] = spon
-            spons['spn'] = Sponsor.objects.filter(kind=spon).order_by('?')
+            spons['spn'] = Sponsor.objects.filter(kind=spon).order_by('priority')
             try:
                 if spons['spn']:
                     self.sponslist.append(spons)