Permalink
Browse files

Update for Django Frontend 1.0.0.

  • Loading branch information...
1 parent fc0dc68 commit d370e22af0e0037466f67441fa1d0f361da24d2c @jonfaustman committed Jan 27, 2014
Showing with 269 additions and 1,808 deletions.
  1. +5 −5 README.rst
  2. +5 −5 djfrontend/skeleton/templates/djfrontend/skeleton.html
  3. BIN docs/build/doctrees/changelog.doctree
  4. BIN docs/build/doctrees/environment.pickle
  5. BIN docs/build/doctrees/getting_started.doctree
  6. BIN docs/build/doctrees/index.doctree
  7. BIN docs/build/doctrees/optional_settings.doctree
  8. BIN docs/build/doctrees/road_map.doctree
  9. BIN docs/build/doctrees/template_blocks.doctree
  10. BIN docs/build/doctrees/template_tags.doctree
  11. +1 −1 docs/build/html/.buildinfo
  12. +5 −0 docs/build/html/_sources/changelog.txt
  13. +0 −14 docs/build/html/_sources/getting_started.txt
  14. +42 −4 docs/build/html/_sources/index.txt
  15. +0 −15 docs/build/html/_sources/optional_settings.txt
  16. +0 −6 docs/build/html/_sources/road_map.txt
  17. +0 −67 docs/build/html/_sources/template_blocks.txt
  18. +0 −270 docs/build/html/_sources/template_tags.txt
  19. +57 −49 docs/build/html/changelog.html
  20. +5 −5 docs/build/html/genindex.html
  21. +0 −134 docs/build/html/getting_started.html
  22. +82 −51 docs/build/html/index.html
  23. +10 −10 docs/build/html/license.html
  24. BIN docs/build/html/objects.inv
  25. +0 −135 docs/build/html/optional_settings.html
  26. +0 −116 docs/build/html/road_map.html
  27. +5 −5 docs/build/html/search.html
  28. +1 −1 docs/build/html/searchindex.js
  29. +0 −206 docs/build/html/template_blocks.html
  30. +0 −335 docs/build/html/template_tags.html
  31. +5 −0 docs/source/changelog.rst
  32. +2 −2 docs/source/conf.py
  33. +0 −14 docs/source/getting_started.rst
  34. +42 −4 docs/source/index.rst
  35. +0 −15 docs/source/optional_settings.rst
  36. +0 −67 docs/source/template_blocks.rst
  37. +0 −270 docs/source/template_tags.rst
  38. +2 −2 setup.py
