Move meeting agenda editing over to new facelifted base template, although without actually facelifting the contents

- Legacy-Id: 8946
This commit is contained in:
Ole Laursen 2015-01-29 17:53:56 +00:00
parent 542e1d710d
commit 756a972113
277 changed files with 683 additions and 113 deletions

View file

@ -48,7 +48,7 @@ class ScheduleEditTests(LiveServerTestCase):
self.driver.get(url)
self.driver.find_element_by_name('username').send_keys('plain')
self.driver.find_element_by_name('password').send_keys('plain+password')
self.driver.find_element_by_xpath('//input[@value="Sign in"]').click()
self.driver.find_element_by_xpath('//button[@type="submit"]').click()
def testUnschedule(self):

View file

@ -187,7 +187,7 @@ def edit_timeslots(request, num=None):
roomsurl = reverse(timeslot_roomsurl, args=[meeting.number])
adddayurl = reverse(timeslot_slotsurl, args=[meeting.number])
return HttpResponse(render_to_string("meeting/timeslot_edit.html",
return render(request, "meeting/timeslot_edit.html",
{"timeslots": timeslots,
"meeting_base_url": meeting_base_url,
"site_base_url": site_base_url,
@ -199,8 +199,9 @@ def edit_timeslots(request, num=None):
"time_slices":time_slices,
"slot_slices": slots,
"date_slices":date_slices,
"meeting":meeting},
RequestContext(request)), content_type="text/html")
"meeting":meeting,
"hide_menu": True,
})
class RoomForm(ModelForm):
class Meta:
@ -227,12 +228,13 @@ def edit_roomurl(request, num, roomid):
roomform = RoomForm(instance=room)
meeting_base_url = request.build_absolute_uri(meeting.base_url())
site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash
return HttpResponse(render_to_string("meeting/room_edit.html",
return render(request, "meeting/room_edit.html",
{"meeting_base_url": meeting_base_url,
"site_base_url": site_base_url,
"editroom": roomform,
"meeting":meeting},
RequestContext(request)), content_type="text/html")
"meeting":meeting,
"hide_menu": True,
})
##############################################################################
#@role_required('Area Director','Secretariat')
@ -287,7 +289,7 @@ def edit_agenda(request, num=None, owner=None, name=None):
time_slices,date_slices = build_all_agenda_slices(meeting)
return HttpResponse(render_to_string("meeting/landscape_edit.html",
return render(request, "meeting/landscape_edit.html",
{"schedule":schedule,
"saveas": saveas,
"saveasurl": saveasurl,
@ -302,8 +304,9 @@ def edit_agenda(request, num=None, owner=None, name=None):
"area_directors" : ads,
"wg_list": wg_list ,
"scheduledsessions": scheduledsessions,
"show_inline": set(["txt","htm","html"]) },
RequestContext(request)), content_type="text/html")
"show_inline": set(["txt","htm","html"]),
"hide_menu": True,
})
##############################################################################
# show the properties associated with an agenda (visible, public)
@ -326,11 +329,12 @@ def edit_agenda_properties(request, num=None, owner=None, name=None):
if not (canedit or has_role(request.user,'Secretariat')):
return HttpResponseForbidden("You may not edit this agenda")
else:
return HttpResponse(render_to_string("meeting/properties_edit.html",
return render(request, "meeting/properties_edit.html",
{"schedule":schedule,
"form":form,
"meeting":meeting},
RequestContext(request)), content_type="text/html")
"meeting":meeting,
"hide_menu": True,
})
##############################################################################
# show list of agendas.
@ -352,12 +356,11 @@ def edit_agendas(request, num=None, order=None):
schedules = schedules.order_by('owner', 'name')
return HttpResponse(render_to_string("meeting/agenda_list.html",
return render(request, "meeting/agenda_list.html",
{"meeting": meeting,
"schedules": schedules.all()
},
RequestContext(request)),
content_type="text/html")
"schedules": schedules.all(),
"hide_menu": True,
})
@ensure_csrf_cookie
def agenda(request, num=None, name=None, base=None, ext=None):

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "ietf.html" %}
{% load ietf_filters %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% load humanize %}
@ -6,29 +6,53 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
<script>
function getCookie(name) {
var cookieValue = null;
if (document.cookie && document.cookie != '') {
var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) {
var cookie = jQuery.trim(cookies[i]);
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) == (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
}
}
}
return cookieValue;
}
<script type='text/javascript' src='/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_property_utils.js'></script>
<script type='text/javascript' src='/js/agenda/agendas_edit.js'></script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
beforeSend: function(xhr, settings) {
if (!csrfSafeMethod(settings.type)) {
xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
}
}
});
</script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_property_utils.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agendas_edit.js'></script>
{% endblock js %}
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
<div class="wrapper custom_text_stuff">
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "ietf.html" %}
{% load ietf_filters %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% load humanize %}
@ -17,23 +17,35 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery-ui.custom.min.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.widget.min.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.droppable.min.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.sortable.min.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.accordion.min.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/minified/jquery.ui.draggable.min.js'></script>
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/facelift/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
beforeSend: function(xhr, settings) {
if (!csrfSafeMethod(settings.type)) {
xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
}
}
});
</script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery-ui.custom.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.widget.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.droppable.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.sortable.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.accordion.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.draggable.min.js'></script>
<script type='text/javascript' src='/js/spin/dist/spin.min.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_edit.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_objects.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/spin/dist/spin.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_edit.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_objects.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript'>
@ -89,11 +101,7 @@ promiselist.push(ss_promise);
{% endblock js %}
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
<div id="read_only">
<p>You do not have write permission to agenda: {{schedule.name}}</p>
<p>Please save this agenda to your account first.</p>

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "ietf.html" %}
{% load ietf_filters %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% load humanize %}
@ -6,28 +6,37 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{schedule.owner}} / {{ schedule.name }}{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/facelift/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
beforeSend: function(xhr, settings) {
if (!csrfSafeMethod(settings.type)) {
xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
}
}
});
</script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_property_utils.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_properties_edit.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_property_utils.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_properties_edit.js'></script>
{% endblock js %}
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
</tr></table></div>
<div class="wrapper custom_text_stuff">

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "ietf.html" %}
{% load ietf_filters %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% load humanize %}
@ -6,36 +6,43 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda: Timeslot/Room Availability{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.datetime.js'></script>
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/facelift/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
beforeSend: function(xhr, settings) {
if (!csrfSafeMethod(settings.type)) {
xhr.setRequestHeader("X-CSRFToken", $.cookie('csrftoken'));
}
}
});
</script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<!-- source (MIT License) http://momentjs.com/ https://github.com/moment/moment/ -->
<script type='text/javascript' src='/js/moment.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/moment.min.js'></script>
<!-- source (MIT License) : https://github.com/trentrichardson/jQuery-Timepicker-Addon -->
<script type='text/javascript' src='/js/jquery-ui-timepicker/jquery-ui-timepicker-addon.js'></script>
<script type='text/javascript' src='/js/jquery-ui-timepicker/jquery-ui-sliderAccess.js.js'></script>
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-timepicker-addon.css' />
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-timepicker/jquery-ui-timepicker-addon.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-timepicker/jquery-ui-sliderAccess.js.js'></script>
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-timepicker-addon.css' />
<script type='text/javascript' src='/js/spin/dist/spin.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/spin/dist/spin.min.js'></script>
{% endblock js %}
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
<div class="wrapper custom_text_stuff">
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">

