Finally, create only one symlink to the plugin's static directory inside modoboa's root static directory. It is more compliant with the way django applications work.

close #17
This commit is contained in:
Antoine Nguyen
2011-04-08 17:07:09 +02:00
parent 169365dfb4
commit adbbcfa458
4 changed files with 12 additions and 23 deletions
+3 -15
View File
@@ -256,12 +256,8 @@ class Extension(models.Model):
staticpath = "%s/%s" % (extdir, "static")
if os.path.exists(staticpath):
for d in ['css', 'js']:
subpath = "%s/%s" % (staticpath, d)
if not os.path.exists(subpath):
continue
exec_cmd("ln -s %s %s/static/%s/%s" % (subpath, settings.MODOBOA_DIR,
d, self.name))
exec_cmd("ln -s %s/static %s/static/%s" % \
(extdir, settings.MODOBOA_DIR, self.name))
def off(self):
self.unload()
@@ -274,12 +270,4 @@ class Extension(models.Model):
staticpath = "%s/%s" % (extdir, "static")
if os.path.exists(staticpath):
for d in ['css', 'js']:
subpath = "%s/static/%s/%s" % (settings.MODOBOA_DIR, d, self.name)
exec_cmd("rm -f %s" % subpath)
exec_cmd("rm -r %s/static/%s" % (settings.MODOBOA_DIR, self.name))
@@ -1,7 +1,8 @@
{% extends "common/email_listing.html" %}
{% load i18n %}
{% block css %}
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/amavis_quarantine/quarantine.css" />
{% block html_head %}
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}amavis_quarantine/css/quarantine.css" />
{{ block.super }}
{% endblock %}
{% block js %}
mysubmit = function(event, name) {
@@ -1,9 +1,9 @@
{% extends "layout_simple.html" %}
{% load i18n %}
{% block html_head %}
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/webmail/folders.css" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}webmail/css/folders.css" />
<script src="{{ MEDIA_URL }}js/form.js" type="text/javascript"></script>
<script src="{{ MEDIA_URL }}js/webmail/webmail.js" type="text/javascript"></script>
<script src="{{ MEDIA_URL }}webmail/js/webmail.js" type="text/javascript"></script>
<script type="text/javascript">
window.addEvent("domready", function() {
init_folders_browsing();
@@ -1,10 +1,10 @@
{% extends "common/email_listing.html" %}
{% load i18n %}
{% block html_head %}
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/webmail/webmail.css" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/webmail/folders.css" />
<script type="text/javascript" src="{{ MEDIA_URL }}js/webmail/fdmenu.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}js/webmail/webmail.js"></script>
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}webmail/css/webmail.css" />
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}webmail/css/folders.css" />
<script type="text/javascript" src="{{ MEDIA_URL }}webmail/js/fdmenu.js"></script>
<script type="text/javascript" src="{{ MEDIA_URL }}webmail/js/webmail.js"></script>
{{ block.super }}
<script type="text/javascript">
function wm_updatelisting(resp) {