fixes

Author: sfrost

template/confreg/schedule.html

@@ -59,46 +59,20 @@ <h2>Schedule - {{conference}}</h2>
                                      <p>A list of the sessions can be found <a href="/events/sessions/{{conference.urlname}}/">here</a>.
                                      </p>
                                    </section>
-                <!-- Secondary Header
-                {%for day in days%}
-                        <section class="section">
-                          <hr>
-                                            <h2>{{day.day|date:"l, F d"}}</h2>
-                                            <div class="schedwrap" style="height: {{day.schedule_height}}px; width: {{day.schedule_width}}px;">
-                                            {%for room in day.rooms%}
-                                             <div class="sessblock roomheader" style="left: {{room.leftpos}}px; width: {{room.widthpos}}px; height: 100px;">
-                                             {{room.name}}
-                                             </div>
-                                            {%endfor%}
-                                            {%for session in day.sessions%}
-                                             <div class="sessblock track{{session.track.id}}">-->
-                                               <!--style="top: {{session.toppos}}px; left: {{session.leftpos}}px; width: {{session.widthpos}}px; height: {{session.heightpos}}px;-->
-                                            <!--{%if session.id%}
-                                              <a href="session/{{session.id}}-{{session.title|slugify}}/">{{session.timeslot}}<br/><b>{{session.title}}</b></a>
-                                            {%else%}
-                                              {{session.timeslot}} - <b>{{session.title}}</b>
-                                            {%endif%}
-                                              {%for speaker in session.speakers %}{%if forloop.first%}{%else%}, {%endif%}<i><a href="speaker/{{speaker.id}}-{{speaker.name|slugify}}/">{{speaker.name}}</a></i>{%endfor%}
-                                             </div>
-                                            {%endfor%}
-                                            </div>
-                                            <br>
-                        </section>
-                  {%endfor%}
-                  -->
                   {%for day in days%}
                   <section class="section">
                     <div class="container">
                       <h2>{{day.day|date:"l, F d"}}</h2>
                       <div class="row">
+                            {%for room in day.rooms%}
                         <div class="4u 12u$(medium)">
                           <section class="box">
-                            {%for room in day.rooms%}
                              <h4><div class="sessblock roomheader">
                              {{room.name}}
                            </div></h4>
                             <br>
                             {%for session in day.sessions%}
+                            {%if session.leftpos == room.leftpos%}
                              <div class="sessblock track{{session.track.id}}">
                                <!--style="top: {{session.toppos}}px; left: {{session.leftpos}}px; width: {{session.widthpos}}px; height: {{session.heightpos}}px;-->
                             {%if session.id%}
@@ -108,52 +82,11 @@ <h4><div class="sessblock roomheader">
                             {%endif%}
                               {%for speaker in session.speakers %}{%if forloop.first%}{%else%}, {%endif%}<i><a href="speaker/{{speaker.id}}-{{speaker.name|slugify}}/">{{speaker.name}}</a></i>{%endfor%}
                              </div>
-                            {%endfor%}
-                            {%endfor%}
-                          </section>
-                        </div>
-                        <div class="4u 12u$(medium)">
-                          <section class="box">
-                            {%for room in day.rooms%}
-                             <div class="sessblock roomheader" style="left: {{room.leftpos}}px; width: {{room.widthpos}}px; height: 100px;">
-                             {{room.name}}
-                             </div>
-                            {%endfor%}
-                            <br>
-                            {%for session in day.sessions%}
-                             <div class="sessblock track{{session.track.id}}">
-                               <!--style="top: {{session.toppos}}px; left: {{session.leftpos}}px; width: {{session.widthpos}}px; height: {{session.heightpos}}px;-->
-                            {%if session.id%}
-                              <a href="session/{{session.id}}-{{session.title|slugify}}/">{{session.timeslot}}<br/><b>{{session.title}}</b></a>
-                            {%else%}
-                              {{session.timeslot}} - <b>{{session.title}}</b>
                             {%endif%}
-                              {%for speaker in session.speakers %}{%if forloop.first%}{%else%}, {%endif%}<i><a href="speaker/{{speaker.id}}-{{speaker.name|slugify}}/">{{speaker.name}}</a></i>{%endfor%}
-                             </div>
                             {%endfor%}
                           </section>
                         </div>
-                        <div class="4u 12u$(medium)">
-                          <section class="box">
-                            {%for room in day.rooms%}
-                             <div class="sessblock roomheader" style="left: {{room.leftpos}}px; width: {{room.widthpos}}px; height: 100px;">
-                             {{room.name}}
-                             </div>
                             {%endfor%}
-                            <br>
-                            {%for session in day.sessions%}
-                             <div class="sessblock track{{session.track.id}}">
-                               <!--style="top: {{session.toppos}}px; left: {{session.leftpos}}px; width: {{session.widthpos}}px; height: {{session.heightpos}}px;-->
-                            {%if session.id%}
-                              <a href="session/{{session.id}}-{{session.title|slugify}}/">{{session.timeslot}}<br/><b>{{session.title}}</b></a>
-                            {%else%}
-                              {{session.timeslot}} - <b>{{session.title}}</b>
-                            {%endif%}
-                              {%for speaker in session.speakers %}{%if forloop.first%}{%else%}, {%endif%}<i><a href="speaker/{{speaker.id}}-{{speaker.name|slugify}}/">{{speaker.name}}</a></i>{%endfor%}
-                             </div>
-                            {%endfor%}
-                          </section>
-                        </div>
                       </div>
                     </div>
                   </section>