Split static files in application specific directories and use django 1.4 staticfiles app.
This commit is contained in:
René Köcher
parent
fbdcc5e0b4
commit
f674897505
@ -1,4 +1,5 @@
|
|||||||
{% extends '!layout.html' %}
|
{% extends '!layout.html' %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block extrahead %}
|
{% block extrahead %}
|
||||||
{{ super() }}
|
{{ super() }}
|
||||||
@ -37,14 +38,14 @@ name="keywords">
|
|||||||
|
|
||||||
<div id="sidebar">
|
<div id="sidebar">
|
||||||
<div id="logo">
|
<div id="logo">
|
||||||
<a href="{{ pathto('index') }}" title="Home" style="border: none;"><img src="_static/images/logo.png"></a>
|
<a href="{{ pathto('index') }}" title="Home" style="border: none;"><img src="{% static 'images/logo.png' %}"></a>
|
||||||
</div>
|
</div>
|
||||||
<div id="language">
|
<div id="language">
|
||||||
{%- for lng in languages.split(' ') %}
|
{%- for lng in languages.split(' ') %}
|
||||||
{%- if lng != language %}
|
{%- if lng != language %}
|
||||||
<a href="{{ pathto('../'+lng+'/'+pagename) }}">
|
<a href="{{ pathto('../'+lng+'/'+pagename) }}">
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
<img src="{{ pathto('_static/images/'+lng+'.png', 1) }}" alt="{{ lng }}" title="{{ lng }}" {%- if lng == language %} width="18px" height="13px" {%- endif %} />
|
<img src="{% static {{ 'images/'+lng+'.png' }} %}" alt="{{ lng }}" title="{{ lng }}" {%- if lng == language %} width="18px" height="13px" {%- endif %} />
|
||||||
|
|
||||||
{%- if lng != language %}
|
{%- if lng != language %}
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 783 B After Width: | Height: | Size: 783 B |
|
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 838 B |
@ -1,5 +1,5 @@
|
|||||||
a.close_link.closed span {
|
a.close_link.closed span {
|
||||||
background-image: url(/static/images/icons/user-offline.png);
|
background-image: url(../images/icons/user-offline.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -7,7 +7,7 @@ a.close_link.closed span {
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
a.close_link.open span {
|
a.close_link.open span {
|
||||||
background-image: url(/static/images/icons/user-online.png);
|
background-image: url(../images/icons/user-online.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -16,7 +16,7 @@ a.close_link.open span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
a.hidelink.hide span {
|
a.hidelink.hide span {
|
||||||
background-image: url(/static/images/icons/layer-visible-off.png);
|
background-image: url(../images/icons/layer-visible-off.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -24,7 +24,7 @@ a.hidelink.hide span {
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
a.hidelink.show span {
|
a.hidelink.show span {
|
||||||
background-image: url(/static/images/icons/layer-visible-on.png);
|
background-image: url(../images/icons/layer-visible-on.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -1,10 +1,11 @@
|
|||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
<tr class="draggable{% cycle ' odd' '' %}
|
<tr class="draggable{% cycle ' odd' '' %}
|
||||||
{% if item.active %}activeline{% endif %}">
|
{% if item.active %}activeline{% endif %}">
|
||||||
<td>
|
<td>
|
||||||
{% if item.closed %}
|
{% if item.closed %}
|
||||||
<img src="/static/images/icons/task-complete.png" title="{% trans 'Item closed' %}">
|
<img src="{% static 'images/icons/task-complete.png' %}" title="{% trans 'Item closed' %}">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
@ -18,10 +19,10 @@
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<span style="width: 1px; white-space: nowrap;">
|
<span style="width: 1px; white-space: nowrap;">
|
||||||
<a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show projector preview' %}"></a>
|
<a href="{{ item.get_absolute_url }}"><img src="{% static 'images/icons/document-preview.png' %}" title="{% trans 'Show projector preview' %}"></a>
|
||||||
{% if perms.agenda.can_manage_agenda %}
|
{% if perms.agenda.can_manage_agenda %}
|
||||||
<a href="{% url item_edit item.id %}"><img src="/static/images/icons/document-edit.png" title="{% trans 'Edit item' %}"></a>
|
<a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit item' %}"></a>
|
||||||
<a href="{% url item_delete item.id %}"><img src="/static/images/icons/edit-delete.png" title="{% trans 'Delete item' %}"></a>
|
<a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete item' %}"></a>
|
||||||
<a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
|
<a class="close_link {% if item.closed %}closed{% else %}open{% endif %}" href="{% if item.closed %}{% url item_open item.id %}{% else %}{% url item_close item.id %}{% endif %}">
|
||||||
<span></span>
|
<span></span>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@ -3,18 +3,19 @@
|
|||||||
{% load tags %}
|
{% load tags %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load mptt_tags %}
|
{% load mptt_tags %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block title %}{{ block.super }} - {% trans "Agenda" %}{% endblock %}
|
{% block title %}{{ block.super }} - {% trans "Agenda" %}{% endblock %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
<link type="text/css" rel="stylesheet" media="all" href="/static/styles/tabledrag.css" />
|
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/tabledrag.css' %}" />
|
||||||
<link type="text/css" rel="stylesheet" media="all" href="/static/styles/agenda.css" />
|
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/agenda.css' %}" />
|
||||||
{% if perms.agenda.can_manage_agenda %}
|
{% if perms.agenda.can_manage_agenda %}
|
||||||
<script type="text/javascript" src="/static/javascript/jquery.once.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/jquery.once.js' %}"></script>
|
||||||
<script type="text/javascript" src="/static/javascript/jquery.cookie.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/jquery.cookie.js' %}"></script>
|
||||||
<script type="text/javascript" src="/static/javascript/jquery.tmpl.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/jquery.tmpl.js' %}"></script>
|
||||||
<script type="text/javascript" src="/static/javascript/tabledrag.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/tabledrag.js' %}"></script>
|
||||||
<script type="text/javascript" src="/static/javascript/agenda.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/agenda.js' %}"></script>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
<!--//--><
|
Before Width: | Height: | Size: 746 B After Width: | Height: | Size: 746 B |
|
Before Width: | Height: | Size: 752 B After Width: | Height: | Size: 752 B |
@ -1,5 +1,5 @@
|
|||||||
a.status_link.active span {
|
a.status_link.active span {
|
||||||
background-image: url(/static/images/icons/user-online.png);
|
background-image: url(../images/icons/user-online.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -7,7 +7,7 @@ a.status_link.active span {
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
a.status_link.inactive span {
|
a.status_link.inactive span {
|
||||||
background-image: url(/static/images/icons/user-offline.png);
|
background-image: url(../images/icons/user-offline.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -16,7 +16,7 @@ a.status_link.inactive span {
|
|||||||
}
|
}
|
||||||
|
|
||||||
a.superuser_link.superuser span {
|
a.superuser_link.superuser span {
|
||||||
background-image: url(/static/images/icons/meeting-chair.png);
|
background-image: url(../images/icons/meeting-chair.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -24,7 +24,7 @@ a.superuser_link.superuser span {
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
a.superuser_link.normaluser span {
|
a.superuser_link.normaluser span {
|
||||||
background-image: url(/static/images/icons/im-user.png);
|
background-image: url(../images/icons/im-user.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
{% load tags %}
|
{% load tags %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block submenu %}
|
{% block submenu %}
|
||||||
{% url user_overview as url_users %}
|
{% url user_overview as url_users %}
|
||||||
@ -20,10 +21,10 @@
|
|||||||
<li class="{% if request.path == url_userimport %}selected{% endif %}"><a href="{% url user_import %}"> {%trans 'Import participants' %}</a></li>
|
<li class="{% if request.path == url_userimport %}selected{% endif %}"><a href="{% url user_import %}"> {%trans 'Import participants' %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if perms.participant.can_see_participant %}
|
{% if perms.participant.can_see_participant %}
|
||||||
<li><a href="{% url user_print %}"><img src="/static/images/icons/application-pdf.png"> {%trans 'Print participant list' %}</a></li>
|
<li><a href="{% url user_print %}"><img src="{% static 'images/icons/application-pdf.png' %}"> {%trans 'Print participant list' %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if perms.participant.can_manage_participant %}
|
{% if perms.participant.can_manage_participant %}
|
||||||
<li><a href="{% url print_passwords %}"><img src="/static/images/icons/application-pdf.png"> {% trans 'Print first time passwords' %}</a></li>
|
<li><a href="{% url print_passwords %}"><img src="{% static 'images/icons/application-pdf.png' %}"> {% trans 'Print first time passwords' %}</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
{% extends "participant/base_participant.html" %}
|
{% extends "participant/base_participant.html" %}
|
||||||
|
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block title %}{{ block.super }} - {%trans "Groups" %}{% endblock %}
|
{% block title %}{{ block.super }} - {%trans "Groups" %}{% endblock %}
|
||||||
|
|
||||||
@ -14,9 +15,9 @@
|
|||||||
{% for group in groups %}
|
{% for group in groups %}
|
||||||
<tr class="{% cycle '' 'odd' %}">
|
<tr class="{% cycle '' 'odd' %}">
|
||||||
<td>{{ group.name }}</td>
|
<td>{{ group.name }}</td>
|
||||||
<td><a href="{% url user_group_edit group.id %}"><img src="/static/images/icons/document-edit.png" title="{%trans 'Edit group' %}"></a>
|
<td><a href="{% url user_group_edit group.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{%trans 'Edit group' %}"></a>
|
||||||
{% if group.name != 'Anonymous' %}
|
{% if group.name != 'Anonymous' %}
|
||||||
<a href="{% url user_group_delete group.id %}"><img src="/static/images/icons/edit-delete.png" title="{%trans 'Delete group' %}"></a>
|
<a href="{% url user_group_delete group.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{%trans 'Delete group' %}"></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
{% extends "participant/base_participant.html" %}
|
{% extends "participant/base_participant.html" %}
|
||||||
|
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block mainmenu %}
|
{% block mainmenu %}
|
||||||
<ul>
|
<ul>
|
||||||
@ -17,7 +18,7 @@
|
|||||||
{% if form.errors %}
|
{% if form.errors %}
|
||||||
<div class="notification error">
|
<div class="notification error">
|
||||||
<a class="close" href="#">
|
<a class="close" href="#">
|
||||||
<img alt="close" title="{% trans 'Close this notification' %}" src="/static/images/icons/cross.png">
|
<img alt="close" title="{% trans 'Close this notification' %}" src="{% static 'images/icons/cross.png' %}">
|
||||||
</a>
|
</a>
|
||||||
<em>{%trans "Your username and password didn't match. Please try again." %}</em>
|
<em>{%trans "Your username and password didn't match. Please try again." %}</em>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,13 +1,14 @@
|
|||||||
{% extends "participant/base_participant.html" %}
|
{% extends "participant/base_participant.html" %}
|
||||||
|
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block title %}{{ block.super }} - {%trans "Participants" %}{% endblock %}
|
{% block title %}{{ block.super }} - {%trans "Participants" %}{% endblock %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
{% if perms.agenda.can_manage_agenda %}
|
{% if perms.agenda.can_manage_agenda %}
|
||||||
<link type="text/css" rel="stylesheet" media="all" href="/static/styles/participant.css" />
|
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/participant.css' %}" />
|
||||||
<script type="text/javascript" src="/static/javascript/participant.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/participant.js' %}"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
@ -83,8 +84,8 @@
|
|||||||
{{ user.last_login }}
|
{{ user.last_login }}
|
||||||
{% endif %}</td>
|
{% endif %}</td>
|
||||||
<td><span style="width: 1px; white-space: nowrap;">
|
<td><span style="width: 1px; white-space: nowrap;">
|
||||||
<a href="{% url user_edit user.id %}"><img src="/static/images/icons/document-edit.png" title="{%trans 'Edit participant' %}"></a>
|
<a href="{% url user_edit user.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{%trans 'Edit participant' %}"></a>
|
||||||
<a href="{% url user_delete user.id %}"><img src="/static/images/icons/edit-delete.png" title="{%trans 'Delete participant' %}"></a>
|
<a href="{% url user_delete user.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{%trans 'Delete participant' %}"></a>
|
||||||
<a class="status_link {% if user.is_active %}active{% else %}inactive{% endif %}"
|
<a class="status_link {% if user.is_active %}active{% else %}inactive{% endif %}"
|
||||||
href="{% if user.is_active %}{% url user_inactive user.id %}{% else %}{% url user_active user.id %}{% endif %}"
|
href="{% if user.is_active %}{% url user_inactive user.id %}{% else %}{% url user_active user.id %}{% endif %}"
|
||||||
title="{%trans 'Change status (active/inactive)' %}">
|
title="{%trans 'Change status (active/inactive)' %}">
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 562 B After Width: | Height: | Size: 562 B |
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 532 B |
|
Before Width: | Height: | Size: 484 B After Width: | Height: | Size: 484 B |
|
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 501 B |
|
Before Width: | Height: | Size: 511 B After Width: | Height: | Size: 511 B |
|
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 370 B |
|
Before Width: | Height: | Size: 867 B After Width: | Height: | Size: 867 B |
|
Before Width: | Height: | Size: 884 B After Width: | Height: | Size: 884 B |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
@ -50,7 +50,7 @@
|
|||||||
}
|
}
|
||||||
/* countdown */
|
/* countdown */
|
||||||
a.countdown_visible_link.closed div {
|
a.countdown_visible_link.closed div {
|
||||||
background-image: url(/static/images/icons/user-offline.png);
|
background-image: url(../images/icons/user-offline.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -58,7 +58,7 @@ a.countdown_visible_link.closed div {
|
|||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
a.countdown_visible_link.open div {
|
a.countdown_visible_link.open div {
|
||||||
background-image: url(/static/images/icons/user-online.png);
|
background-image: url(../images/icons/user-online.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -67,7 +67,7 @@ a.countdown_visible_link.open div {
|
|||||||
}
|
}
|
||||||
/* activate link */
|
/* activate link */
|
||||||
a.activate_link div {
|
a.activate_link div {
|
||||||
background-image: url(/static/images/icons/task-accepted-grey.png);
|
background-image: url(../images/icons/task-accepted-grey.png);
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
float: left;
|
float: left;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
@ -78,5 +78,5 @@ a.activate_link div {
|
|||||||
left: 4px;
|
left: 4px;
|
||||||
}
|
}
|
||||||
a.activate_link.active div {
|
a.activate_link.active div {
|
||||||
background-image: url(/static/images/icons/task-accepted.png);
|
background-image: url(../images/icons/task-accepted.png);
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 260 B After Width: | Height: | Size: 260 B |
|
Before Width: | Height: | Size: 251 B After Width: | Height: | Size: 251 B |
|
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 178 B |
|
Before Width: | Height: | Size: 104 B After Width: | Height: | Size: 104 B |
|
Before Width: | Height: | Size: 125 B After Width: | Height: | Size: 125 B |
|
Before Width: | Height: | Size: 105 B After Width: | Height: | Size: 105 B |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 90 B After Width: | Height: | Size: 90 B |
|
Before Width: | Height: | Size: 129 B After Width: | Height: | Size: 129 B |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
@ -1,14 +1,15 @@
|
|||||||
{% load tags %}
|
{% load tags %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
||||||
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
||||||
<head>
|
<head>
|
||||||
<link type="text/css" rel="stylesheet" href="/static/styles/projector.css">
|
<link type="text/css" rel="stylesheet" href="{% static 'styles/projector.css' %}">
|
||||||
<link rel="shortcut icon" href="/static/images/favicon.png" type="image/png" />
|
<link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" />
|
||||||
<script type="text/javascript" src="/static/javascript/jquery.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/jquery.js' %}"></script>
|
||||||
<script type="text/javascript" src="/static/javascript/projector.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/projector.js' %}"></script>
|
||||||
<title>{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
|
<title>{% block title %} {% get_config 'event_name' %} {% endblock %}</title>
|
||||||
{% block header %}
|
{% block header %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@ -20,7 +21,7 @@
|
|||||||
<div id="ajaxswitcher"></div>
|
<div id="ajaxswitcher"></div>
|
||||||
|
|
||||||
<div id="header">
|
<div id="header">
|
||||||
<div id="logo"><img src="/static/images/logo-projector.png"></div>
|
<div id="logo"><img src="{% static 'images/logo-projector.png' %}"></div>
|
||||||
<div class="event_name">{% get_config 'event_name' %}</div>
|
<div class="event_name">{% get_config 'event_name' %}</div>
|
||||||
<div class="event_description">{% get_config 'event_description' %}</div>
|
<div class="event_description">{% get_config 'event_description' %}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
{% load tags %}
|
{% load tags %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block title %}{{ block.super}} – {% trans 'Projector' %} {% endblock %}
|
{% block title %}{{ block.super}} – {% trans 'Projector' %} {% endblock %}
|
||||||
|
|
||||||
@ -23,7 +24,7 @@
|
|||||||
<a href="{% url projector_new %}">{% trans 'New Slide' %}</a>
|
<a href="{% url projector_new %}">{% trans 'New Slide' %}</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="{% url projector_show %}"><img src="/static/images/icons/video-projector.png"> {% trans 'Projector view' %}</a>
|
<a href="{% url projector_show %}"><img src="{% static 'images/icons/video-projector.png' %}"> {% trans 'Projector view' %}</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
{% load tags %}
|
{% load tags %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
<link type="text/css" href="/static/styles/ui-lightness/jquery-ui-1.8.18.custom.css" rel="stylesheet" />
|
<link type="text/css" href="{% static 'styles/ui-lightness/jquery-ui-1.8.18.custom.css' %}" rel="stylesheet" />
|
||||||
<link type="text/css" rel="stylesheet" media="all" href="/static/styles/projector-control.css" />
|
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/projector-control.css' %}" />
|
||||||
<script type="text/javascript" src="/static/javascript/jquery-ui-1.8.18.custom.min.js"></script>
|
<script type="text/javascript" src="{% static javascript/jquery-ui-1.8.18.custom.min.js' %}"></script>
|
||||||
<script type="text/javascript" src="/static/javascript/projector-control.js"></script>
|
<script type="text/javascript" src="{% static javascript/projector-control.js %}"></script>
|
||||||
<script type="text/javascript" src="/static/javascript/jquery.cookie.js"></script>
|
<script type="text/javascript" src="{% static javascript/jquery.cookie.js %}"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
$( ".column" ).sortable({
|
$( ".column" ).sortable({
|
||||||
@ -39,32 +40,32 @@
|
|||||||
{% trans "Countdown" %} (<a href="{% url config_agenda %}">{{countdown_time}}{% trans "sec" %}</a>)
|
{% trans "Countdown" %} (<a href="{% url config_agenda %}">{{countdown_time}}{% trans "sec" %}</a>)
|
||||||
{% if countdown_visible %}:
|
{% if countdown_visible %}:
|
||||||
<a class="projector_countdown" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
|
<a class="projector_countdown" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
|
||||||
<img src="/static/images/icons/media-skip-backward.png" />
|
<img src="{% static 'images/icons/media-skip-backward.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_countdown" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}">
|
<a class="projector_countdown" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}">
|
||||||
<img src="/static/images/icons/media-playback-start.png" />
|
<img src="{% static 'images/icons/media-playback-start.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_countdown" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}">
|
<a class="projector_countdown" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}">
|
||||||
<img src="/static/images/icons/media-playback-pause.png" />
|
<img src="{% static 'images/icons/media-playback-pause.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<p></p>
|
<p></p>
|
||||||
<!-- projector control -->
|
<!-- projector control -->
|
||||||
{% trans "Adjust projector view" %}:
|
{% trans "Adjust projector view" %}:
|
||||||
<a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}">
|
<a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}">
|
||||||
<img src="/static/images/icons/zoom-in.png" />
|
<img src="{% static 'images/icons/zoom-in.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_edit" href="{% url projector_smaller %}" title="{% trans 'Zoom out' %}">
|
<a class="projector_edit" href="{% url projector_smaller %}" title="{% trans 'Zoom out' %}">
|
||||||
<img src="/static/images/icons/zoom-out.png" />
|
<img src="{% static 'images/icons/zoom-out.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_edit" href="{% url projector_up %}" title="{% trans 'Scroll text up' %}">
|
<a class="projector_edit" href="{% url projector_up %}" title="{% trans 'Scroll text up' %}">
|
||||||
<img src="/static/images/icons/go-up.png" />
|
<img src="{% static 'images/icons/go-up.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_edit" href="{% url projector_down %}" title="{% trans 'Scroll text down' %}">
|
<a class="projector_edit" href="{% url projector_down %}" title="{% trans 'Scroll text down' %}">
|
||||||
<img src="/static/images/icons/go-down.png" />
|
<img src="{% static 'images/icons/go-down.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
<a class="projector_edit" href="{% url projector_clean %}" title="{% trans 'Reset projector view' %}">
|
<a class="projector_edit" href="{% url projector_clean %}" title="{% trans 'Reset projector view' %}">
|
||||||
<img src="/static/images/icons/view-restore.png" />
|
<img src="{% static 'images/icons/view-restore.png' %}" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -84,7 +85,7 @@
|
|||||||
{% for i in slide.get_ancestors %} {% endfor %}
|
{% for i in slide.get_ancestors %} {% endfor %}
|
||||||
<a href="{% url projector_edit_slide slide.id %}">{{ slide }}</a>
|
<a href="{% url projector_edit_slide slide.id %}">{{ slide }}</a>
|
||||||
{% if slide.children.exists %}
|
{% if slide.children.exists %}
|
||||||
<a href="{% url projector_activate_summary slide.sid %}"><img src="/static/images/icons/view-list-tree.png" title="{% trans 'Select item overview' %}"></a>
|
<a href="{% url projector_activate_summary slide.sid %}"><img src="{% static 'images/icons/view-list-tree.png' %}" title="{% trans 'Select item overview' %}"></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|||||||
@ -539,28 +539,28 @@ ul.results {
|
|||||||
padding: 10px 20px 10px 36px;
|
padding: 10px 20px 10px 36px;
|
||||||
}
|
}
|
||||||
.notification.success {
|
.notification.success {
|
||||||
background: url("/static/images/icons/task-complete.png") repeat scroll 0 0 #D5FFCE;
|
background: url("../images/icons/task-complete.png") repeat scroll 0 0 #D5FFCE;
|
||||||
border-color: #9ADF8F;
|
border-color: #9ADF8F;
|
||||||
color: #556652;
|
color: #556652;
|
||||||
}
|
}
|
||||||
.notification.error {
|
.notification.error {
|
||||||
background: url("/static/images/icons/task-reject.png") repeat scroll 0 0 #FFCECE;
|
background: url("../images/icons/task-reject.png") repeat scroll 0 0 #FFCECE;
|
||||||
border-color: #DF8F8F;
|
border-color: #DF8F8F;
|
||||||
color: #665252;
|
color: #665252;
|
||||||
}
|
}
|
||||||
.notification.warning {
|
.notification.warning {
|
||||||
background: url("/static/images/icons/task-attention.png") repeat scroll 0 0 #FFFBCC;
|
background: url("../images/icons/task-attention.png") repeat scroll 0 0 #FFFBCC;
|
||||||
border-color: #E6DB55;
|
border-color: #E6DB55;
|
||||||
color: #666452;
|
color: #666452;
|
||||||
}
|
}
|
||||||
.notification.info {
|
.notification.info {
|
||||||
background: url("/static/images/icons/dialog-information.png") repeat scroll 0 0 #DBE3FF;
|
background: url("../images/icons/dialog-information.png") repeat scroll 0 0 #DBE3FF;
|
||||||
border-color: #A2B4EE;
|
border-color: #A2B4EE;
|
||||||
color: #585B66;
|
color: #585B66;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pdficon span {
|
.pdficon span {
|
||||||
background-image: url("/static/images/icons/application-pdf.png");
|
background-image: url("../images/icons/application-pdf.png");
|
||||||
background-repeat: no-repeat;
|
background-repeat: no-repeat;
|
||||||
background-position: center;
|
background-position: center;
|
||||||
width: 16px;
|
width: 16px;
|
||||||
|
|||||||
@ -21,7 +21,7 @@ a.tabledrag-handle:hover {
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
a.tabledrag-handle .handle {
|
a.tabledrag-handle .handle {
|
||||||
background: url("/static/images/draggable.png") no-repeat scroll 0 0 transparent;
|
background: url("../images/draggable.png") no-repeat scroll 0 0 transparent;
|
||||||
height: 13px;
|
height: 13px;
|
||||||
margin-top: 4px;
|
margin-top: 4px;
|
||||||
width: 13px;
|
width: 13px;
|
||||||
@ -37,13 +37,13 @@ div.indentation {
|
|||||||
width: 10px;
|
width: 10px;
|
||||||
}
|
}
|
||||||
div.tree-child {
|
div.tree-child {
|
||||||
background: url(/static/images/tree.png) no-repeat 11px center; /* LTR */
|
background: url(../images/tree.png) no-repeat 11px center; /* LTR */
|
||||||
}
|
}
|
||||||
div.tree-child-last {
|
div.tree-child-last {
|
||||||
background: url(/static/images/tree-bottom.png) no-repeat 11px center; /* LTR */
|
background: url(../images/tree-bottom.png) no-repeat 11px center; /* LTR */
|
||||||
}
|
}
|
||||||
div.tree-child-horizontal {
|
div.tree-child-horizontal {
|
||||||
background: url(/static/images/tree.png) no-repeat -11px center;
|
background: url(../images/tree.png) no-repeat -11px center;
|
||||||
}
|
}
|
||||||
.tabledrag-toggle-weight-wrapper {
|
.tabledrag-toggle-weight-wrapper {
|
||||||
text-align: right; /* LTR */
|
text-align: right; /* LTR */
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
{% load tags %}
|
{% load tags %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load staticfiles %}
|
||||||
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
||||||
@ -7,15 +8,15 @@
|
|||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
||||||
<head>
|
<head>
|
||||||
<title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title>
|
<title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title>
|
||||||
<link type="text/css" rel="stylesheet" media="all" href="/static/styles/base.css" />
|
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/base.css' %}" />
|
||||||
<link rel="shortcut icon" href="/static/images/favicon.png" type="image/png" />
|
<link rel="shortcut icon" href="{% static 'images/favicon.png' %}" type="image/png" />
|
||||||
<script type="text/javascript" src="/static/javascript/jquery.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/jquery.js' %}"></script>
|
||||||
{% block header %}
|
{% block header %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="header">
|
<div id="header">
|
||||||
<a href="/" title="{% trans 'Home' %}"><div id="logo"><img src="/static/images/logo.png"></div></a>
|
<a href="/" title="{% trans 'Home' %}"><div id="logo"><img src="{% static 'images/logo.png' %}"></div></a>
|
||||||
<div id="header_title">{% get_config 'event_name' %}</div>
|
<div id="header_title">{% get_config 'event_name' %}</div>
|
||||||
<div id="header_subtitle">{% get_config 'event_description' %}</div>
|
<div id="header_subtitle">{% get_config 'event_description' %}</div>
|
||||||
<div id="header_userprofile">
|
<div id="header_userprofile">
|
||||||
@ -51,7 +52,7 @@
|
|||||||
{% for message in messages %}
|
{% for message in messages %}
|
||||||
<div class="notification {% if message.tags %}{{ message.tags }}{% endif %}">
|
<div class="notification {% if message.tags %}{{ message.tags }}{% endif %}">
|
||||||
<a class="close" href="#">
|
<a class="close" href="#">
|
||||||
<img alt="close" title="{% trans 'Close this notification' %}" src="/static/images/icons/cross.png">
|
<img alt="close" title="{% trans 'Close this notification' %}" src="{% static 'images/icons/cross.png' %}">
|
||||||
</a>
|
</a>
|
||||||
<em>{{ message|safe }}</em>
|
<em>{{ message|safe }}</em>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -31,7 +31,6 @@ urlpatterns = patterns('',
|
|||||||
(r'^participant/', include('participant.urls')),
|
(r'^participant/', include('participant.urls')),
|
||||||
(r'^config/', include('config.urls')),
|
(r'^config/', include('config.urls')),
|
||||||
(r'^projector/', include('projector.urls')),
|
(r'^projector/', include('projector.urls')),
|
||||||
(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_DOC_ROOT}),
|
|
||||||
(r'^i18n/', include('django.conf.urls.i18n')),
|
(r'^i18n/', include('django.conf.urls.i18n')),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user