Skip to content

Commit

Permalink
Merge pull request #27 from ekonstantinidis/fix-collect-static
Browse files Browse the repository at this point in the history
Move static files inside "rest_framework_docs" dir, include all type of files within static
  • Loading branch information
ekonstantinidis committed Dec 20, 2015
2 parents 815804b + 79743ff commit bff8d4f
Show file tree
Hide file tree
Showing 19 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -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 *.*
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rest_framework_docs/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.0.2'
__version__ = '0.0.3'
8 changes: 4 additions & 4 deletions rest_framework_docs/static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion rest_framework_docs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit bff8d4f

Please sign in to comment.