Skip to content

Commit 756a972

Browse files
OleLaursenOleLaursen
committed
Move meeting agenda editing over to new facelifted base template, although without actually facelifting the contents
 - Legacy-Id: 8946
1 parent 542e1d7 commit 756a972

277 files changed

Lines changed: 684 additions & 114 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ietf/meeting/tests_js.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def login(self):
4848
self.driver.get(url)
4949
self.driver.find_element_by_name('username').send_keys('plain')
5050
self.driver.find_element_by_name('password').send_keys('plain+password')
51-
self.driver.find_element_by_xpath('//input[@value="Sign in"]').click()
51+
self.driver.find_element_by_xpath('//button[@type="submit"]').click()
5252

5353
def testUnschedule(self):
5454

‎ietf/meeting/views.py‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def edit_timeslots(request, num=None):
187187
roomsurl = reverse(timeslot_roomsurl, args=[meeting.number])
188188
adddayurl = reverse(timeslot_slotsurl, args=[meeting.number])
189189

190-
return HttpResponse(render_to_string("meeting/timeslot_edit.html",
190+
return render(request, "meeting/timeslot_edit.html",
191191
{"timeslots": timeslots,
192192
"meeting_base_url": meeting_base_url,
193193
"site_base_url": site_base_url,
@@ -199,8 +199,9 @@ def edit_timeslots(request, num=None):
199199
"time_slices":time_slices,
200200
"slot_slices": slots,
201201
"date_slices":date_slices,
202-
"meeting":meeting},
203-
RequestContext(request)), content_type="text/html")
202+
"meeting":meeting,
203+
"hide_menu": True,
204+
})
204205

205206
class RoomForm(ModelForm):
206207
class Meta:
@@ -227,12 +228,13 @@ def edit_roomurl(request, num, roomid):
227228
roomform = RoomForm(instance=room)
228229
meeting_base_url = request.build_absolute_uri(meeting.base_url())
229230
site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash
230-
return HttpResponse(render_to_string("meeting/room_edit.html",
231+
return render(request, "meeting/room_edit.html",
231232
{"meeting_base_url": meeting_base_url,
232233
"site_base_url": site_base_url,
233234
"editroom": roomform,
234-
"meeting":meeting},
235-
RequestContext(request)), content_type="text/html")
235+
"meeting":meeting,
236+
"hide_menu": True,
237+
})
236238

237239
##############################################################################
238240
#@role_required('Area Director','Secretariat')
@@ -287,7 +289,7 @@ def edit_agenda(request, num=None, owner=None, name=None):
287289

288290
time_slices,date_slices = build_all_agenda_slices(meeting)
289291

290-
return HttpResponse(render_to_string("meeting/landscape_edit.html",
292+
return render(request, "meeting/landscape_edit.html",
291293
{"schedule":schedule,
292294
"saveas": saveas,
293295
"saveasurl": saveasurl,
@@ -302,8 +304,9 @@ def edit_agenda(request, num=None, owner=None, name=None):
302304
"area_directors" : ads,
303305
"wg_list": wg_list ,
304306
"scheduledsessions": scheduledsessions,
305-
"show_inline": set(["txt","htm","html"]) },
306-
RequestContext(request)), content_type="text/html")
307+
"show_inline": set(["txt","htm","html"]),
308+
"hide_menu": True,
309+
})
307310

308311
##############################################################################
309312
# show the properties associated with an agenda (visible, public)
@@ -326,11 +329,12 @@ def edit_agenda_properties(request, num=None, owner=None, name=None):
326329
if not (canedit or has_role(request.user,'Secretariat')):
327330
return HttpResponseForbidden("You may not edit this agenda")
328331
else:
329-
return HttpResponse(render_to_string("meeting/properties_edit.html",
332+
return render(request, "meeting/properties_edit.html",
330333
{"schedule":schedule,
331334
"form":form,
332-
"meeting":meeting},
333-
RequestContext(request)), content_type="text/html")
335+
"meeting":meeting,
336+
"hide_menu": True,
337+
})
334338

