orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:mitsuhiko/flask

Browse source
This commit is contained in:
Armin Ronacher 2013-05-14 11:33:18 +01:00
commit 38eed272f9
3 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -28,3 +28,4 @@ Patches and Suggestions
- Stephane Wirtel - Stephane Wirtel
- Thomas Schranz - Thomas Schranz
- Zhao Xiaohong - Zhao Xiaohong
- Edmond Burnett

4
docs/patterns/jquery.rst
View file

@ -31,11 +31,11 @@ to add a script statement to the bottom of your `<body>` to load jQuery:
url_for('static', filename='jquery.js') }}"></script> url_for('static', filename='jquery.js') }}"></script>
Another method is using Google's `AJAX Libraries API Another method is using Google's `AJAX Libraries API
<http://code.google.com/apis/ajaxlibs/documentation/>`_ to load jQuery: <https://developers.google.com/speed/libraries/devguide>`_ to load jQuery:
.. sourcecode:: html .. sourcecode:: html
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="{{ <script>window.jQuery || document.write('<script src="{{
url_for('static', filename='jquery.js') }}">\x3C/script>')</script> url_for('static', filename='jquery.js') }}">\x3C/script>')</script>

7
examples/flaskr/README
View file

@ -1,4 +1,3 @@
/ Flaskr / / Flaskr /
a minimal blog application a minimal blog application
@ -14,11 +13,7 @@
export an FLASKR_SETTINGS environment variable export an FLASKR_SETTINGS environment variable
pointing to a configuration file. pointing to a configuration file.
2. fire up a python shell and run this: 2. now you can run the flaskr.py file with your
>>> from flaskr import init_db; init_db()
3. now you can run the flaskr.py file with your
python interpreter and the application will python interpreter and the application will
greet you on http://localhost:5000/ greet you on http://localhost:5000/