From f3dbae14e824e0fc1322bd290592968c2491f971 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 20 Oct 2014 09:37:25 +0200
Subject: [PATCH] Spit css and javascript blocks.

see #585
---
 doc/extending/events.rst                      |   5 +-
 .../core/templates/core/settings_header.html  |   9 +-
 modoboa/core/templates/core/user_index.html   |   9 +-
 modoboa/demo/__init__.py                      |   4 +-
 .../admin/templates/admin/domains.html        |  11 +-
 .../admin/templates/admin/header.html         |   6 +-
 .../admin/templates/admin/identities.html     |  11 +-
 .../admin/templates/admin/listing.html        |   9 +-
 .../extensions/amavis/general_callbacks.py    |   4 +-
 .../amavis/templates/amavis/index.html        |   7 +-
 .../extensions/limits/general_callbacks.py    |   7 +-
 .../general_callbacks.py                      |   4 +-
 .../templates/radicale/calendars.html         |   8 +-
 .../templates/sievefilters/index.html         |   9 +-
 .../stats/templates/stats/index.html          |   8 +-
 .../webmail/templates/webmail/index.html      |   5 +-
 modoboa/lib/templatetags/lib_tags.py          |   6 +-
 modoboa/templates/nlayout.html                | 105 ++++++------------
 18 files changed, 135 insertions(+), 92 deletions(-)

diff --git a/doc/extending/events.rst b/doc/extending/events.rst
index 90bcef511..41b742ff7 100644
--- a/doc/extending/events.rst
+++ b/doc/extending/events.rst
@@ -629,10 +629,13 @@ template but need javascript stuff.
 
 *Callback prototype*::
 
-  def callback(caller, user): pass
+  def callback(caller, st_type, user): pass
 
 * ``caller`` is name of the application (or the location) responsible
   for the call
+
+* ``st_type`` is the expected static content type (``css`` or ``js``)
+
 * ``user`` is a ``User`` instance corresponding to the currently
   logged in user
 
diff --git a/modoboa/core/templates/core/settings_header.html b/modoboa/core/templates/core/settings_header.html
index a9f5e5138..641f8d85d 100644
--- a/modoboa/core/templates/core/settings_header.html
+++ b/modoboa/core/templates/core/settings_header.html
@@ -1,10 +1,15 @@
 {% extends "twocols.html" %}
 {% load i18n lib_tags core_tags %}
 {% load static %}
+
 {% block pagetitle %}{% trans "Modoboa settings" %}{% endblock %}
-{% block html_head %}
+
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'admin/css/settings.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'css/jquery.sortable.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'js/jquery.infinitescroll.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/history.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/listing.js' %}"></script>
@@ -23,5 +28,7 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
+
 {% block leftcol %}{% admin_menu left_selection user %}{% endblock %}
+
 {% block apparea %}<div id="settings_content"></div>{% endblock %}
diff --git a/modoboa/core/templates/core/user_index.html b/modoboa/core/templates/core/user_index.html
index c03ed5b28..711603221 100644
--- a/modoboa/core/templates/core/user_index.html
+++ b/modoboa/core/templates/core/user_index.html
@@ -1,8 +1,13 @@
 {% extends "twocols.html" %}{% load i18n core_tags lib_tags %}
 {% load static %}
+
 {% block pagetitle %}{% trans "Settings" %}{% endblock %}
-{% block html_head %}
+
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'core/css/userprefs.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'js/history.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/listing.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/twocols_nav.js' %}"></script>
@@ -18,5 +23,7 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
+
 {% block leftcol %}{% uprefs_menu left_selection user %}{% endblock %}
+
 {% block apparea %}<div id="uprefs_content"></div>{% endblock %}
diff --git a/modoboa/demo/__init__.py b/modoboa/demo/__init__.py
index b179d6de3..a9fca9b36 100755
--- a/modoboa/demo/__init__.py
+++ b/modoboa/demo/__init__.py
@@ -43,8 +43,8 @@ def password_change(user):
 
 
 @events.observe("GetStaticContent")
