From: Stephen Burrows Date: Thu, 7 Apr 2011 17:14:35 +0000 (-0400) Subject: Merge branch 'gilbert' into gilbert-1.3 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/1eb51a5b5ac85607af67275ff3684febd84406c9?hp=7e796853f50f6ea6d829b91bb05ebcfa4bb02822 Merge branch 'gilbert' into gilbert-1.3 --- diff --git a/.gitmodules b/.gitmodules index 2eab002..54849cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[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 diff --git a/README b/README index cae3cad..4a89499 100644 --- a/README +++ b/README @@ -4,7 +4,6 @@ Prerequisites: * Python 2.5.4+ * Django 1.2+ * django-mptt e734079+ - * (Optional) django-staticmedia 0.2+ * (Optional) django-grappelli 2.0+ * (Optional) south 0.7.2+ * (Optional) recaptcha-django r6 diff --git a/README.markdown b/README.markdown index 6ecadca..22bac1c 100644 --- a/README.markdown +++ b/README.markdown @@ -5,7 +5,6 @@ Prerequisites: * [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/) diff --git a/contrib/gilbert/README b/contrib/gilbert/README new file mode 100644 index 0000000..6763313 --- /dev/null +++ b/contrib/gilbert/README @@ -0,0 +1 @@ +Gilbert requires Django 1.3+. \ No newline at end of file diff --git a/contrib/gilbert/media/gilbert/extjs b/contrib/gilbert/media/gilbert/extjs deleted file mode 160000 index e9397f9..0000000 --- a/contrib/gilbert/media/gilbert/extjs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e9397f91ede62d446aed37d23256e8938fc4c335 diff --git a/contrib/gilbert/media/gilbert/fugue-icons b/contrib/gilbert/media/gilbert/fugue-icons deleted file mode 160000 index 764abbe..0000000 --- a/contrib/gilbert/media/gilbert/fugue-icons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 764abbef432ef8a7333a58ca21b0ef6ef0a80b1a diff --git a/contrib/gilbert/plugins/auth.py b/contrib/gilbert/plugins/auth.py index 66cfebc..d0c514b 100644 --- a/contrib/gilbert/plugins/auth.py +++ b/contrib/gilbert/plugins/auth.py @@ -1,6 +1,6 @@ +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 @@ -11,7 +11,7 @@ class Auth(Plugin): @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 diff --git a/contrib/gilbert/plugins/models.py b/contrib/gilbert/plugins/models.py index 5bf2550..ee13989 100644 --- a/contrib/gilbert/plugins/models.py +++ b/contrib/gilbert/plugins/models.py @@ -1,6 +1,7 @@ from django.conf import settings from django.contrib.admin.util import lookup_field, label_for_field, display_for_field, NestedObjects from django.core.exceptions import PermissionDenied +from django.db import router from django.db.models import Q from django.db.models.fields.related import ManyToOneRel from django.db.models.fields.files import FieldFile, ImageFieldFile, FileField @@ -10,7 +11,7 @@ from django.utils import simplejson as json 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') @@ -24,8 +25,8 @@ class Models(Plugin): @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 @@ -378,9 +379,8 @@ class ModelAdmin(Plugin): pks = [pks] objs = [self.model._default_manager.all().get(pk=pk) for pk in pks] - collector = NestedObjects() - - for obj in objs: - obj._collect_sub_objects(collector) + using = router.db_for_write(self.model) + collector = NestedObjects(using=using) + collector.collect(objs) return collector.nested(self.data_serialize_model_instance) \ No newline at end of file diff --git a/contrib/gilbert/sites.py b/contrib/gilbert/sites.py index 3b4124d..3d07a84 100644 --- a/contrib/gilbert/sites.py +++ b/contrib/gilbert/sites.py @@ -225,6 +225,7 @@ class GilbertSite(object): return render_to_response('gilbert/icons.css', { 'icon_names': set(icon_names), + 'STATIC_URL': settings.STATIC_URL }, mimetype='text/css') def router(self, request, app_label=None, extra_context=None): diff --git a/contrib/gilbert/media/gilbert/gilbert.js b/contrib/gilbert/static/gilbert/gilbert.js similarity index 100% rename from contrib/gilbert/media/gilbert/gilbert.js rename to contrib/gilbert/static/gilbert/gilbert.js diff --git a/contrib/gilbert/media/gilbert/lib/app.js b/contrib/gilbert/static/gilbert/lib/app.js similarity index 100% rename from contrib/gilbert/media/gilbert/lib/app.js rename to contrib/gilbert/static/gilbert/lib/app.js diff --git a/contrib/gilbert/media/gilbert/lib/models.js b/contrib/gilbert/static/gilbert/lib/models.js similarity index 100% rename from contrib/gilbert/media/gilbert/lib/models.js rename to contrib/gilbert/static/gilbert/lib/models.js diff --git a/contrib/gilbert/media/gilbert/lib/plugins.js b/contrib/gilbert/static/gilbert/lib/plugins.js similarity index 100% rename from contrib/gilbert/media/gilbert/lib/plugins.js rename to contrib/gilbert/static/gilbert/lib/plugins.js diff --git a/contrib/gilbert/media/gilbert/lib/ui/forms.js b/contrib/gilbert/static/gilbert/lib/ui/forms.js similarity index 100% rename from contrib/gilbert/media/gilbert/lib/ui/forms.js rename to contrib/gilbert/static/gilbert/lib/ui/forms.js diff --git a/contrib/gilbert/media/gilbert/lib/ui/ui.js b/contrib/gilbert/static/gilbert/lib/ui/ui.js similarity index 100% rename from contrib/gilbert/media/gilbert/lib/ui/ui.js rename to contrib/gilbert/static/gilbert/lib/ui/ui.js diff --git a/contrib/gilbert/media/gilbert/lib/ui/windows.js b/contrib/gilbert/static/gilbert/lib/ui/windows.js similarity index 100% rename from contrib/gilbert/media/gilbert/lib/ui/windows.js rename to contrib/gilbert/static/gilbert/lib/ui/windows.js diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/arrv.png b/contrib/gilbert/static/gilbert/murano/images/btn/arrv.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/arrv.png rename to contrib/gilbert/static/gilbert/murano/images/btn/arrv.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/c/Down.png b/contrib/gilbert/static/gilbert/murano/images/btn/c/Down.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/c/Down.png rename to contrib/gilbert/static/gilbert/murano/images/btn/c/Down.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/c/Normal.png b/contrib/gilbert/static/gilbert/murano/images/btn/c/Normal.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/c/Normal.png rename to contrib/gilbert/static/gilbert/murano/images/btn/c/Normal.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/c/Over.png b/contrib/gilbert/static/gilbert/murano/images/btn/c/Over.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/c/Over.png rename to contrib/gilbert/static/gilbert/murano/images/btn/c/Over.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/c/Pressed.png b/contrib/gilbert/static/gilbert/murano/images/btn/c/Pressed.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/c/Pressed.png rename to contrib/gilbert/static/gilbert/murano/images/btn/c/Pressed.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/left-over.png b/contrib/gilbert/static/gilbert/murano/images/btn/left-over.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/left-over.png rename to contrib/gilbert/static/gilbert/murano/images/btn/left-over.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/left.png b/contrib/gilbert/static/gilbert/murano/images/btn/left.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/left.png rename to contrib/gilbert/static/gilbert/murano/images/btn/left.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/menu.png b/contrib/gilbert/static/gilbert/murano/images/btn/menu.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/menu.png rename to contrib/gilbert/static/gilbert/murano/images/btn/menu.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/right-over.png b/contrib/gilbert/static/gilbert/murano/images/btn/right-over.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/right-over.png rename to contrib/gilbert/static/gilbert/murano/images/btn/right-over.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/right.png b/contrib/gilbert/static/gilbert/murano/images/btn/right.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/right.png rename to contrib/gilbert/static/gilbert/murano/images/btn/right.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/split.png b/contrib/gilbert/static/gilbert/murano/images/btn/split.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/split.png rename to contrib/gilbert/static/gilbert/murano/images/btn/split.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/splith.png b/contrib/gilbert/static/gilbert/murano/images/btn/splith.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/splith.png rename to contrib/gilbert/static/gilbert/murano/images/btn/splith.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/splitv.png b/contrib/gilbert/static/gilbert/murano/images/btn/splitv.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/splitv.png rename to contrib/gilbert/static/gilbert/murano/images/btn/splitv.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/whole/Down.png b/contrib/gilbert/static/gilbert/murano/images/btn/whole/Down.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/whole/Down.png rename to contrib/gilbert/static/gilbert/murano/images/btn/whole/Down.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/whole/Normal.png b/contrib/gilbert/static/gilbert/murano/images/btn/whole/Normal.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/whole/Normal.png rename to contrib/gilbert/static/gilbert/murano/images/btn/whole/Normal.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/whole/Over.png b/contrib/gilbert/static/gilbert/murano/images/btn/whole/Over.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/whole/Over.png rename to contrib/gilbert/static/gilbert/murano/images/btn/whole/Over.png diff --git a/contrib/gilbert/media/gilbert/murano/images/btn/whole/Pressed.png b/contrib/gilbert/static/gilbert/murano/images/btn/whole/Pressed.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/btn/whole/Pressed.png rename to contrib/gilbert/static/gilbert/murano/images/btn/whole/Pressed.png diff --git a/contrib/gilbert/media/gilbert/murano/images/fills/30b.png b/contrib/gilbert/static/gilbert/murano/images/fills/30b.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/fills/30b.png rename to contrib/gilbert/static/gilbert/murano/images/fills/30b.png diff --git a/contrib/gilbert/media/gilbert/murano/images/fills/30w.png b/contrib/gilbert/static/gilbert/murano/images/fills/30w.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/fills/30w.png rename to contrib/gilbert/static/gilbert/murano/images/fills/30w.png diff --git a/contrib/gilbert/media/gilbert/murano/images/fills/70w.png b/contrib/gilbert/static/gilbert/murano/images/fills/70w.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/fills/70w.png rename to contrib/gilbert/static/gilbert/murano/images/fills/70w.png diff --git a/contrib/gilbert/media/gilbert/murano/images/fills/80b.png b/contrib/gilbert/static/gilbert/murano/images/fills/80b.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/fills/80b.png rename to contrib/gilbert/static/gilbert/murano/images/fills/80b.png diff --git a/contrib/gilbert/media/gilbert/murano/images/form/checked.png b/contrib/gilbert/static/gilbert/murano/images/form/checked.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/form/checked.png rename to contrib/gilbert/static/gilbert/murano/images/form/checked.png diff --git a/contrib/gilbert/media/gilbert/murano/images/form/field.opacity b/contrib/gilbert/static/gilbert/murano/images/form/field.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/form/field.opacity rename to contrib/gilbert/static/gilbert/murano/images/form/field.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/form/field.png b/contrib/gilbert/static/gilbert/murano/images/form/field.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/form/field.png rename to contrib/gilbert/static/gilbert/murano/images/form/field.png diff --git a/contrib/gilbert/media/gilbert/murano/images/form/radioed.png b/contrib/gilbert/static/gilbert/murano/images/form/radioed.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/form/radioed.png rename to contrib/gilbert/static/gilbert/murano/images/form/radioed.png diff --git a/contrib/gilbert/media/gilbert/murano/images/form/unchecked.png b/contrib/gilbert/static/gilbert/murano/images/form/unchecked.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/form/unchecked.png rename to contrib/gilbert/static/gilbert/murano/images/form/unchecked.png diff --git a/contrib/gilbert/media/gilbert/murano/images/form/unradioed.png b/contrib/gilbert/static/gilbert/murano/images/form/unradioed.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/form/unradioed.png rename to contrib/gilbert/static/gilbert/murano/images/form/unradioed.png diff --git a/contrib/gilbert/media/gilbert/murano/images/gloss/gloss.opacity b/contrib/gilbert/static/gilbert/murano/images/gloss/gloss.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/gloss/gloss.opacity rename to contrib/gilbert/static/gilbert/murano/images/gloss/gloss.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/gloss/gloss.png b/contrib/gilbert/static/gilbert/murano/images/gloss/gloss.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/gloss/gloss.png rename to contrib/gilbert/static/gilbert/murano/images/gloss/gloss.png diff --git a/contrib/gilbert/media/gilbert/murano/images/gloss/light-gloss.png b/contrib/gilbert/static/gilbert/murano/images/gloss/light-gloss.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/gloss/light-gloss.png rename to contrib/gilbert/static/gilbert/murano/images/gloss/light-gloss.png diff --git a/contrib/gilbert/media/gilbert/murano/images/gradients/30white-to-trans.png b/contrib/gilbert/static/gilbert/murano/images/gradients/30white-to-trans.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/gradients/30white-to-trans.png rename to contrib/gilbert/static/gilbert/murano/images/gradients/30white-to-trans.png diff --git a/contrib/gilbert/media/gilbert/murano/images/gradients/dark-inner-shadow.png b/contrib/gilbert/static/gilbert/murano/images/gradients/dark-inner-shadow.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/gradients/dark-inner-shadow.png rename to contrib/gilbert/static/gilbert/murano/images/gradients/dark-inner-shadow.png diff --git a/contrib/gilbert/media/gilbert/murano/images/grid/col-move-bottom.png b/contrib/gilbert/static/gilbert/murano/images/grid/col-move-bottom.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/grid/col-move-bottom.png rename to contrib/gilbert/static/gilbert/murano/images/grid/col-move-bottom.png diff --git a/contrib/gilbert/media/gilbert/murano/images/grid/col-move-top.png b/contrib/gilbert/static/gilbert/murano/images/grid/col-move-top.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/grid/col-move-top.png rename to contrib/gilbert/static/gilbert/murano/images/grid/col-move-top.png diff --git a/contrib/gilbert/media/gilbert/murano/images/grid/row-editor-btns.png b/contrib/gilbert/static/gilbert/murano/images/grid/row-editor-btns.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/grid/row-editor-btns.png rename to contrib/gilbert/static/gilbert/murano/images/grid/row-editor-btns.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/balloon.png b/contrib/gilbert/static/gilbert/murano/images/icons/balloon.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/balloon.png rename to contrib/gilbert/static/gilbert/murano/images/icons/balloon.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/cross.png b/contrib/gilbert/static/gilbert/murano/images/icons/cross.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/cross.png rename to contrib/gilbert/static/gilbert/murano/images/icons/cross.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/d-first.png b/contrib/gilbert/static/gilbert/murano/images/icons/d-first.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/d-first.png rename to contrib/gilbert/static/gilbert/murano/images/icons/d-first.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/d-last.png b/contrib/gilbert/static/gilbert/murano/images/icons/d-last.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/d-last.png rename to contrib/gilbert/static/gilbert/murano/images/icons/d-last.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/d-next.png b/contrib/gilbert/static/gilbert/murano/images/icons/d-next.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/d-next.png rename to contrib/gilbert/static/gilbert/murano/images/icons/d-next.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/d-prev.png b/contrib/gilbert/static/gilbert/murano/images/icons/d-prev.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/d-prev.png rename to contrib/gilbert/static/gilbert/murano/images/icons/d-prev.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/d-refresh.png b/contrib/gilbert/static/gilbert/murano/images/icons/d-refresh.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/d-refresh.png rename to contrib/gilbert/static/gilbert/murano/images/icons/d-refresh.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/exclamation.png b/contrib/gilbert/static/gilbert/murano/images/icons/exclamation.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/exclamation.png rename to contrib/gilbert/static/gilbert/murano/images/icons/exclamation.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/exclamation32.png b/contrib/gilbert/static/gilbert/murano/images/icons/exclamation32.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/exclamation32.png rename to contrib/gilbert/static/gilbert/murano/images/icons/exclamation32.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/first.png b/contrib/gilbert/static/gilbert/murano/images/icons/first.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/first.png rename to contrib/gilbert/static/gilbert/murano/images/icons/first.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/information.png b/contrib/gilbert/static/gilbert/murano/images/icons/information.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/information.png rename to contrib/gilbert/static/gilbert/murano/images/icons/information.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/last.png b/contrib/gilbert/static/gilbert/murano/images/icons/last.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/last.png rename to contrib/gilbert/static/gilbert/murano/images/icons/last.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/next.png b/contrib/gilbert/static/gilbert/murano/images/icons/next.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/next.png rename to contrib/gilbert/static/gilbert/murano/images/icons/next.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/no.png b/contrib/gilbert/static/gilbert/murano/images/icons/no.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/no.png rename to contrib/gilbert/static/gilbert/murano/images/icons/no.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/prev.png b/contrib/gilbert/static/gilbert/murano/images/icons/prev.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/prev.png rename to contrib/gilbert/static/gilbert/murano/images/icons/prev.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/refresh.png b/contrib/gilbert/static/gilbert/murano/images/icons/refresh.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/refresh.png rename to contrib/gilbert/static/gilbert/murano/images/icons/refresh.png diff --git a/contrib/gilbert/media/gilbert/murano/images/icons/yes.png b/contrib/gilbert/static/gilbert/murano/images/icons/yes.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/icons/yes.png rename to contrib/gilbert/static/gilbert/murano/images/icons/yes.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/az.png b/contrib/gilbert/static/gilbert/murano/images/listview/az.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/az.png rename to contrib/gilbert/static/gilbert/murano/images/listview/az.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/cols.png b/contrib/gilbert/static/gilbert/murano/images/listview/cols.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/cols.png rename to contrib/gilbert/static/gilbert/murano/images/listview/cols.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/header.png b/contrib/gilbert/static/gilbert/murano/images/listview/header.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/header.png rename to contrib/gilbert/static/gilbert/murano/images/listview/header.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/headerdrop.png b/contrib/gilbert/static/gilbert/murano/images/listview/headerdrop.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/headerdrop.png rename to contrib/gilbert/static/gilbert/murano/images/listview/headerdrop.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/listview-sort-asc.png b/contrib/gilbert/static/gilbert/murano/images/listview/listview-sort-asc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/listview-sort-asc.png rename to contrib/gilbert/static/gilbert/murano/images/listview/listview-sort-asc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/listview-sort-desc.png b/contrib/gilbert/static/gilbert/murano/images/listview/listview-sort-desc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/listview-sort-desc.png rename to contrib/gilbert/static/gilbert/murano/images/listview/listview-sort-desc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/sort-asc.png b/contrib/gilbert/static/gilbert/murano/images/listview/sort-asc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/sort-asc.png rename to contrib/gilbert/static/gilbert/murano/images/listview/sort-asc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/sort-desc.png b/contrib/gilbert/static/gilbert/murano/images/listview/sort-desc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/sort-desc.png rename to contrib/gilbert/static/gilbert/murano/images/listview/sort-desc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/listview/za.png b/contrib/gilbert/static/gilbert/murano/images/listview/za.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/listview/za.png rename to contrib/gilbert/static/gilbert/murano/images/listview/za.png diff --git a/contrib/gilbert/media/gilbert/murano/images/load.gif b/contrib/gilbert/static/gilbert/murano/images/load.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/load.gif rename to contrib/gilbert/static/gilbert/murano/images/load.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/menu/arrow.opacity b/contrib/gilbert/static/gilbert/murano/images/menu/arrow.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/menu/arrow.opacity rename to contrib/gilbert/static/gilbert/murano/images/menu/arrow.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/menu/arrow.png b/contrib/gilbert/static/gilbert/murano/images/menu/arrow.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/menu/arrow.png rename to contrib/gilbert/static/gilbert/murano/images/menu/arrow.png diff --git a/contrib/gilbert/media/gilbert/murano/images/mini/mini-bottom.png b/contrib/gilbert/static/gilbert/murano/images/mini/mini-bottom.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/mini/mini-bottom.png rename to contrib/gilbert/static/gilbert/murano/images/mini/mini-bottom.png diff --git a/contrib/gilbert/media/gilbert/murano/images/mini/mini-left.png b/contrib/gilbert/static/gilbert/murano/images/mini/mini-left.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/mini/mini-left.png rename to contrib/gilbert/static/gilbert/murano/images/mini/mini-left.png diff --git a/contrib/gilbert/media/gilbert/murano/images/mini/mini-right.png b/contrib/gilbert/static/gilbert/murano/images/mini/mini-right.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/mini/mini-right.png rename to contrib/gilbert/static/gilbert/murano/images/mini/mini-right.png diff --git a/contrib/gilbert/media/gilbert/murano/images/mini/mini-top.png b/contrib/gilbert/static/gilbert/murano/images/mini/mini-top.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/mini/mini-top.png rename to contrib/gilbert/static/gilbert/murano/images/mini/mini-top.png diff --git a/contrib/gilbert/media/gilbert/murano/images/progress.png b/contrib/gilbert/static/gilbert/murano/images/progress.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/progress.png rename to contrib/gilbert/static/gilbert/murano/images/progress.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/e.png b/contrib/gilbert/static/gilbert/murano/images/resizable/e.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/e.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/e.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/n.png b/contrib/gilbert/static/gilbert/murano/images/resizable/n.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/n.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/n.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/ne.png b/contrib/gilbert/static/gilbert/murano/images/resizable/ne.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/ne.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/ne.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/nw.png b/contrib/gilbert/static/gilbert/murano/images/resizable/nw.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/nw.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/nw.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/s.png b/contrib/gilbert/static/gilbert/murano/images/resizable/s.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/s.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/s.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/se.png b/contrib/gilbert/static/gilbert/murano/images/resizable/se.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/se.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/se.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/sw.png b/contrib/gilbert/static/gilbert/murano/images/resizable/sw.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/sw.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/sw.png diff --git a/contrib/gilbert/media/gilbert/murano/images/resizable/w.png b/contrib/gilbert/static/gilbert/murano/images/resizable/w.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/resizable/w.png rename to contrib/gilbert/static/gilbert/murano/images/resizable/w.png diff --git a/contrib/gilbert/media/gilbert/murano/images/scroller/l.png b/contrib/gilbert/static/gilbert/murano/images/scroller/l.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/scroller/l.png rename to contrib/gilbert/static/gilbert/murano/images/scroller/l.png diff --git a/contrib/gilbert/media/gilbert/murano/images/scroller/r.png b/contrib/gilbert/static/gilbert/murano/images/scroller/r.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/scroller/r.png rename to contrib/gilbert/static/gilbert/murano/images/scroller/r.png diff --git a/contrib/gilbert/media/gilbert/murano/images/slider/h.png b/contrib/gilbert/static/gilbert/murano/images/slider/h.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/slider/h.png rename to contrib/gilbert/static/gilbert/murano/images/slider/h.png diff --git a/contrib/gilbert/media/gilbert/murano/images/slider/thumbh.png b/contrib/gilbert/static/gilbert/murano/images/slider/thumbh.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/slider/thumbh.png rename to contrib/gilbert/static/gilbert/murano/images/slider/thumbh.png diff --git a/contrib/gilbert/media/gilbert/murano/images/slider/thumbv.png b/contrib/gilbert/static/gilbert/murano/images/slider/thumbv.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/slider/thumbv.png rename to contrib/gilbert/static/gilbert/murano/images/slider/thumbv.png diff --git a/contrib/gilbert/media/gilbert/murano/images/slider/v.png b/contrib/gilbert/static/gilbert/murano/images/slider/v.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/slider/v.png rename to contrib/gilbert/static/gilbert/murano/images/slider/v.png diff --git a/contrib/gilbert/media/gilbert/murano/images/src/30-b.opacity b/contrib/gilbert/static/gilbert/murano/images/src/30-b.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/30-b.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/30-b.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/30-w.opacity b/contrib/gilbert/static/gilbert/murano/images/src/30-w.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/30-w.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/30-w.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/30w.opacity b/contrib/gilbert/static/gilbert/murano/images/src/30w.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/30w.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/30w.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/30white-to-trans.opacity b/contrib/gilbert/static/gilbert/murano/images/src/30white-to-trans.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/30white-to-trans.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/30white-to-trans.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/70w.opacity b/contrib/gilbert/static/gilbert/murano/images/src/70w.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/70w.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/70w.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/80-b.opacity b/contrib/gilbert/static/gilbert/murano/images/src/80-b.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/80-b.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/80-b.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/?.opacity b/contrib/gilbert/static/gilbert/murano/images/src/?.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/?.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/?.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/arrow buttons.opacity b/contrib/gilbert/static/gilbert/murano/images/src/arrow buttons.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/arrow buttons.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/arrow buttons.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/btn.opacity b/contrib/gilbert/static/gilbert/murano/images/src/btn.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/btn.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/btn.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/check.opacity b/contrib/gilbert/static/gilbert/murano/images/src/check.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/check.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/check.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/col-move-bottom.opacity b/contrib/gilbert/static/gilbert/murano/images/src/col-move-bottom.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/col-move-bottom.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/col-move-bottom.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/col-move-top.opacity b/contrib/gilbert/static/gilbert/murano/images/src/col-move-top.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/col-move-top.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/col-move-top.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/dark-inner-shadow.opacity b/contrib/gilbert/static/gilbert/murano/images/src/dark-inner-shadow.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/dark-inner-shadow.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/dark-inner-shadow.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/exclamation.opacity b/contrib/gilbert/static/gilbert/murano/images/src/exclamation.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/exclamation.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/exclamation.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/grad-height-25.opacity b/contrib/gilbert/static/gilbert/murano/images/src/grad-height-25.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/grad-height-25.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/grad-height-25.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/h.opacity b/contrib/gilbert/static/gilbert/murano/images/src/h.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/h.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/h.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/light-gloss.opacity b/contrib/gilbert/static/gilbert/murano/images/src/light-gloss.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/light-gloss.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/light-gloss.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/listview-sort.opacity b/contrib/gilbert/static/gilbert/murano/images/src/listview-sort.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/listview-sort.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/listview-sort.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/listviewheader.opacity b/contrib/gilbert/static/gilbert/murano/images/src/listviewheader.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/listviewheader.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/listviewheader.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/mini.opacity b/contrib/gilbert/static/gilbert/murano/images/src/mini.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/mini.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/mini.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/progress.opacity b/contrib/gilbert/static/gilbert/murano/images/src/progress.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/progress.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/progress.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/resizable corner.psd b/contrib/gilbert/static/gilbert/murano/images/src/resizable corner.psd similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/resizable corner.psd rename to contrib/gilbert/static/gilbert/murano/images/src/resizable corner.psd diff --git a/contrib/gilbert/media/gilbert/murano/images/src/resizable long.psd b/contrib/gilbert/static/gilbert/murano/images/src/resizable long.psd similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/resizable long.psd rename to contrib/gilbert/static/gilbert/murano/images/src/resizable long.psd diff --git a/contrib/gilbert/media/gilbert/murano/images/src/row-editor-btns.opacity b/contrib/gilbert/static/gilbert/murano/images/src/row-editor-btns.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/row-editor-btns.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/row-editor-btns.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/scroller.opacity b/contrib/gilbert/static/gilbert/murano/images/src/scroller.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/scroller.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/scroller.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/sort.opacity b/contrib/gilbert/static/gilbert/murano/images/src/sort.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/sort.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/sort.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/tabs.opacity b/contrib/gilbert/static/gilbert/murano/images/src/tabs.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/tabs.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/tabs.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/tb-sprite.psd b/contrib/gilbert/static/gilbert/murano/images/src/tb-sprite.psd similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/tb-sprite.psd rename to contrib/gilbert/static/gilbert/murano/images/src/tb-sprite.psd diff --git a/contrib/gilbert/media/gilbert/murano/images/src/tb.opacity b/contrib/gilbert/static/gilbert/murano/images/src/tb.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/tb.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/tb.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/thumbh.opacity b/contrib/gilbert/static/gilbert/murano/images/src/thumbh.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/thumbh.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/thumbh.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/thumbv.opacity b/contrib/gilbert/static/gilbert/murano/images/src/thumbv.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/thumbv.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/thumbv.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/tools.psd b/contrib/gilbert/static/gilbert/murano/images/src/tools.psd similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/tools.psd rename to contrib/gilbert/static/gilbert/murano/images/src/tools.psd diff --git a/contrib/gilbert/media/gilbert/murano/images/src/tooltip-invalid.opacity b/contrib/gilbert/static/gilbert/murano/images/src/tooltip-invalid.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/tooltip-invalid.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/tooltip-invalid.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/tooltip.opacity b/contrib/gilbert/static/gilbert/murano/images/src/tooltip.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/tooltip.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/tooltip.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/triggers/blank.opacity b/contrib/gilbert/static/gilbert/murano/images/src/triggers/blank.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/triggers/blank.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/triggers/blank.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/triggers/blank.png b/contrib/gilbert/static/gilbert/murano/images/src/triggers/blank.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/triggers/blank.png rename to contrib/gilbert/static/gilbert/murano/images/src/triggers/blank.png diff --git a/contrib/gilbert/media/gilbert/murano/images/src/triggers/clear.opacity b/contrib/gilbert/static/gilbert/murano/images/src/triggers/clear.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/triggers/clear.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/triggers/clear.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/triggers/date.opacity b/contrib/gilbert/static/gilbert/murano/images/src/triggers/date.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/triggers/date.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/triggers/date.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/triggers/drop.opacity b/contrib/gilbert/static/gilbert/murano/images/src/triggers/drop.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/triggers/drop.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/triggers/drop.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/triggers/search.opacity b/contrib/gilbert/static/gilbert/murano/images/src/triggers/search.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/triggers/search.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/triggers/search.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/v.opacity b/contrib/gilbert/static/gilbert/murano/images/src/v.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/v.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/v.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/window-dark.opacity b/contrib/gilbert/static/gilbert/murano/images/src/window-dark.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/window-dark.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/window-dark.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/window.opacity b/contrib/gilbert/static/gilbert/murano/images/src/window.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/window.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/window.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/src/x.opacity b/contrib/gilbert/static/gilbert/murano/images/src/x.opacity similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/src/x.opacity rename to contrib/gilbert/static/gilbert/murano/images/src/x.opacity diff --git a/contrib/gilbert/media/gilbert/murano/images/tab/c/Bottom.png b/contrib/gilbert/static/gilbert/murano/images/tab/c/Bottom.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tab/c/Bottom.png rename to contrib/gilbert/static/gilbert/murano/images/tab/c/Bottom.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tab/c/Top.png b/contrib/gilbert/static/gilbert/murano/images/tab/c/Top.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tab/c/Top.png rename to contrib/gilbert/static/gilbert/murano/images/tab/c/Top.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tab/close.png b/contrib/gilbert/static/gilbert/murano/images/tab/close.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tab/close.png rename to contrib/gilbert/static/gilbert/murano/images/tab/close.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tab/l/Bottom.png b/contrib/gilbert/static/gilbert/murano/images/tab/l/Bottom.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tab/l/Bottom.png rename to contrib/gilbert/static/gilbert/murano/images/tab/l/Bottom.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tab/l/Top.png b/contrib/gilbert/static/gilbert/murano/images/tab/l/Top.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tab/l/Top.png rename to contrib/gilbert/static/gilbert/murano/images/tab/l/Top.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tab/r/Bottom.png b/contrib/gilbert/static/gilbert/murano/images/tab/r/Bottom.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tab/r/Bottom.png rename to contrib/gilbert/static/gilbert/murano/images/tab/r/Bottom.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tab/r/Top.png b/contrib/gilbert/static/gilbert/murano/images/tab/r/Top.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tab/r/Top.png rename to contrib/gilbert/static/gilbert/murano/images/tab/r/Top.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tb-sprite.png b/contrib/gilbert/static/gilbert/murano/images/tb-sprite.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tb-sprite.png rename to contrib/gilbert/static/gilbert/murano/images/tb-sprite.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tb.png b/contrib/gilbert/static/gilbert/murano/images/tb.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tb.png rename to contrib/gilbert/static/gilbert/murano/images/tb.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tools.png b/contrib/gilbert/static/gilbert/murano/images/tools.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tools.png rename to contrib/gilbert/static/gilbert/murano/images/tools.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/arrows.gif b/contrib/gilbert/static/gilbert/murano/images/tree/arrows.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/arrows.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/arrows.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/drop-add.png b/contrib/gilbert/static/gilbert/murano/images/tree/drop-add.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/drop-add.png rename to contrib/gilbert/static/gilbert/murano/images/tree/drop-add.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/drop-between.gif b/contrib/gilbert/static/gilbert/murano/images/tree/drop-between.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/drop-between.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/drop-between.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/drop-no.png b/contrib/gilbert/static/gilbert/murano/images/tree/drop-no.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/drop-no.png rename to contrib/gilbert/static/gilbert/murano/images/tree/drop-no.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/drop-over.gif b/contrib/gilbert/static/gilbert/murano/images/tree/drop-over.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/drop-over.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/drop-over.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/drop-under.gif b/contrib/gilbert/static/gilbert/murano/images/tree/drop-under.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/drop-under.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/drop-under.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/drop-yes.png b/contrib/gilbert/static/gilbert/murano/images/tree/drop-yes.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/drop-yes.png rename to contrib/gilbert/static/gilbert/murano/images/tree/drop-yes.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-minus-nl.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-minus-nl.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-minus-nl.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-minus-nl.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-minus.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-minus.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-minus.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-minus.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-plus-nl.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-plus-nl.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-plus-nl.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-plus-nl.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-plus.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-plus.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-end-plus.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-end-plus.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-end.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-end.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-end.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-end.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-line.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-line.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-line.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-line.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-minus-nl.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-minus-nl.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-minus-nl.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-minus-nl.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-minus.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-minus.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-minus.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-minus.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-plus-nl.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-plus-nl.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-plus-nl.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-plus-nl.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow-plus.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow-plus.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow-plus.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow-plus.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/elbow.gif b/contrib/gilbert/static/gilbert/murano/images/tree/elbow.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/elbow.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/elbow.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/folder-open.png b/contrib/gilbert/static/gilbert/murano/images/tree/folder-open.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/folder-open.png rename to contrib/gilbert/static/gilbert/murano/images/tree/folder-open.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/folder.png b/contrib/gilbert/static/gilbert/murano/images/tree/folder.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/folder.png rename to contrib/gilbert/static/gilbert/murano/images/tree/folder.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/leaf.png b/contrib/gilbert/static/gilbert/murano/images/tree/leaf.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/leaf.png rename to contrib/gilbert/static/gilbert/murano/images/tree/leaf.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/loading.gif b/contrib/gilbert/static/gilbert/murano/images/tree/loading.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/loading.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/loading.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/tree/s.gif b/contrib/gilbert/static/gilbert/murano/images/tree/s.gif similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tree/s.gif rename to contrib/gilbert/static/gilbert/murano/images/tree/s.gif diff --git a/contrib/gilbert/media/gilbert/murano/images/trigger/blank.png b/contrib/gilbert/static/gilbert/murano/images/trigger/blank.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/trigger/blank.png rename to contrib/gilbert/static/gilbert/murano/images/trigger/blank.png diff --git a/contrib/gilbert/media/gilbert/murano/images/trigger/clear.png b/contrib/gilbert/static/gilbert/murano/images/trigger/clear.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/trigger/clear.png rename to contrib/gilbert/static/gilbert/murano/images/trigger/clear.png diff --git a/contrib/gilbert/media/gilbert/murano/images/trigger/date.png b/contrib/gilbert/static/gilbert/murano/images/trigger/date.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/trigger/date.png rename to contrib/gilbert/static/gilbert/murano/images/trigger/date.png diff --git a/contrib/gilbert/media/gilbert/murano/images/trigger/drop.png b/contrib/gilbert/static/gilbert/murano/images/trigger/drop.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/trigger/drop.png rename to contrib/gilbert/static/gilbert/murano/images/trigger/drop.png diff --git a/contrib/gilbert/media/gilbert/murano/images/trigger/search.png b/contrib/gilbert/static/gilbert/murano/images/trigger/search.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/trigger/search.png rename to contrib/gilbert/static/gilbert/murano/images/trigger/search.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/bc.png b/contrib/gilbert/static/gilbert/murano/images/tt/bc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/bc.png rename to contrib/gilbert/static/gilbert/murano/images/tt/bc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/bl.png b/contrib/gilbert/static/gilbert/murano/images/tt/bl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/bl.png rename to contrib/gilbert/static/gilbert/murano/images/tt/bl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/br.png b/contrib/gilbert/static/gilbert/murano/images/tt/br.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/br.png rename to contrib/gilbert/static/gilbert/murano/images/tt/br.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/c.png b/contrib/gilbert/static/gilbert/murano/images/tt/c.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/c.png rename to contrib/gilbert/static/gilbert/murano/images/tt/c.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-bc.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-bc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-bc.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-bc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-bl.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-bl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-bl.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-bl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-br.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-br.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-br.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-br.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-c.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-c.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-c.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-c.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-ml.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-ml.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-ml.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-ml.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-mr.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-mr.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-mr.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-mr.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-tc.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-tc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-tc.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-tc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-tl.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-tl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-tl.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-tl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/i-tr.png b/contrib/gilbert/static/gilbert/murano/images/tt/i-tr.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/i-tr.png rename to contrib/gilbert/static/gilbert/murano/images/tt/i-tr.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/ml.png b/contrib/gilbert/static/gilbert/murano/images/tt/ml.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/ml.png rename to contrib/gilbert/static/gilbert/murano/images/tt/ml.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/mr.png b/contrib/gilbert/static/gilbert/murano/images/tt/mr.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/mr.png rename to contrib/gilbert/static/gilbert/murano/images/tt/mr.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/tc.png b/contrib/gilbert/static/gilbert/murano/images/tt/tc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/tc.png rename to contrib/gilbert/static/gilbert/murano/images/tt/tc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/tl.png b/contrib/gilbert/static/gilbert/murano/images/tt/tl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/tl.png rename to contrib/gilbert/static/gilbert/murano/images/tt/tl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/tt/tr.png b/contrib/gilbert/static/gilbert/murano/images/tt/tr.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/tt/tr.png rename to contrib/gilbert/static/gilbert/murano/images/tt/tr.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/bc.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/bc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/bc.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/bc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/bl.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/bl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/bl.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/bl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/br.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/br.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/br.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/br.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/c.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/c.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/c.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/c.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/l.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/l.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/l.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/l.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/r.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/r.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/r.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/r.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/tc.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/tc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/tc.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/tc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/tl.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/tl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/tl.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/tl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowdark/tr.png b/contrib/gilbert/static/gilbert/murano/images/windowdark/tr.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowdark/tr.png rename to contrib/gilbert/static/gilbert/murano/images/windowdark/tr.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/bc.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/bc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/bc.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/bc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/bl.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/bl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/bl.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/bl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/br.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/br.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/br.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/br.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/c.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/c.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/c.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/c.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/l.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/l.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/l.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/l.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/r.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/r.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/r.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/r.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/tc.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/tc.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/tc.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/tc.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/tl.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/tl.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/tl.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/tl.png diff --git a/contrib/gilbert/media/gilbert/murano/images/windowlight/tr.png b/contrib/gilbert/static/gilbert/murano/images/windowlight/tr.png similarity index 100% rename from contrib/gilbert/media/gilbert/murano/images/windowlight/tr.png rename to contrib/gilbert/static/gilbert/murano/images/windowlight/tr.png diff --git a/contrib/gilbert/media/gilbert/murano/murano.css b/contrib/gilbert/static/gilbert/murano/murano.css similarity index 100% rename from contrib/gilbert/media/gilbert/murano/murano.css rename to contrib/gilbert/static/gilbert/murano/murano.css diff --git a/contrib/gilbert/media/gilbert/plugins/auth.js b/contrib/gilbert/static/gilbert/plugins/auth.js similarity index 100% rename from contrib/gilbert/media/gilbert/plugins/auth.js rename to contrib/gilbert/static/gilbert/plugins/auth.js diff --git a/contrib/gilbert/media/gilbert/plugins/models.js b/contrib/gilbert/static/gilbert/plugins/models.js similarity index 100% rename from contrib/gilbert/media/gilbert/plugins/models.js rename to contrib/gilbert/static/gilbert/plugins/models.js diff --git a/contrib/gilbert/media/gilbert/superboxselect/SuperBoxSelect.js b/contrib/gilbert/static/gilbert/superboxselect/SuperBoxSelect.js similarity index 100% rename from contrib/gilbert/media/gilbert/superboxselect/SuperBoxSelect.js rename to contrib/gilbert/static/gilbert/superboxselect/SuperBoxSelect.js diff --git a/contrib/gilbert/media/gilbert/superboxselect/clear.png b/contrib/gilbert/static/gilbert/superboxselect/clear.png similarity index 100% rename from contrib/gilbert/media/gilbert/superboxselect/clear.png rename to contrib/gilbert/static/gilbert/superboxselect/clear.png diff --git a/contrib/gilbert/media/gilbert/superboxselect/close.png b/contrib/gilbert/static/gilbert/superboxselect/close.png similarity index 100% rename from contrib/gilbert/media/gilbert/superboxselect/close.png rename to contrib/gilbert/static/gilbert/superboxselect/close.png diff --git a/contrib/gilbert/media/gilbert/superboxselect/expand.png b/contrib/gilbert/static/gilbert/superboxselect/expand.png similarity index 100% rename from contrib/gilbert/media/gilbert/superboxselect/expand.png rename to contrib/gilbert/static/gilbert/superboxselect/expand.png diff --git a/contrib/gilbert/media/gilbert/superboxselect/superboxselect-gray-extend.css b/contrib/gilbert/static/gilbert/superboxselect/superboxselect-gray-extend.css similarity index 100% rename from contrib/gilbert/media/gilbert/superboxselect/superboxselect-gray-extend.css rename to contrib/gilbert/static/gilbert/superboxselect/superboxselect-gray-extend.css diff --git a/contrib/gilbert/media/gilbert/superboxselect/superboxselect.css b/contrib/gilbert/static/gilbert/superboxselect/superboxselect.css similarity index 100% rename from contrib/gilbert/media/gilbert/superboxselect/superboxselect.css rename to contrib/gilbert/static/gilbert/superboxselect/superboxselect.css diff --git a/contrib/gilbert/media/gilbert/wallpaper.README b/contrib/gilbert/static/gilbert/wallpaper.README similarity index 100% rename from contrib/gilbert/media/gilbert/wallpaper.README rename to contrib/gilbert/static/gilbert/wallpaper.README diff --git a/contrib/gilbert/media/gilbert/wallpaper.jpg b/contrib/gilbert/static/gilbert/wallpaper.jpg similarity index 100% rename from contrib/gilbert/media/gilbert/wallpaper.jpg rename to contrib/gilbert/static/gilbert/wallpaper.jpg diff --git a/contrib/gilbert/templates/gilbert/base.html b/contrib/gilbert/templates/gilbert/base.html index c2635c9..4bc7bb1 100644 --- a/contrib/gilbert/templates/gilbert/base.html +++ b/contrib/gilbert/templates/gilbert/base.html @@ -1,26 +1,26 @@ -{% load staticmedia %} + {% block head %} {% block title %}{{ gilbert.title }}{% endblock %} {% block css %} - - - - - + + + + + {% endblock %} {% block js %} - + {% if request.GET.debug %} - + {% else %} - + {% endif %} {% endblock %} @@ -28,5 +28,5 @@ {% endblock %} {% endblock %} -{% block body %}{% endblock %} +{% block body %}{% endblock %} diff --git a/contrib/gilbert/templates/gilbert/icons.css b/contrib/gilbert/templates/gilbert/icons.css index cecb603..677d7eb 100644 --- a/contrib/gilbert/templates/gilbert/icons.css +++ b/contrib/gilbert/templates/gilbert/icons.css @@ -1,6 +1,5 @@ -{% 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 diff --git a/contrib/gilbert/templates/gilbert/index.html b/contrib/gilbert/templates/gilbert/index.html index 6d48a78..b45a2b8 100644 --- a/contrib/gilbert/templates/gilbert/index.html +++ b/contrib/gilbert/templates/gilbert/index.html @@ -1,9 +1,8 @@ {% extends 'gilbert/base.html' %} -{% load staticmedia %} {% block css %}{{ block.super }} - - + + {% for router in gilbert.model_routers.values %}{% for admin in router.models.values %}{% for css_url in admin.index_css_urls %} @@ -16,18 +15,18 @@ {% endblock %} {% block js %}{{ block.super }} - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/contrib/gilbert/templates/gilbert/login.html b/contrib/gilbert/templates/gilbert/login.html index 13c79c3..0041ff7 100644 --- a/contrib/gilbert/templates/gilbert/login.html +++ b/contrib/gilbert/templates/gilbert/login.html @@ -1,21 +1,20 @@ {% extends 'gilbert/base.html' %} -{% load staticmedia %} {% block css %}{{ block.super }} - + {% endblock %} {% block js %}{{ block.super }} - +