Move static files to standard location: static/sentry

Torkn · Aug 8, 2011 · bb0fd8f · bb0fd8f
1 parent 533af9e
commit bb0fd8f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/sentry/templates/sentry/layout.html b/sentry/templates/sentry/layout.html
@@ -7,18 +7,18 @@
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
         <meta name="robots" content="NONE,NOARCHIVE">
         <link href="//fonts.googleapis.com/css?family=Yanone+Kaffeesatz:light,regular&amp;subset=latin" rel="stylesheet" type="text/css">
-        <link href="{% url sentry-media "styles/global.css" %}" rel="stylesheet" type="text/css"/>
-        <link href="{% url sentry-media "images/sentry.png" %}" rel="shortcut icon"/>
+        <link href="{{ STATIC_URL }}sentry/styles/global.css" rel="stylesheet" type="text/css"/>
+        <link href="{{ STATIC_URL }}sentry/images/sentry.png" rel="shortcut icon"/>
         <title>{% block title %}Sentry{% endblock %}</title>
-        <script type="text/javascript" src="{% url sentry-media "scripts/jquery.js" %}"></script>
-        <script type="text/javascript" src="{% url sentry-media "scripts/jquery.animate-colors-min.js" %}"></script>
-        <script type="text/javascript" src="{% url sentry-media "scripts/highcharts.js" %}" ></script>
-        <script type="text/javascript" src="{% url sentry-media "scripts/global.js" %}"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}sentry/scripts/jquery.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}sentry/scripts/jquery.animate-colors-min.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}sentry/scripts/highcharts.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}sentry/scripts/global.js"></script>
         <script type="text/javascript">
         Sentry.config({
-            mediaUrl: '{% url sentry-media '' %}',
+            mediaUrl: '{{ STATIC_URL }}sentry/',
             apiUrl: '{% url sentry-ajax %}',
-            defaultImage: '{% url sentry-media 'images/sentry.png' %}'
+            defaultImage: '{{ STATIC_URL }}sentry/images/sentry.png'
         });
         {% if has_realtime %}
         Sentry.realtime.enable();
@@ -30,7 +30,7 @@
         {% block body %}
         <div id="header">
             <div class="container">
-                <h1><a href="{% url sentry %}"><img src="{% url sentry-media "images/sentry.png" %}" border="0" width="32"/>Sentry</a></h1>
+                <h1><a href="{% url sentry %}"><img src="{{ STATIC_URL }}sentry/images/sentry.png" border="0" width="32"/>Sentry</a></h1>
                 <h2>{% block heading %}{% trans "Dashboard" %}{% endblock %}</h2>
                 {% block search %}
                     <form id="search" method="GET" action="{% url sentry-search %}">

diff --git a/sentry/templates/sentry/partial/_notification.html b/sentry/templates/sentry/partial/_notification.html
@@ -3,7 +3,7 @@
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
         <meta name="robots" content="NONE,NOARCHIVE">
-        <link href="{% url sentry-media "images/sentry.png" %}" rel="shortcut icon"/>
+        <link href="{{ STATIC_URL }}sentry/images/sentry.png" rel="shortcut icon"/>
         <style type="text/css">
         html * { padding:0; margin:0; }
         body * * { padding:0; }

diff --git a/sentry/web/urls.py b/sentry/web/urls.py
@@ -24,8 +24,6 @@ def handler500(request):
     return HttpResponseServerError(t.render(Context(context)))
 
 urlpatterns = patterns('',
-    url(r'^_static/(?P<path>.*)$', views.static_media, name='sentry-media'),
-
     # Feeds
 
     url(r'^feeds/%s/messages.xml$' % re.escape(KEY), feeds.MessageFeed(), name='sentry-feed-messages'),