Use uibase.html for mmctlui.

mbr · Jan 4, 2012 · a1dc62d · a1dc62d
1 parent 7a5f67c
commit a1dc62d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/mmctl/mmctlui/templates/index.html b/mmctl/mmctlui/templates/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "uibase.html" %}
 
 {% block title %}mmctl{% endblock %}
 

diff --git a/mmctl/mmctlui/templates/login.html b/mmctl/mmctlui/templates/login.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "uibase.html" %}
 
 {% block title %}mmctl: Login{% endblock %}
 

diff --git a/mmctl/mmctlui/templates/uibase.html b/mmctl/mmctlui/templates/uibase.html
@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block jsglobal %}
+{{super()}}
+	$AUTH_COOKIE_NAME = {{config['AUTH_COOKIE_NAME']|tojson|safe }};
+	$AUTH_COOKIE_PATH = {{url_for('mmctlui.index')|tojson|safe}};
+{% endblock %}
diff --git a/mmctl/templates/base.html b/mmctl/templates/base.html
@@ -24,9 +24,9 @@
 {% endassets %}
 
 <script type="text/javascript">
+{% block jsglobal %}
 	$SCRIPT_ROOT = {{ request.script_root|tojson|safe }};
-	$AUTH_COOKIE_NAME = {{config['AUTH_COOKIE_NAME']|tojson|safe }};
+{% endblock %}
-	$AUTH_COOKIE_PATH = {{url_for('mmctlui.index')|tojson|safe}};
 </script>
 
 {% endblock %}