Merge pull request #27 from ekonstantinidis/fix-collect-static

Move static files inside "rest_framework_docs" dir, include all type of files within static
manosim · Dec 20, 2015 · bff8d4f · bff8d4f
2 parents 815804b + 79743ff
commit bff8d4f
Show file tree

Hide file tree

Showing 19 changed files with 9 additions and 9 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 include README.md
 include LICENSE
 
-recursive-include rest_framework_docs/static *.js *.css *.less *.png *.eot *.svg *.ttf *.woff
+recursive-include rest_framework_docs/static *
 recursive-include rest_framework_docs/templates *.html
 
 recursive-exclude rest_framework_docs/static/node_modules *.*

diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ First of all thanks to the [Django](http://www.djangoproject.com/) core team and
 [travis-image]: https://travis-ci.org/ekonstantinidis/django-rest-framework-docs.svg?branch=master
 [travis-url]: https://travis-ci.org/ekonstantinidis/django-rest-framework-docs
 
-[pypi-image]: https://img.shields.io/pypi/v/drfdocs.svg
+[pypi-image]: https://badge.fury.io/py/drfdocs.svg
 [pypi-url]: https://pypi.python.org/pypi/drfdocs/
 
 [codecov-image]: https://codecov.io/github/ekonstantinidis/django-rest-framework-docs/coverage.svg?branch=master

diff --git a/rest_framework_docs/__init__.py b/rest_framework_docs/__init__.py
@@ -1 +1 @@
-__version__ = '0.0.2'
+__version__ = '0.0.3'
diff --git a/rest_framework_docs/static/package.json b/rest_framework_docs/static/package.json
@@ -4,10 +4,10 @@
   "description": "Document Web APIs made with Django Rest Framework",
   "main": "index.js",
   "scripts": {
-    "build-font-awesome": "cp -r node_modules/font-awesome/fonts .",
-    "build-bootstrap-fonts": "cp -r node_modules/bootstrap/fonts .",
-    "build-less": "lessc --clean-css less/style.less css/style.css",
-    "watch-less": "watch 'npm run build-less' less/",
+    "build-font-awesome": "cp -r node_modules/font-awesome/fonts rest_framework_docs/",
+    "build-bootstrap-fonts": "cp -r node_modules/bootstrap/fonts rest_framework_docs/",
+    "build-less": "lessc --clean-css rest_framework_docs/less/style.less rest_framework_docs/css/style.css",
+    "watch-less": "watch 'npm run build-less' rest_framework_docs/less/",
     "build": "npm run build-font-awesome && npm run build-bootstrap-fonts && npm run build-less",
     "start": "npm run build && npm run watch-less",
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/rest_framework_docs/static/css/style.css → .../static/rest_framework_docs/css/style.css b/rest_framework_docs/static/css/style.css → .../static/rest_framework_docs/css/style.css
diff --git a/...amework_docs/static/fonts/FontAwesome.otf → ...rest_framework_docs/fonts/FontAwesome.otf b/...amework_docs/static/fonts/FontAwesome.otf → ...rest_framework_docs/fonts/FontAwesome.otf
diff --git a/...docs/static/fonts/fontawesome-webfont.eot → ...mework_docs/fonts/fontawesome-webfont.eot b/...docs/static/fonts/fontawesome-webfont.eot → ...mework_docs/fonts/fontawesome-webfont.eot
diff --git a/...docs/static/fonts/fontawesome-webfont.svg → ...mework_docs/fonts/fontawesome-webfont.svg b/...docs/static/fonts/fontawesome-webfont.svg → ...mework_docs/fonts/fontawesome-webfont.svg
diff --git a/...docs/static/fonts/fontawesome-webfont.ttf → ...mework_docs/fonts/fontawesome-webfont.ttf b/...docs/static/fonts/fontawesome-webfont.ttf → ...mework_docs/fonts/fontawesome-webfont.ttf
diff --git a/...ocs/static/fonts/fontawesome-webfont.woff → ...ework_docs/fonts/fontawesome-webfont.woff b/...ocs/static/fonts/fontawesome-webfont.woff → ...ework_docs/fonts/fontawesome-webfont.woff
diff --git a/...cs/static/fonts/fontawesome-webfont.woff2 → ...work_docs/fonts/fontawesome-webfont.woff2 b/...cs/static/fonts/fontawesome-webfont.woff2 → ...work_docs/fonts/fontawesome-webfont.woff2
diff --git a/...ic/fonts/glyphicons-halflings-regular.eot → ...cs/fonts/glyphicons-halflings-regular.eot b/...ic/fonts/glyphicons-halflings-regular.eot → ...cs/fonts/glyphicons-halflings-regular.eot
diff --git a/...ic/fonts/glyphicons-halflings-regular.svg → ...cs/fonts/glyphicons-halflings-regular.svg b/...ic/fonts/glyphicons-halflings-regular.svg → ...cs/fonts/glyphicons-halflings-regular.svg
diff --git a/...ic/fonts/glyphicons-halflings-regular.ttf → ...cs/fonts/glyphicons-halflings-regular.ttf b/...ic/fonts/glyphicons-halflings-regular.ttf → ...cs/fonts/glyphicons-halflings-regular.ttf
diff --git a/...c/fonts/glyphicons-halflings-regular.woff → ...s/fonts/glyphicons-halflings-regular.woff b/...c/fonts/glyphicons-halflings-regular.woff → ...s/fonts/glyphicons-halflings-regular.woff
diff --git a/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2 b/.../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
diff --git a/rest_framework_docs/static/less/style.less → ...tatic/rest_framework_docs/less/style.less b/rest_framework_docs/static/less/style.less → ...tatic/rest_framework_docs/less/style.less
diff --git a/rest_framework_docs/templates/rest_framework_docs/base.html b/rest_framework_docs/templates/rest_framework_docs/base.html
@@ -10,7 +10,7 @@
     <title>{% block title %}DRF Docs{% endblock %}</title>
 
     <!-- Custom Style -->
-    <link rel="stylesheet" href="{% static "css/style.css" %}">
+    <link rel="stylesheet" href="{% static "rest_framework_docs/css/style.css" %}">
   </head>
 
   <body>

diff --git a/rest_framework_docs/views.py b/rest_framework_docs/views.py
@@ -11,7 +11,7 @@ class DRFDocsView(TemplateView):
     def get_context_data(self, **kwargs):
         settings = DRFSettings().settings
         if settings["HIDDEN"]:
-            raise Http404("Django Rest Framework Docs are hidden. Check you settings.")
+            raise Http404("Django Rest Framework Docs are hidden. Check your settings.")
 
         context = super(DRFDocsView, self).get_context_data(**kwargs)
         docs = ApiDocumentation()