altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions3 Packages Projects Releases Wiki Activity

Fixed some additional cases of template if statements not using '=='.

Browse source 
- Legacy-Id: 12715
This commit is contained in:
Henrik Levkowetz 2017-01-23 18:56:44 +00:00
parent 613f0c8233
commit 650ffe3c15
3 changed files with 6 additions and 6 deletions
ietf
secr/templates/proceedings
agenda.html
templates/meeting
agenda.htmlroom-view.html

6
ietf/secr/templates/proceedings/agenda.html
View file

@ -32,7 +32,7 @@
</td>
</tr>
{% endifchanged %}
{% if ss.timeslot.type.name = 'Session' %} {% if ss.session.group %}
{% if ss.timeslot.type.name == 'Session' %} {% if ss.session.group %}
<tr id="{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}" class="grouprow">
<td style="width:200px">{% if ss.timeslot.show_location %}{{ss.timeslot.get_location}}{% endif %}</td>
<td style="width:50px">{{ss.session.group.parent.acronym|upper}}</td>
@ -42,13 +42,13 @@
<td>
{% if ss.session.agenda %}<a href="/meeting/{{ meeting.number }}/agenda/{{ ss.session.group.acronym }}/">{{ss.session.group.name}}</a>
{% else %}{{ss.session.group.name}}{% endif %}
{% if ss.session.group.state.name = "BOF" %} BOF {% endif %}
{% if ss.session.group.state.name == "BOF" %} BOF {% endif %}
{% if ss.session.agenda_note %}
<br/><span class="note">{{ss.session.agenda_note}}</span>{% endif %}</td>
</tr>
{% endif %} {% endif %}
{% if ss.timeslot.type.name = 'Plenary' %}
{% if ss.timeslot.type.name == 'Plenary' %}
<tr class="grouprow">
<td style="width:200px">{% if ss.timeslot.show_location %}{{ss.timeslot.get_location}}{% endif %}</td>
<td></td>

2
ietf/templates/meeting/agenda.html
View file

@ -217,7 +217,7 @@
</tr>
{% endif %}
{% if item.timeslot.type.slug = 'session' or item.timeslot.type.slug == 'plenary' %}
{% if item.timeslot.type.slug == 'session' or item.timeslot.type.slug == 'plenary' %}
{% if item.session.historic_group %}
<tr id="row-{{item.slug}}" data-ske="row-{{ item.slug }}" {% if item.timeslot.type.slug == 'plenary' %}class="{{item.timeslot.type.slug}}danger"{% endif %}>
{% if item.timeslot.type.slug == 'plenary' %}

4
ietf/templates/meeting/room-view.html
View file

@ -24,7 +24,7 @@
{% for ss in assignments %}
if (room_names.indexOf("{{ss.timeslot.get_hidden_location}}") >= 0 )
{
items.push({room_index:room_names.indexOf("{{ss.timeslot.get_hidden_location}}"),day:{{ss.day}}, delta_from_beginning:{{ss.delta_from_beginning}},time:"{{ss.timeslot.time|date:"Hi"}}-{{ss.timeslot.end_time|date:"Hi"}}", verbose_time:"{{ss.timeslot.time|date:"D M d Hi"}}-{{ss.timeslot.end_time|date:"Hi"}}",duration:{{ss.timeslot.duration.total_seconds}}, type:"{{ss.timeslot.type}}", {% if ss.session.name %}name:"{{ss.session.name|escapejs}}",{% if ss.session.group.acronym %} wg:"{{ss.session.group.acronym}}",{%endif%}{% else %}{% if ss.timeslot.type.name == "Break" %}name:"{{ss.timeslot.name|escapejs}}", area:"break", wg:"break",{% elif ss.timeslot.type.slug == "unavail" %}name:"Unavailable",{% else %}name:"{{ss.session.group.name|escapejs}}{%if ss.session.group.state.name = "BOF"%} BOF{%endif%}",wg:"{{ss.session.group.acronym}}",state:"{{ss.session.group.state}}",area:"{{ss.session.group.parent.acronym}}",{% endif %}{% endif %} dayname:"{{ ss.timeslot.time|date:"l"|upper }}, {{ ss.timeslot.time|date:"F j, Y" }}"{% if ss.session.agenda %}, agenda:"{{ss.session.agenda.get_absolute_url}}"{% endif %} });
items.push({room_index:room_names.indexOf("{{ss.timeslot.get_hidden_location}}"),day:{{ss.day}}, delta_from_beginning:{{ss.delta_from_beginning}},time:"{{ss.timeslot.time|date:"Hi"}}-{{ss.timeslot.end_time|date:"Hi"}}", verbose_time:"{{ss.timeslot.time|date:"D M d Hi"}}-{{ss.timeslot.end_time|date:"Hi"}}",duration:{{ss.timeslot.duration.total_seconds}}, type:"{{ss.timeslot.type}}", {% if ss.session.name %}name:"{{ss.session.name|escapejs}}",{% if ss.session.group.acronym %} wg:"{{ss.session.group.acronym}}",{%endif%}{% else %}{% if ss.timeslot.type.name == "Break" %}name:"{{ss.timeslot.name|escapejs}}", area:"break", wg:"break",{% elif ss.timeslot.type.slug == "unavail" %}name:"Unavailable",{% else %}name:"{{ss.session.group.name|escapejs}}{%if ss.session.group.state.name == "BOF"%} BOF{%endif%}",wg:"{{ss.session.group.acronym}}",state:"{{ss.session.group.state}}",area:"{{ss.session.group.parent.acronym}}",{% endif %}{% endif %} dayname:"{{ ss.timeslot.time|date:"l"|upper }}, {{ ss.timeslot.time|date:"F j, Y" }}"{% if ss.session.agenda %}, agenda:"{{ss.session.agenda.get_absolute_url}}"{% endif %} });
}
{% endfor %}
{% endautoescape %}
@ -372,7 +372,7 @@
div.appendChild(document.createElement("br"));
var label = items[i].name;
if (label.length === 0) { label = "Free Slot"; }
if (label.length == 0) { label = "Free Slot"; }
if (items[i].wg && fg[items[i].area])
{
label = label + " (" + items[i].wg + ")";