View
@@ -11,14 +11,14 @@ Version 2.0.0 of Django Frontend Skeleton is a much simpler package - it's now j
---------
Starring
---------
-* `HTML5 Boilerplate (based on 4.3.0) <https://github.com/h5bp/html5-boilerplate>`_
-* `Modernizr (2.6.2) <https://github.com/Modernizr/Modernizr>`_
-* `jQuery (1.10.2) and (2.0.3) <https://github.com/jquery/jquery>`_
-* `Twitter Bootstrap (3.0.0) <https://github.com/twbs/bootstrap>`_
+* `HTML5 Boilerplate (based on 4.3.0/master) <https://github.com/h5bp/html5-boilerplate>`_
+* `Modernizr (2.7.1) <https://github.com/Modernizr/Modernizr>`_
+* `jQuery (1.11.0) and (2.1.0) <https://github.com/jquery/jquery>`_
+* `Twitter Bootstrap (3.0.3) <https://github.com/twbs/bootstrap>`_
* `iOS-Orientationchange-Fix <https://github.com/scottjehl/iOS-Orientationchange-Fix>`_
-----------------
More Information
-----------------
-For more information, instructions on how to get started, a changelog and a roadmap `read the documentation <https://django-frontend-skeleton.readthedocs.org/>`_.
+For more information, instructions on how to get started, and a changelog `read the documentation <https://django-frontend-skeleton.readthedocs.org/>`_.
@@ -7,24 +7,24 @@
{% endblock djfrontend_h5bp_css %}
{% block djfrontend_twbs_css %}
- {% djfrontend_twbs_css '3.0.0' %}
- {% djfrontend_twbs_theme_css '3.0.0' %}
+ {% djfrontend_twbs_css %}
+ {% djfrontend_twbs_theme_css %}
{% endblock djfrontend_twbs_css %}
{% endblock head_css %}
{% block head_js %}
- {% djfrontend_modernizr '2.6.2' %}
+ {% djfrontend_modernizr %}
{% endblock head_js %}
{% block body_js %}
{% block djfrontend_jquery %}
- {% djfrontend_jquery '1.10.2' %}
+ {% djfrontend_jquery %}
{% endblock djfrontend_jquery %}
{% block djfrontend_twbs_js %}
- {% djfrontend_twbs_js all %}
+ {% djfrontend_twbs_js %}
{% endblock djfrontend_twbs_js %}
{% block djfrontend_ga %}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: d858a0e7fd5974f9cfd699308b4c087f
+config: ead97396d36f86c0871ea9828299a738
tags: fbb0d17656682115ca4d033fb2f83ba1
@@ -1,6 +1,11 @@
Changelog
==============
+3.0.0
+------
+* Updated requirement to Django Frontend 1.0.0.
+* Cleaned up documentation to reduce duplication.
+
2.0.1
------
* Updated requires to install at least django-frontend 0.3.1.
@@ -1,14 +0,0 @@
-Getting Started
-================
-
-Install
---------
-1. install `django-frontend-skeleton` (pip install, add to your requirements files, etc.)
-2. add `'djfrontend'` and `'djfrontend.skeleton'` to your INSTALLED_APPS
-
-Extend
--------
-Extend the skeleton's base template in your template(s)
-::
-
- {% extends 'djfrontend/skeleton.html' %}
@@ -18,17 +18,55 @@ Starring
* `Twitter Bootstrap (3.0.0) <https://github.com/twbs/bootstrap>`_
* `iOS-Orientationchange-Fix <https://github.com/scottjehl/iOS-Orientationchange-Fix>`_
+Getting Started
+-----------------
+Install
+~~~~~~~~
+1. install `django-frontend-skeleton` (pip install, add to your requirements files, etc.)
+2. add `'djfrontend'` and `'djfrontend.skeleton'` to your INSTALLED_APPS
+3. make sure `'django.contrib.staticfiles'` is also in your INSTALLED_APPS
+
+Extend
+~~~~~~~
+Extend the skeleton's base template in your template(s)
+::
+
+ {% extends 'djfrontend/skeleton.html' %}
+
+Load
+~~~~~~
+Load all the djfrontend tags if you want to add or change the template's defaults.
+::
+
+ {% load djfrontend %}
+
+
+Template Blocks
+----------------
+Template blocks provided by Django Frontend which are fundamental for Django Frontend Skeleton.
+
+djfrontend_h5bp_css
+~~~~~~~~~~~~~~~~~~~~~
+Block to include {% djfrontend_normalize %} and/or {% djfrontend_h5bp_css %}.
+
+djfrontend_twbs_css
+~~~~~~~~~~~~~~~~~~~~~
+Block to override the included Twitter Bootstrap CSS and responsive CSS files.
+
+djfrontend_twbs_js
+~~~~~~~~~~~~~~~~~~~~
+Override the included {% djfrontend_twbs_js %}.
+
+Further Documentation
+----------------------
+For more documenation about Django Frontend `read the documentation <https://django-frontend.readthedocs.org/>`_.
Contents
---------
.. toctree::
:maxdepth: 2
- getting_started
- template_tags
- template_blocks
- optional_settings
license
changelog
@@ -1,15 +0,0 @@
-Optional Settings
-==================
-There are a few optional settings for customization.
-
-DJFRONTEND_STATIC_URL
-----------------------
-Set a dedicated static server or CDN for serving static files.
-
-DJFRONTEND_GA_SETDOMAINNAME
-----------------------------
-Set domain for multiple, or cross-domain tracking with Google Analytics.
-
-DJFRONTEND_GA_SETALLOWLINKER
------------------------------
-To use _setAllowLinker method on target site for cross-domain tracking with Google Analytics. Set to 'True' to enable. Requires H5BP_GA_SETDOMAINNAME to be set.
@@ -1,6 +0,0 @@
-Road Map
-==============
-
-1.*.0
------
-* Use Git submodules for external libraries.
@@ -1,67 +0,0 @@
-Template blocks
-================
-Use the included template blocks to suit your needs
-
-html
------
-Override the HTML doctype, or use in conjunction with {% djfrontend_h5bp_html '' %} to change the HTML lang attribute.
-
-meta
------
-Override or extend meta tags and the title tag.
-
-title
-~~~~~~
-Add your application specific title to the title tag.
-
-meta_description
-~~~~~~~~~~~~~~~~~~
-Add your application specific information to the meta description.
-
-head_css
-----------
-Parent CSS block to override or extend the included CSS files.
-
-djfrontend_h5bp_css
-~~~~~~~~~~~~~~~~~~~~~
-Block to include {% djfrontend_normalize '' %} and/or {% djfrontend_h5bp_css '' %}.
-
-djfrontend_twbs_css
-~~~~~~~~~~~~~~~~~~~~~
-Block to override the included Twitter Bootstrap CSS and responsive CSS files.
-
-head_js
----------
-Override the included {% djfrontend_modernizr '2.6.2' %} or extend with JavaScript files that need to loaded in the head.
-
-body_id
---------
-Add an id to the body if needed.
-
-body_class
-------------
-Add class(es) to the body if needed.
-
-body_content
---------------
-Override the Internet Explorer warning, and/or extend with the main content from your application.
-
-body_js
----------
-Override or extend the included JavaScript files with any file that does not need to be loaded in the head.
-
-djfrontend_jquery
-~~~~~~~~~~~~~~~~~~~
-Override the included {% djfrontend_jquery '1.10.1' %} or use the included {% djfrontend_jquery '2.0.2' %}.
-
-djfrontend_twbs_js
-~~~~~~~~~~~~~~~~~~~~
-Override the included {% djfrontend_twbs_js 'all' %}.
-
-djfrontend_ga
-~~~~~~~~~~~~~~~
-Block to use {% h5bp_ga '' %} to include Google Analytics.
-
-djfrontend_ios_fix
-~~~~~~~~~~~~~~~~~~~~
-Block to use {% djfrontend_ios_fix %} if iOS-Orientationchange-Fix is required. Deprecation warning: this block may be removed in future versions.
Oops, something went wrong. Retry.

0 comments on commit d370e22

Please sign in to comment.