-def get_static_content(caller, user):
-    if caller != 'top' and not user.mailbox_set.count():
+def get_static_content(caller, st_type, user):
+    if caller != 'top' or st_type != 'js' or not user.mailbox_set.count():
         return []
 
     return ["""<script type="text/javascript">
diff --git a/modoboa/extensions/admin/templates/admin/domains.html b/modoboa/extensions/admin/templates/admin/domains.html
index a22be905c..44485ac2e 100644
--- a/modoboa/extensions/admin/templates/admin/domains.html
+++ b/modoboa/extensions/admin/templates/admin/domains.html
@@ -1,6 +1,12 @@
 {% extends "admin/listing.html" %}{% load i18n admin_tags lib_tags %}
+
 {% block pagetitle %}{% trans "Domains" %}{% endblock %}
-{% block html_head %}
+
+{% block extra_css %}
+{% extra_static_content "domains" "css" user %}
+{% endblock %}
+
+{% block extra_js %}
 {{ block.super }}
 <script type="text/javascript">
 $(document).ready(function() {
@@ -9,8 +15,9 @@ $(document).ready(function() {
     });
 });
 </script>
-{% extra_static_content "domains" user %}
+{% extra_static_content "domains" "js" user %}
 {% endblock %}
+
 {% block actions %}{% domains_menu "domains" user %}{% endblock %}
 
 {% block table_header %}
diff --git a/modoboa/extensions/admin/templates/admin/header.html b/modoboa/extensions/admin/templates/admin/header.html
index 24b03a533..1dacea7a8 100644
--- a/modoboa/extensions/admin/templates/admin/header.html
+++ b/modoboa/extensions/admin/templates/admin/header.html
@@ -1,7 +1,11 @@
 {% extends "twocols.html" %}
 {% load static %}
-{% block html_head %}
+
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'admin/css/admin.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'js/history.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/listing.js' %}"></script>
 <script type="text/javascript" src="{% static 'admin/js/admin.js' %}"></script>
diff --git a/modoboa/extensions/admin/templates/admin/identities.html b/modoboa/extensions/admin/templates/admin/identities.html
index 961016f41..250c8dfd1 100644
--- a/modoboa/extensions/admin/templates/admin/identities.html
+++ b/modoboa/extensions/admin/templates/admin/identities.html
@@ -1,7 +1,13 @@
 {% extends "admin/listing.html" %}{% load admin_tags lib_tags i18n %}{% load url from future %}
 {% load static %}
+
 {% block pagetitle %}{% trans "Identities" %}{% endblock %}
-{% block html_head %}
+
+{% block extra_css %}
+{% extra_static_content "identities" "css" user %}
+{% endblock %}
+
+{% block extra_js %}
 {{ block.super }}
 <script type="text/javascript" src="{% static 'js/autocompleter.js' %}"></script>
 <script type="text/javascript">
@@ -12,6 +18,7 @@ $(document).ready(function() {
     });
 });
 </script>
-{% extra_static_content "identities" user %}
+{% extra_static_content "identities" "js" user %}
 {% endblock %}
+
 {% block actions %}{% identities_menu user "identities" %}{% endblock %}
diff --git a/modoboa/extensions/admin/templates/admin/listing.html b/modoboa/extensions/admin/templates/admin/listing.html
index 79240fffd..a5c5c7dbb 100644
--- a/modoboa/extensions/admin/templates/admin/listing.html
+++ b/modoboa/extensions/admin/templates/admin/listing.html
@@ -1,8 +1,13 @@
 {% extends "admin/header.html" %}{% load i18n admin_tags %}
 {% load static %}
-{% block html_head %}
+
+{% block extra_css %}
 {{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% static 'css/jquery.sortable.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
+{{ block.super }}
 <script type="text/javascript" src="{% static 'js/creation_wizard.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/dynamic_input.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.sortable.js' %}"></script>
@@ -11,6 +16,7 @@
 var admin;
 </script>
 {% endblock %}
+
 {% block leftcol %}
 <ul class="nav nav-sidebar">
   {% block actions %}{% endblock %}
@@ -18,6 +24,7 @@ var admin;
 
 {% get_extra_admin_content user "leftcol" selection %}
 {% endblock %}
+
 {% block apparea %}
 <div class="row">
   <div class="col-sm-5">
diff --git a/modoboa/extensions/amavis/general_callbacks.py b/modoboa/extensions/amavis/general_callbacks.py
index aaf022733..4ec602842 100644
--- a/modoboa/extensions/amavis/general_callbacks.py
+++ b/modoboa/extensions/amavis/general_callbacks.py
@@ -50,8 +50,8 @@ def on_domain_alias_deleted(domainaliases):
 
 
 @events.observe("GetStaticContent")
-def extra_static_content(caller, user):
-    if user.group == "SimpleUsers":
+def extra_static_content(caller, st_type, user):
+    if user.group == "SimpleUsers" or st_type != "js":
         return []
 
     if caller == 'domains':
diff --git a/modoboa/extensions/amavis/templates/amavis/index.html b/modoboa/extensions/amavis/templates/amavis/index.html
index 77b65efbe..d1ebfbe4a 100644
--- a/modoboa/extensions/amavis/templates/amavis/index.html
+++ b/modoboa/extensions/amavis/templates/amavis/index.html
@@ -1,9 +1,14 @@
 {% extends "fluid.html" %}{% load i18n amavis_tags %}
 {% load static %}
+
 {% block pagetitle %}{% trans "Quarantine management" %}{% endblock %}
-{% block html_head %}
+
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'amavis/css/quarantine.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'css/jquery.sortable.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'js/jquery.htmltable.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.infinitescroll.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.sortable.js' %}"></script>
diff --git a/modoboa/extensions/limits/general_callbacks.py b/modoboa/extensions/limits/general_callbacks.py
index 0d41c2449..8831dfe87 100644
--- a/modoboa/extensions/limits/general_callbacks.py
+++ b/modoboa/extensions/limits/general_callbacks.py
@@ -71,12 +71,13 @@ def fill_account_instances(user, account, instances):
 
 
 @events.observe("GetStaticContent")
-def get_static_content(caller, user):
+def get_static_content(caller, st_type, user):
     if caller not in ['domains', 'identities']:
         return []
     if user.group == "SimpleUsers":
         return []
-    return ["""<style>
+    if st_type == "css":
+        return ["""<style>
 .resource {
     margin: 5px 0;
 }
@@ -89,6 +90,8 @@ def get_static_content(caller, user):
     color: #000000;
 }
 </style>
+"""]
+    return ["""
 <script type="text/javascript">
 $(document).ready(function() {
     $(".progress").tooltip();
diff --git a/modoboa/extensions/postfix_relay_domains/general_callbacks.py b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
index 2521eeada..43b25312d 100644
--- a/modoboa/extensions/postfix_relay_domains/general_callbacks.py
+++ b/modoboa/extensions/postfix_relay_domains/general_callbacks.py
@@ -8,8 +8,8 @@ from .models import RelayDomain, RelayDomainAlias
 
 
 @events.observe('GetStaticContent')
-def static_content(caller, user):
-    if caller != 'domains':
+def static_content(caller, st_type, user):
+    if caller != 'domains' or st_type != 'js':
         return []
 
     t = Template("""<script src="{{ STATIC_URL }}postfix_relay_domains/js/relay_domains.js" type="text/javascript"></script>
diff --git a/modoboa/extensions/radicale/templates/radicale/calendars.html b/modoboa/extensions/radicale/templates/radicale/calendars.html
index 17ef0dacc..c5afe5e42 100644
--- a/modoboa/extensions/radicale/templates/radicale/calendars.html
+++ b/modoboa/extensions/radicale/templates/radicale/calendars.html
@@ -1,9 +1,13 @@
 {% extends "twocols.html" %}
 {% load i18n radicale_tags %}
 {% load static %}
-{% block html_head %}
+
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'css/jquery.sortable.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'radicale/css/radicale.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'js/jquery.sortable.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/jquery.infinitescroll.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/history.js' %}"></script>
@@ -21,11 +25,13 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
+
 {% block leftcol %}
 <ul class="nav nav-sidebar">
   {% radicale_left_menu user %}
 </ul>
 {% endblock %}
+
 {% block apparea %}
 <div class="row">
   <div class="col-sm-5">
diff --git a/modoboa/extensions/sievefilters/templates/sievefilters/index.html b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
index 7fb019742..40d3482ba 100644
--- a/modoboa/extensions/sievefilters/templates/sievefilters/index.html
+++ b/modoboa/extensions/sievefilters/templates/sievefilters/index.html
@@ -1,8 +1,13 @@
 {% extends "twocols.html" %}{% load i18n sfilters_tags %}{% load url from future %}
 {% load static %}
+
 {% block pagetitle %}{% trans "Message filters" %}{% endblock %}
-{% block html_head %}
+
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'sievefilters/css/style.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'js/history.js' %}"></script>
 <script type="text/javascript" src="{% static 'sievefilters/js/lib.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/dynamic_input.js' %}"></script>
@@ -71,6 +76,7 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
+
 {% block leftcol %}
 <ul id="menu" class="nav nav-sidebar">
   <li class="nav-header">{% trans "Filter sets" %}</li>
@@ -88,6 +94,7 @@ $(document).ready(function() {
   {% sfilters_menu user %}
 </ul>
 {% endblock %}
+
 {% block apparea %}
 <div id="set_content">
   {% if not active_script and not scripts %}
diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html
index 195b3139f..55e0ae065 100644
--- a/modoboa/extensions/stats/templates/stats/index.html
+++ b/modoboa/extensions/stats/templates/stats/index.html
@@ -1,8 +1,13 @@
 {% extends "twocols.html" %}{% load i18n %}{% load url from future %}
 {% load static %}
+
 {% block pagetitle %}{% trans "Graphical statistics" %}{% endblock %}
-{% block html_head %}
+
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'stats/css/stats.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'js/history.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/autocompleter.js' %}"></script>
 <script type="text/javascript" src="{% static 'd3/d3.min.js' %}"></script>
@@ -20,6 +25,7 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
+
 {% block leftcol %}
 <ul class="nav nav-sidebar">
   {% for id, gset in graph_sets.items %}
diff --git a/modoboa/extensions/webmail/templates/webmail/index.html b/modoboa/extensions/webmail/templates/webmail/index.html
index 77d7734c2..96d68e9de 100644
--- a/modoboa/extensions/webmail/templates/webmail/index.html
+++ b/modoboa/extensions/webmail/templates/webmail/index.html
@@ -1,9 +1,12 @@
 {% extends "twocols.html" %}{% load i18n lib_tags webmail_tags %}{% load url from future %}
 {% load static %}
 {% block pagetitle %}Webmail{% endblock %}
-{% block html_head %}
+{% block extra_css %}
 <link rel="stylesheet" type="text/css" href="{% static 'jquery-ui/themes/base/all.css' %}" />
 <link rel="stylesheet" type="text/css" href="{% static 'webmail/css/webmail.css' %}" />
+{% endblock %}
+
+{% block extra_js %}
 <script type="text/javascript" src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/ckeditor/ckeditor.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/history.js' %}"></script>
diff --git a/modoboa/lib/templatetags/lib_tags.py b/modoboa/lib/templatetags/lib_tags.py
index 23d553cc2..359d99a50 100644
--- a/modoboa/lib/templatetags/lib_tags.py
+++ b/modoboa/lib/templatetags/lib_tags.py
@@ -73,10 +73,11 @@ def render_tags(tags):
 
 
 @register.simple_tag
-def extra_static_content(caller, user):
+def extra_static_content(caller, st_type, user):
     """Get extra static content from extensions.
 
     :param str caller: the application (location) responsible for the call
+    :param str st_type: content type (css or js)
     :param ``User`` user: connected user
     """
     tpl = template.Template(
@@ -84,6 +85,7 @@ def extra_static_content(caller, user):
     )
     return tpl.render(
         template.Context({
-            'static_content': events.raiseQueryEvent("GetStaticContent", caller, user)
+            'static_content': events.raiseQueryEvent(
+                "GetStaticContent", caller, st_type, user)
         })
     )
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 151452124..267d1944f 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -13,7 +13,42 @@
     <link rel="stylesheet" href="{% static 'eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css' %}" />
     <link rel="stylesheet" href="{% static 'bootstrap-select/bootstrap-select.min.css' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'css/custom.css' %}" />
+    {% block extra_css %}{% endblock %}
+  </head>
 
+  <body>
+    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+      <div class="container-fluid">
+        <div class="navbar-header">
+          <button class="navbar-toggle collapsed" data-target=".navbar-collapse" data-toggle="collapse" type="button">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+        </div>
+
+        <div id="navigate-navbar-collapse" class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            {% if selection %}
+              {% extensions_menu selection user %}{% core_menu selection user %}
+            {% else %}
+              {% extensions_menu "" user %}{% core_menu "" user %}
+            {% endif %}
+            {% load_optionalmenu user %}
+            <li class="divider"></li>
+          </ul>
+          <ul class="nav navbar-nav navbar-right">
+            {% if selection %}{% user_menu user selection %}{% else %}{% user_menu user "" %}{% endif %}
+          </ul>
+          {% include "common/top_notifications.html" %}
+        </div>
+      </div>
+    </div>
+
+    {% block content %}{% endblock %}
+
+    <!-- Javascript -->
     <script src="{% static 'jquery/jquery.js' %}" type="text/javascript"></script>
     <script src="{% static 'bootstrap/dist/js/bootstrap.min.js' %}" type="text/javascript"></script>
     <script type="text/javascript" src="{% static 'moment/min/moment.min.js' %}"></script>
@@ -42,73 +77,7 @@
           });
       });
     </script>
