Move zephyr/static to just static.

It's not really a part of the server (aka the rest of zephyr/).

(imported from commit 27f6b6b064938ad927075a68d873e4b68710d279)

assets/README

@@ -1,3 +1,3 @@
 This directory contains e.g. the editable originals for image files.
 
-The exported files we serve are checked in under zephyr/static.
+The exported files we serve are checked in under static/.

assets/favicon/generate

@@ -20,5 +20,5 @@ for i in xrange(1,100):
 
     # Convert to PNG
     subprocess.check_call(['inkscape', '--without-gui', '--export-area-page',
-        '--export-png=../../zephyr/static/images/favicon/favicon-%d.png' % (i,),
+        '--export-png=../../static/images/favicon/favicon-%d.png' % (i,),
         'tmp.svg'])

assets/presence/dots.svg

@@ -219,11 +219,11 @@
        transform="matrix(0,0.04182885,-0.03977476,0,7.8218971,1034.3239)"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90"
-       inkscape:export-filename="/home/keegan/work/humbug/git/humbug/zephyr/static/images/presence/user-active.png" />
+       inkscape:export-filename="/home/keegan/work/humbug/git/humbug/static/images/presence/user-active.png" />
     <g
        id="g5762"
        transform="matrix(0.99431261,0,0,0.99685318,0.36497654,3.3956519)"
-       inkscape:export-filename="/home/keegan/work/humbug/git/humbug/zephyr/static/images/presence/user-away.png"
+       inkscape:export-filename="/home/keegan/work/humbug/git/humbug/static/images/presence/user-away.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90">
       <path
@@ -266,7 +266,7 @@
        id="path5701-5"
        style="fill:none;stroke:#505050;stroke-width:19.18614006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        sodipodi:type="arc"
-       inkscape:export-filename="/home/keegan/work/humbug/git/humbug/zephyr/static/images/presence/user-idle.png" />
+       inkscape:export-filename="/home/keegan/work/humbug/git/humbug/static/images/presence/user-idle.png" />
     <text
        xml:space="preserve"
        style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
@@ -281,6 +281,6 @@
          sodipodi:role="line"
          x="-20.234934"
          y="1108.5381"
-         id="tspan3017">in zephyr/static/images/presence</tspan></text>
+         id="tspan3017">in static/images/presence</tspan></text>
   </g>
 </svg>

humbug/settings.py

@@ -245,6 +245,7 @@ else:
     else:
         STATIC_ROOT = 'prod-static/serve'
 
+STATICFILES_DIRS = ['static/']
 STATIC_HEADER_FILE = 'zephyr/static_header.txt'
 
 # To use minified files in dev, set PIPELINE = True.  For the full

humbug/urls.py

@@ -200,7 +200,7 @@ urlpatterns += patterns('',
 if not settings.DEPLOYED:
     use_prod_static = getattr(settings, 'PIPELINE', False)
     static_root = os.path.join(settings.DEPLOY_ROOT,
-        'prod-static/serve' if use_prod_static else 'zephyr/static')
+        'prod-static/serve' if use_prod_static else 'static')
 
     urlpatterns += patterns('',
         url(r'^static/(?P<path>.*)$', 'django.views.static.serve',