Merge lp:~jose/summit/981880-fix into lp:summit

[José Antonio Rey]

Copied hover details from daily.html to mine.html and review.html. Credits to mhall119.

Copied hover details from daily.html to mine.html and review.html.

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/templates/schedule/mine.html'
--- summit/schedule/templates/schedule/mine.html	2012-04-15 02:34:02 +0000
+++ summit/schedule/templates/schedule/mine.html	2013-03-14 01:21:22 +0000
@@ -6,21 +6,6 @@
 
 {% block head %}
 {{ block.super }}
-<script language="JavaScript">
-
-function show_agenda_details(agenda_id, index_id) {
-    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
-    var details = document.getElementById(elem_id)
-    details.style.display='block';
-}
-
-function hide_agenda_details(agenda_id, index_id) {
-    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
-    var details = document.getElementById(elem_id)
-    details.style.display='none';
-}
-
-</script>
 <style>
 TABLE img.icon {
     vertical-align: bottom;
@@ -87,7 +72,6 @@
 {% block content %}
 <div class="row">
 <article class="span-12">
-
 <div class="schedule-head">
     <h2>Meetings created by {{ drafter.name }}</h2>
 </div>
@@ -95,9 +79,31 @@
 {% for meeting in meetings %}
 <tr style="background-color: {{ meeting.track_color }}; {% if meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
 <td width="75%">
+    <span onMouseOver="show_meeting_details({{meeting.id}});" onMouseOut="hide_meeting_details({{meeting.id}});">
     <a href="{{ meeting.meeting_page_url }}" style="color: #000000;" class="main-agenda-item-name">
         {{ meeting.title }}
     </a>
+<div id="meeting-{{meeting.id}}-details" class="agenda-details">
+<div class="arrow"></div>
+<div class="meeting-description">{{meeting.description}}</div>
+{% if meeting.participant_set.count %}
+<br /><b>Participants:</b>
+<div>{% for participant in meeting.participant_set.all %}
+    <div>
+        {% if participant.required %}
+        <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
+        {% else %}
+        <img class="icon" src="/media/img/attending.png" alt="attending">
+        {% endif %}{{ participant.attendee.user }}</div>
+{% endfor %}</div>
+{% endif %}
+{% if meeting.tracks.count > 0 %}
+<br /><b>Tracks:</b>
+<ul>{% for track in meeting.tracks.all %}
+    <li style="color: #{{track.color}};">{{ track.title }}</li>
+{% endfor %}</ul>
+{% endif %}
+</div>
 </td>
 <td width="25%">
 Status: {{ meeting.get_approved_display }}
@@ -107,4 +113,23 @@
 </table>
 </article>
 </div>
+{% block closure %}
+
+<script language="JavaScript">
+
+function show_meeting_details(meeting_id) {
+    var elem_id = 'meeting-'+meeting_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='block';
+}
+
+function hide_meeting_details(meeting_id) {
+    var elem_id = 'meeting-'+meeting_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='none';
+}
+
+</script>
+{% endblock %}
+
 {% endblock %}

=== modified file 'summit/schedule/templates/schedule/review.html'
--- summit/schedule/templates/schedule/review.html	2012-04-15 02:34:02 +0000
+++ summit/schedule/templates/schedule/review.html	2013-03-14 01:21:22 +0000
@@ -6,21 +6,6 @@
 
 {% block extrahead %}
 {{ block.super }}
-<script language="JavaScript">
-
-function show_agenda_details(agenda_id, index_id) {
-    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
-    var details = document.getElementById(elem_id)
-    details.style.display='block';
-}
-
-function hide_agenda_details(agenda_id, index_id) {
-    var elem_id = 'agenda-'+agenda_id+'-'+index_id+'-details'
-    var details = document.getElementById(elem_id)
-    details.style.display='none';
-}
-
-</script>
 <style>
 TABLE img.icon {
     vertical-align: bottom;
@@ -96,9 +81,31 @@
 {% for meeting in meetings %}
 <tr style="background-color: {{ meeting.track_color }}; {% if meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
 <td width="75%">
+    <span onMouseOver="show_meeting_details({{meeting.id}});" onMouseOut="hide_meeting_details({{meeting.id}});">
     <a href="{{ meeting.meeting_page_url }}" style="color: #000000;" class="main-agenda-item-name">
         {{ meeting.title }}
     </a>
+<div id="meeting-{{meeting.id}}-details" class="agenda-details">
+<div class="arrow"></div>
+<div class="meeting-description">{{meeting.description}}</div>
+{% if meeting.participant_set.count %}
+<br /><b>Participants:</b>
+<div>{% for participant in meeting.participant_set.all %}
+    <div>
+        {% if participant.required %}
+        <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
+        {% else %}
+        <img class="icon" src="/media/img/attending.png" alt="attending">
+        {% endif %}{{ participant.attendee.user }}</div>
+{% endfor %}</div>
+{% endif %}
+{% if meeting.tracks.count > 0 %}
+<br /><b>Tracks:</b>
+<ul>{% for track in meeting.tracks.all %}
+    <li style="color: #{{track.color}};">{{ track.title }}</li>
+{% endfor %}</ul>
+{% endif %}
+</div>
 </td>
 <td width="25%">
 <a href="{% url summit.schedule.views.meeting_review summit.name meeting.id %}">Status: {{ meeting.get_approved_display }}</a>
@@ -109,4 +116,23 @@
 {% endfor%}
 </article>
 </div>
+{% block closure %}
+
+<script language="JavaScript">
+
+function show_meeting_details(meeting_id) {
+    var elem_id = 'meeting-'+meeting_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='block';
+}
+
+function hide_meeting_details(meeting_id) {
+    var elem_id = 'meeting-'+meeting_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='none';
+}
+
+</script>
+{% endblock %}
+
 {% endblock %}