diff --git a/applications/examples/private/content/en/default/documentation/official.markmin b/applications/examples/private/content/en/default/documentation/official.markmin index af686d1e..6c60111a 100644 --- a/applications/examples/private/content/en/default/documentation/official.markmin +++ b/applications/examples/private/content/en/default/documentation/official.markmin @@ -7,3 +7,4 @@ - [[Quick Examples http://www.web2py.com/examples/default/examples]] - [[API http://web2py.com/book/default/chapter/04#API popup]] - [[Sphinx (source code documentation) http://web2py.readthedocs.org/en/latest/ popup]] +- [[Videos https://vimeo.com/album/3016728]] (edited by Nico Zanferrari) \ No newline at end of file diff --git a/applications/examples/static/images/videos.png b/applications/examples/static/images/videos.png index b19e34fc..7654109e 100644 Binary files a/applications/examples/static/images/videos.png and b/applications/examples/static/images/videos.png differ diff --git a/applications/examples/views/default/documentation.html b/applications/examples/views/default/documentation.html index 4c3f86c5..ecb719d3 100644 --- a/applications/examples/views/default/documentation.html +++ b/applications/examples/views/default/documentation.html @@ -1,5 +1,7 @@ {{extend 'layout.html'}} + +
{{=get_content('main')}} diff --git a/applications/examples/views/default/index.html b/applications/examples/views/default/index.html index 28852551..89cb10a8 100644 --- a/applications/examples/views/default/index.html +++ b/applications/examples/views/default/index.html @@ -26,13 +26,13 @@ random.shuffle(quotes) - - + + - - + + diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index abd3c6ad..7a26aaa2 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -89,10 +89,8 @@ def get_databases(request): dbs[key] = value return dbs - databases = get_databases(None) - def eval_in_global_env(text): exec ('_ret=%s' % text, {}, global_env) return global_env['_ret'] @@ -105,7 +103,6 @@ def get_database(request): session.flash = T('invalid request') redirect(URL('index')) - def get_table(request): db = get_database(request) if len(request.args) > 1 and request.args[1] in db.tables: