move static resources to share/jupyterhub

from share/jupyter/hub

to be consistent with use of etc/jupyterhub etc.

MANIFEST.in

@@ -18,15 +18,15 @@ graft docs
 prune docs/node_modules
 
 # prune some large unused files from components
-prune share/jupyter/hub/static/components/bootstrap/dist/css
+prune share/jupyterhub/static/components/bootstrap/dist/css
-exclude share/jupyter/hub/static/components/bootstrap/dist/fonts/*.svg
+exclude share/jupyterhub/static/components/bootstrap/dist/fonts/*.svg
-prune share/jupyter/hub/static/components/font-awesome/css
+prune share/jupyterhub/static/components/font-awesome/css
-prune share/jupyter/hub/static/components/font-awesome/scss
+prune share/jupyterhub/static/components/font-awesome/scss
-exclude share/jupyter/hub/static/components/font-awesome/fonts/*.svg
+exclude share/jupyterhub/static/components/font-awesome/fonts/*.svg
-prune share/jupyter/hub/static/components/jquery/external
+prune share/jupyterhub/static/components/jquery/external
-prune share/jupyter/hub/static/components/jquery/src
+prune share/jupyterhub/static/components/jquery/src
-prune share/jupyter/hub/static/components/moment/lang
+prune share/jupyterhub/static/components/moment/lang
-prune share/jupyter/hub/static/components/moment/min
+prune share/jupyterhub/static/components/moment/min
 
 # Patterns to exclude from any directory
 global-exclude *~

jupyterhub/_data.py

@@ -2,7 +2,7 @@
 
 
 def get_data_files():
-    """Walk up until we find share/jupyter/hub"""
+    """Walk up until we find share/jupyterhub"""
     import sys
     from os.path import join, abspath, dirname, exists, split
     path = abspath(dirname(__file__))
@@ -12,10 +12,10 @@ def get_data_files():
     for path in starting_points:
         # walk up, looking for prefix/share/jupyter
         while path != '/':
-            share_jupyter = join(path, 'share', 'jupyter', 'hub')
+            share_jupyterhub = join(path, 'share', 'jupyterhub')
-            static = join(share_jupyter, 'static')
+            static = join(share_jupyterhub, 'static')
             if all(exists(join(static, f)) for f in ['components', 'css']):
-                return share_jupyter
+                return share_jupyterhub
             path, _ = split(path)
     # didn't find it, give up
     return ''

jupyterhub/app.py

@@ -263,7 +263,7 @@ class JupyterHub(Application):
     ).tag(config=True)
 
     data_files_path = Unicode(DATA_FILES_PATH,
-        help="The location of jupyterhub data files (e.g. /usr/local/share/jupyter/hub)"
+        help="The location of jupyterhub data files (e.g. /usr/local/share/jupyterhub)"
     ).tag(config=True)
 
     template_paths = List(

setup.py

@@ -38,7 +38,7 @@ from setuptools.command.bdist_egg import bdist_egg
 pjoin = os.path.join
 
 here = os.path.abspath(os.path.dirname(__file__))
-share_jupyter = pjoin(here, 'share', 'jupyter', 'hub')
+share_jupyterhub = pjoin(here, 'share', 'jupyterhub')
 static = pjoin(share_jupyter, 'static')
 
 is_repo = os.path.exists(pjoin(here, '.git'))
@@ -53,7 +53,7 @@ def get_data_files():
     data_files = []
     ntrim = len(here + os.path.sep)
 
-    for (d, dirs, filenames) in os.walk(share_jupyter):
+    for (d, dirs, filenames) in os.walk(share_jupyterhub):
         data_files.append((
             d[ntrim:],
             [ pjoin(d, f) for f in filenames ]

share/jupyterhub/static/less/error.less

@@ -18,4 +18,3 @@ div.error > p {
   font-size: 200%;
   line-height: normal;
 }
-

share/jupyterhub/static/less/login.less

@@ -57,4 +57,3 @@
         border-radius: 0 0 @border-radius-large @border-radius-large;
     }
 }
-

share/jupyterhub/static/less/page.less

@@ -12,4 +12,3 @@
 .hidden {
   display: none;
 }
-

share/jupyterhub/templates/404.html

@@ -3,4 +3,3 @@
 {% block error_detail %}
 <p>Jupyter has lots of moons, but this is not one...</p>
 {% endblock %}
-

share/jupyterhub/templates/logout.html

@@ -6,4 +6,3 @@
   </p>
 </div>
 {% endblock %}
-

share/jupyterhub/templates/spawn.html

@@ -21,4 +21,3 @@
 </div>
 
 {% endblock %}
-