diff --git a/assets/README b/assets/README index c9be1ff0f0..7df1ad329b 100644 --- a/assets/README +++ b/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/. diff --git a/assets/favicon/generate b/assets/favicon/generate index 26033a81d0..eecf036e0c 100755 --- a/assets/favicon/generate +++ b/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']) diff --git a/assets/presence/dots.svg b/assets/presence/dots.svg index c5a3a0597b..5eaa7a5a72 100644 Binary files a/assets/presence/dots.svg and b/assets/presence/dots.svg differ diff --git a/humbug/settings.py b/humbug/settings.py index 276491526c..c74f9812c7 100644 --- a/humbug/settings.py +++ b/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 diff --git a/humbug/urls.py b/humbug/urls.py index 73655a0f70..322f5d5eaa 100644 --- a/humbug/urls.py +++ b/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.*)$', 'django.views.static.serve', diff --git a/zephyr/static/.gitignore b/static/.gitignore similarity index 100% rename from zephyr/static/.gitignore rename to static/.gitignore diff --git a/zephyr/static/audio/humbug.mp3 b/static/audio/humbug.mp3 similarity index 100% rename from zephyr/static/audio/humbug.mp3 rename to static/audio/humbug.mp3 diff --git a/zephyr/static/audio/humbug.ogg b/static/audio/humbug.ogg similarity index 100% rename from zephyr/static/audio/humbug.ogg rename to static/audio/humbug.ogg diff --git a/zephyr/static/favicon.ico b/static/favicon.ico similarity index 100% rename from zephyr/static/favicon.ico rename to static/favicon.ico diff --git a/zephyr/static/html/404.html b/static/html/404.html similarity index 100% rename from zephyr/static/html/404.html rename to static/html/404.html diff --git a/zephyr/static/html/5xx.html b/static/html/5xx.html similarity index 100% rename from zephyr/static/html/5xx.html rename to static/html/5xx.html diff --git a/zephyr/static/images/api/bot-key.png b/static/images/api/bot-key.png similarity index 100% rename from zephyr/static/images/api/bot-key.png rename to static/images/api/bot-key.png diff --git a/zephyr/static/images/api/create-bot.png b/static/images/api/create-bot.png similarity index 100% rename from zephyr/static/images/api/create-bot.png rename to static/images/api/create-bot.png diff --git a/zephyr/static/images/app-screenshots/humbug-android.png b/static/images/app-screenshots/humbug-android.png similarity index 100% rename from zephyr/static/images/app-screenshots/humbug-android.png rename to static/images/app-screenshots/humbug-android.png diff --git a/zephyr/static/images/app-screenshots/humbug-desktop-mac.png b/static/images/app-screenshots/humbug-desktop-mac.png similarity index 100% rename from zephyr/static/images/app-screenshots/humbug-desktop-mac.png rename to static/images/app-screenshots/humbug-desktop-mac.png diff --git a/zephyr/static/images/app-screenshots/humbug-desktop-windows.png b/static/images/app-screenshots/humbug-desktop-windows.png similarity index 100% rename from zephyr/static/images/app-screenshots/humbug-desktop-windows.png rename to static/images/app-screenshots/humbug-desktop-windows.png diff --git a/zephyr/static/images/app-screenshots/humbug-iphone.png b/static/images/app-screenshots/humbug-iphone.png similarity index 100% rename from zephyr/static/images/app-screenshots/humbug-iphone.png rename to static/images/app-screenshots/humbug-iphone.png diff --git a/zephyr/static/images/backgrounds/header.jpg b/static/images/backgrounds/header.jpg similarity index 100% rename from zephyr/static/images/backgrounds/header.jpg rename to static/images/backgrounds/header.jpg diff --git a/zephyr/static/images/favicon/favicon-1.png b/static/images/favicon/favicon-1.png similarity index 100% rename from zephyr/static/images/favicon/favicon-1.png rename to static/images/favicon/favicon-1.png diff --git a/zephyr/static/images/favicon/favicon-10.png b/static/images/favicon/favicon-10.png similarity index 100% rename from zephyr/static/images/favicon/favicon-10.png rename to static/images/favicon/favicon-10.png diff --git a/zephyr/static/images/favicon/favicon-11.png b/static/images/favicon/favicon-11.png similarity index 100% rename from zephyr/static/images/favicon/favicon-11.png rename to static/images/favicon/favicon-11.png diff --git a/zephyr/static/images/favicon/favicon-12.png b/static/images/favicon/favicon-12.png similarity index 100% rename from zephyr/static/images/favicon/favicon-12.png rename to static/images/favicon/favicon-12.png diff --git a/zephyr/static/images/favicon/favicon-13.png b/static/images/favicon/favicon-13.png similarity index 100% rename from zephyr/static/images/favicon/favicon-13.png rename to static/images/favicon/favicon-13.png diff --git a/zephyr/static/images/favicon/favicon-14.png b/static/images/favicon/favicon-14.png similarity index 100% rename from zephyr/static/images/favicon/favicon-14.png rename to static/images/favicon/favicon-14.png diff --git a/zephyr/static/images/favicon/favicon-15.png b/static/images/favicon/favicon-15.png similarity index 100% rename from zephyr/static/images/favicon/favicon-15.png rename to static/images/favicon/favicon-15.png diff --git a/zephyr/static/images/favicon/favicon-16.png b/static/images/favicon/favicon-16.png similarity index 100% rename from zephyr/static/images/favicon/favicon-16.png rename to static/images/favicon/favicon-16.png diff --git a/zephyr/static/images/favicon/favicon-17.png b/static/images/favicon/favicon-17.png similarity index 100% rename from zephyr/static/images/favicon/favicon-17.png rename to static/images/favicon/favicon-17.png diff --git a/zephyr/static/images/favicon/favicon-18.png b/static/images/favicon/favicon-18.png similarity index 100% rename from zephyr/static/images/favicon/favicon-18.png rename to static/images/favicon/favicon-18.png diff --git a/zephyr/static/images/favicon/favicon-19.png b/static/images/favicon/favicon-19.png similarity index 100% rename from zephyr/static/images/favicon/favicon-19.png rename to static/images/favicon/favicon-19.png diff --git a/zephyr/static/images/favicon/favicon-2.png b/static/images/favicon/favicon-2.png similarity index 100% rename from zephyr/static/images/favicon/favicon-2.png rename to static/images/favicon/favicon-2.png diff --git a/zephyr/static/images/favicon/favicon-20.png b/static/images/favicon/favicon-20.png similarity index 100% rename from zephyr/static/images/favicon/favicon-20.png rename to static/images/favicon/favicon-20.png diff --git a/zephyr/static/images/favicon/favicon-21.png b/static/images/favicon/favicon-21.png similarity index 100% rename from zephyr/static/images/favicon/favicon-21.png rename to static/images/favicon/favicon-21.png diff --git a/zephyr/static/images/favicon/favicon-22.png b/static/images/favicon/favicon-22.png similarity index 100% rename from zephyr/static/images/favicon/favicon-22.png rename to static/images/favicon/favicon-22.png diff --git a/zephyr/static/images/favicon/favicon-23.png b/static/images/favicon/favicon-23.png similarity index 100% rename from zephyr/static/images/favicon/favicon-23.png rename to static/images/favicon/favicon-23.png diff --git a/zephyr/static/images/favicon/favicon-24.png b/static/images/favicon/favicon-24.png similarity index 100% rename from zephyr/static/images/favicon/favicon-24.png rename to static/images/favicon/favicon-24.png diff --git a/zephyr/static/images/favicon/favicon-25.png b/static/images/favicon/favicon-25.png similarity index 100% rename from zephyr/static/images/favicon/favicon-25.png rename to static/images/favicon/favicon-25.png diff --git a/zephyr/static/images/favicon/favicon-26.png b/static/images/favicon/favicon-26.png similarity index 100% rename from zephyr/static/images/favicon/favicon-26.png rename to static/images/favicon/favicon-26.png diff --git a/zephyr/static/images/favicon/favicon-27.png b/static/images/favicon/favicon-27.png similarity index 100% rename from zephyr/static/images/favicon/favicon-27.png rename to static/images/favicon/favicon-27.png diff --git a/zephyr/static/images/favicon/favicon-28.png b/static/images/favicon/favicon-28.png similarity index 100% rename from zephyr/static/images/favicon/favicon-28.png rename to static/images/favicon/favicon-28.png diff --git a/zephyr/static/images/favicon/favicon-29.png b/static/images/favicon/favicon-29.png similarity index 100% rename from zephyr/static/images/favicon/favicon-29.png rename to static/images/favicon/favicon-29.png diff --git a/zephyr/static/images/favicon/favicon-3.png b/static/images/favicon/favicon-3.png similarity index 100% rename from zephyr/static/images/favicon/favicon-3.png rename to static/images/favicon/favicon-3.png diff --git a/zephyr/static/images/favicon/favicon-30.png b/static/images/favicon/favicon-30.png similarity index 100% rename from zephyr/static/images/favicon/favicon-30.png rename to static/images/favicon/favicon-30.png diff --git a/zephyr/static/images/favicon/favicon-31.png b/static/images/favicon/favicon-31.png similarity index 100% rename from zephyr/static/images/favicon/favicon-31.png rename to static/images/favicon/favicon-31.png diff --git a/zephyr/static/images/favicon/favicon-32.png b/static/images/favicon/favicon-32.png similarity index 100% rename from zephyr/static/images/favicon/favicon-32.png rename to static/images/favicon/favicon-32.png diff --git a/zephyr/static/images/favicon/favicon-33.png b/static/images/favicon/favicon-33.png similarity index 100% rename from zephyr/static/images/favicon/favicon-33.png rename to static/images/favicon/favicon-33.png diff --git a/zephyr/static/images/favicon/favicon-34.png b/static/images/favicon/favicon-34.png similarity index 100% rename from zephyr/static/images/favicon/favicon-34.png rename to static/images/favicon/favicon-34.png diff --git a/zephyr/static/images/favicon/favicon-35.png b/static/images/favicon/favicon-35.png similarity index 100% rename from zephyr/static/images/favicon/favicon-35.png rename to static/images/favicon/favicon-35.png diff --git a/zephyr/static/images/favicon/favicon-36.png b/static/images/favicon/favicon-36.png similarity index 100% rename from zephyr/static/images/favicon/favicon-36.png rename to static/images/favicon/favicon-36.png diff --git a/zephyr/static/images/favicon/favicon-37.png b/static/images/favicon/favicon-37.png similarity index 100% rename from zephyr/static/images/favicon/favicon-37.png rename to static/images/favicon/favicon-37.png diff --git a/zephyr/static/images/favicon/favicon-38.png b/static/images/favicon/favicon-38.png similarity index 100% rename from zephyr/static/images/favicon/favicon-38.png rename to static/images/favicon/favicon-38.png diff --git a/zephyr/static/images/favicon/favicon-39.png b/static/images/favicon/favicon-39.png similarity index 100% rename from zephyr/static/images/favicon/favicon-39.png rename to static/images/favicon/favicon-39.png diff --git a/zephyr/static/images/favicon/favicon-4.png b/static/images/favicon/favicon-4.png similarity index 100% rename from zephyr/static/images/favicon/favicon-4.png rename to static/images/favicon/favicon-4.png diff --git a/zephyr/static/images/favicon/favicon-40.png b/static/images/favicon/favicon-40.png similarity index 100% rename from zephyr/static/images/favicon/favicon-40.png rename to static/images/favicon/favicon-40.png diff --git a/zephyr/static/images/favicon/favicon-41.png b/static/images/favicon/favicon-41.png similarity index 100% rename from zephyr/static/images/favicon/favicon-41.png rename to static/images/favicon/favicon-41.png diff --git a/zephyr/static/images/favicon/favicon-42.png b/static/images/favicon/favicon-42.png similarity index 100% rename from zephyr/static/images/favicon/favicon-42.png rename to static/images/favicon/favicon-42.png diff --git a/zephyr/static/images/favicon/favicon-43.png b/static/images/favicon/favicon-43.png similarity index 100% rename from zephyr/static/images/favicon/favicon-43.png rename to static/images/favicon/favicon-43.png diff --git a/zephyr/static/images/favicon/favicon-44.png b/static/images/favicon/favicon-44.png similarity index 100% rename from zephyr/static/images/favicon/favicon-44.png rename to static/images/favicon/favicon-44.png diff --git a/zephyr/static/images/favicon/favicon-45.png b/static/images/favicon/favicon-45.png similarity index 100% rename from zephyr/static/images/favicon/favicon-45.png rename to static/images/favicon/favicon-45.png diff --git a/zephyr/static/images/favicon/favicon-46.png b/static/images/favicon/favicon-46.png similarity index 100% rename from zephyr/static/images/favicon/favicon-46.png rename to static/images/favicon/favicon-46.png diff --git a/zephyr/static/images/favicon/favicon-47.png b/static/images/favicon/favicon-47.png similarity index 100% rename from zephyr/static/images/favicon/favicon-47.png rename to static/images/favicon/favicon-47.png diff --git a/zephyr/static/images/favicon/favicon-48.png b/static/images/favicon/favicon-48.png similarity index 100% rename from zephyr/static/images/favicon/favicon-48.png rename to static/images/favicon/favicon-48.png diff --git a/zephyr/static/images/favicon/favicon-49.png b/static/images/favicon/favicon-49.png similarity index 100% rename from zephyr/static/images/favicon/favicon-49.png rename to static/images/favicon/favicon-49.png diff --git a/zephyr/static/images/favicon/favicon-5.png b/static/images/favicon/favicon-5.png similarity index 100% rename from zephyr/static/images/favicon/favicon-5.png rename to static/images/favicon/favicon-5.png diff --git a/zephyr/static/images/favicon/favicon-50.png b/static/images/favicon/favicon-50.png similarity index 100% rename from zephyr/static/images/favicon/favicon-50.png rename to static/images/favicon/favicon-50.png diff --git a/zephyr/static/images/favicon/favicon-51.png b/static/images/favicon/favicon-51.png similarity index 100% rename from zephyr/static/images/favicon/favicon-51.png rename to static/images/favicon/favicon-51.png diff --git a/zephyr/static/images/favicon/favicon-52.png b/static/images/favicon/favicon-52.png similarity index 100% rename from zephyr/static/images/favicon/favicon-52.png rename to static/images/favicon/favicon-52.png diff --git a/zephyr/static/images/favicon/favicon-53.png b/static/images/favicon/favicon-53.png similarity index 100% rename from zephyr/static/images/favicon/favicon-53.png rename to static/images/favicon/favicon-53.png diff --git a/zephyr/static/images/favicon/favicon-54.png b/static/images/favicon/favicon-54.png similarity index 100% rename from zephyr/static/images/favicon/favicon-54.png rename to static/images/favicon/favicon-54.png diff --git a/zephyr/static/images/favicon/favicon-55.png b/static/images/favicon/favicon-55.png similarity index 100% rename from zephyr/static/images/favicon/favicon-55.png rename to static/images/favicon/favicon-55.png diff --git a/zephyr/static/images/favicon/favicon-56.png b/static/images/favicon/favicon-56.png similarity index 100% rename from zephyr/static/images/favicon/favicon-56.png rename to static/images/favicon/favicon-56.png diff --git a/zephyr/static/images/favicon/favicon-57.png b/static/images/favicon/favicon-57.png similarity index 100% rename from zephyr/static/images/favicon/favicon-57.png rename to static/images/favicon/favicon-57.png diff --git a/zephyr/static/images/favicon/favicon-58.png b/static/images/favicon/favicon-58.png similarity index 100% rename from zephyr/static/images/favicon/favicon-58.png rename to static/images/favicon/favicon-58.png diff --git a/zephyr/static/images/favicon/favicon-59.png b/static/images/favicon/favicon-59.png similarity index 100% rename from zephyr/static/images/favicon/favicon-59.png rename to static/images/favicon/favicon-59.png diff --git a/zephyr/static/images/favicon/favicon-6.png b/static/images/favicon/favicon-6.png similarity index 100% rename from zephyr/static/images/favicon/favicon-6.png rename to static/images/favicon/favicon-6.png diff --git a/zephyr/static/images/favicon/favicon-60.png b/static/images/favicon/favicon-60.png similarity index 100% rename from zephyr/static/images/favicon/favicon-60.png rename to static/images/favicon/favicon-60.png diff --git a/zephyr/static/images/favicon/favicon-61.png b/static/images/favicon/favicon-61.png similarity index 100% rename from zephyr/static/images/favicon/favicon-61.png rename to static/images/favicon/favicon-61.png diff --git a/zephyr/static/images/favicon/favicon-62.png b/static/images/favicon/favicon-62.png similarity index 100% rename from zephyr/static/images/favicon/favicon-62.png rename to static/images/favicon/favicon-62.png diff --git a/zephyr/static/images/favicon/favicon-63.png b/static/images/favicon/favicon-63.png similarity index 100% rename from zephyr/static/images/favicon/favicon-63.png rename to static/images/favicon/favicon-63.png diff --git a/zephyr/static/images/favicon/favicon-64.png b/static/images/favicon/favicon-64.png similarity index 100% rename from zephyr/static/images/favicon/favicon-64.png rename to static/images/favicon/favicon-64.png diff --git a/zephyr/static/images/favicon/favicon-65.png b/static/images/favicon/favicon-65.png similarity index 100% rename from zephyr/static/images/favicon/favicon-65.png rename to static/images/favicon/favicon-65.png diff --git a/zephyr/static/images/favicon/favicon-66.png b/static/images/favicon/favicon-66.png similarity index 100% rename from zephyr/static/images/favicon/favicon-66.png rename to static/images/favicon/favicon-66.png diff --git a/zephyr/static/images/favicon/favicon-67.png b/static/images/favicon/favicon-67.png similarity index 100% rename from zephyr/static/images/favicon/favicon-67.png rename to static/images/favicon/favicon-67.png diff --git a/zephyr/static/images/favicon/favicon-68.png b/static/images/favicon/favicon-68.png similarity index 100% rename from zephyr/static/images/favicon/favicon-68.png rename to static/images/favicon/favicon-68.png diff --git a/zephyr/static/images/favicon/favicon-69.png b/static/images/favicon/favicon-69.png similarity index 100% rename from zephyr/static/images/favicon/favicon-69.png rename to static/images/favicon/favicon-69.png diff --git a/zephyr/static/images/favicon/favicon-7.png b/static/images/favicon/favicon-7.png similarity index 100% rename from zephyr/static/images/favicon/favicon-7.png rename to static/images/favicon/favicon-7.png diff --git a/zephyr/static/images/favicon/favicon-70.png b/static/images/favicon/favicon-70.png similarity index 100% rename from zephyr/static/images/favicon/favicon-70.png rename to static/images/favicon/favicon-70.png diff --git a/zephyr/static/images/favicon/favicon-71.png b/static/images/favicon/favicon-71.png similarity index 100% rename from zephyr/static/images/favicon/favicon-71.png rename to static/images/favicon/favicon-71.png diff --git a/zephyr/static/images/favicon/favicon-72.png b/static/images/favicon/favicon-72.png similarity index 100% rename from zephyr/static/images/favicon/favicon-72.png rename to static/images/favicon/favicon-72.png diff --git a/zephyr/static/images/favicon/favicon-73.png b/static/images/favicon/favicon-73.png similarity index 100% rename from zephyr/static/images/favicon/favicon-73.png rename to static/images/favicon/favicon-73.png diff --git a/zephyr/static/images/favicon/favicon-74.png b/static/images/favicon/favicon-74.png similarity index 100% rename from zephyr/static/images/favicon/favicon-74.png rename to static/images/favicon/favicon-74.png diff --git a/zephyr/static/images/favicon/favicon-75.png b/static/images/favicon/favicon-75.png similarity index 100% rename from zephyr/static/images/favicon/favicon-75.png rename to static/images/favicon/favicon-75.png diff --git a/zephyr/static/images/favicon/favicon-76.png b/static/images/favicon/favicon-76.png similarity index 100% rename from zephyr/static/images/favicon/favicon-76.png rename to static/images/favicon/favicon-76.png diff --git a/zephyr/static/images/favicon/favicon-77.png b/static/images/favicon/favicon-77.png similarity index 100% rename from zephyr/static/images/favicon/favicon-77.png rename to static/images/favicon/favicon-77.png diff --git a/zephyr/static/images/favicon/favicon-78.png b/static/images/favicon/favicon-78.png similarity index 100% rename from zephyr/static/images/favicon/favicon-78.png rename to static/images/favicon/favicon-78.png diff --git a/zephyr/static/images/favicon/favicon-79.png b/static/images/favicon/favicon-79.png similarity index 100% rename from zephyr/static/images/favicon/favicon-79.png rename to static/images/favicon/favicon-79.png diff --git a/zephyr/static/images/favicon/favicon-8.png b/static/images/favicon/favicon-8.png similarity index 100% rename from zephyr/static/images/favicon/favicon-8.png rename to static/images/favicon/favicon-8.png diff --git a/zephyr/static/images/favicon/favicon-80.png b/static/images/favicon/favicon-80.png similarity index 100% rename from zephyr/static/images/favicon/favicon-80.png rename to static/images/favicon/favicon-80.png diff --git a/zephyr/static/images/favicon/favicon-81.png b/static/images/favicon/favicon-81.png similarity index 100% rename from zephyr/static/images/favicon/favicon-81.png rename to static/images/favicon/favicon-81.png diff --git a/zephyr/static/images/favicon/favicon-82.png b/static/images/favicon/favicon-82.png similarity index 100% rename from zephyr/static/images/favicon/favicon-82.png rename to static/images/favicon/favicon-82.png diff --git a/zephyr/static/images/favicon/favicon-83.png b/static/images/favicon/favicon-83.png similarity index 100% rename from zephyr/static/images/favicon/favicon-83.png rename to static/images/favicon/favicon-83.png diff --git a/zephyr/static/images/favicon/favicon-84.png b/static/images/favicon/favicon-84.png similarity index 100% rename from zephyr/static/images/favicon/favicon-84.png rename to static/images/favicon/favicon-84.png diff --git a/zephyr/static/images/favicon/favicon-85.png b/static/images/favicon/favicon-85.png similarity index 100% rename from zephyr/static/images/favicon/favicon-85.png rename to static/images/favicon/favicon-85.png diff --git a/zephyr/static/images/favicon/favicon-86.png b/static/images/favicon/favicon-86.png similarity index 100% rename from zephyr/static/images/favicon/favicon-86.png rename to static/images/favicon/favicon-86.png diff --git a/zephyr/static/images/favicon/favicon-87.png b/static/images/favicon/favicon-87.png similarity index 100% rename from zephyr/static/images/favicon/favicon-87.png rename to static/images/favicon/favicon-87.png diff --git a/zephyr/static/images/favicon/favicon-88.png b/static/images/favicon/favicon-88.png similarity index 100% rename from zephyr/static/images/favicon/favicon-88.png rename to static/images/favicon/favicon-88.png diff --git a/zephyr/static/images/favicon/favicon-89.png b/static/images/favicon/favicon-89.png similarity index 100% rename from zephyr/static/images/favicon/favicon-89.png rename to static/images/favicon/favicon-89.png diff --git a/zephyr/static/images/favicon/favicon-9.png b/static/images/favicon/favicon-9.png similarity index 100% rename from zephyr/static/images/favicon/favicon-9.png rename to static/images/favicon/favicon-9.png diff --git a/zephyr/static/images/favicon/favicon-90.png b/static/images/favicon/favicon-90.png similarity index 100% rename from zephyr/static/images/favicon/favicon-90.png rename to static/images/favicon/favicon-90.png diff --git a/zephyr/static/images/favicon/favicon-91.png b/static/images/favicon/favicon-91.png similarity index 100% rename from zephyr/static/images/favicon/favicon-91.png rename to static/images/favicon/favicon-91.png diff --git a/zephyr/static/images/favicon/favicon-92.png b/static/images/favicon/favicon-92.png similarity index 100% rename from zephyr/static/images/favicon/favicon-92.png rename to static/images/favicon/favicon-92.png diff --git a/zephyr/static/images/favicon/favicon-93.png b/static/images/favicon/favicon-93.png similarity index 100% rename from zephyr/static/images/favicon/favicon-93.png rename to static/images/favicon/favicon-93.png diff --git a/zephyr/static/images/favicon/favicon-94.png b/static/images/favicon/favicon-94.png similarity index 100% rename from zephyr/static/images/favicon/favicon-94.png rename to static/images/favicon/favicon-94.png diff --git a/zephyr/static/images/favicon/favicon-95.png b/static/images/favicon/favicon-95.png similarity index 100% rename from zephyr/static/images/favicon/favicon-95.png rename to static/images/favicon/favicon-95.png diff --git a/zephyr/static/images/favicon/favicon-96.png b/static/images/favicon/favicon-96.png similarity index 100% rename from zephyr/static/images/favicon/favicon-96.png rename to static/images/favicon/favicon-96.png diff --git a/zephyr/static/images/favicon/favicon-97.png b/static/images/favicon/favicon-97.png similarity index 100% rename from zephyr/static/images/favicon/favicon-97.png rename to static/images/favicon/favicon-97.png diff --git a/zephyr/static/images/favicon/favicon-98.png b/static/images/favicon/favicon-98.png similarity index 100% rename from zephyr/static/images/favicon/favicon-98.png rename to static/images/favicon/favicon-98.png diff --git a/zephyr/static/images/favicon/favicon-99.png b/static/images/favicon/favicon-99.png similarity index 100% rename from zephyr/static/images/favicon/favicon-99.png rename to static/images/favicon/favicon-99.png diff --git a/zephyr/static/images/favicon/favicon-infinite.png b/static/images/favicon/favicon-infinite.png similarity index 100% rename from zephyr/static/images/favicon/favicon-infinite.png rename to static/images/favicon/favicon-infinite.png diff --git a/zephyr/static/images/favicon/favicon-pms.png b/static/images/favicon/favicon-pms.png similarity index 100% rename from zephyr/static/images/favicon/favicon-pms.png rename to static/images/favicon/favicon-pms.png diff --git a/zephyr/static/images/favicon/faviconx128.png b/static/images/favicon/faviconx128.png similarity index 100% rename from zephyr/static/images/favicon/faviconx128.png rename to static/images/favicon/faviconx128.png diff --git a/zephyr/static/images/favicon/faviconx16.png b/static/images/favicon/faviconx16.png similarity index 100% rename from zephyr/static/images/favicon/faviconx16.png rename to static/images/favicon/faviconx16.png diff --git a/zephyr/static/images/favicon/faviconx32.png b/static/images/favicon/faviconx32.png similarity index 100% rename from zephyr/static/images/favicon/faviconx32.png rename to static/images/favicon/faviconx32.png diff --git a/zephyr/static/images/favicon/faviconx64.png b/static/images/favicon/faviconx64.png similarity index 100% rename from zephyr/static/images/favicon/faviconx64.png rename to static/images/favicon/faviconx64.png diff --git a/zephyr/static/images/integrations/beanstalk/001.png b/static/images/integrations/beanstalk/001.png similarity index 100% rename from zephyr/static/images/integrations/beanstalk/001.png rename to static/images/integrations/beanstalk/001.png diff --git a/zephyr/static/images/integrations/beanstalk/002.png b/static/images/integrations/beanstalk/002.png similarity index 100% rename from zephyr/static/images/integrations/beanstalk/002.png rename to static/images/integrations/beanstalk/002.png diff --git a/zephyr/static/images/integrations/capistrano/001.png b/static/images/integrations/capistrano/001.png similarity index 100% rename from zephyr/static/images/integrations/capistrano/001.png rename to static/images/integrations/capistrano/001.png diff --git a/zephyr/static/images/integrations/git/001.png b/static/images/integrations/git/001.png similarity index 100% rename from zephyr/static/images/integrations/git/001.png rename to static/images/integrations/git/001.png diff --git a/zephyr/static/images/integrations/github/001.png b/static/images/integrations/github/001.png similarity index 100% rename from zephyr/static/images/integrations/github/001.png rename to static/images/integrations/github/001.png diff --git a/zephyr/static/images/integrations/github/002.png b/static/images/integrations/github/002.png similarity index 100% rename from zephyr/static/images/integrations/github/002.png rename to static/images/integrations/github/002.png diff --git a/zephyr/static/images/integrations/github/003.png b/static/images/integrations/github/003.png similarity index 100% rename from zephyr/static/images/integrations/github/003.png rename to static/images/integrations/github/003.png diff --git a/zephyr/static/images/integrations/github/004.png b/static/images/integrations/github/004.png similarity index 100% rename from zephyr/static/images/integrations/github/004.png rename to static/images/integrations/github/004.png diff --git a/zephyr/static/images/integrations/jenkins/001.png b/static/images/integrations/jenkins/001.png similarity index 100% rename from zephyr/static/images/integrations/jenkins/001.png rename to static/images/integrations/jenkins/001.png diff --git a/zephyr/static/images/integrations/jenkins/002.png b/static/images/integrations/jenkins/002.png similarity index 100% rename from zephyr/static/images/integrations/jenkins/002.png rename to static/images/integrations/jenkins/002.png diff --git a/zephyr/static/images/integrations/jenkins/003.png b/static/images/integrations/jenkins/003.png similarity index 100% rename from zephyr/static/images/integrations/jenkins/003.png rename to static/images/integrations/jenkins/003.png diff --git a/zephyr/static/images/integrations/jenkins/004.png b/static/images/integrations/jenkins/004.png similarity index 100% rename from zephyr/static/images/integrations/jenkins/004.png rename to static/images/integrations/jenkins/004.png diff --git a/zephyr/static/images/integrations/jenkins/005.png b/static/images/integrations/jenkins/005.png similarity index 100% rename from zephyr/static/images/integrations/jenkins/005.png rename to static/images/integrations/jenkins/005.png diff --git a/zephyr/static/images/integrations/jira/001.png b/static/images/integrations/jira/001.png similarity index 100% rename from zephyr/static/images/integrations/jira/001.png rename to static/images/integrations/jira/001.png diff --git a/zephyr/static/images/integrations/nagios/001.png b/static/images/integrations/nagios/001.png similarity index 100% rename from zephyr/static/images/integrations/nagios/001.png rename to static/images/integrations/nagios/001.png diff --git a/zephyr/static/images/integrations/newrelic/001.png b/static/images/integrations/newrelic/001.png similarity index 100% rename from zephyr/static/images/integrations/newrelic/001.png rename to static/images/integrations/newrelic/001.png diff --git a/zephyr/static/images/integrations/newrelic/002.png b/static/images/integrations/newrelic/002.png similarity index 100% rename from zephyr/static/images/integrations/newrelic/002.png rename to static/images/integrations/newrelic/002.png diff --git a/zephyr/static/images/integrations/pivotal/001.png b/static/images/integrations/pivotal/001.png similarity index 100% rename from zephyr/static/images/integrations/pivotal/001.png rename to static/images/integrations/pivotal/001.png diff --git a/zephyr/static/images/integrations/pivotal/002.png b/static/images/integrations/pivotal/002.png similarity index 100% rename from zephyr/static/images/integrations/pivotal/002.png rename to static/images/integrations/pivotal/002.png diff --git a/zephyr/static/images/integrations/svn/001.png b/static/images/integrations/svn/001.png similarity index 100% rename from zephyr/static/images/integrations/svn/001.png rename to static/images/integrations/svn/001.png diff --git a/zephyr/static/images/integrations/trac/001.png b/static/images/integrations/trac/001.png similarity index 100% rename from zephyr/static/images/integrations/trac/001.png rename to static/images/integrations/trac/001.png diff --git a/zephyr/static/images/integrations/trello/001.png b/static/images/integrations/trello/001.png similarity index 100% rename from zephyr/static/images/integrations/trello/001.png rename to static/images/integrations/trello/001.png diff --git a/zephyr/static/images/landing-page/api.png b/static/images/landing-page/api.png similarity index 100% rename from zephyr/static/images/landing-page/api.png rename to static/images/landing-page/api.png diff --git a/zephyr/static/images/landing-page/app-screenshot.png b/static/images/landing-page/app-screenshot.png similarity index 100% rename from zephyr/static/images/landing-page/app-screenshot.png rename to static/images/landing-page/app-screenshot.png diff --git a/zephyr/static/images/landing-page/efficient.png b/static/images/landing-page/efficient.png similarity index 100% rename from zephyr/static/images/landing-page/efficient.png rename to static/images/landing-page/efficient.png diff --git a/zephyr/static/images/landing-page/file-uploads.png b/static/images/landing-page/file-uploads.png similarity index 100% rename from zephyr/static/images/landing-page/file-uploads.png rename to static/images/landing-page/file-uploads.png diff --git a/zephyr/static/images/landing-page/laptop.png b/static/images/landing-page/laptop.png similarity index 100% rename from zephyr/static/images/landing-page/laptop.png rename to static/images/landing-page/laptop.png diff --git a/zephyr/static/images/landing-page/more.png b/static/images/landing-page/more.png similarity index 100% rename from zephyr/static/images/landing-page/more.png rename to static/images/landing-page/more.png diff --git a/zephyr/static/images/landing-page/one-on-one.png b/static/images/landing-page/one-on-one.png similarity index 100% rename from zephyr/static/images/landing-page/one-on-one.png rename to static/images/landing-page/one-on-one.png diff --git a/zephyr/static/images/landing-page/platforms/android-icon.png b/static/images/landing-page/platforms/android-icon.png similarity index 100% rename from zephyr/static/images/landing-page/platforms/android-icon.png rename to static/images/landing-page/platforms/android-icon.png diff --git a/zephyr/static/images/landing-page/platforms/browser-icon.png b/static/images/landing-page/platforms/browser-icon.png similarity index 100% rename from zephyr/static/images/landing-page/platforms/browser-icon.png rename to static/images/landing-page/platforms/browser-icon.png diff --git a/zephyr/static/images/landing-page/platforms/iOS-icon.png b/static/images/landing-page/platforms/iOS-icon.png similarity index 100% rename from zephyr/static/images/landing-page/platforms/iOS-icon.png rename to static/images/landing-page/platforms/iOS-icon.png diff --git a/zephyr/static/images/landing-page/platforms/linux-icon.png b/static/images/landing-page/platforms/linux-icon.png similarity index 100% rename from zephyr/static/images/landing-page/platforms/linux-icon.png rename to static/images/landing-page/platforms/linux-icon.png diff --git a/zephyr/static/images/landing-page/platforms/mac-icon.png b/static/images/landing-page/platforms/mac-icon.png similarity index 100% rename from zephyr/static/images/landing-page/platforms/mac-icon.png rename to static/images/landing-page/platforms/mac-icon.png diff --git a/zephyr/static/images/landing-page/platforms/windows-icon.png b/static/images/landing-page/platforms/windows-icon.png similarity index 100% rename from zephyr/static/images/landing-page/platforms/windows-icon.png rename to static/images/landing-page/platforms/windows-icon.png diff --git a/zephyr/static/images/landing-page/search.png b/static/images/landing-page/search.png similarity index 100% rename from zephyr/static/images/landing-page/search.png rename to static/images/landing-page/search.png diff --git a/zephyr/static/images/landing-page/signup/canceled-stamp.png b/static/images/landing-page/signup/canceled-stamp.png similarity index 100% rename from zephyr/static/images/landing-page/signup/canceled-stamp.png rename to static/images/landing-page/signup/canceled-stamp.png diff --git a/zephyr/static/images/landing-page/threads.png b/static/images/landing-page/threads.png similarity index 100% rename from zephyr/static/images/landing-page/threads.png rename to static/images/landing-page/threads.png diff --git a/zephyr/static/images/logo/zulip@2x.png b/static/images/logo/zulip@2x.png similarity index 100% rename from zephyr/static/images/logo/zulip@2x.png rename to static/images/logo/zulip@2x.png diff --git a/zephyr/static/images/presence/user-active.png b/static/images/presence/user-active.png similarity index 100% rename from zephyr/static/images/presence/user-active.png rename to static/images/presence/user-active.png diff --git a/zephyr/static/images/presence/user-away.png b/static/images/presence/user-away.png similarity index 100% rename from zephyr/static/images/presence/user-away.png rename to static/images/presence/user-away.png diff --git a/zephyr/static/images/presence/user-idle.png b/static/images/presence/user-idle.png similarity index 100% rename from zephyr/static/images/presence/user-idle.png rename to static/images/presence/user-idle.png diff --git a/zephyr/static/images/streams-example.png b/static/images/streams-example.png similarity index 100% rename from zephyr/static/images/streams-example.png rename to static/images/streams-example.png diff --git a/zephyr/static/js/activity.js b/static/js/activity.js similarity index 100% rename from zephyr/static/js/activity.js rename to static/js/activity.js diff --git a/zephyr/static/js/api.js b/static/js/api.js similarity index 100% rename from zephyr/static/js/api.js rename to static/js/api.js diff --git a/zephyr/static/js/blueslip.js b/static/js/blueslip.js similarity index 100% rename from zephyr/static/js/blueslip.js rename to static/js/blueslip.js diff --git a/zephyr/static/js/colorspace.js b/static/js/colorspace.js similarity index 100% rename from zephyr/static/js/colorspace.js rename to static/js/colorspace.js diff --git a/zephyr/static/js/common.js b/static/js/common.js similarity index 100% rename from zephyr/static/js/common.js rename to static/js/common.js diff --git a/zephyr/static/js/compose.js b/static/js/compose.js similarity index 100% rename from zephyr/static/js/compose.js rename to static/js/compose.js diff --git a/zephyr/static/js/composebox_typeahead.js b/static/js/composebox_typeahead.js similarity index 100% rename from zephyr/static/js/composebox_typeahead.js rename to static/js/composebox_typeahead.js diff --git a/zephyr/static/js/debug.js b/static/js/debug.js similarity index 100% rename from zephyr/static/js/debug.js rename to static/js/debug.js diff --git a/zephyr/static/js/emoji.js b/static/js/emoji.js similarity index 100% rename from zephyr/static/js/emoji.js rename to static/js/emoji.js diff --git a/zephyr/static/js/hashchange.js b/static/js/hashchange.js similarity index 100% rename from zephyr/static/js/hashchange.js rename to static/js/hashchange.js diff --git a/zephyr/static/js/hotkey.js b/static/js/hotkey.js similarity index 100% rename from zephyr/static/js/hotkey.js rename to static/js/hotkey.js diff --git a/zephyr/static/js/initial_invite.js b/static/js/initial_invite.js similarity index 100% rename from zephyr/static/js/initial_invite.js rename to static/js/initial_invite.js diff --git a/zephyr/static/js/invite.js b/static/js/invite.js similarity index 100% rename from zephyr/static/js/invite.js rename to static/js/invite.js diff --git a/zephyr/static/js/landing-page.js b/static/js/landing-page.js similarity index 100% rename from zephyr/static/js/landing-page.js rename to static/js/landing-page.js diff --git a/zephyr/static/js/message_edit.js b/static/js/message_edit.js similarity index 100% rename from zephyr/static/js/message_edit.js rename to static/js/message_edit.js diff --git a/zephyr/static/js/message_list.js b/static/js/message_list.js similarity index 100% rename from zephyr/static/js/message_list.js rename to static/js/message_list.js diff --git a/zephyr/static/js/message_tour.js b/static/js/message_tour.js similarity index 100% rename from zephyr/static/js/message_tour.js rename to static/js/message_tour.js diff --git a/zephyr/static/js/metrics.js b/static/js/metrics.js similarity index 100% rename from zephyr/static/js/metrics.js rename to static/js/metrics.js diff --git a/zephyr/static/js/narrow.js b/static/js/narrow.js similarity index 100% rename from zephyr/static/js/narrow.js rename to static/js/narrow.js diff --git a/zephyr/static/js/navigate.js b/static/js/navigate.js similarity index 100% rename from zephyr/static/js/navigate.js rename to static/js/navigate.js diff --git a/zephyr/static/js/notifications.js b/static/js/notifications.js similarity index 100% rename from zephyr/static/js/notifications.js rename to static/js/notifications.js diff --git a/zephyr/static/js/notifications_bar.js b/static/js/notifications_bar.js similarity index 100% rename from zephyr/static/js/notifications_bar.js rename to static/js/notifications_bar.js diff --git a/zephyr/static/js/onboarding.js b/static/js/onboarding.js similarity index 100% rename from zephyr/static/js/onboarding.js rename to static/js/onboarding.js diff --git a/zephyr/static/js/popovers.js b/static/js/popovers.js similarity index 100% rename from zephyr/static/js/popovers.js rename to static/js/popovers.js diff --git a/zephyr/static/js/reload.js b/static/js/reload.js similarity index 100% rename from zephyr/static/js/reload.js rename to static/js/reload.js diff --git a/zephyr/static/js/rows.js b/static/js/rows.js similarity index 100% rename from zephyr/static/js/rows.js rename to static/js/rows.js diff --git a/zephyr/static/js/search.js b/static/js/search.js similarity index 100% rename from zephyr/static/js/search.js rename to static/js/search.js diff --git a/zephyr/static/js/settings.js b/static/js/settings.js similarity index 100% rename from zephyr/static/js/settings.js rename to static/js/settings.js diff --git a/zephyr/static/js/setup.js b/static/js/setup.js similarity index 100% rename from zephyr/static/js/setup.js rename to static/js/setup.js diff --git a/zephyr/static/js/signup.js b/static/js/signup.js similarity index 100% rename from zephyr/static/js/signup.js rename to static/js/signup.js diff --git a/zephyr/static/js/stream_list.js b/static/js/stream_list.js similarity index 100% rename from zephyr/static/js/stream_list.js rename to static/js/stream_list.js diff --git a/zephyr/static/js/subs.js b/static/js/subs.js similarity index 100% rename from zephyr/static/js/subs.js rename to static/js/subs.js diff --git a/zephyr/static/js/tab_bar.js b/static/js/tab_bar.js similarity index 100% rename from zephyr/static/js/tab_bar.js rename to static/js/tab_bar.js diff --git a/zephyr/static/js/templates.js b/static/js/templates.js similarity index 100% rename from zephyr/static/js/templates.js rename to static/js/templates.js diff --git a/zephyr/static/js/timerender.js b/static/js/timerender.js similarity index 100% rename from zephyr/static/js/timerender.js rename to static/js/timerender.js diff --git a/zephyr/static/js/tutorial.js b/static/js/tutorial.js similarity index 100% rename from zephyr/static/js/tutorial.js rename to static/js/tutorial.js diff --git a/zephyr/static/js/typeahead_helper.js b/static/js/typeahead_helper.js similarity index 100% rename from zephyr/static/js/typeahead_helper.js rename to static/js/typeahead_helper.js diff --git a/zephyr/static/js/ui.js b/static/js/ui.js similarity index 100% rename from zephyr/static/js/ui.js rename to static/js/ui.js diff --git a/zephyr/static/js/unread.js b/static/js/unread.js similarity index 100% rename from zephyr/static/js/unread.js rename to static/js/unread.js diff --git a/zephyr/static/js/util.js b/static/js/util.js similarity index 100% rename from zephyr/static/js/util.js rename to static/js/util.js diff --git a/zephyr/static/js/viewport.js b/static/js/viewport.js similarity index 100% rename from zephyr/static/js/viewport.js rename to static/js/viewport.js diff --git a/zephyr/static/js/zephyr.js b/static/js/zephyr.js similarity index 100% rename from zephyr/static/js/zephyr.js rename to static/js/zephyr.js diff --git a/zephyr/static/robots.txt b/static/robots.txt similarity index 100% rename from zephyr/static/robots.txt rename to static/robots.txt diff --git a/zephyr/static/styles/activity.css b/static/styles/activity.css similarity index 100% rename from zephyr/static/styles/activity.css rename to static/styles/activity.css diff --git a/zephyr/static/styles/fonts.css b/static/styles/fonts.css similarity index 100% rename from zephyr/static/styles/fonts.css rename to static/styles/fonts.css diff --git a/zephyr/static/styles/portico.css b/static/styles/portico.css similarity index 100% rename from zephyr/static/styles/portico.css rename to static/styles/portico.css diff --git a/zephyr/static/styles/pygments.css b/static/styles/pygments.css similarity index 100% rename from zephyr/static/styles/pygments.css rename to static/styles/pygments.css diff --git a/zephyr/static/styles/thirdparty-fonts.css b/static/styles/thirdparty-fonts.css similarity index 100% rename from zephyr/static/styles/thirdparty-fonts.css rename to static/styles/thirdparty-fonts.css diff --git a/zephyr/static/styles/zulip.css b/static/styles/zulip.css similarity index 100% rename from zephyr/static/styles/zulip.css rename to static/styles/zulip.css diff --git a/zephyr/static/templates/.gitignore b/static/templates/.gitignore similarity index 100% rename from zephyr/static/templates/.gitignore rename to static/templates/.gitignore diff --git a/zephyr/static/templates/actions_popover_content.handlebars b/static/templates/actions_popover_content.handlebars similarity index 100% rename from zephyr/static/templates/actions_popover_content.handlebars rename to static/templates/actions_popover_content.handlebars diff --git a/zephyr/static/templates/bankruptcy_modal.handlebars b/static/templates/bankruptcy_modal.handlebars similarity index 100% rename from zephyr/static/templates/bankruptcy_modal.handlebars rename to static/templates/bankruptcy_modal.handlebars diff --git a/zephyr/static/templates/bot_avatar_row.handlebars b/static/templates/bot_avatar_row.handlebars similarity index 100% rename from zephyr/static/templates/bot_avatar_row.handlebars rename to static/templates/bot_avatar_row.handlebars diff --git a/zephyr/static/templates/invite_subscription.handlebars b/static/templates/invite_subscription.handlebars similarity index 100% rename from zephyr/static/templates/invite_subscription.handlebars rename to static/templates/invite_subscription.handlebars diff --git a/zephyr/static/templates/message.handlebars b/static/templates/message.handlebars similarity index 100% rename from zephyr/static/templates/message.handlebars rename to static/templates/message.handlebars diff --git a/zephyr/static/templates/message_edit_form.handlebars b/static/templates/message_edit_form.handlebars similarity index 100% rename from zephyr/static/templates/message_edit_form.handlebars rename to static/templates/message_edit_form.handlebars diff --git a/zephyr/static/templates/message_info_popover_content.handlebars b/static/templates/message_info_popover_content.handlebars similarity index 100% rename from zephyr/static/templates/message_info_popover_content.handlebars rename to static/templates/message_info_popover_content.handlebars diff --git a/zephyr/static/templates/message_info_popover_title.handlebars b/static/templates/message_info_popover_title.handlebars similarity index 100% rename from zephyr/static/templates/message_info_popover_title.handlebars rename to static/templates/message_info_popover_title.handlebars diff --git a/zephyr/static/templates/new_stream_users.handlebars b/static/templates/new_stream_users.handlebars similarity index 100% rename from zephyr/static/templates/new_stream_users.handlebars rename to static/templates/new_stream_users.handlebars diff --git a/zephyr/static/templates/notification.handlebars b/static/templates/notification.handlebars similarity index 100% rename from zephyr/static/templates/notification.handlebars rename to static/templates/notification.handlebars diff --git a/zephyr/static/templates/notification_docs.handlebars b/static/templates/notification_docs.handlebars similarity index 100% rename from zephyr/static/templates/notification_docs.handlebars rename to static/templates/notification_docs.handlebars diff --git a/zephyr/static/templates/sidebar_subject_list.handlebars b/static/templates/sidebar_subject_list.handlebars similarity index 100% rename from zephyr/static/templates/sidebar_subject_list.handlebars rename to static/templates/sidebar_subject_list.handlebars diff --git a/zephyr/static/templates/sticky_app_popover.handlebars b/static/templates/sticky_app_popover.handlebars similarity index 100% rename from zephyr/static/templates/sticky_app_popover.handlebars rename to static/templates/sticky_app_popover.handlebars diff --git a/zephyr/static/templates/stream_sidebar_actions.handlebars b/static/templates/stream_sidebar_actions.handlebars similarity index 100% rename from zephyr/static/templates/stream_sidebar_actions.handlebars rename to static/templates/stream_sidebar_actions.handlebars diff --git a/zephyr/static/templates/stream_sidebar_row.handlebars b/static/templates/stream_sidebar_row.handlebars similarity index 100% rename from zephyr/static/templates/stream_sidebar_row.handlebars rename to static/templates/stream_sidebar_row.handlebars diff --git a/zephyr/static/templates/subscription.handlebars b/static/templates/subscription.handlebars similarity index 100% rename from zephyr/static/templates/subscription.handlebars rename to static/templates/subscription.handlebars diff --git a/zephyr/static/templates/subscription_table_body.handlebars b/static/templates/subscription_table_body.handlebars similarity index 100% rename from zephyr/static/templates/subscription_table_body.handlebars rename to static/templates/subscription_table_body.handlebars diff --git a/zephyr/static/templates/tab_bar.handlebars b/static/templates/tab_bar.handlebars similarity index 100% rename from zephyr/static/templates/tab_bar.handlebars rename to static/templates/tab_bar.handlebars diff --git a/zephyr/static/templates/trailing_bookend.handlebars b/static/templates/trailing_bookend.handlebars similarity index 100% rename from zephyr/static/templates/trailing_bookend.handlebars rename to static/templates/trailing_bookend.handlebars diff --git a/zephyr/static/templates/tutorial_home.handlebars b/static/templates/tutorial_home.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_home.handlebars rename to static/templates/tutorial_home.handlebars diff --git a/zephyr/static/templates/tutorial_message.handlebars b/static/templates/tutorial_message.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_message.handlebars rename to static/templates/tutorial_message.handlebars diff --git a/zephyr/static/templates/tutorial_private.handlebars b/static/templates/tutorial_private.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_private.handlebars rename to static/templates/tutorial_private.handlebars diff --git a/zephyr/static/templates/tutorial_reply.handlebars b/static/templates/tutorial_reply.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_reply.handlebars rename to static/templates/tutorial_reply.handlebars diff --git a/zephyr/static/templates/tutorial_stream.handlebars b/static/templates/tutorial_stream.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_stream.handlebars rename to static/templates/tutorial_stream.handlebars diff --git a/zephyr/static/templates/tutorial_subject.handlebars b/static/templates/tutorial_subject.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_subject.handlebars rename to static/templates/tutorial_subject.handlebars diff --git a/zephyr/static/templates/tutorial_title.handlebars b/static/templates/tutorial_title.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_title.handlebars rename to static/templates/tutorial_title.handlebars diff --git a/zephyr/static/templates/tutorial_welcome.handlebars b/static/templates/tutorial_welcome.handlebars similarity index 100% rename from zephyr/static/templates/tutorial_welcome.handlebars rename to static/templates/tutorial_welcome.handlebars diff --git a/zephyr/static/templates/user_presence_rows.handlebars b/static/templates/user_presence_rows.handlebars similarity index 100% rename from zephyr/static/templates/user_presence_rows.handlebars rename to static/templates/user_presence_rows.handlebars diff --git a/zephyr/static/templates/user_sidebar_actions.handlebars b/static/templates/user_sidebar_actions.handlebars similarity index 100% rename from zephyr/static/templates/user_sidebar_actions.handlebars rename to static/templates/user_sidebar_actions.handlebars diff --git a/zephyr/static/third/bootstrap-notify/css/bootstrap-notify.css b/static/third/bootstrap-notify/css/bootstrap-notify.css similarity index 100% rename from zephyr/static/third/bootstrap-notify/css/bootstrap-notify.css rename to static/third/bootstrap-notify/css/bootstrap-notify.css diff --git a/zephyr/static/third/bootstrap-notify/js/bootstrap-notify.js b/static/third/bootstrap-notify/js/bootstrap-notify.js similarity index 100% rename from zephyr/static/third/bootstrap-notify/js/bootstrap-notify.js rename to static/third/bootstrap-notify/js/bootstrap-notify.js diff --git a/zephyr/static/third/bootstrap/css/bootstrap-responsive.css b/static/third/bootstrap/css/bootstrap-responsive.css similarity index 100% rename from zephyr/static/third/bootstrap/css/bootstrap-responsive.css rename to static/third/bootstrap/css/bootstrap-responsive.css diff --git a/zephyr/static/third/bootstrap/css/bootstrap.css b/static/third/bootstrap/css/bootstrap.css similarity index 100% rename from zephyr/static/third/bootstrap/css/bootstrap.css rename to static/third/bootstrap/css/bootstrap.css diff --git a/zephyr/static/third/bootstrap/img/glyphicons-halflings-white.png b/static/third/bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from zephyr/static/third/bootstrap/img/glyphicons-halflings-white.png rename to static/third/bootstrap/img/glyphicons-halflings-white.png diff --git a/zephyr/static/third/bootstrap/img/glyphicons-halflings.png b/static/third/bootstrap/img/glyphicons-halflings.png similarity index 100% rename from zephyr/static/third/bootstrap/img/glyphicons-halflings.png rename to static/third/bootstrap/img/glyphicons-halflings.png diff --git a/zephyr/static/third/bootstrap/js/bootstrap.js b/static/third/bootstrap/js/bootstrap.js similarity index 100% rename from zephyr/static/third/bootstrap/js/bootstrap.js rename to static/third/bootstrap/js/bootstrap.js diff --git a/zephyr/static/third/fontawesome/FontAwesome.vfb b/static/third/fontawesome/FontAwesome.vfb similarity index 100% rename from zephyr/static/third/fontawesome/FontAwesome.vfb rename to static/third/fontawesome/FontAwesome.vfb diff --git a/zephyr/static/third/fontawesome/fontawesome-webfont.eot b/static/third/fontawesome/fontawesome-webfont.eot similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome-webfont.eot rename to static/third/fontawesome/fontawesome-webfont.eot diff --git a/zephyr/static/third/fontawesome/fontawesome-webfont.svg b/static/third/fontawesome/fontawesome-webfont.svg similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome-webfont.svg rename to static/third/fontawesome/fontawesome-webfont.svg diff --git a/zephyr/static/third/fontawesome/fontawesome-webfont.ttf b/static/third/fontawesome/fontawesome-webfont.ttf similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome-webfont.ttf rename to static/third/fontawesome/fontawesome-webfont.ttf diff --git a/zephyr/static/third/fontawesome/fontawesome-webfont.woff b/static/third/fontawesome/fontawesome-webfont.woff similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome-webfont.woff rename to static/third/fontawesome/fontawesome-webfont.woff diff --git a/zephyr/static/third/fontawesome/fontawesome.otf b/static/third/fontawesome/fontawesome.otf similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome.otf rename to static/third/fontawesome/fontawesome.otf diff --git a/zephyr/static/third/fontawesome/fontawesome2-webfont.eot b/static/third/fontawesome/fontawesome2-webfont.eot similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome2-webfont.eot rename to static/third/fontawesome/fontawesome2-webfont.eot diff --git a/zephyr/static/third/fontawesome/fontawesome2-webfont.svg b/static/third/fontawesome/fontawesome2-webfont.svg similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome2-webfont.svg rename to static/third/fontawesome/fontawesome2-webfont.svg diff --git a/zephyr/static/third/fontawesome/fontawesome2-webfont.ttf b/static/third/fontawesome/fontawesome2-webfont.ttf similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome2-webfont.ttf rename to static/third/fontawesome/fontawesome2-webfont.ttf diff --git a/zephyr/static/third/fontawesome/fontawesome2-webfont.woff b/static/third/fontawesome/fontawesome2-webfont.woff similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome2-webfont.woff rename to static/third/fontawesome/fontawesome2-webfont.woff diff --git a/zephyr/static/third/fontawesome/fontawesome2.otf b/static/third/fontawesome/fontawesome2.otf similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome2.otf rename to static/third/fontawesome/fontawesome2.otf diff --git a/zephyr/static/third/fontawesome/fontawesome3-webfont.eot b/static/third/fontawesome/fontawesome3-webfont.eot similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome3-webfont.eot rename to static/third/fontawesome/fontawesome3-webfont.eot diff --git a/zephyr/static/third/fontawesome/fontawesome3-webfont.svg b/static/third/fontawesome/fontawesome3-webfont.svg similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome3-webfont.svg rename to static/third/fontawesome/fontawesome3-webfont.svg diff --git a/zephyr/static/third/fontawesome/fontawesome3-webfont.ttf b/static/third/fontawesome/fontawesome3-webfont.ttf similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome3-webfont.ttf rename to static/third/fontawesome/fontawesome3-webfont.ttf diff --git a/zephyr/static/third/fontawesome/fontawesome3-webfont.woff b/static/third/fontawesome/fontawesome3-webfont.woff similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome3-webfont.woff rename to static/third/fontawesome/fontawesome3-webfont.woff diff --git a/zephyr/static/third/fontawesome/fontawesome3.otf b/static/third/fontawesome/fontawesome3.otf similarity index 100% rename from zephyr/static/third/fontawesome/fontawesome3.otf rename to static/third/fontawesome/fontawesome3.otf diff --git a/zephyr/static/third/gemoji/images/emoji/zulip.png b/static/third/gemoji/images/emoji/zulip.png similarity index 100% rename from zephyr/static/third/gemoji/images/emoji/zulip.png rename to static/third/gemoji/images/emoji/zulip.png diff --git a/zephyr/static/third/handlebars/handlebars.js b/static/third/handlebars/handlebars.js similarity index 100% rename from zephyr/static/third/handlebars/handlebars.js rename to static/third/handlebars/handlebars.js diff --git a/zephyr/static/third/handlebars/handlebars.runtime.js b/static/third/handlebars/handlebars.runtime.js similarity index 100% rename from zephyr/static/third/handlebars/handlebars.runtime.js rename to static/third/handlebars/handlebars.runtime.js diff --git a/zephyr/static/third/html5-formdata/formdata.js b/static/third/html5-formdata/formdata.js similarity index 100% rename from zephyr/static/third/html5-formdata/formdata.js rename to static/third/html5-formdata/formdata.js diff --git a/zephyr/static/third/jquery-autosize/jquery.autosize.js b/static/third/jquery-autosize/jquery.autosize.js similarity index 100% rename from zephyr/static/third/jquery-autosize/jquery.autosize.js rename to static/third/jquery-autosize/jquery.autosize.js diff --git a/zephyr/static/third/jquery-caret/jquery.caret.1.02.js b/static/third/jquery-caret/jquery.caret.1.02.js similarity index 100% rename from zephyr/static/third/jquery-caret/jquery.caret.1.02.js rename to static/third/jquery-caret/jquery.caret.1.02.js diff --git a/zephyr/static/third/jquery-filedrop/jquery.filedrop.js b/static/third/jquery-filedrop/jquery.filedrop.js similarity index 100% rename from zephyr/static/third/jquery-filedrop/jquery.filedrop.js rename to static/third/jquery-filedrop/jquery.filedrop.js diff --git a/zephyr/static/third/jquery-form/jquery.form.js b/static/third/jquery-form/jquery.form.js similarity index 100% rename from zephyr/static/third/jquery-form/jquery.form.js rename to static/third/jquery-form/jquery.form.js diff --git a/zephyr/static/third/jquery-highlight/jquery.highlight.js b/static/third/jquery-highlight/jquery.highlight.js similarity index 100% rename from zephyr/static/third/jquery-highlight/jquery.highlight.js rename to static/third/jquery-highlight/jquery.highlight.js diff --git a/zephyr/static/third/jquery-idle/jquery.idle.js b/static/third/jquery-idle/jquery.idle.js similarity index 100% rename from zephyr/static/third/jquery-idle/jquery.idle.js rename to static/third/jquery-idle/jquery.idle.js diff --git a/zephyr/static/third/jquery-mousewheel/jquery.mousewheel.js b/static/third/jquery-mousewheel/jquery.mousewheel.js similarity index 100% rename from zephyr/static/third/jquery-mousewheel/jquery.mousewheel.js rename to static/third/jquery-mousewheel/jquery.mousewheel.js diff --git a/zephyr/static/third/jquery-throttle-debounce/jquery.ba-throttle-debounce.js b/static/third/jquery-throttle-debounce/jquery.ba-throttle-debounce.js similarity index 100% rename from zephyr/static/third/jquery-throttle-debounce/jquery.ba-throttle-debounce.js rename to static/third/jquery-throttle-debounce/jquery.ba-throttle-debounce.js diff --git a/zephyr/static/third/jquery-validate/jquery.validate.js b/static/third/jquery-validate/jquery.validate.js similarity index 100% rename from zephyr/static/third/jquery-validate/jquery.validate.js rename to static/third/jquery-validate/jquery.validate.js diff --git a/zephyr/static/third/jquery/jquery-1.7.2.js b/static/third/jquery/jquery-1.7.2.js similarity index 100% rename from zephyr/static/third/jquery/jquery-1.7.2.js rename to static/third/jquery/jquery-1.7.2.js diff --git a/zephyr/static/third/sorttable/sorttable.js b/static/third/sorttable/sorttable.js similarity index 100% rename from zephyr/static/third/sorttable/sorttable.js rename to static/third/sorttable/sorttable.js diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.eot b/static/third/sourcesans/SourceSansPro-Black-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.eot rename to static/third/sourcesans/SourceSansPro-Black-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.svg b/static/third/sourcesans/SourceSansPro-Black-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.svg rename to static/third/sourcesans/SourceSansPro-Black-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.ttf b/static/third/sourcesans/SourceSansPro-Black-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.ttf rename to static/third/sourcesans/SourceSansPro-Black-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.woff b/static/third/sourcesans/SourceSansPro-Black-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Black-webfont.woff rename to static/third/sourcesans/SourceSansPro-Black-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.eot b/static/third/sourcesans/SourceSansPro-BlackIt-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.eot rename to static/third/sourcesans/SourceSansPro-BlackIt-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.svg b/static/third/sourcesans/SourceSansPro-BlackIt-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.svg rename to static/third/sourcesans/SourceSansPro-BlackIt-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.ttf b/static/third/sourcesans/SourceSansPro-BlackIt-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.ttf rename to static/third/sourcesans/SourceSansPro-BlackIt-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.woff b/static/third/sourcesans/SourceSansPro-BlackIt-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BlackIt-webfont.woff rename to static/third/sourcesans/SourceSansPro-BlackIt-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.eot b/static/third/sourcesans/SourceSansPro-Bold-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.eot rename to static/third/sourcesans/SourceSansPro-Bold-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.svg b/static/third/sourcesans/SourceSansPro-Bold-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.svg rename to static/third/sourcesans/SourceSansPro-Bold-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.ttf b/static/third/sourcesans/SourceSansPro-Bold-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.ttf rename to static/third/sourcesans/SourceSansPro-Bold-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.woff b/static/third/sourcesans/SourceSansPro-Bold-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Bold-webfont.woff rename to static/third/sourcesans/SourceSansPro-Bold-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.eot b/static/third/sourcesans/SourceSansPro-BoldIt-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.eot rename to static/third/sourcesans/SourceSansPro-BoldIt-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.svg b/static/third/sourcesans/SourceSansPro-BoldIt-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.svg rename to static/third/sourcesans/SourceSansPro-BoldIt-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.ttf b/static/third/sourcesans/SourceSansPro-BoldIt-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.ttf rename to static/third/sourcesans/SourceSansPro-BoldIt-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.woff b/static/third/sourcesans/SourceSansPro-BoldIt-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-BoldIt-webfont.woff rename to static/third/sourcesans/SourceSansPro-BoldIt-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.eot b/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.eot rename to static/third/sourcesans/SourceSansPro-ExtraLight-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.svg b/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.svg rename to static/third/sourcesans/SourceSansPro-ExtraLight-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.ttf b/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.ttf rename to static/third/sourcesans/SourceSansPro-ExtraLight-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.woff b/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLight-webfont.woff rename to static/third/sourcesans/SourceSansPro-ExtraLight-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.eot b/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.eot rename to static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.svg b/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.svg rename to static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.ttf b/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.ttf rename to static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.woff b/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.woff rename to static/third/sourcesans/SourceSansPro-ExtraLightIt-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-It-webfont.eot b/static/third/sourcesans/SourceSansPro-It-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-It-webfont.eot rename to static/third/sourcesans/SourceSansPro-It-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-It-webfont.svg b/static/third/sourcesans/SourceSansPro-It-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-It-webfont.svg rename to static/third/sourcesans/SourceSansPro-It-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-It-webfont.ttf b/static/third/sourcesans/SourceSansPro-It-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-It-webfont.ttf rename to static/third/sourcesans/SourceSansPro-It-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-It-webfont.woff b/static/third/sourcesans/SourceSansPro-It-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-It-webfont.woff rename to static/third/sourcesans/SourceSansPro-It-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.eot b/static/third/sourcesans/SourceSansPro-Light-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.eot rename to static/third/sourcesans/SourceSansPro-Light-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.svg b/static/third/sourcesans/SourceSansPro-Light-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.svg rename to static/third/sourcesans/SourceSansPro-Light-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.ttf b/static/third/sourcesans/SourceSansPro-Light-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.ttf rename to static/third/sourcesans/SourceSansPro-Light-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.woff b/static/third/sourcesans/SourceSansPro-Light-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Light-webfont.woff rename to static/third/sourcesans/SourceSansPro-Light-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.eot b/static/third/sourcesans/SourceSansPro-LightIt-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.eot rename to static/third/sourcesans/SourceSansPro-LightIt-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.svg b/static/third/sourcesans/SourceSansPro-LightIt-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.svg rename to static/third/sourcesans/SourceSansPro-LightIt-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.ttf b/static/third/sourcesans/SourceSansPro-LightIt-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.ttf rename to static/third/sourcesans/SourceSansPro-LightIt-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.woff b/static/third/sourcesans/SourceSansPro-LightIt-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-LightIt-webfont.woff rename to static/third/sourcesans/SourceSansPro-LightIt-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.eot b/static/third/sourcesans/SourceSansPro-Regular-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.eot rename to static/third/sourcesans/SourceSansPro-Regular-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.svg b/static/third/sourcesans/SourceSansPro-Regular-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.svg rename to static/third/sourcesans/SourceSansPro-Regular-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.ttf b/static/third/sourcesans/SourceSansPro-Regular-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.ttf rename to static/third/sourcesans/SourceSansPro-Regular-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.woff b/static/third/sourcesans/SourceSansPro-Regular-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Regular-webfont.woff rename to static/third/sourcesans/SourceSansPro-Regular-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.eot b/static/third/sourcesans/SourceSansPro-Semibold-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.eot rename to static/third/sourcesans/SourceSansPro-Semibold-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.svg b/static/third/sourcesans/SourceSansPro-Semibold-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.svg rename to static/third/sourcesans/SourceSansPro-Semibold-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.ttf b/static/third/sourcesans/SourceSansPro-Semibold-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.ttf rename to static/third/sourcesans/SourceSansPro-Semibold-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.woff b/static/third/sourcesans/SourceSansPro-Semibold-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-Semibold-webfont.woff rename to static/third/sourcesans/SourceSansPro-Semibold-webfont.woff diff --git a/zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.eot b/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.eot similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.eot rename to static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.eot diff --git a/zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.svg b/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.svg similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.svg rename to static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.svg diff --git a/zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.ttf b/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.ttf similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.ttf rename to static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.ttf diff --git a/zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.woff b/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.woff similarity index 100% rename from zephyr/static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.woff rename to static/third/sourcesans/SourceSansPro-SemiboldIt-webfont.woff diff --git a/zephyr/static/third/spectrum/spectrum.css b/static/third/spectrum/spectrum.css similarity index 100% rename from zephyr/static/third/spectrum/spectrum.css rename to static/third/spectrum/spectrum.css diff --git a/zephyr/static/third/spectrum/spectrum.js b/static/third/spectrum/spectrum.js similarity index 100% rename from zephyr/static/third/spectrum/spectrum.js rename to static/third/spectrum/spectrum.js diff --git a/zephyr/static/third/spin/spin.js b/static/third/spin/spin.js similarity index 100% rename from zephyr/static/third/spin/spin.js rename to static/third/spin/spin.js diff --git a/zephyr/static/third/xdate/xdate.dev.js b/static/third/xdate/xdate.dev.js similarity index 100% rename from zephyr/static/third/xdate/xdate.dev.js rename to static/third/xdate/xdate.dev.js diff --git a/zephyr/static/third/zocial/zocial-regular-webfont.eot b/static/third/zocial/zocial-regular-webfont.eot similarity index 100% rename from zephyr/static/third/zocial/zocial-regular-webfont.eot rename to static/third/zocial/zocial-regular-webfont.eot diff --git a/zephyr/static/third/zocial/zocial-regular-webfont.svg b/static/third/zocial/zocial-regular-webfont.svg similarity index 100% rename from zephyr/static/third/zocial/zocial-regular-webfont.svg rename to static/third/zocial/zocial-regular-webfont.svg diff --git a/zephyr/static/third/zocial/zocial-regular-webfont.ttf b/static/third/zocial/zocial-regular-webfont.ttf similarity index 100% rename from zephyr/static/third/zocial/zocial-regular-webfont.ttf rename to static/third/zocial/zocial-regular-webfont.ttf diff --git a/zephyr/static/third/zocial/zocial-regular-webfont.woff b/static/third/zocial/zocial-regular-webfont.woff similarity index 100% rename from zephyr/static/third/zocial/zocial-regular-webfont.woff rename to static/third/zocial/zocial-regular-webfont.woff diff --git a/zephyr/static/third/zocial/zocial.css b/static/third/zocial/zocial.css similarity index 100% rename from zephyr/static/third/zocial/zocial.css rename to static/third/zocial/zocial.css diff --git a/tools/check-all b/tools/check-all index 77ca076fa5..4556c38138 100755 --- a/tools/check-all +++ b/tools/check-all @@ -22,7 +22,7 @@ os.chdir(path.join(path.dirname(__file__), '..')) # Exclude some directories and files from lint checking exclude_trees = """ -zephyr/static/third +static/third confirmation zephyr/tests/frontend/casperjs zephyr/migrations diff --git a/tools/jslint/check-all.js b/tools/jslint/check-all.js index a3056c05ce..848d3d28b0 100644 --- a/tools/jslint/check-all.js +++ b/tools/jslint/check-all.js @@ -113,7 +113,7 @@ process.argv.forEach(function (filepath) { var messages = []; // We mutate 'options' so be sure to clear everything. - if (filepath.indexOf('zephyr/static/js/') !== -1) { + if (filepath.indexOf('static/js/') !== -1) { // Frontend browser code options.browser = true; options.node = false; diff --git a/tools/minify-js b/tools/minify-js index 5ac3a70335..070480cf5c 100755 --- a/tools/minify-js +++ b/tools/minify-js @@ -24,7 +24,7 @@ from django.conf import settings os.chdir(settings.DEPLOY_ROOT) -STATIC_PATH = 'zephyr/static/' +STATIC_PATH = 'static/' # Compile Handlebars templates subprocess.check_call(['tools/node', 'node_modules/.bin/handlebars'] diff --git a/tools/print-all/print-all b/tools/print-all/print-all index d921bf8316..1d7c391caa 100755 --- a/tools/print-all/print-all +++ b/tools/print-all/print-all @@ -24,7 +24,7 @@ from os import path # (binary files, minified third-party JS). exclude_trees = """ -zephyr/static/third +static/third servers/puppet/modules/common servers/puppet/modules/puppet-common servers/puppet/modules/apt diff --git a/zephyr/finders.py b/zephyr/finders.py index 7e69ec33bc..c47fe11ef1 100644 --- a/zephyr/finders.py +++ b/zephyr/finders.py @@ -1,5 +1,5 @@ import re -from django.contrib.staticfiles.finders import AppDirectoriesFinder +from django.contrib.staticfiles.finders import FileSystemFinder class ExcludeUnminifiedMixin(object): """ Excludes unminified copies of our JavaScript code, templates @@ -20,5 +20,5 @@ class ExcludeUnminifiedMixin(object): if not re.search(excluded, path): yield path, storage -class HumbugFinder(ExcludeUnminifiedMixin, AppDirectoriesFinder): +class HumbugFinder(ExcludeUnminifiedMixin, FileSystemFinder): pass diff --git a/zephyr/lib/bugdown/__init__.py b/zephyr/lib/bugdown/__init__.py index 22c50c45b3..7acef03042 100644 --- a/zephyr/lib/bugdown/__init__.py +++ b/zephyr/lib/bugdown/__init__.py @@ -333,8 +333,8 @@ class Gravatar(markdown.inlinepatterns.Pattern): % (gravatar_hash(match.group('email')),)) return img -path_to_emoji = os.path.join(os.path.dirname(__file__), '..', '..', - # This should be zephyr/ +path_to_emoji = os.path.join(os.path.dirname(__file__), '..', '..', '..', + # This should be the root 'static', 'third', 'gemoji', 'images', 'emoji', '*.png') emoji_list = [os.path.splitext(os.path.basename(fn))[0] for fn in glob.glob(path_to_emoji)] diff --git a/zephyr/tests/frontend/node/test_message_tour.js b/zephyr/tests/frontend/node/test_message_tour.js index fbfb957d65..b0787e3068 100644 --- a/zephyr/tests/frontend/node/test_message_tour.js +++ b/zephyr/tests/frontend/node/test_message_tour.js @@ -3,7 +3,7 @@ // purpose, but, briefly, it provides an API to keep track of // messages that you visit on a "tour." -var message_tour = require('../../../static/js/message_tour.js'); +var message_tour = require('../../../../static/js/message_tour.js'); var assert = require('assert'); (function test_basic_tour() {