diff --git a/ietf/secr/meetings/forms.py b/ietf/secr/meetings/forms.py index ab27acf38..6942cce34 100644 --- a/ietf/secr/meetings/forms.py +++ b/ietf/secr/meetings/forms.py @@ -128,7 +128,7 @@ class MeetingModelForm(forms.ModelForm): class MeetingRoomForm(forms.ModelForm): class Meta: model = Room - fields = '__all__' + exclude = ['resources'] class NewSessionForm(forms.Form): day = forms.ChoiceField(choices=SESSION_DAYS) diff --git a/ietf/secr/static/secr/css/custom.css b/ietf/secr/static/secr/css/custom.css index fd9f8727a..0825f1b7e 100644 --- a/ietf/secr/static/secr/css/custom.css +++ b/ietf/secr/static/secr/css/custom.css @@ -499,6 +499,10 @@ tr.cancelled { display: inline; } +#id_rooms_table input[type="number"] { + width: 4em; +} + /* ========================================================================== Proceedings Tool ========================================================================== */ diff --git a/ietf/secr/templates/base_secr_bootstrap.html b/ietf/secr/templates/base_secr_bootstrap.html new file mode 100644 index 000000000..36841aed1 --- /dev/null +++ b/ietf/secr/templates/base_secr_bootstrap.html @@ -0,0 +1,89 @@ + +{% load staticfiles %} + + +{% block title %}{% endblock %} + + + + + + +{% if not server_mode == "production" %} + +{% endif %} +{% block extrastyle %}{% endblock %} + +{% block extrahead %} + +{% endblock %} + +{% block blockbots %}{% endblock %} + + + + + + +
+ + {% if not is_popup %} + + + + + +
+ + + + + +
+ {% block breadcrumbs %}Home{% endblock %} + + {% block instructions %}{% endblock %} +
+
+ + {% endif %} + + {% comment %} + + + + {% endcomment %} + + + {% if messages %} + + {% endif %} + + +
+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ content }} + {% endblock %} + {% block sidebar %}{% endblock %} +
+
+ + + {% block footer %}{% endblock %} +
+ + + + diff --git a/ietf/secr/templates/base_site_bootstrap.html b/ietf/secr/templates/base_site_bootstrap.html new file mode 100644 index 000000000..786cdb02f --- /dev/null +++ b/ietf/secr/templates/base_site_bootstrap.html @@ -0,0 +1,39 @@ +{% extends "base_secr_bootstrap.html" %} +{% load i18n %} +{% load ietf_filters %} +{% load staticfiles %} + +{% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %} + +{% block branding %} + + + + + +
+

{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}

+ 		+
+ +
+{% endblock %} + +{% block nav-global %}{% endblock %} + +{% block footer %} + +{% endblock %} diff --git a/ietf/secr/templates/meetings/base_rooms_times.html b/ietf/secr/templates/meetings/base_rooms_times.html index 388530bcd..aee4b6986 100644 --- a/ietf/secr/templates/meetings/base_rooms_times.html +++ b/ietf/secr/templates/meetings/base_rooms_times.html @@ -1,4 +1,4 @@ -{% extends "base_site.html" %} +{% extends "base_site_bootstrap.html" %} {% load staticfiles %} {% block title %}Meetings{% endblock %} diff --git a/ietf/secr/templates/meetings/rooms.html b/ietf/secr/templates/meetings/rooms.html index a5de03056..643be358c 100644 --- a/ietf/secr/templates/meetings/rooms.html +++ b/ietf/secr/templates/meetings/rooms.html @@ -1,4 +1,5 @@ {% extends "meetings/base_rooms_times.html" %} +{% load bootstrap3 %} {% block subsection %} @@ -10,6 +11,7 @@
{% csrf_token %} {{ formset.management_form }} {{ formset.non_form_errors }} +