Skip to content

Commit bff8d4f

Browse files
ekonstantinidisekonstantinidis
committed
Merge pull request #27 from ekonstantinidis/fix-collect-static
Move static files inside "rest_framework_docs" dir, include all type of files within static
2 parents 815804b + 79743ff commit bff8d4f

19 files changed

+9
-9
lines changed

‎MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include README.md
22
include LICENSE
33

4-
recursive-include rest_framework_docs/static *.js *.css *.less *.png *.eot *.svg *.ttf *.woff
4+
recursive-include rest_framework_docs/static *
55
recursive-include rest_framework_docs/templates *.html
66

77
recursive-exclude rest_framework_docs/static/node_modules *.*

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ First of all thanks to the [Django](http://www.djangoproject.com/) core team and
6868
[travis-image]: https://travis-ci.org/ekonstantinidis/django-rest-framework-docs.svg?branch=master
6969
[travis-url]: https://travis-ci.org/ekonstantinidis/django-rest-framework-docs
7070

71-
[pypi-image]: https://img.shields.io/pypi/v/drfdocs.svg
71+
[pypi-image]: https://badge.fury.io/py/drfdocs.svg
7272
[pypi-url]: https://pypi.python.org/pypi/drfdocs/
7373

7474
[codecov-image]: https://codecov.io/github/ekonstantinidis/django-rest-framework-docs/coverage.svg?branch=master

‎rest_framework_docs/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.0.2'
1+
__version__ = '0.0.3'

‎rest_framework_docs/static/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"description": "Document Web APIs made with Django Rest Framework",
55
"main": "index.js",
66
"scripts": {
7-
"build-font-awesome": "cp -r node_modules/font-awesome/fonts .",
8-
"build-bootstrap-fonts": "cp -r node_modules/bootstrap/fonts .",
9-
"build-less": "lessc --clean-css less/style.less css/style.css",
10-
"watch-less": "watch 'npm run build-less' less/",
7+
"build-font-awesome": "cp -r node_modules/font-awesome/fonts rest_framework_docs/",
8+
"build-bootstrap-fonts": "cp -r node_modules/bootstrap/fonts rest_framework_docs/",
9+
"build-less": "lessc --clean-css rest_framework_docs/less/style.less rest_framework_docs/css/style.css",
10+
"watch-less": "watch 'npm run build-less' rest_framework_docs/less/",
1111
"build": "npm run build-font-awesome && npm run build-bootstrap-fonts && npm run build-less",
1212
"start": "npm run build && npm run watch-less",
1313
"test": "echo \"Error: no test specified\" && exit 1"

‎rest_framework_docs/static/css/style.css renamed to ‎rest_framework_docs/static/rest_framework_docs/css/style.css

File renamed without changes.

‎rest_framework_docs/static/fonts/FontAwesome.otf renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/FontAwesome.otf

File renamed without changes.

‎rest_framework_docs/static/fonts/fontawesome-webfont.eot renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/fontawesome-webfont.eot

File renamed without changes.

‎rest_framework_docs/static/fonts/fontawesome-webfont.svg renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/fontawesome-webfont.svg

File renamed without changes.

‎rest_framework_docs/static/fonts/fontawesome-webfont.ttf renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/fontawesome-webfont.ttf

File renamed without changes.

‎rest_framework_docs/static/fonts/fontawesome-webfont.woff renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/fontawesome-webfont.woff

File renamed without changes.

‎rest_framework_docs/static/fonts/fontawesome-webfont.woff2 renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/fontawesome-webfont.woff2

File renamed without changes.

‎rest_framework_docs/static/fonts/glyphicons-halflings-regular.eot renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/glyphicons-halflings-regular.eot

File renamed without changes.

‎rest_framework_docs/static/fonts/glyphicons-halflings-regular.svg renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/glyphicons-halflings-regular.svg

File renamed without changes.

‎rest_framework_docs/static/fonts/glyphicons-halflings-regular.ttf renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/glyphicons-halflings-regular.ttf

File renamed without changes.

‎rest_framework_docs/static/fonts/glyphicons-halflings-regular.woff renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/glyphicons-halflings-regular.woff

File renamed without changes.

‎rest_framework_docs/static/fonts/glyphicons-halflings-regular.woff2 renamed to ‎rest_framework_docs/static/rest_framework_docs/fonts/glyphicons-halflings-regular.woff2

File renamed without changes.

‎rest_framework_docs/static/less/style.less renamed to ‎rest_framework_docs/static/rest_framework_docs/less/style.less

File renamed without changes.

‎rest_framework_docs/templates/rest_framework_docs/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<title>{% block title %}DRF Docs{% endblock %}</title>
1111

1212
<!-- Custom Style -->
13-
<link rel="stylesheet" href="{% static "css/style.css" %}">
13+
<link rel="stylesheet" href="{% static "rest_framework_docs/css/style.css" %}">
1414
</head>
1515

1616
<body>

‎rest_framework_docs/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class DRFDocsView(TemplateView):
1111
def get_context_data(self, **kwargs):
1212
settings = DRFSettings().settings
1313
if settings["HIDDEN"]:
14-
raise Http404("Django Rest Framework Docs are hidden. Check you settings.")
14+
raise Http404("Django Rest Framework Docs are hidden. Check your settings.")
1515

1616
context = super(DRFDocsView, self).get_context_data(**kwargs)
1717
docs = ApiDocumentation()

0 commit comments

Comments
 (0)