From 8de3bc1ac3c3961a46a88efb97e1aa9b0fd7cf84 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Mon, 2 Feb 2015 16:19:27 +0000 Subject: [PATCH] Summary: Add a couple of hidden-xs/visible-xs classes to the agenda table to make it work on a smart phone, this seem to cover most of the intended goal with m_agenda.html, so delete it instead of facelifting it - Legacy-Id: 8950 --- ietf/meeting/views.py | 2 - ietf/templates/m_base.html | 29 ------ ietf/templates/meeting/agenda.html | 26 +++-- ietf/templates/meeting/m_agenda.html | 127 ------------------------ ietf/templates/meeting/no-m_agenda.html | 17 ---- 5 files changed, 18 insertions(+), 183 deletions(-) delete mode 100644 ietf/templates/m_base.html delete mode 100644 ietf/templates/meeting/m_agenda.html delete mode 100644 ietf/templates/meeting/no-m_agenda.html diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 5f2d98275..5321ecdca 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -366,8 +366,6 @@ def edit_agendas(request, num=None, order=None): def agenda(request, num=None, name=None, base=None, ext=None): base = base if base else 'agenda' ext = ext if ext else '.html' - if 'iPhone' in get_user_agent(request) and ext == ".html": - base = 'm_agenda' mimetype = {".html":"text/html", ".txt": "text/plain", ".ics":"text/calendar", ".csv":"text/csv"} meeting = get_meeting(num) schedule = get_schedule(meeting, name) diff --git a/ietf/templates/m_base.html b/ietf/templates/m_base.html deleted file mode 100644 index 09a39ccc2..000000000 --- a/ietf/templates/m_base.html +++ /dev/null @@ -1,29 +0,0 @@ -{% block doctype %} - -{% endblock %} - - -{# Copyright The IETF Trust 2007, All Rights Reserved #} - - - - - {% block title %}IETF Data{% endblock %} - - {% if server_mode != "production" %} - - {% else %} - - {% endif %} - - {% block head %}{% endblock %} - - - - - {% block content %}{% endblock %} - {% include "debug.html" %} - - diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index d69695a4a..76cb2c83b 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -190,15 +190,20 @@ tr:first-child th.gap { {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} {% endif %} - + {% if item.timeslot.show_location %} {{item.timeslot.get_location|split:"/"|join:"/"}} {% endif %} - + + {% if item.timeslot.show_location %} + {{item.timeslot.get_location|split:"/"|join:"/"}} + {% endif %} + + {{item.timeslot.name}} - + {% endwith %} {% endif %} @@ -209,20 +214,25 @@ tr:first-child th.gap { {% if item.timeslot.type.slug == 'plenary' %} - {% if "-utc" in request.path %} + {% if "-utc" in request.path %} {{item.timeslot.utc_start_time|date:"G:i"}}-{{item.timeslot.utc_end_time|date:"G:i"}} {% else %} {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} {% endif %} - + + {% if item.timeslot.show_location %} + {{item.timeslot.get_location|split:"/"|join:"/"}} + {% endif %} + + {% if item.timeslot.show_location %} {{item.timeslot.get_location|split:"/"|join:"/"}} {% endif %} {% else %} - + @@ -231,7 +241,7 @@ tr:first-child th.gap { {% endif %} - {{item.session.group.parent.acronym}} + {{item.session.group.parent.acronym}} {% if item.session.group.charter %} @@ -305,7 +315,7 @@ tr:first-child th.gap { - + {% if item.session.agenda %} diff --git a/ietf/templates/meeting/m_agenda.html b/ietf/templates/meeting/m_agenda.html deleted file mode 100644 index 0759f51da..000000000 --- a/ietf/templates/meeting/m_agenda.html +++ /dev/null @@ -1,127 +0,0 @@ -{% extends "m_base.html" %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} -{% load humanize %} -{% load ietf_filters %} -{% block title %} IETF {{ schedule.meeting.number }} Meeting Agenda{% endblock %} -{% block head %} - - - - - - -{% endblock %} -{% block body_attributes %}onload="on_load_actions()"{% endblock %} -{% block content %} - -
- -

Agenda of the {{ schedule.meeting.number|ordinal }} IETF Meeting

-

{{ schedule.meeting.date|date:"F j" }}-{% if schedule.meeting.date.month != schedule.meeting.end_date.month %}{{ schedule.meeting.end_date|date:"F " }}{% endif %}{{ schedule.meeting.end_date|date:"j, Y" }}

-
-
IETF agendas are subject to change, up to and during the meeting.
-
- - {% for item in schedule.assignments.all.distinct %} - {% ifchanged %} - - - - {% endifchanged %} - - {% if item.timeslot.type.slug == "reg" %} - - - - {% endif %}{# reg #} - - {% if item.timeslot.type.slug == "break" %} - - - - {% endif %}{# break #} - - - {% if item.timeslot.type.slug == "session" %} - {% if item.session.group %} - {% ifchanged %} - - - - {% endifchanged %} - - - - - - - {% endif %} - {% endif %}{# session #} - - - {% if item.timeslot.type.slug == "other" %} - - - - {% endif %}{# other #} - - - {% endfor %} -
- -

{{ item.timeslot.time|date:"l"|upper }}, {{ item.timeslot.time|date:"F j, Y" }}

-
- {{ item.timeslot.time_desc }} {{ item.timeslot.name }} - {% if schedule.meeting.reg_area %} - {{ schedule.meeting.reg_area }}{% endif %} -
-
- {{ item.timeslot.time_desc }} {{ item.timeslot.name }} - {% if schedule.meeting.break_area and item.timeslot.break_info.show_break_location %} - {{ schedule.meeting.break_area }}{% endif %} -
- -
{{item.timeslot.time|date:"D"}} {{ item.timeslot.time_desc }} {{ item.timeslot.name }} -
- {{ item.timeslot.location.name}} - - {% if item.session.type == "WG" %}{%endif%} - {% if item.session.type == "BOF" %}{% endif %} - {{ item.session.group.acronym|lower }} - {% if item.session.type == "BOF" %}{% endif %} - {% if item.session.type == "WG" %}{%endif%} - - {% if item.session.agenda_file %}{%endif%} - {{ item.session.group.name|truncate_ellipsis:"22"|safe }} - {% if item.session.agenda_file %}{%endif%} -
- - {{ item.timeslot.time_desc }} {{ item.timeslot.name|truncate_ellipsis:"19"|safe }} - {{ item.timeslot.location.name}} -
-
-{% endblock %} diff --git a/ietf/templates/meeting/no-m_agenda.html b/ietf/templates/meeting/no-m_agenda.html deleted file mode 100644 index 45d0ecc38..000000000 --- a/ietf/templates/meeting/no-m_agenda.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "m_base.html" %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} -{% load humanize %} -{% load ietf_filters %} -{% block title %} IETF {{ meeting.number }} Meeting Agenda{% endblock %} -{% block head %} - - -{% endblock %} -{% block content %} -
- -

Agenda of the {{ meeting.number|ordinal }} IETF Meeting

-

{{ meeting.date|date:"F j" }}-{% if meeting.date.month != meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endif %}{{ meeting.end_date|date:"j, Y" }}

-
-
There is no Agenda available yet.
-{% endblock %}