View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "ietf.html" %}
{% load ietf_filters %}
{# Copyright The IETF Trust 2007, All Rights Reserved #}
{% load humanize %}
@ -6,33 +6,60 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda: Timeslot/Room Availability{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type='text/javascript' src='/js/jquery-ui-1.9.0.custom/jquery.ui.datetime.js'></script>
<script type="text/javascript" src="/facelift/js/agenda/jquery-1.8.2.min.js"></script>
<script>
function getCookie(name) {
var cookieValue = null;
if (document.cookie && document.cookie != '') {
var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) {
var cookie = jQuery.trim(cookies[i]);
// Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) == (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
}
}
}
return cookieValue;
}
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
beforeSend: function(xhr, settings) {
if (!csrfSafeMethod(settings.type)) {
xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
}
}
});
</script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.datetime.js'></script>
<!-- source (MIT License) http://momentjs.com/ https://github.com/moment/moment/ -->
<script type='text/javascript' src='/js/moment.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/moment.min.js'></script>
<!-- source (MIT License) : https://github.com/trentrichardson/jQuery-Timepicker-Addon -->
<script type='text/javascript' src='/js/jquery-ui-timepicker/jquery-ui-timepicker-addon.js'></script>
<script type='text/javascript' src='/js/jquery-ui-timepicker/jquery-ui-sliderAccess.js.js'></script>
<link rel='stylesheet' type='text/css' href='/css/jquery-ui-timepicker-addon.css' />
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-timepicker/jquery-ui-timepicker-addon.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/jquery-ui-timepicker/jquery-ui-sliderAccess.js.js'></script>
<link rel='stylesheet' type='text/css' href='/facelift/css/agenda/jquery-ui-timepicker-addon.css' />
<script type='text/javascript' src='/js/spin/dist/spin.min.js'></script>
<script type='text/javascript' src='/js/agenda/timeslot_edit.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_objects.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/spin/dist/spin.min.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/timeslot_edit.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_objects.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_helpers.js'></script>
<script type='text/javascript' src='/facelift/js/agenda/agenda_listeners.js'></script>
<script type='text/javascript'>

