-[submodule "contrib/gilbert/media/gilbert/extjs"]
- path = contrib/gilbert/media/gilbert/extjs
+[submodule "contrib/gilbert/static/gilbert/extjs"]
+ path = contrib/gilbert/static/gilbert/extjs
url = git://git.ithinksw.org/extjs.git
-[submodule "contrib/gilbert/media/gilbert/fugue-icons"]
- path = contrib/gilbert/media/gilbert/fugue-icons
+[submodule "contrib/gilbert/static/gilbert/fugue-icons"]
+ path = contrib/gilbert/static/gilbert/fugue-icons
url = git://git.ithinksw.org/fugue-icons.git
* Python 2.5.4+ <http://www.python.org/>
* Django 1.2+ <http://www.djangoproject.com/>
* django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>
- * (Optional) django-staticmedia 0.2+ <http://pypi.python.org/pypi/django-staticmedia/>
* (Optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
* (Optional) south 0.7.2+ <http://south.aeracode.org/>
* (Optional) recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>
* [Python 2.5.4+ <http://www.python.org>](http://www.python.org/)
* [Django 1.2+ <http://www.djangoproject.com/>](http://www.djangoproject.com/)
* [django-mptt e734079+ <https://github.com/django-mptt/django-mptt/>](https://github.com/django-mptt/django-mptt/)
- * (Optional) [django-staticmedia 0.2+ <http://pypi.python.org/pypi/django-staticmedia/>](http://pypi.python.org/pypi/django-staticmedia/)
* (Optional) [django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>](http://code.google.com/p/django-grappelli/)
* (Optional) [south 0.7.2+ <http://south.aeracode.org/)](http://south.aeracode.org/)
* (Optional) [recaptcha-django r6 <http://code.google.com/p/recaptcha-django/>](http://code.google.com/p/recaptcha-django/)
--- /dev/null
+Gilbert requires Django 1.3+.
\ No newline at end of file
+++ /dev/null
-Subproject commit e9397f91ede62d446aed37d23256e8938fc4c335
+++ /dev/null
-Subproject commit 764abbef432ef8a7333a58ca21b0ef6ef0a80b1a
+from django.conf import settings
from django.contrib.auth import logout
from django.contrib.auth.forms import PasswordChangeForm
-import staticmedia
from .base import Plugin
from ..extdirect import ext_action, ext_method
from ..models import UserPreferences
@property
def index_js_urls(self):
return super(Auth, self).index_js_urls + [
- staticmedia.url('gilbert/plugins/auth.js'),
+ settings.STATIC_URL + 'gilbert/plugins/auth.js',
]
@property
from django.utils.encoding import smart_unicode
from .base import Plugin
from ..extdirect import ext_action, ext_method
-import operator, staticmedia
+import operator
@ext_action(name='models')
@property
def index_js_urls(self):
return super(Models, self).index_js_urls + [
- staticmedia.url('gilbert/extjs/examples/ux/SearchField.js'),
- staticmedia.url('gilbert/plugins/models.js'),
+ settings.STATIC_URL + 'gilbert/extjs/examples/ux/SearchField.js',
+ settings.STATIC_URL + 'gilbert/plugins/models.js',
]
@property
-{% load staticmedia %}<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>{% block head %}
<title>{% block title %}{{ gilbert.title }}{% endblock %}</title>
{% block css %}
- <link rel="stylesheet" type="text/css" href="{% mediaurl 'gilbert/extjs/resources/css/ext-all-notheme.css' %}" />
- <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.murano" title="murano" href="{% mediaurl 'gilbert/murano/murano.css' %}"{% if request.GET.theme and request.GET.theme != 'murano' %} disabled="disabled"{% endif %} />
- <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.access" title="access" href="{% mediaurl 'gilbert/extjs/resources/css' %}/xtheme-access.css"{% if request.GET.theme != 'access' %} disabled="disabled"{% endif %} />
- <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.blue" title="blue" href="{% mediaurl 'gilbert/extjs/resources/css' %}/xtheme-blue.css"{% if request.GET.theme != 'blue' %} disabled="disabled"{% endif %} />
- <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.gray" title="gray" href="{% mediaurl 'gilbert/extjs/resources/css' %}/xtheme-gray.css"{% if request.GET.theme != 'gray' %} disabled="disabled"{% endif %} />
+ <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}gilbert/extjs/resources/css/ext-all-notheme.css" />
+ <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.murano" title="murano" href="{{ STATIC_URL }}gilbert/murano/murano.css"{% if request.GET.theme and request.GET.theme != 'murano' %} disabled="disabled"{% endif %} />
+ <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.access" title="access" href="{{ STATIC_URL }}gilbert/extjs/resources/css/xtheme-access.css"{% if request.GET.theme != 'access' %} disabled="disabled"{% endif %} />
+ <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.blue" title="blue" href="{{ STATIC_URL }}gilbert/extjs/resources/css/xtheme-blue.css"{% if request.GET.theme != 'blue' %} disabled="disabled"{% endif %} />
+ <link rel="stylesheet" type="text/css" class="gilbert.theme" id="gilbert.theme.gray" title="gray" href="{{ STATIC_URL }}gilbert/extjs/resources/css/xtheme-gray.css"{% if request.GET.theme != 'gray' %} disabled="disabled"{% endif %} />
{% endblock %}
{% block js %}
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/adapter/ext/ext-base.js' %}"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/adapter/ext/ext-base.js"></script>
{% if request.GET.debug %}
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/ext-all-debug.js' %}"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/ext-all-debug.js"></script>
{% else %}
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/ext-all.js' %}"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/ext-all.js"></script>
{% endif %}
<script type="text/javascript">
- Ext.BLANK_IMAGE_URL = '{% mediaurl "gilbert/extjs/resources/images/default/s.gif" %}';
+ Ext.BLANK_IMAGE_URL = '{{ STATIC_URL }}gilbert/extjs/resources/images/default/s.gif';
</script>
{% endblock %}
{% endblock %}
{% endblock %}</head>
-<body style="background-image: url({% mediaurl 'gilbert/wallpaper.jpg' %});">{% block body %}{% endblock %}</body>
+<body style="background-image: url({{ STATIC_URL }}gilbert/wallpaper.jpg);">{% block body %}{% endblock %}</body>
</html>
-{% load staticmedia %}
{% for icon_name in icon_names %}
.icon-{{ icon_name }} {
- background: url({% mediaurl 'gilbert/fugue-icons/icons-shadowless' %}/{{ icon_name }}.png) 0 no-repeat !important;
+ background: url({{ STATIC_URL }}gilbert/fugue-icons/icons-shadowless/{{ icon_name }}.png) 0 no-repeat !important;
}
{% endfor %}
\ No newline at end of file
{% extends 'gilbert/base.html' %}
-{% load staticmedia %}
{% block css %}{{ block.super }}
- <link rel="stylesheet" type="text/css" href="{% mediaurl 'gilbert/extjs/examples/ux/fileuploadfield/css/fileuploadfield.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% mediaurl 'gilbert/superboxselect/superboxselect.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}gilbert/extjs/examples/ux/fileuploadfield/css/fileuploadfield.css" />
+ <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}gilbert/superboxselect/superboxselect.css" />
<link rel="stylesheet" type="text/css" href="{% url gilbert:icons %}" />
{% for router in gilbert.model_routers.values %}{% for admin in router.models.values %}{% for css_url in admin.index_css_urls %}
{% endblock %}
{% block js %}{{ block.super }}
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/examples/ux/FieldLabeler.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/examples/ux/fileuploadfield/FileUploadField.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/superboxselect/SuperBoxSelect.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/examples/ux/Reorderer.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/examples/ux/ToolbarReorderer.js' %}"></script>
-
- <script type="text/javascript" src="{% mediaurl 'gilbert/lib/app.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/lib/models.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/lib/plugins.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/lib/ui/forms.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/lib/ui/windows.js' %}"></script>
- <script type="text/javascript" src="{% mediaurl 'gilbert/gilbert.js' %}"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/examples/ux/FieldLabeler.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/examples/ux/fileuploadfield/FileUploadField.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/superboxselect/SuperBoxSelect.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/examples/ux/Reorderer.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/examples/ux/ToolbarReorderer.js"></script>
+
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/lib/app.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/lib/models.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/lib/plugins.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/lib/ui/forms.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/lib/ui/windows.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/gilbert.js"></script>
<script type="text/javascript" src="{% url gilbert:api %}"></script>
{% extends 'gilbert/base.html' %}
-{% load staticmedia %}
{% block css %}{{ block.super }}
- <link rel="stylesheet" type="text/css" href="{% mediaurl 'gilbert/extjs/examples/ux/statusbar/css/statusbar.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}gilbert/extjs/examples/ux/statusbar/css/statusbar.css" />
<style type="text/css">
.icon-door-open-in {
- background: url({% mediaurl 'gilbert/fugue-icons/icons-shadowless' %}/door-open-in.png) no-repeat !important;
+ background: url({{ STATIC_URL }}gilbert/fugue-icons/icons-shadowless/door-open-in.png) no-repeat !important;
}
.x-statusbar .x-status-error {
cursor: help;
- background-image: url({% mediaurl 'gilbert/fugue-icons/icons-shadowless' %}/exclamation-red.png) !important;
+ background-image: url({{ STATIC_URL }}gilbert/fugue-icons/icons-shadowless/exclamation-red.png) !important;
}
</style>
{% endblock %}
{% block js %}{{ block.super }}
- <script type="text/javascript" src="{% mediaurl 'gilbert/extjs/examples/ux/statusbar/StatusBar.js' %}"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}gilbert/extjs/examples/ux/statusbar/StatusBar.js"></script>
<script type="text/javascript" charset="utf-8">
Ext.onReady(function () {
git.ithinksw.org / philo.git / commitdiff
