Skip to content

Commit afbcc4e

Browse files
rpcrossrpcross
committed
Removed resources field from secr/meetings/../rooms.
Tweaked CSS for this page to eliminate horizontal scrolling. Includes new base templates to facilitate transition to bootstrap. Fixes ietf-tools#2628. Commit ready for merge. - Legacy-Id: 15719
1 parent 44b01c6 commit afbcc4e

6 files changed

Lines changed: 136 additions & 2 deletions

File tree

‎ietf/secr/meetings/forms.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def save(self, force_insert=False, force_update=False, commit=True):
128128
class MeetingRoomForm(forms.ModelForm):
129129
class Meta:
130130
model = Room
131-
fields = '__all__'
131+
exclude = ['resources']
132132

133133
class NewSessionForm(forms.Form):
134134
day = forms.ChoiceField(choices=SESSION_DAYS)

‎ietf/secr/static/secr/css/custom.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,10 @@ tr.cancelled {
499499
display: inline;
500500
}
501501

502+
#id_rooms_table input[type="number"] {
503+
width: 4em;
504+
}
505+
502506
/* ==========================================================================
503507
Proceedings Tool
504508
========================================================================== */

‎ietf/secr/templates/base_secr_bootstrap.html‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
{% load staticfiles %}
3+
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4+
<head>
5+
<title>{% block title %}{% endblock %}</title>
6+
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css' %}">
7+
<link rel="stylesheet" href="{% static 'ietf/bootstrap/css/bootstrap.min.css' %}">
8+
<link rel="stylesheet" href="{% static 'ietf/bootstrap/css/bootstrap-theme.min.css' %}">
9+
<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static 'secr/css/base.css' %}{% endblock %}" />
10+
<link rel="stylesheet" type="text/css" href="{% static 'secr/css/forms.css' %}" />
11+
<link rel="stylesheet" type="text/css" href="{% static 'secr/css/custom.css' %}" />
12+
{% if not server_mode == "production" %}
13+
<link rel="stylesheet" type="text/css" href="{% static 'secr/css/test.css' %}" />
14+
{% endif %}
15+
{% block extrastyle %}{% endblock %}
16+
17+
{% block extrahead %}
18+
<script type="text/javascript" src="{% static 'jquery/jquery.min.js' %}"></script>
19+
{% endblock %}
20+
21+
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
22+
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
23+
</head>
24+
25+
<body class="{% if is_popup %}popup {% endif %}{% block bodyclass %}{% endblock %}">
26+
27+
<!-- Container -->
28+
<div class="container">
29+
30+
{% if not is_popup %}
31+
<!-- Header -->
32+
<div id="header">
33+
<div id="branding">
34+
{% block branding %}{% endblock %}
35+
</div>
36+
{% block nav-global %}{% endblock %}
37+
</div>
38+
<!-- END Header -->
39+
40+
<!-- Breadcrumbs -->
41+
<div class="breadcrumbs">
42+
<table width="100%">
43+
<tr>
44+
<td align="left">
45+
{% block breadcrumbs %}<a href="/secr/">Home</a>{% endblock %}
46+
</td>
47+
<td align="right">
48+
{% block instructions %}{% endblock %}
49+
</td>
50+
</tr>
51+
</table>
52+
</div>
53+
<!-- END Breadcrumbs -->
54+
{% endif %}
55+
56+
{% comment %}
57+
<!-- Removed per Glen 08-04-2010 -->
58+
<!-- Javascript Warning -->
59+
<noscript class="errornote"> You have Javascript disabled. Javascript is required for this application.</noscript>
60+
{% endcomment %}
61+
62+
<!-- Django Messages -->
63+
{% if messages %}
64+
<ul class="messages">
65+
{% for message in messages %}
66+
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
67+
{% endfor %}
68+
</ul>
69+
{% endif %}
70+
71+
<!-- Content -->
72+
<div id="content" class="{% block coltype %}colM{% endblock %}">
73+
{% block pretitle %}{% endblock %}
74+
{% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
75+
{% block content %}
76+
{% block object-tools %}{% endblock %}
77+
{{ content }}
78+
{% endblock %}
79+
{% block sidebar %}{% endblock %}
80+
<br class="clear" />
81+
</div>
82+
<!-- END Content -->
83+
84+
{% block footer %}<div id="footer"></div>{% endblock %}
85+
</div>
86+
<!-- END Container -->
87+
88+
</body>
89+
</html>

‎ietf/secr/templates/base_site_bootstrap.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{% extends "base_secr_bootstrap.html" %}
2+
{% load i18n %}
3+
{% load ietf_filters %}
4+
{% load staticfiles %}
5+
6+
{% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %}
7+
8+
{% block branding %}
9+
<table width="100%">
10+
<tr>
11+
<td align="left">
12+
<h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}</h1>
13+
</td>
14+
<td align="right">
15+
<br>
16+
<span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a> | <a rel="nofollow" href="/accounts/logout/">Log out</a></span>
17+
</td>
18+
</tr>
19+
</table>
20+
{% endblock %}
21+
22+
{% block nav-global %}{% endblock %}
23+
24+
{% block footer %}
25+
<div id="footer">
26+
<div id="footer-extras">
27+
<ul>
28+
{% block footer-extras %}{% endblock %}
29+
</ul>
30+
</div>
31+
<div id="footer-version">
32+
<p>IETF Secretariat Tools v. {{ secr_version_num }}</p>
33+
34+
</div>
35+
<div id="footer-logo">
36+
<a href="https://www.amsl.com/"><img src="{% static 'secr/img/ams_logo.png' %}" alt="AMS" align="right" border="0" hspace="5" /></a>
37+
</div>
38+
</div>
39+
{% endblock %}

‎ietf/secr/templates/meetings/base_rooms_times.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base_site.html" %}
1+
{% extends "base_site_bootstrap.html" %}
22
{% load staticfiles %}
33

44
{% block title %}Meetings{% endblock %}

‎ietf/secr/templates/meetings/rooms.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% extends "meetings/base_rooms_times.html" %}
2+
{% load bootstrap3 %}
23

34
{% block subsection %}
45

@@ -10,6 +11,7 @@ <h2>Rooms</h2>
1011
<form id="meetings-meta-rooms" action="" method="post">{% csrf_token %}
1112
{{ formset.management_form }}
1213
{{ formset.non_form_errors }}
14+
1315
<table id="id_rooms_table" class="full-width">
1416
<thead>
1517
<tr>

0 commit comments

Comments
 (0)