View file

@ -1,3 +1,41 @@
/* first some global settings to make the pages have the same environment as in the pre-Bootstrap days */
.content {
padding: 0;
font: 13px/1.231 arial,helvetica,clean,sans-serif;
}
.content * {
box-sizing: content-box;
}
.content th {
text-align: center;
}
.content button { font: normal; color: #000; }
.content .close { float: none; opacity: 1; }
.content table { border-collapse: separate; border-spacing: 2px; }
.ietf-navbar { background-color: #edf5ff; padding:0; border: 1px solid #89d; margin-top:4px; width: 130px; }
.ietf-navbar ul { padding: 0; margin: 0; }
.ietf-navbar ul li { list-style: none; padding: 0; margin: 0; font-size: 93%; padding: 2px 0px 2px 0px; }
.ietf-navbar ul li.yuimenuitem { padding: 0px 0px 1px 0px; border: 0;}
.ietf-navbar ul li a { padding: 0px 0px 0px 10px; }
.ietf-navbar ul li.sect a { padding: 2px 2px 2px 2px; }
.ietf-navbar ul li.sect { font-weight:bold; color:#fff; background:#2647A0; margin-top:2px; text-indent:2px; padding: 2px 0;}
.ietf-navbar ul li.first { margin-top: 0px; }
.ietf-navbar ul li.sect a { color:#fff; }
.ietf-navbar a, .ietf-navbar a:visited { color: #000000; }
.ietf-navbar > ul > li > a:hover { background-color: #b3d4ff; }
.ietf-navbar .yuimenuitemlabel { font-size: 12px; padding: 0 10px; }
.ietf-navbar #wgs .bd { background-color: #edf5ff; }
.ietf-navbar #wgs > .bd { border: 0;}
/* rest of agenda edit settings */
.IETF-scheme, .meeting_event th.IETF-scheme, #IETF-groups, #selector-IETF {
color: black;
background-color: white;
@ -822,7 +860,7 @@ td.ourconflicts, td.theirconflicts {
/* from: http://www.usabilitypost.com/2012/01/10/pressed-button-state-with-css3/# */
.styled_button {
.content .styled_button {
/* padding: 10px 15px; */
background: #4479BA;
color: #FFF;
@ -842,13 +880,13 @@ td.ourconflicts, td.theirconflicts {
-ms-user-select:none;
user-select:none;
}
.styled_button:hover {
.content .styled_button:hover {
cursor:pointer;
background: #356094;
border: solid 1px #2A4E77;
text-decoration: none;
}
.styled_button:active {
.content .styled_button:active {
-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);

View file

@ -0,0 +1,437 @@
/*
* Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* * Neither the name of the Nokia Corporation and/or its
* subsidiary(-ies) nor the names of its contributors may be used
* to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
body { margin: 0; }
a img { border: 0; }
.yui-skin-sam h1 {margin: 0.5em 0; font-size: 167%;}
.yui-skin-sam .yui-navset .yui-content {
background: white;
border:0px;
border-top:1px solid #243356;
padding:0.5em 0;
}
.yui-navset .disabled a em {color:#a0a0a0;}
.yui-skin-sam h1 { margin-top: 0; }
#ietf-login { color: white; position:absolute; top:8px; right: 10px; }
#ietf-login a, #ietf-login a:visited { color: white; }
.ietf-box { background:#edf5ff; border: 1px solid #cccccc; }
.ietf-navbar { background-color: #edf5ff; padding:0; border: 1px solid #89d; margin-top:4px; width: 130px; }
.ietf-navbar ul { padding: 0; margin: 0; }
.ietf-navbar ul li { list-style: none; padding: 0; margin: 0; font-size: 93%; padding: 2px 0px 2px 0px; }
.ietf-navbar ul li.yuimenuitem { padding: 0px 0px 1px 0px; border: 0;}
.ietf-navbar ul li a { padding: 0px 0px 0px 10px; }
.ietf-navbar ul li.sect a { padding: 2px 2px 2px 2px; }
.ietf-navbar ul li.sect { font-weight:bold; color:#fff; background:#2647A0; margin-top:2px; text-indent:2px; padding: 2px 0;}
.ietf-navbar ul li.first { margin-top: 0px; }
.ietf-navbar ul li.sect a { color:#fff; }
.ietf-navbar a, .ietf-navbar a:visited { color: #000000; }
.ietf-navbar > ul > li > a:hover { background-color: #b3d4ff; }
.ietf-navbar .yuimenuitemlabel { font-size: 12px; padding: 0 10px; }
.ietf-navbar #wgs .bd { background-color: #edf5ff; }
.ietf-navbar #wgs > .bd { border: 0;}
.ietf-navset {
background:#214197 url(/images/yui/sprite.png) repeat-x left -1400px;
color:white;
border:1px solid black;
padding:4px;
}
.ietf-navset .selected { font-weight:bold; padding: 0 3px; }
.ietf-navset a, .ietf-navset a:visited { color: white; padding:0 3px; }
.ietf-navset .actions { margin-top: 0.5em; font-style: italic; font-size: 90%; }
.ietf-ballot .left { background: #edf5ff; width:160px; padding-left: 10px; }
.ietf-ballot .right { padding-left: 15px; padding-right:15px; width:610px;padding-top:0px;}
.ietf-ballot h2.ballot_ad { background: #2647A0; color:white; padding: 2px 4px; font-size: 108%; margin-top: 0;}
.ietf-ballot .right { background: white; }
.ietf-ballot .square { border:1px solid black; display: block; float:left;width: 10px; height:10px;font-size:1px;margin-right:4px; margin-top:1px;}
.ietf-ballot .was { padding-left: 10px; font-size:85%; }
.ietf-stream tr { vertical-align: top; }
.ietf-stream ul.ietf-stream-tag-list { padding: 10px; margin: 0px; list-style-type: none; font-size: 10px; }
.ietf-stream ul.ietf-stream-tag-list li { margin-bottom: 1em; list-style-type: circle; color: #999999; }
.ietf-stream ul.ietf-stream-tag-list li.tag_set { font-weight: bold; list-style-type: disc; color: black; }
.ietf-stream td.right { padding-top: 1em; }
.ietf-stream .ietf-stream-head h2, .ietf-stream .ietf-stream-head h3 { margin: 0px; }
.ietf-stream .ietf-stream-head { margin-bottom: 2em; }
.ietf-stream .entry-title { background: #2647A0; color:white; padding: 2px 4px; font-size: 108%; margin-top: 0;}
.ietf-stream .entry-title .entry-date { float: right; }
.ietf-stream .entry-comment { background: #eeeeee; margin: 1em 0px; padding: 1em; }
.search-form-box { width: 99.5%; margin-top:8px; padding:4px; margin-bottom:1em; padding-left:8px; }
form#search_form { padding-top: 4px; padding-bottom: 4px; }
#search_form .submit { padding-top: 0.5em; }
#search_form .submit .button { padding: 0.2em 0.5em; border: 1px solid #999; }
#search_form input { padding: 0; padding-left: 2px; border: 1px solid #89d;}
#search_form input.radio { padding-left: 0; border: 0; }
#search_form select { border: 1px solid #89d; }
#search_form div.search_field { margin-top:2px; clear:both;}
#search_form .search_field > label { width: 170px; float: left; }
#search_form #search_advanced { margin-top: 1em; }
/* checkboxes for document types */
#search_form table#search_types { border-collapse:collapse;}
#search_form #search_types td { padding:0; }
#search_form #search_types td input { margin-left: 0; width:14px; border:0;}
/* give checkbox a fixed width so that IE6 aligns the left edge correctly */
#search_form #id_filename,
#search_form #id_author { width: 244px; }
#search_form #id_state,
#search_form #id_ad,
#search_form #id_positionAd { width:248px; }
#search_form #id_group {width: 120px; margin-right:4px; }
#search_form #id_area {width:120px; }
.search-text-shepherd { color: #808080; }
table.ietf-table { border-collapse:collapse; border:1px solid #7f7f7f; }
.ietf-table tr.evenrow { background-color: #EDF5FF; }
.ietf-table tr.oddrow { background-color: white; }
.ietf-table td { border-right: 1px solid #cbcbcb; padding:3px 6px; vertical-align: top; }
.ietf-table th { color: #fff; background: #2647A0; text-align: left; padding:3px 6px; border-right: 1px solid #7f7f7f; }
.ietf-doctable tr.header { border-top: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f; border-left: 1px solid white; border-right:2px solid white;}
.ietf-doctable tr.header td {padding: 6px 6px; font-weight: bold; }
.ietf-doctable table { max-width: 1200px; }
.ietf-doctable th { white-space: nowrap; }
.ietf-doctable th a { text-decoration: none; color: #fff; }
.ietf-doctable th img { border-style: none; vertical-align: top; }
.ietf-doctable th.doc, .ietf-doctable td.doc { min-width:20em; max-width: 35em; }
.ietf-doctable th.title, .ietf-doctable td.title { min-width: 20em; max-width: 35em; }
.ietf-doctable th.date, .ietf-doctable td.date { white-space:nowrap; min-width: 6em;}
.ietf-doctable th.status, .ietf-doctable td.status { min-width: 20em;}
.ietf-doctable th.ipr { font-variant: small-caps; }
.ietf-doctable th.ad, .ietf-doctable td.ad { white-space:nowrap; min-width: 6em; }
.ietf-doctable td { padding-right: 0.5em; padding-left: 0.5em; }
.ietf-doctable td.ballot { border-left: hidden; min-width: 37px; }
.ietf-doctable td .updated-by { max-width: 20em; } /* some RFCs have really long lists */
.ietf-doctable .status .milestone,
.ietf-box .stream-state .milestone
{ display: inline-block; font-size: smaller; background-color: #d5dde6; padding: 0 0.2em; margin-left: 0.3em; }
.ietf-small { font-size:85%; }
.ietf-tiny { font-size:70%; }
.ietf-highlight-y { padding:0 2px;background:yellow;}
.ietf-highlight-r { padding:0 2px;background:#ffa0a0;}
.ietf-divider { background: #2647a0; color: white; font-size:116%; padding:0.5em 1em; }
table .snippet .show-all { color: blue; cursor: pointer; }
.error-text {
font-size: 1.095em;
width: 48em;
}
form .actions {
margin-top: 20px;
}
form .actions a {
margin-right: 10px;
}
form table th {
font-weight: normal;
text-align: left;
padding-right: 10px;
padding-top: 2px;
vertical-align: top;
}
form table .help, form table .helptext {
font-style: italic;
font-size: 11px;
}
@media print { .noprint { display: none } }
.color1 { color: #ffb000; }
.color2 { color: #00ffff; }
.bgcolor1 { background-color: #ffb000; }
.bgcolor2 { background-color: #00ffff; }
.square { width: 0.8ex; height: 0.8ex; margin: 0; padding: 0; display: inline-block; position: relative; top: 0.8ex; }
.big { font-size: 109.5%; margin: 0; padding: 0; }
.large { font-size: 120%; margin: 0; padding: 0; }
.huge { font-size: 144%; margin: 0; padding: 0; }
.warning { color: #a00; }
.position-discuss,
.position-block { background-color: #c00000;}
.position-yes { background-color: #80ff80;}
.position-noobj { background-color: #80ff80;}
.position-abstain { background-color: #ffff00;}
.position-recuse { background-color: #c0c0c0;}
.position-norecord { background-color: #ffffff;}
.ballot-icon table { empty-cells: show; padding: 0; border-spacing: 0; border: 1px solid #666; border-collapse: collapse; table-layout: fixed; min-width: 35px; background: #fff; }
.ballot-icon table td { border: 1px solid #666; height: 7px; width: 6px; padding: 0;}
.ballot-icon table td.my { border: 3px solid #000;}
.ballot-sidebar { width: 160px; float: left; margin-top: 0.4em; padding: 5px; background: #edf5ff; }
.ballot-sidebar .action { margin-bottom: 1em; }
.ballot-sidebar .position-group { margin-bottom: 1em; }
.ballot-sidebar .position-group .heading { font-weight: bold; }
.ballot-sidebar .position-group .square { border: 1px solid #000; display: inline-block; width: 10px; height: 10px; margin-right:4px; position: static; vertical-align: middle }
.ballot-sidebar .position-group .was { padding-left: 10px; font-size:85%; }
.ballot-sidebar .position-group:last-child { margin-bottom: 0; }
.ballot-content { margin-left: 180px; } /* this positions the content to the right of the sidebar */
.ballot-content .other-ballots { margin: 1em 0 2em 0; }
.ballot-content .other-ballots a { display: inline-block; margin-right: 0.5em; }
.ballot-content h2.ad-ballot-comment { background: #2647A0; color: #fff; padding: 2px 4px; font-size: 108%; margin-top: 0;}
.ballot-popup > .content { width: 860px; height: 500px; overflow: auto; background: #fff; border: 1px solid #ccc; }
.ballot-popup .ballot-sidebar { margin-top: 0; }
ul.messages { border: solid black 1px; margin: 0.4em 0; padding: 1em; }
li.debug { margin: 0.5em; background-color: #ccf; }
li.info { margin: 0.5em; background-color: #ff8; }
li.success { margin: 0.5em; background-color: #4f4; }
li.warning { margin: 0.5em; background-color: #fc8; color: black;}
li.error { margin: 0.5em; background-color: #f44; }
li.preformatted { white-space:pre-wrap; }
.errorlist, errorlist li {
background: red;
color: white;
padding: 0.2ex 0.2ex 0.2ex 0.5ex;
border: 0px;
margin: 0px;
font-family: Arial, sans-serif;
}
.errorlist a { color: #fff; }
.group-documents .search-results { margin-top: 1.5em; }
table.milestones td.due { vertical-align: top; width: 80px; }
table.milestones .doc { display: block; padding-left: 1em; }
#modal-box { background: #f0f0f0; border-radius: 2px; padding: 10px; box-shadow: 0 0 4px rgba(0, 0, 0, 0.8); }
#modal-box .actions { padding-top: 1em; text-align: right; }
.button {
display: inline-block; padding: 4px 12px; margin-right: 0.3em;
color: #222; font-weight: normal; text-align: center; text-decoration: none; outline: none; cursor: pointer;
background: #eee; background: linear-gradient(#fff, #e0e0e0); background: -webkit-linear-gradient(#fff, #e0e0e0); background: -moz-linear-gradient(#fff, #e0e0e0);
border: 1px solid #666; border-radius: 3px;
transition-duration: 0.2s;
}
.button:hover { color: #111; background: #ddd; background: linear-gradient(#eee, #ccc); background: -webkit-linear-gradient(#eee, #ccc); background: -moz-linear-gradient(#eee, #ccc); }
.button:active { color: #000; background: #ccc; }
.button:disabled, .button:hover:disabled { color: #999; cursor: default; background: #eee; background: linear-gradient(#fff, #e0e0e0); background: -webkit-linear-gradient(#fff, #e0e0e0); background: -moz-linear-gradient(#fff, #e0e0e0); }
/* Message types */
div.info-message-success { border: 1px solid green; background-color: #eeffbb; padding: 5px 10px; margin: 1em 0px; color: green; }
div.info-message-warning { border: 1px dashed red; background-color: #ffeeaa; padding: 1em 2em; margin: 1em 0px; }
div.info-message-error { border: 1px solid red; background-color: #ffeebb; padding: 5px 10px; margin: 1em 0px; color: red; }
/* Prompts */
div.prompt { border: 1px dashed red; background-color: #ffeeaa; padding: 1em 2em; margin: 1em 0px; }
/* Form styles */
.baseform {
font-size: 12px;
}
.baseform .fieldset {
margin: 1em 0px;
border: none;
border: 1px solid #8899dd;
background-color: #edf5ff;
}
.baseform .fieldset h2 {
background-color: #2647a0;
color: white;
font-size: 14px;
padding: 5px 10px;
margin: 0px;
}
.baseform .field {
padding: 0.5em 10px;
}
.baseform .field label {
display: block;
width: 150px;
float: left;
clear: left;
}
.baseform .field .endfield {
clear: left;
}
.baseform .fieldWidget {
margin-left: 150px;
}
.baseform .fieldWidget ul.token-input-list {
clear: none;
}
#feedbackformset .fieldWidget {
margin-left: 0px;
}
#feedbackformset .fieldWidget.defaultPos {
margin-left: 150px;
}
#feedbackformset ul {
padding: 0px;
}
#feedbackformset ul li {
display: inline;
}
#feedbackformset ul li label {
display: inline;
float: none;
}
#feedbackformset .baseform h3 {
margin-left: 12px;
margin-top: 24px;
margin-bottom: 0px;
}
#feedbackformset pre {
margin: 12px;
}
#feedbackformset table {width: 100%;}
#feedbackformset .oddradio { background-color: white; text-align: center;}
#feedbackformset .evenradio { background-color: #EDF5FF; text-align: center;}
#feedbackformset .toggle { padding: 0px; }
#feedbackformset .toggle a.trigger { display: block; width: 22px; height: 22px;}
#feedbackformset .toggle a.closed { background: url(../images/plus.png) no-repeat center center;}
#feedbackformset .toggle a.open { background: url(../images/minus.png) no-repeat center center;}
#feedbackformset tr.body td { border-bottom: 1px solid #cbcbcb;}
#feedbackformset tr.bodyform td { border-top: 1px solid #cbcbcb;}
.baseform select,
.baseform textarea,
.baseform input {
border: 1px solid #cccccc;
}
.baseform input {
font-size: 12px;
}
.nomcom-menu {
text-align: center;
}
.nomcom-edit {
font-style: italic;
font-size: 90%;
text-align: center;
margin-top: 0.5em;
}
span.fieldRequired {
color: red;
}
.fieldError {
background-color: #ffcc66;
}
.state-help-icon {
display: inline-block;
margin-left: 0.2em;
padding: 0 0.2em;
font-weight: bold;
font-style: normal;
font-size: 90%;
color: #999;
background-color: #ddd;
text-decoration: none;
}
.state-help-icon:hover {
color: #eee;
background-color: #bbb;
transition-duration: 0.2s;
}
.js-info { /* Javascript disabled box */
display: block;
background-color: #ffdd88;
border: 1px dashed red;
font-size: 1.2em;
padding: 1em 2em;
margin: 1em 0;
}
#login-pane {
width: 100%;
height: 100%;
// background: rgba(196,196,196,.5);
}
#login-form {
width: 24em;
padding: 2em;
margin-right: auto;
margin-left: auto;
margin-top: 10em;
background: white;
}
#login-back {
text-align: center;
}
.login {
font-style: italic;
}

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

@ -144,6 +144,7 @@ function read_only_result(msg) {
$(".agenda_save_box").css("right", "10px");
$(".agenda_save_box").css("bottom", "auto");
$(".agenda_save_box").css("border", "3px solid blue");
$(".agenda_save_box").css("z-index", "2000");
}
} else {
$(".agenda_save_box").html("please login to save");

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show more