Merge lp:~octplane/graphite/url_management into lp:~graphite-dev/graphite/main

[Pierre Baillet]

. Support any title in graph names ( Fix for #784414 )
. Fix Auto select url when opening share window in dashboard ( Fix for #893159 )
. Add dashboard name to # in url when editing a dashboard. Load matching dashboard upon first load (fix for #893160)
. Display render url and graph name in at top of contextual menu

[lp:~octplane/graphite/url_management]

608. By Pierre Baillet <email address hidden> on 2011-11-22

Handle SCRIPT URL ( #893618 ). Fist Pass.

609. By Pierre Baillet <email address hidden> on 2011-11-22

Oups.

610. By Pierre Baillet <email address hidden> on 2011-12-02

Added SLASH knowledge in graphlot urls

611. By Pierre Baillet <email address hidden> on 2011-12-02

Autocomplete is case sensitive to allow selection metrics with different case without breaking the cache.
(findmetric is case sensitive)

Fix the autocomplete in the graphlot interface.

[chrismd (chrismd)]

Hi Pierre, thanks for all these patches. I have merged in revs 603-607 and 610-611. I omitted the 608-609 revs because this is a very risky change that I'd like to make sure has been thoroughly tested before merging. I say that it is risky because it is a lot of little changes all over the place, even though they are relatively simple changes there is a big opportunity for introducing lots of bugs unless each affected code path is tested in both the root url context and in a non-root url context.

If you do give it thorough testing and would be willing to help fix reported bugs once its released I would be happy to merge it in. The only reason there is a higher hurdle for this change than other changes is because it's been attempted previously a couple times and has had to be rolled back twice because of bugs.

Thanks again for all the awesome contributions.

review: Approve

[Pierre Baillet (octplane)]

Hello Chris,

I'm mostly ok to support the non / configurable option for Graphite,
I'm using it this way in two differents environments right now and I
can say I use the patch I've submitted. Last week, I also added the
support for events and into the Graphlot interface. As the cli is
supposed to be deprecated, I haven't touched it (and also because I
ignore how to use it). And there are probably other parts of the web
application I'm unaware of. As I've started modifiying the Javascript,
I think I can fix most bug that would be reported to me for this
feature.

Re the philosophical issue of supporting - or not - of this
configuration option, I find it sad that Django does support
overriding the SCRIPT_URL only to reveal that Graphite does not adapt
itself to this setting. I have no stronger feelings about that but I
feel it would make graphite a bit more professional. :-)

For as long as I use graphite in my work environment, I will be able
to maintain it quite easily as it's part of my job.

--
Pierre Baillet <email address hidden>

On Mon, Dec 5, 2011 at 08:05, chrismd <email address hidden> wrote:
> Review: Approve
>
> Hi Pierre, thanks for all these patches. I have merged in revs 603-607 and 610-611. I omitted the 608-609 revs because this is a very risky change that I'd like to make sure has been thoroughly tested before merging. I say that it is risky because it is a lot of little changes all over the place, even though they are relatively simple changes there is a big opportunity for introducing lots of bugs unless each affected code path is tested in both the root url context and in a non-root url context.
>
> If you do give it thorough testing and would be willing to help fix reported bugs once its released I would be happy to merge it in. The only reason there is a higher hurdle for this change than other changes is because it's been attempted previously a couple times and has had to be rolled back twice because of bugs.
>
> Thanks again for all the awesome contributions.
> --
> https://code.launchpad.net/~octplane/graphite/url_management/+merge/82998
> You are the owner of lp:~octplane/graphite/url_management.

[lp:~octplane/graphite/url_management]

612. By Pierre Baillet <email address hidden> on 2011-12-05

Merge from main branch

613. By Pierre Baillet <email address hidden> on 2011-12-05

Merge head

Unmerged revisions

613. By Pierre Baillet <email address hidden> on 2011-12-05

Merge head

612. By Pierre Baillet <email address hidden> on 2011-12-05

Merge from main branch

611. By Pierre Baillet <email address hidden> on 2011-12-02

Autocomplete is case sensitive to allow selection metrics with different case without breaking the cache.
(findmetric is case sensitive)

Fix the autocomplete in the graphlot interface.

610. By Pierre Baillet <email address hidden> on 2011-12-02

Added SLASH knowledge in graphlot urls

609. By Pierre Baillet <email address hidden> on 2011-11-22

Oups.

608. By Pierre Baillet <email address hidden> on 2011-11-22

Handle SCRIPT URL ( #893618 ). Fist Pass.

607. By Pierre Baillet <email address hidden> on 2011-11-22

Merge

=== modified file 'webapp/content/css/dashboard.css'
--- webapp/content/css/dashboard.css	2011-07-26 05:16:59 +0000
+++ webapp/content/css/dashboard.css	2011-12-05 13:09:25 +0000
@@ -79,22 +79,22 @@
 
 .x-layout-split-north .x-layout-mini {
   height: 10px;
-  background-image: url(/content/img/mini-top2.gif);
+  background-image: url(../img/mini-top2.gif);
 }
 
 .x-layout-split-south .x-layout-mini {
   height: 10px !important;
-  background-image: url(/content/img/mini-bottom2.gif);
+  background-image: url(../img/mini-bottom2.gif);
 }
 
 .x-layout-split-east .x-layout-mini {
   width: 10px !important;
-  background-image: url(/content/img/mini-right2.gif);
+  background-image: url(../img/mini-right2.gif);
 }
 /*
 .x-layout-split-west .x-layout-mini {
   width: 10px !important;
-  background-image: url(/content/img/mini-left2.gif);
+  background-image: url(../img/mini-left2.gif);
 }
 */
 .x-layout-cmini-north {
@@ -103,22 +103,22 @@
 
 .x-layout-cmini-north .x-layout-mini {
   height: 10px !important;
-  background-image: url(/content/img/mini-bottom2.gif);
+  background-image: url(../img/mini-bottom2.gif);
 }
 
 .x-layout-cmini-south .x-layout-mini {
   height: 10px !important;
-  background-image: url(/content/img/mini-top2.gif);
+  background-image: url(../img/mini-top2.gif);
 }
 /*
 .x-layout-cmini-east .x-layout-mini {
   width: 10px !important;
-  background-image: url(/content/img/mini-left2.gif);
+  background-image: url(../img/mini-left2.gif);
 }
 */
 .x-layout-cmini-west .x-layout-mini {
   width: 10px !important;
-  background-image: url(/content/img/mini-right2.gif);
+  background-image: url(../img/mini-right2.gif);
 }
 
 /* DnD classes */

=== modified file 'webapp/content/js/composer_widgets.js'
--- webapp/content/js/composer_widgets.js	2011-12-05 08:30:48 +0000
+++ webapp/content/js/composer_widgets.js	2011-12-05 13:09:25 +0000
@@ -841,7 +841,7 @@
 
   addWlSelected: function (item, e) {
     Ext.Ajax.request({
-      url: "/whitelist/add",
+      url: "../whitelist/add",
       method: "POST",
       success: function () { Ext.Msg.alert("Result", "Successfully added metrics to whitelist."); },
       failure: function () { Ext.Msg.alert("Result", "Failed to add metrics to whitelist.");   },
@@ -851,7 +851,7 @@
 
   removeWlSelected: function (item, e) {
     Ext.Ajax.request({
-      url: "/whitelist/remove",
+      url: "../whitelist/remove",
       method: "POST",
       success: function () { Ext.Msg.alert("Result", "Successfully removed metrics from whitelist."); },
       failure: function () { Ext.Msg.alert("Result", "Failed to remove metrics from whitelist.");   },

=== modified file 'webapp/content/js/dashboard.js'
--- webapp/content/js/dashboard.js	2011-12-05 06:10:16 +0000
+++ webapp/content/js/dashboard.js	2011-12-05 13:09:25 +0000
@@ -19,7 +19,7 @@
 var NOT_EDITABLE = ['from', 'until', 'width', 'height', 'target', 'uniq'];
 
 var cookieProvider = new Ext.state.CookieProvider({
-  path: "/dashboard"
+  path: "/"
 });
 
 var NAV_BAR_REGION = cookieProvider.get('navbar-region') || 'west';
@@ -68,7 +68,7 @@
 ]);
 
 var contextFieldStore = new Ext.data.JsonStore({
-  url: '/metrics/find/',
+  url: '../metrics/find/',
   root: 'metrics',
   idProperty: 'name',
   fields: ContextFieldValueRecord,
@@ -286,7 +286,7 @@
       }),
       store: new Ext.data.JsonStore({
         method: 'GET',
-        url: '/metrics/find/',
+        url: '../metrics/find/',
         autoLoad: true,
         baseParams: {
           query: '',
@@ -849,7 +849,7 @@
   }
 
   var loader = new Ext.tree.TreeLoader({
-    url: '/metrics/find/',
+    url: '../metrics/find/',
     requestMethod: 'GET',
     listeners: {beforeload: setParams}
   });
@@ -923,7 +923,7 @@
     var record = new GraphRecord({
       target: graphTargetString,
       params: myParams,
-      url: '/render?' + Ext.urlEncode(urlParams)
+      url: '../render?' + Ext.urlEncode(urlParams)
     });
     graphStore.add([record]);
   }
@@ -939,7 +939,7 @@
     if (params.title === undefined && params.target.length == 1) {
       params.title = params.target[0];
     }
-    this.set('url', '/render?' + Ext.urlEncode(params));
+    this.set('url', '../render?' + Ext.urlEncode(params));
     this.set('width', GraphSize.width);
     this.set('height', GraphSize.height);
   });
@@ -1303,7 +1303,7 @@
 function doShare() {
   if (dashboardName == null) {
     Ext.Ajax.request({
-      url: "/dashboard/create-temporary/",
+      url: "../dashboard/create-temporary/",
       method: 'POST',
       params: {
         state: Ext.encode( getState() )
@@ -1478,6 +1478,49 @@
       }
     }
   });
+
+  urlButton = new Ext.Button({
+    icon: SHARE_ICON,
+    text: (record.data.params.title || "Unamed Graph"),
+    width: gridWidth,
+    handler: function(thisButton) {
+      menu.destroy();
+      var win = new Ext.Window({
+        title: "Graph URL",
+        width: 600,
+        height: 125,
+        layout: 'border',
+        modal: true,
+        items: [
+          {
+            xtype: "label",
+            region: 'north',
+            style: "text-align: center;",
+            text: "You can use this URL to graph directly this Graph"
+          }, {
+            xtype: 'textfield',
+            region: 'center',
+            value:  record.data.url,
+            editable: false,
+            style: "text-align: center; font-size: large;",
+            listeners: {
+              focus: function (field) { field.selectText(); }
+            }
+          }
+        ],
+        buttonAlign: 'center',
+        buttons: [
+          {text: "Close", handler: function () { win.close(); } }
+        ]
+      });
+      win.show();
+
+    }
+
+  });
+
+  menuItems.push(urlButton);
+
   menuItems.push(targetGrid);
 
   /* Setup our menus */
@@ -1685,7 +1728,7 @@
   }
 
   Ext.Ajax.request({
-    url: '/metrics/expand/',
+    url: '../metrics/expand/',
     params: {
       groupByExpr: '1',
       leavesOnly: '1',
@@ -1891,7 +1934,7 @@
 
 function sendSaveRequest(name) {
   Ext.Ajax.request({
-    url: "/dashboard/save/" + name,
+    url: "../dashboard/save/" + name,
     method: 'POST',
     params: {
       state: Ext.encode( getState() )
@@ -1908,7 +1951,7 @@
 
 function sendLoadRequest(name) {
   Ext.Ajax.request({
-    url: "/dashboard/load/" + name,
+    url: "../dashboard/load/" + name,
     success: function (response) {
                var result = Ext.decode(response.responseText);
                if (result.error) {
@@ -1990,7 +2033,7 @@
 
 function deleteDashboard(name) {
   Ext.Ajax.request({
-    url: "/dashboard/delete/" + name,
+    url: "../dashboard/delete/" + name,
     success: function (response) {
       var result = Ext.decode(response.responseText);
       if (result.error) {
@@ -2107,7 +2150,7 @@
   var dashboardsList;
   var queryField;
   var dashboardsStore = new Ext.data.JsonStore({
-    url: "/dashboard/find/",
+    url: "../dashboard/find/",
     method: 'GET',
     params: {query: "e"},
     fields: ['name'],

=== modified file 'webapp/graphite/account/views.py'
--- webapp/graphite/account/views.py	2011-07-10 22:35:02 +0000
+++ webapp/graphite/account/views.py	2011-12-05 13:09:25 +0000
@@ -16,6 +16,7 @@
 from django.http import HttpResponseRedirect
 from django.contrib.auth import authenticate, login, logout
 from graphite.util import getProfile
+from django.core.urlresolvers import get_script_prefix
 from graphite.logger import log
 from graphite.account.models import Profile
 
@@ -24,9 +25,9 @@
   username = request.POST.get('username')
   password = request.POST.get('password')
   if request.method == 'GET':
-    nextPage = request.GET.get('nextPage','/')
+    nextPage = request.GET.get('nextPage',get_script_prefix())
   else:
-    nextPage = request.POST.get('nextPage','/')
+    nextPage = request.POST.get('nextPage',get_script_prefix())
   if username and password:
     user = authenticate(username=username,password=password)
     if user is None:
@@ -37,10 +38,10 @@
       login(request,user)
       return HttpResponseRedirect(nextPage)
   else:
-    return render_to_response("login.html",{'nextPage' : nextPage})
+    return render_to_response("login.html",{'nextPage' : nextPage, 'slash': get_script_prefix()})
 
 def logoutView(request):
-  nextPage = request.GET.get('nextPage','/')
+  nextPage = request.GET.get('nextPage',get_script_prefix())
   logout(request)
   return HttpResponseRedirect(nextPage)
 
@@ -55,5 +56,5 @@
   if profile:
     profile.advancedUI = request.POST.get('advancedUI','off') == 'on'
     profile.save()
-  nextPage = request.POST.get('nextPage','/')
+  nextPage = request.POST.get('nextPage',get_script_prefix())
   return HttpResponseRedirect(nextPage)

=== modified file 'webapp/graphite/browser/urls.py'
--- webapp/graphite/browser/urls.py	2011-08-24 07:06:40 +0000
+++ webapp/graphite/browser/urls.py	2011-12-05 13:09:25 +0000
@@ -15,9 +15,9 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('graphite.browser.views',
-  ('^header/?$', 'header'),
-  ('^search/?$', 'search'),
-  ('^mygraph/?$', 'myGraphLookup'),
-  ('^usergraph/?$', 'userGraphLookup'),
-  ('^$', 'browser'),
+  ('header/?$', 'header'),
+  (r'^search/?$', 'search'),
+  (r'^mygraph/?$', 'myGraphLookup'),
+  (r'^usergraph/?$', 'userGraphLookup'),
+  (r'^$', 'browser'),
 )

=== modified file 'webapp/graphite/browser/views.py'
--- webapp/graphite/browser/views.py	2011-12-05 06:12:33 +0000
+++ webapp/graphite/browser/views.py	2011-12-05 13:09:25 +0000
@@ -16,6 +16,7 @@
 from django.shortcuts import render_to_response
 from django.http import HttpResponse
 from django.conf import settings
+from django.core.urlresolvers import get_script_prefix
 from graphite.account.models import Profile
 from graphite.util import getProfile, getProfileByUsername, defaultUser, json
 from graphite.logger import log
@@ -33,6 +34,7 @@
   context['user'] = request.user
   context['profile'] = getProfile(request)
   context['documentation_url'] = settings.DOCUMENTATION_URL
+  context['slash'] = get_script_prefix()
   return render_to_response("browserHeader.html", context)
 
 
@@ -40,7 +42,8 @@
   "View for the top-level frame of the browser UI"
   context = {
     'queryString' : request.GET.urlencode(),
-    'target' : request.GET.get('target')
+    'target' : request.GET.get('target'),
+    'slash' : get_script_prefix()
   }
   if context['queryString']:
     context['queryString'] = context['queryString'].replace('#','%23')

=== modified file 'webapp/graphite/composer/urls.py'
--- webapp/graphite/composer/urls.py	2009-09-11 19:54:50 +0000
+++ webapp/graphite/composer/urls.py	2011-12-05 13:09:25 +0000
@@ -17,5 +17,5 @@
 urlpatterns = patterns('graphite.composer.views',
   ('send_email','send_email'),
   ('mygraph', 'mygraph'),
-  ('', 'composer'),
+  ('^$', 'composer'),
 )

=== modified file 'webapp/graphite/composer/views.py'
--- webapp/graphite/composer/views.py	2010-02-26 16:15:44 +0000
+++ webapp/graphite/composer/views.py	2011-12-05 13:09:25 +0000
@@ -26,6 +26,7 @@
 from graphite.logger import log
 from graphite.account.models import MyGraph
 
+from django.core.urlresolvers import get_script_prefix
 from django.shortcuts import render_to_response
 from django.http import HttpResponse
 from django.conf import settings
@@ -42,6 +43,7 @@
     'searchEnabled' : int( os.access(settings.INDEX_FILE, os.R_OK) ),
     'debug' : settings.DEBUG,
     'jsdebug' : settings.DEBUG,
+    'slash' : get_script_prefix()
   }
   return render_to_response("composer.html",context)
 

=== modified file 'webapp/graphite/dashboard/views.py'
--- webapp/graphite/dashboard/views.py	2011-08-13 08:20:38 +0000
+++ webapp/graphite/dashboard/views.py	2011-12-05 13:09:25 +0000
@@ -7,6 +7,8 @@
 from django.conf import settings
 from graphite.util import json
 from graphite.dashboard.models import Dashboard
+from django.core.urlresolvers import get_script_prefix
+
 
 
 fieldRegex = re.compile(r'<([^>]+)>')
@@ -126,6 +128,7 @@
     'initialError' : initialError,
     'querystring' : json.dumps( dict( request.GET.items() ) ),
     'dashboard_conf_missing' : dashboard_conf_missing,
+    'slash' : get_script_prefix()
   }
 
   if name is not None:

=== modified file 'webapp/graphite/graphlot/views.py'
--- webapp/graphite/graphlot/views.py	2011-12-05 06:43:23 +0000
+++ webapp/graphite/graphlot/views.py	2011-12-05 13:09:25 +0000
@@ -3,6 +3,8 @@
 from django.shortcuts import render_to_response
 from django.http import HttpResponse, Http404, HttpResponseBadRequest
 from django.conf import settings
+from django.core.urlresolvers import get_script_prefix
+
 import simplejson
 
 from graphite.render.views import parseOptions

=== modified file 'webapp/graphite/templates/500.html'
--- webapp/graphite/templates/500.html	2011-09-03 20:57:58 +0000
+++ webapp/graphite/templates/500.html	2011-12-05 13:09:25 +0000
@@ -1,8 +1,7 @@
 <body style="background-color: #666666; color: black;">
 <center>
 <h2 style='font-family: "Arial"'>
-<p>Graphite encountered an unexpected error while handling your request.</p>
-<p>Please contact your site administrator if the problem persists.</p>
+<p>Not found</p>
 </h2>
 <br/>
 <div style="width: 50%; text-align: center; font-family: monospace; background-color: black; font-weight: bold; color: #ff4422;">

=== modified file 'webapp/graphite/templates/browser.html'
--- webapp/graphite/templates/browser.html	2011-07-12 07:37:01 +0000
+++ webapp/graphite/templates/browser.html	2011-12-05 13:09:25 +0000
@@ -21,11 +21,11 @@
         
 
 <frameset rows="80,*" frameborder="1" border="1">
-  <frame src="/browser/header/" name="Header" id='header' scrolling="no" noresize="true" />
+  <frame src="{{slash}}browser/header/" name="Header" id='header' scrolling="no" noresize="true" />
   {% if target %}
-    <frame src="/composer/?showTarget={{target}}&{{queryString}}" name="content" id="composerFrame"/>
+    <frame src="{{slash}}composer/?showTarget={{target}}&{{queryString}}" name="content" id="composerFrame"/>
   {% else %}
-    <frame src="/composer/?{{queryString}}" name="content" id="composerFrame"/>
+    <frame src="{{slash}}composer/?{{queryString}}" name="content" id="composerFrame"/>
   {% endif %}
   </frameset>
 </html>

=== modified file 'webapp/graphite/templates/browserHeader.html'
--- webapp/graphite/templates/browserHeader.html	2011-08-24 07:06:40 +0000
+++ webapp/graphite/templates/browserHeader.html	2011-12-05 13:09:25 +0000
@@ -68,7 +68,7 @@
 
 <body bgcolor="white">
 
-<img  src="/content/img/graphite_short.png" alt="Graphite" style="border: 0px solid" align='top'/>
+<img  src="{{slash}}content/img/graphite_short.png" alt="Graphite" style="border: 0px solid" align='top'/>
 
 <!-- Right side (only works in firefox for some reason) -->
 <!--
@@ -81,10 +81,10 @@
 
  <tr><td style='font-size: smaller;'>
   {% if user.is_authenticated %}
-   Logged in as {{ user.username }}, <a href="/account/logout/" target="_top">logout</a> &nbsp;
-   (<a href="/account/edit/" target="_top">edit profile</a>)
+   Logged in as {{ user.username }}, <a href="{{slash}}account/logout/" target="_top">logout</a> &nbsp;
+   (<a href="{{slash}}account/edit/" target="_top">edit profile</a>)
   {% else %}
-   <a href="/account/login/" target="_top">Login</a>
+   <a href="{{slash}}account/login/" target="_top">Login</a>
   {% endif %}
  </td></tr>
 
@@ -95,10 +95,10 @@
  </td></tr>
 
  <tr><td style='font-size: smaller;'>
-  User Interface: <a href="/dashboard/" target="_top">Dashboard</a> |
-  <a href="/graphlot/" target="_top">flot (experimental)</a> |
-  <a href="/events/" target="_top">events (experimental)</a> |
-  <a href="/cli/" target="_top">Command-Line (deprecated)</a>
+  User Interface: <a href="{{slash}}dashboard/" target="_top">Dashboard</a> |
+  <a href="{{slash}}graphlot/" target="_top">flot (experimental)</a> |
+  <a href="{{slash}}events/" target="_top">events (experimental)</a> |
+  <a href="{{slash}}cli/" target="_top">Command-Line (deprecated)</a>
  </td></tr>
 
 </table>

=== modified file 'webapp/graphite/templates/composer.html'
--- webapp/graphite/templates/composer.html	2011-07-10 22:35:02 +0000
+++ webapp/graphite/templates/composer.html	2011-12-05 13:09:25 +0000
@@ -17,14 +17,14 @@
 <html>
   <head>
     <title>Graphite Composer</title>
-    <link rel="stylesheet" type="text/css" href="/content/js/ext/resources/css/ext-all.css"/>
+    <link rel="stylesheet" type="text/css" href="{{slash}}content/js/ext/resources/css/ext-all.css"/>
 
     {% if jsdebug %}
-    <script type="text/javascript" src="/content/js/ext/adapter/ext/ext-base-debug.js"></script>
-    <script type="text/javascript" src="/content/js/ext/ext-all-debug.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/ext/adapter/ext/ext-base-debug.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/ext/ext-all-debug.js"></script>
     {% else %}
-    <script type="text/javascript" src="/content/js/ext/adapter/ext/ext-base.js"></script>
-    <script type="text/javascript" src="/content/js/ext/ext-all.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/ext/adapter/ext/ext-base.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/ext/ext-all.js"></script>
     {% endif %}
 
     <script type="text/javascript">
@@ -65,10 +65,10 @@
       }
     </script>
 
-    <script type="text/javascript" src="/content/js/browser.js"></script>
-    <script type="text/javascript" src="/content/js/composer_widgets.js"></script>
-    <script type="text/javascript" src="/content/js/composer.js"></script>
-    <script type="text/javascript" src="/content/js/completer.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/browser.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/composer_widgets.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/composer.js"></script>
+    <script type="text/javascript" src="{{slash}content/js/completer.js"></script>
 
     <style type="text/css">
     /* Hack to fix this bug http://extjs.net/forum/showthread.php?s=a570aba1bf2fc67a2287684c5d91c662&t=74230 */
@@ -85,7 +85,7 @@
     </style>
 
     <script type="text/javascript">
-      Ext.BLANK_IMAGE_URL = '/content/js/ext/resources/images/default/s.gif';
+      Ext.BLANK_IMAGE_URL = '{{slash}}content/js/ext/resources/images/default/s.gif';
 
       var Browser;
       var Composer;

=== modified file 'webapp/graphite/templates/dashboard.html'
--- webapp/graphite/templates/dashboard.html	2011-07-26 05:16:59 +0000
+++ webapp/graphite/templates/dashboard.html	2011-12-05 13:09:25 +0000
@@ -1,10 +1,9 @@
 {% autoescape off %}
-
 <html>
   <head>
     <title>Graphite Dashboard</title>
-    <link rel="stylesheet" type="text/css" href="/content/js/ext/resources/css/ext-all.css"/>
-    <link rel="stylesheet" type="text/css" href="/content/css/dashboard.css"/>
+    <link rel="stylesheet" type="text/css" href="{{slash}}content/js/ext/resources/css/ext-all.css"/>
+    <link rel="stylesheet" type="text/css" href="{{slash}}content/css/dashboard.css"/>
 
     <script type="text/javascript">
     var schemes = {{schemes_json|safe}};
@@ -14,13 +13,13 @@
     var FINDER_QUERY_DELAY = 100;
     var NEW_DASHBOARD_REMOVE_GRAPHS = false;
 
-    var RESIZE_ICON   = '/content/js/ext/examples/shared/icons/fam/cog_edit.png';
-    var REMOVE_ICON   = '/content/js/ext/examples/shared/icons/fam/cross.gif';
-    var REFRESH_ICON  = '/content/js/ext/examples/shared/icons/fam/table_refresh.png';
-    var SHARE_ICON    = '/content/js/ext/examples/shared/icons/fam/application_go.png';
-    var CALENDAR_ICON = '/content/js/ext/resources/images/default/shared/calendar.gif';
-    var CLOCK_ICON    = '/content/img/clock_16.png';
-    var HELP_ICON     = '/content/js/ext/examples/shared/icons/fam/information.png';
+    var RESIZE_ICON   = '{{slash}}content/js/ext/examples/shared/icons/fam/cog_edit.png';
+    var REMOVE_ICON   = '{{slash}}content/js/ext/examples/shared/icons/fam/cross.gif';
+    var REFRESH_ICON  = '{{slash}}content/js/ext/examples/shared/icons/fam/table_refresh.png';
+    var SHARE_ICON    = '{{slash}}content/js/ext/examples/shared/icons/fam/application_go.png';
+    var CALENDAR_ICON = '{{slash}}content/js/ext/resources/images/default/shared/calendar.gif';
+    var CLOCK_ICON    = '{{slash}}content/img/clock_16.png';
+    var HELP_ICON     = '{{slash}}content/js/ext/examples/shared/icons/fam/information.png';
 
     {% if initialState %}
     var initialState = {{initialState|safe}};
@@ -40,24 +39,24 @@
     </script>
 
     <!-- Theme overrides -->
-    <link rel="stylesheet" type="text/css" href="/content/css/dashboard-{{theme}}.css"/>
+    <link rel="stylesheet" type="text/css" href="{{slash}}content/css/dashboard-{{theme}}.css"/>
 
     {% if jsdebug %}
-    <script type="text/javascript" src="/content/js/ext/adapter/ext/ext-base-debug.js"></script>
-    <script type="text/javascript" src="/content/js/ext/ext-all-debug.js"></script>
-    <script type="text/javascript" src="/content/js/ext/ux/DataViewTransition.js"></script>
-    <script type="text/javascript" src="/content/js/composer_widgets.js"></script>
-    <script type="text/javascript" src="/content/js/dashboard.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/ext/adapter/ext/ext-base-debug.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/ext/ext-all-debug.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/ext/ux/DataViewTransition.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/composer_widgets.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/dashboard.js"></script>
     {% else %}
-    <script type="text/javascript" src="/content/js/ext/adapter/ext/ext-base.js"></script>
-    <script type="text/javascript" src="/content/js/ext/ext-all.js"></script>
-    <script type="text/javascript" src="/content/js/ext/ux/DataViewTransition.js"></script>
-    <script type="text/javascript" src="/content/js/composer_widgets.js"></script>
-    <script type="text/javascript" src="/content/js/dashboard.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/ext/adapter/ext/ext-base.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/ext/ext-all.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/ext/ux/DataViewTransition.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/composer_widgets.js"></script>
+    <script type="text/javascript" src="{{slash}}content/js/dashboard.js"></script>
     {% endif %}
 
     <script type="text/javascript">
-    Ext.BLANK_IMAGE_URL = '/content/js/ext/resources/images/default/s.gif';
+    Ext.BLANK_IMAGE_URL = '{{slash}}content/js/ext/resources/images/default/s.gif';
     Ext.QuickTips.init();
     Ext.onReady(initDashboard);
     </script> 

=== modified file 'webapp/graphite/templates/event.html'
--- webapp/graphite/templates/event.html	2011-10-03 08:57:37 +0000
+++ webapp/graphite/templates/event.html	2011-12-05 13:09:25 +0000
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>{{event.what}}</title>
-    <link rel="stylesheet" type="text/css" href="/content/css/table.css" />
+    <link rel="stylesheet" type="text/css" href="../content/css/table.css" />
     <style type="text/css">
     body {
         font-family: sans-serif;

=== modified file 'webapp/graphite/templates/login.html'
--- webapp/graphite/templates/login.html	2011-07-10 22:35:02 +0000
+++ webapp/graphite/templates/login.html	2011-12-05 13:09:25 +0000
@@ -28,7 +28,7 @@
 </div>
 {% endif %}
 
-<form method='POST' action='/account/login/'>
+<form method='POST' action='{{slash}}account/login/'>
 {% if nextPage %}
 <input type='hidden' name='nextPage' value='{{nextPage}}'/>
 {% endif %}

=== modified file 'webapp/graphite/urls.py'
--- webapp/graphite/urls.py	2011-09-15 07:54:41 +0000
+++ webapp/graphite/urls.py	2011-12-05 13:09:25 +0000
@@ -25,19 +25,19 @@
   admin_urls = include(admin.site.urls)
 
 urlpatterns = patterns('',
-  ('^admin/', admin_urls),
-  ('^render/?', include('graphite.render.urls')),
-  ('^cli/?', include('graphite.cli.urls')),
-  ('^composer/?', include('graphite.composer.urls')),
-  ('^metrics/?', include('graphite.metrics.urls')),
-  ('^browser/?', include('graphite.browser.urls')),
-  ('^account/?', include('graphite.account.urls')),
-  ('^dashboard/?', include('graphite.dashboard.urls')),
-  ('^whitelist/?', include('graphite.whitelist.urls')),
-  ('^content/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.CONTENT_DIR}),
+  ('content/(?P<path>.*)$', 'django.views.static.serve', {'document_root' : settings.CONTENT_DIR}),
+  ('admin/', admin_urls),
+  ('render/?', include('graphite.render.urls')),
+  ('cli/?', include('graphite.cli.urls')),
+  ('composer/?', include('graphite.composer.urls')),
+  ('metrics/?', include('graphite.metrics.urls')),
+  ('browser/?', include('graphite.browser.urls')),
+  ('account/?', include('graphite.account.urls')),
+  ('dashboard/?', include('graphite.dashboard.urls')),
+  ('whitelist/?', include('graphite.whitelist.urls')),
   ('graphlot/', include('graphite.graphlot.urls')),
-  ('^version/', include('graphite.version.urls')),
-  ('^events/', include('graphite.events.urls')),
+  ('version/', include('graphite.version.urls')),
+  ('events/', include('graphite.events.urls')),
   ('', 'graphite.browser.views.browser'),
 )