Remove non-facelift static assets, and move the facelift assets one step up

- Legacy-Id: 8971
This commit is contained in:
Ole Laursen 2015-02-04 17:03:43 +00:00
parent 8d4e1a8528
commit e78637b9fc
469 changed files with 147 additions and 10164 deletions

View file

@ -13,7 +13,6 @@ def get_user_managed_lists(user):
if not (user and hasattr(user, "is_authenticated") and user.is_authenticated()):
return ''
lists = {'personal': CommunityList.objects.get_or_create(user=user)[0]}
print lists
try:
person = user.person
groups = []

View file

@ -11,7 +11,7 @@
{% block extrastyle %}{% endblock %}
{% block extrahead %}
<script type="text/javascript" src="/facelift/js/lib/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="/js/lib/jquery-1.11.1.min.js"></script>
{% endblock %}
{% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}

View file

@ -8,9 +8,9 @@
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/jquery-ui-1.8.1.custom.min.js"></script>
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
<script src="/js/lib/select2-3.5.2.min.js"></script>
<script>
// this is copy-pasted from ietf.js, we should include that here too instead of this
$(document).ready(function () {

View file

@ -6,9 +6,9 @@
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/sessions.js"></script>
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
<script src="/js/lib/select2-3.5.2.min.js"></script>
<script>
// this is copy-pasted from ietf.js, we should include that here too instead of this
$(document).ready(function () {

View file

@ -6,9 +6,9 @@
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/utils.js"></script>
<script type="text/javascript" src="{{ SECR_STATIC_URL }}js/sessions.js"></script>
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
<script src="/js/lib/select2-3.5.2.min.js"></script>
<script>
// this is copy-pasted from ietf.js, we should include that here too instead of this
$(document).ready(function () {

View file

@ -5,8 +5,8 @@
{% block title %}Change document shepherd for {{ doc.name }}-{{ doc.rev }}{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}
{% block content %}
@ -29,5 +29,5 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
{% endblock %}

View file

@ -7,8 +7,8 @@
{% bootstrap_messages %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}
{% block content %}
@ -28,5 +28,5 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
{% endblock %}

View file

@ -6,7 +6,7 @@
<h1>{{ title }}</h1>
{% if state_type.slug == "draft-iesg" %}
<p><a class="btn btn-default" href="/facelift/images/iesg-draft-state-diagram.png">View diagram</a></p>
<p><a class="btn btn-default" href="/images/iesg-draft-state-diagram.png">View diagram</a></p>
{% endif %}
<table class="table table-condensed table-striped">

View file

@ -23,6 +23,6 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/status-change-edit-relations.js"></script>
<script src="/js/status-change-edit-relations.js"></script>
{% endblock %}

View file

@ -3,7 +3,7 @@
{% load bootstrap3 %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
{% endblock %}
{% block title %}Make last call for {{ doc.name }}{% endblock %}
@ -33,7 +33,7 @@
{% block js %}
<script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
<script src="/js/lib/bootstrap-datepicker.js"></script>
{% endblock %}
{% block scripts %}

View file

@ -33,5 +33,5 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/status-change-edit-relations.js"></script>
<script src="/js/status-change-edit-relations.js"></script>
{% endblock %}

View file

@ -12,8 +12,8 @@
{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}
{% block content %}
@ -51,7 +51,7 @@ so. New accounts can be <a href="{% url "create_account" %}">created here</a>.</
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
<script>
$(document).ready(function () {
$("#id_acronym").closest(".form-group").each(function() {

View file

@ -3,9 +3,9 @@
{% load bootstrap3 %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/facelift/css/lib/datepicker3.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/datepicker3.css">
{% endblock %}
{% block title %}{{ title }}{% endblock %}
@ -93,7 +93,7 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
<script src="/facelift/js/edit-milestones.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/lib/bootstrap-datepicker.js"></script>
<script src="/js/edit-milestones.js"></script>
{% endblock %}

View file

@ -6,8 +6,8 @@
{% block title %}Manage {{ group.name }} RFC stream{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}
{% block content %}
@ -42,5 +42,5 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
{% endblock %}

View file

@ -10,18 +10,18 @@
<title>{% block title %}No title{% endblock %}{% if server_mode and server_mode != "production" %} &beta;{% endif %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/facelift/css/bootstrap.min.css">
<link rel="stylesheet" href="/facelift/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/facelift/css/font-awesome.min.css">
<link rel="stylesheet" href="/facelift/css/ietf.css">
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/ietf.css">
<style>
{% block morecss %}{% endblock %}
</style>
{% block pagehead %}{% endblock %}
<link rel="shortcut icon" href="/facelift/images/ietficon.ico">
<link rel="apple-touch-icon-precomposed" href="/facelift/images/ietficon.png">
<link rel="shortcut icon" href="/images/ietficon.ico">
<link rel="apple-touch-icon-precomposed" href="/images/ietficon.png">
</head>
<body {% block bodyAttrs %}{%endblock%}>
@ -160,11 +160,11 @@
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="/facelift/js/lib/jquery-1.11.1.min.js"><\/script>')</script>
<script src="/facelift/js/lib/jquery.cookie.min.js"></script>
<script src="/facelift/js/lib/bootstrap.min.js"></script>
<script>window.jQuery || document.write('<script src="/js/lib/jquery-1.11.1.min.js"><\/script>')</script>
<script src="/js/lib/jquery.cookie.min.js"></script>
<script src="/js/lib/bootstrap.min.js"></script>
{% block js %}{% endblock %}
<script src="/facelift/js/ietf.js"></script>
<script src="/js/ietf.js"></script>
<script>
//<![CDATA[
{% block scripts %}{% endblock %}

View file

@ -5,8 +5,8 @@
{% block title %}{% if form.instance %}Edit IPR #{{ form.instance.id }}{% else %}New IPR{% endif %}{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}
{% block content %}
@ -241,7 +241,7 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
<script src="/facelift/js/ipr-edit.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/lib/bootstrap-datepicker.js"></script>
<script src="/js/ipr-edit.js"></script>
{% endblock %}

View file

@ -5,7 +5,7 @@
{% block title %}Email submitter of {{ ipr.title }}{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
{% endblock %}
{% block content %}
@ -26,5 +26,5 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
<script src="/js/lib/bootstrap-datepicker.js"></script>
{% endblock %}

View file

@ -7,5 +7,5 @@
{% endblock %}
{% block js %}
<script type="text/javascript" src="/facelift/js/ipr-search.js"></script>
<script type="text/javascript" src="/js/ipr-search.js"></script>
{% endblock %}

View file

@ -78,5 +78,5 @@
{% endblock %}
{% block js %}
<script type="text/javascript" src="/facelift/js/ipr-search.js"></script>
<script type="text/javascript" src="/js/ipr-search.js"></script>
{% endblock %}

View file

@ -5,9 +5,9 @@
{% block title %}{% if liaison %}Edit liaison: {{ liaison }}{% else %}Send Liaison Statement{% endif %}{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}
{% block content %}
@ -59,7 +59,7 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/facelift/js/liaisons.js"></script>
<script src="/js/lib/bootstrap-datepicker.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/liaisons.js"></script>
{% endblock %}

View file

@ -6,14 +6,14 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<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' />
<link rel='stylesheet' type='text/css' href='/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<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 type="text/javascript" src="/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
@ -24,17 +24,17 @@ jQuery.ajaxSetup({
}
});
</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/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/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>
<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>
{% endblock js %}

View file

@ -17,13 +17,13 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<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' />
<link rel='stylesheet' type='text/css' href='/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<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 type="text/javascript" src="/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
@ -34,18 +34,18 @@ jQuery.ajaxSetup({
}
});
</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/agenda/jquery-ui-1.9.0.custom/minified/jquery-ui.custom.min.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.widget.min.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.droppable.min.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.sortable.min.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.accordion.min.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/minified/jquery.ui.draggable.min.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' src='/js/agenda/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'>

View file

@ -6,14 +6,14 @@
{% 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='/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' />
<link rel='stylesheet' type='text/css' href='/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<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 type="text/javascript" src="/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
@ -24,17 +24,17 @@ jQuery.ajaxSetup({
}
});
</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/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/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/agenda_properties_edit.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>
{% endblock js %}
{% block content %}

View file

@ -6,14 +6,14 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda: Timeslot/Room Availability{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<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' />
<link rel='stylesheet' type='text/css' href='/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<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 type="text/javascript" src="/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
@ -24,22 +24,22 @@ jQuery.ajaxSetup({
}
});
</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/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/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='/facelift/js/agenda/moment.min.js'></script>
<script type='text/javascript' src='/js/agenda/moment.min.js'></script>
<!-- source (MIT License) : https://github.com/trentrichardson/jQuery-Timepicker-Addon -->
<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/agenda/jquery-ui-timepicker/jquery-ui-timepicker-addon.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-timepicker/jquery-ui-sliderAccess.js.js'></script>
<link rel='stylesheet' type='text/css' href='/css/agenda/jquery-ui-timepicker-addon.css' />
<script type='text/javascript' src='/facelift/js/agenda/spin/dist/spin.min.js'></script>
<script type='text/javascript' src='/js/agenda/spin/dist/spin.min.js'></script>
{% endblock js %}

View file

@ -6,14 +6,14 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda: Timeslot/Room Availability{% endblock %}
{% load agenda_custom_tags %}
{% block pagehead %}
<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' />
<link rel='stylesheet' type='text/css' href='/css/agenda/jquery-ui-themes/jquery-ui-1.8.11.custom.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/base2.css' />
<link rel='stylesheet' type='text/css' href='/css/agenda/agenda.css' />
{% endblock pagehead %}
{% block js %}
<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 type="text/javascript" src="/js/agenda/jquery-1.8.2.min.js"></script>
<script src="/js/lib/jquery.cookie.min.js"></script>
<script>
jQuery.ajaxSetup({
crossDomain: false, // obviates need for sameOrigin test
@ -24,27 +24,27 @@ jQuery.ajaxSetup({
}
});
</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>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery-ui.custom.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.widget.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.droppable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.sortable.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.accordion.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-1.9.0.custom/jquery.ui.draggable.js'></script>
<script type='text/javascript' src='/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='/facelift/js/agenda/moment.min.js'></script>
<script type='text/javascript' src='/js/agenda/moment.min.js'></script>
<!-- source (MIT License) : https://github.com/trentrichardson/jQuery-Timepicker-Addon -->
<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/agenda/jquery-ui-timepicker/jquery-ui-timepicker-addon.js'></script>
<script type='text/javascript' src='/js/agenda/jquery-ui-timepicker/jquery-ui-sliderAccess.js.js'></script>
<link rel='stylesheet' type='text/css' href='/css/agenda/jquery-ui-timepicker-addon.css' />
<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' src='/js/agenda/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'>

View file

@ -502,7 +502,7 @@ function finish_maximize(e)
var minimize_func = function (e) { return function(){minimize(e);} }
var img = document.createElement("img");
img.src = "/facelift/images/agenda-weekview/close.png";
img.src = "/images/agenda-weekview/close.png";
img.style.cssFloat="right";
img.onclick = minimize_func(e);
img.style.cursor="pointer";

View file

@ -3,7 +3,7 @@
{% load bootstrap3 %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
{% endblock %}
{% block subtitle %} - Settings{% endblock %}
@ -43,7 +43,7 @@
{% endblock %}
{% block js %}
<script src="/facelift/js/lib/bootstrap-datepicker.js"></script>
<script src="/js/lib/bootstrap-datepicker.js"></script>
{% endblock %}
{% block scripts %}

View file

@ -1,8 +1,8 @@
{% extends "nomcom/nomcom_private_base.html" %}
{% block pagehead %}
<link rel="stylesheet" href="/facelift/css/lib/select2.css">
<link rel="stylesheet" href="/facelift/css/lib/select2-bootstrap.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}
{% load bootstrap3 %}
@ -27,5 +27,5 @@
{% endblock %}
{% block content_end %}
<script src="/facelift/js/lib/select2-3.5.2.min.js"></script>
<script src="/js/lib/select2-3.5.2.min.js"></script>
{% endblock %}

View file

@ -75,9 +75,7 @@ for n,a in api._api_list:
if settings.SERVER_MODE in ('development', 'test'):
urlpatterns += patterns('',
(r'^(?P<path>(?:images|css|js|test)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
# FACELIFT: Load facelift assets from subdirectory. Might eventually be changed.
(r'^(?P<path>facelift/(?:images|css|js|fonts|other)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
(r'^(?P<path>(?:images|css|js|test|fonts|other)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
(r'^(?P<path>admin/(?:img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
(r'^(?P<path>secretariat/(img|css|js)/.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
(r'^(?P<path>robots\.txt)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT+"dev/"}),

View file

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 203 B

View file

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 199 B

View file

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 200 B

View file

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

View file

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 198 B

View file

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 200 B

View file

Before

Width:  |  Height:  |  Size: 212 B

After

Width:  |  Height:  |  Size: 212 B

View file

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View file

Before

Width:  |  Height:  |  Size: 613 B

After

Width:  |  Height:  |  Size: 613 B

View file

Before

Width:  |  Height:  |  Size: 280 KiB

After

Width:  |  Height:  |  Size: 280 KiB

View file

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View file

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

View file

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View file

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View file

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

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