diff --git a/ietf/secr/templates/meetings/add.html b/ietf/secr/templates/meetings/add.html index ca6b2229d..33c8be4b4 100644 --- a/ietf/secr/templates/meetings/add.html +++ b/ietf/secr/templates/meetings/add.html @@ -3,8 +3,8 @@ {% block title %}Meetings - Add{% endblock %} -{% block extrahead %}{{ block.super }} - +{% block extrahead %} + {{ block.super }} {% endblock %} diff --git a/ietf/static/ietf/images/boardroom-layout.png b/ietf/static/ietf/images/boardroom-layout.png new file mode 100644 index 000000000..fab25df17 Binary files /dev/null and b/ietf/static/ietf/images/boardroom-layout.png differ diff --git a/ietf/static/ietf/images/meetecho-mini.png b/ietf/static/ietf/images/meetecho-mini.png new file mode 100644 index 000000000..c9c6fdeb9 Binary files /dev/null and b/ietf/static/ietf/images/meetecho-mini.png differ diff --git a/ietf/static/ietf/images/projector.png b/ietf/static/ietf/images/projector.png new file mode 100644 index 000000000..00e5087dd Binary files /dev/null and b/ietf/static/ietf/images/projector.png differ diff --git a/ietf/static/ietf/images/projector2.png b/ietf/static/ietf/images/projector2.png new file mode 100644 index 000000000..7af5e2410 Binary files /dev/null and b/ietf/static/ietf/images/projector2.png differ diff --git a/ietf/templates/meeting/room_edit.html b/ietf/templates/meeting/room_edit.html index cd340443a..21070abe6 100644 --- a/ietf/templates/meeting/room_edit.html +++ b/ietf/templates/meeting/room_edit.html @@ -38,7 +38,7 @@ jQuery.ajaxSetup({ - + diff --git a/ietf/templates/meeting/timeslot_edit.html b/ietf/templates/meeting/timeslot_edit.html index 12e5a5f6a..38f85396c 100644 --- a/ietf/templates/meeting/timeslot_edit.html +++ b/ietf/templates/meeting/timeslot_edit.html @@ -32,14 +32,14 @@ jQuery.ajaxSetup({ - + - + @@ -138,7 +138,10 @@ promiselist.push(ts_promise);
{% for resource in r.resources.all %} - {{resource.desc}} + {% if resource.id == "project" %} {{resource.desc}}{% endif %} + {% if resource.id == "proj2" %} {{resource.desc}}{% endif %} + {% if resource.id == "meetecho" %} {{resource.desc}}{% endif %} + {% if resource.id == "boardroom" %} {{resource.desc}}{% endif %} {% endfor %}