335339
##############################################################################
336340
# show list of agendas.
@@ -352,12 +356,11 @@ def edit_agendas(request, num=None, order=None):
352356

353357
schedules = schedules.order_by('owner', 'name')
354358

355-
return HttpResponse(render_to_string("meeting/agenda_list.html",
359+
return render(request, "meeting/agenda_list.html",
356360
{"meeting": meeting,
357-
"schedules": schedules.all()
358-
},
359-
RequestContext(request)),
360-
content_type="text/html")
361+
"schedules": schedules.all(),
362+
"hide_menu": True,
363+
})
361364

362365
@ensure_csrf_cookie
363366
def agenda(request, num=None, name=None, base=None, ext=None):

‎ietf/templates/meeting/agenda_list.html‎

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,57 @@
1-
{% extends "base.html" %}
1+
{% extends "ietf.html" %}
22
{% load ietf_filters %}
33
{# Copyright The IETF Trust 2007, All Rights Reserved #}
44
{% load humanize %}
55

66
{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
77
{% load agenda_custom_tags %}
88
{% block pagehead %}
9-
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
10-
<link rel='stylesheet' type='text/css' href='/css/base2.css' />
11-
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
9+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
10+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/base2.css' />
11+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
1212
{% endblock pagehead %}
1313

1414
{% block js %}
15-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
16-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
17-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
18-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
19-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
20-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
15+
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
16+
<script>
17+
function getCookie(name) {
18+
var cookieValue = null;
19+
if (document.cookie && document.cookie != '') {
20+
var cookies = document.cookie.split(';');
21+
for (var i = 0; i < cookies.length; i++) {
22+
var cookie = jQuery.trim(cookies[i]);
23+
// Does this cookie string begin with the name we want?
24+
if (cookie.substring(0, name.length + 1) == (name + '=')) {
25+
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
26+
break;
27+
}
28+
}
29+
}
30+
return cookieValue;
31+
}
2132

22-
<script type='text/javascript' src='/js/agenda/agenda_listeners.js'></script>
23-
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
24-
<script type='text/javascript' src='/js/agenda/agenda_property_utils.js'></script>
25-
<script type='text/javascript' src='/js/agenda/agendas_edit.js'></script>
26-
{% endblock js %}
33+
jQuery.ajaxSetup({
34+
crossDomain: false, // obviates need for sameOrigin test
35+
beforeSend: function(xhr, settings) {
36+
if (!csrfSafeMethod(settings.type)) {
37+
xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
38+
}
39+
}
40+
});
41+
</script>
42+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
43+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
44+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
45+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
46+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
47+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
2748

49+
<script type='text/javascript' src='/facelift/js/agenda/agenda_listeners.js'></script>
50+
<script type='text/javascript' src='/facelift/js/agenda/agenda_helpers.js'></script>
51+
<script type='text/javascript' src='/facelift/js/agenda/agenda_property_utils.js'></script>
52+
<script type='text/javascript' src='/facelift/js/agenda/agendas_edit.js'></script>
53+
{% endblock js %}
2854

29-
{% block start_content_table %}{% endblock %}
30-
{% block end_content_table %}{% endblock %}
3155

3256
{% block content %}
3357
<div class="wrapper custom_text_stuff">

‎ietf/templates/meeting/landscape_edit.html‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "base.html" %}
1+
{% extends "ietf.html" %}
22
{% load ietf_filters %}
33
{# Copyright The IETF Trust 2007, All Rights Reserved #}
44
{% load humanize %}
@@ -17,23 +17,35 @@
1717
{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
1818
{% load agenda_custom_tags %}
1919
{% block pagehead %}
20-
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
21-
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
20+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
21+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
2222
{% endblock pagehead %}
2323

2424
{% block js %}
25-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery-ui.custom.min.js'></script>
26-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.widget.min.js'></script>
27-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.droppable.min.js'></script>
28-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.sortable.min.js'></script>
29-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.accordion.min.js'></script>
30-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.draggable.min.js'></script>
25+
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
26+
<script src="/facelift/js/lib/jquery.cookie.min.js"></script>
27+
<script>
28+
jQuery.ajaxSetup({
29+
crossDomain: false, // obviates need for sameOrigin test
30+
beforeSend: function(xhr, settings) {
31+
if (!csrfSafeMethod(settings.type)) {
32+
xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
33+
}
34+
}
35+
});
36+
</script>
37+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery-ui.custom.min.js'></script>
38+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.widget.min.js'></script>
39+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.droppable.min.js'></script>
40+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.sortable.min.js'></script>
41+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.accordion.min.js'></script>
42+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.draggable.min.js'></script>
3143

32-
<script type='text/javascript' src='/js/spin/dist/spin.min.js'></script>
33-
<script type='text/javascript' src='/js/agenda/agenda_edit.js'></script>
34-
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
35-
<script type='text/javascript' src='/js/agenda/agenda_objects.js'></script>
36-
<script type='text/javascript' src='/js/agenda/agenda_listeners.js'></script>
44+
<script type='text/javascript' src='/facelift/js/agenda/spin/dist/spin.min.js'></script>
45+
<script type='text/javascript' src='/facelift/js/agenda/agenda_edit.js'></script>
46+
<script type='text/javascript' src='/facelift/js/agenda/agenda_helpers.js'></script>
47+
<script type='text/javascript' src='/facelift/js/agenda/agenda_objects.js'></script>
48+
<script type='text/javascript' src='/facelift/js/agenda/agenda_listeners.js'></script>
3749

3850

3951
<script type='text/javascript'>
@@ -89,11 +101,7 @@
89101
{% endblock js %}
90102

91103

92-
{% block start_content_table %}{% endblock %}
93-
{% block end_content_table %}{% endblock %}
94-
95104
{% block content %}
96-
97105
<div id="read_only">
98106
<p>You do not have write permission to agenda: {{schedule.name}}</p>
99107
<p>Please save this agenda to your account first.</p>

‎ietf/templates/meeting/properties_edit.html‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,42 @@
1-
{% extends "base.html" %}
1+
{% extends "ietf.html" %}
22
{% load ietf_filters %}
33
{# Copyright The IETF Trust 2007, All Rights Reserved #}
44
{% load humanize %}
55

66
{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{schedule.owner}} / {{ schedule.name }}{% endblock %}
77
{% load agenda_custom_tags %}
88
{% block pagehead %}
9-
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
10-
<link rel='stylesheet' type='text/css' href='/css/base2.css' />
11-
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
9+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
10+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/base2.css' />
11+
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
1212
{% endblock pagehead %}
1313

1414
{% block js %}
15-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
16-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
17-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
18-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
19-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
20-
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
15+
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
16+
<script src="/facelift/js/lib/jquery.cookie.min.js"></script>
17+
<script>
18+
jQuery.ajaxSetup({
19+
crossDomain: false, // obviates need for sameOrigin test
20+
beforeSend: function(xhr, settings) {
21+
if (!csrfSafeMethod(settings.type)) {
22+
xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
23+
}
24+
}
25+
});
26+
</script>
27+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
28+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
29+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
30+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
31+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
32+
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
2133

22-
<script type='text/javascript' src='/js/agenda/agenda_listeners.js'></script>
23-
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
24-
<script type='text/javascript' src='/js/agenda/agenda_property_utils.js'></script>
25-
<script type='text/javascript' src='/js/agenda/agenda_properties_edit.js'></script>
34+
<script type='text/javascript' src='/facelift/js/agenda/agenda_listeners.js'></script>
35+
<script type='text/javascript' src='/facelift/js/agenda/agenda_helpers.js'></script>
36+
<script type='text/javascript' src='/facelift/js/agenda/agenda_property_utils.js'></script>
37+
<script type='text/javascript' src='/facelift/js/agenda/agenda_properties_edit.js'></script>
2638
{% endblock js %}
2739

28-
{% block start_content_table %}{% endblock %}
29-
{% block end_content_table %}{% endblock %}
30-
3140
{% block content %}
3241
</tr></table></div>
3342
<div class="wrapper custom_text_stuff">

0 commit comments

Comments
 (0)