-    {% extra_static_content "top" user %}
-    {% block html_head %}{% endblock %}
-  </head>
-  <body>
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-      <div class="container-fluid">
-        <div class="navbar-header">
-          <button class="navbar-toggle collapsed" data-target=".navbar-collapse" data-toggle="collapse" type="button">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-        </div>
-
-        <div id="navigate-navbar-collapse" class="navbar-collapse collapse">
-
-          <!--<ul class="nav navbar-nav display-less-1198">
-            <li class="droppable active ui-droppable" name="INBOX">
-              <a class="block" name="loadfolder" href="INBOX">
-                <i class="fa fa-inbox"></i>
-                INBOX
-              </a>
-            </li>
-            <li class="droppable ui-droppable" name="Drafts">
-              <a class="block" name="loadfolder" href="Drafts">
-                <i class="fa fa-file"></i>
-                Drafts
-              </a>
-            </li>
-            <li class="droppable ui-droppable" name="Junk">
-              <a class="block" name="loadfolder" href="Junk">
-                <i class="fa fa-fire"></i>
-                Junk
-              </a>
-            </li>
-            <li class="droppable ui-droppable" name="Sent">
-              <a class="block" name="loadfolder" href="Sent">
-                <i class="fa fa-envelope"></i>
-                Sent
-              </a>
-            </li>
-            <li class="droppable ui-droppable" name="Trash">
-              <a class="block" name="loadfolder" href="Trash">
-                <i class="fa fa-trash"></i>
-                Trash
-              </a>
-            </li>
-          </ul> -->
-
-          <ul class="nav navbar-nav">
-            {% if selection %}
-              {% extensions_menu selection user %}{% core_menu selection user %}
-            {% else %}
-              {% extensions_menu "" user %}{% core_menu "" user %}
-            {% endif %}
-            {% load_optionalmenu user %}
-            <li class="divider"></li>
-          </ul>
-          <ul class="nav navbar-nav navbar-right">
-            {% if selection %}{% user_menu user selection %}{% else %}{% user_menu user "" %}{% endif %}
-          </ul>
-          {% include "common/top_notifications.html" %}
-        </div>
-      </div>
-    </div>
-    {% block content %}{% endblock %}
-
+    {% extra_static_content "top" "js" user %}
+    {% block extra_js %}{% endblock %}
   </body>
 </html>