R-2.4.6

Added an ANY_OF validator

.travis.yml

@@ -0,0 +1,25 @@
+language: python
+
+python:
+  - '2.5'
+  - '2.6'
+  - '2.7'
+env:
+  - DB=sqlite:memory
+  - DB=mysql://root:@localhost/test_w2p
+  - DB=postgres://postgres:@localhost/test_w2p
+before_script:
+  - pip install unittest2
+  - if [[ $DB == postgres* ]]; then pip install --use-mirrors psycopg2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors pysqlite; fi
+  - if [[ $DB == mysql* ]]; then mysql -e 'create database test_w2p;'; fi
+  - if [[ $DB == postgres* ]]; then psql -c 'create database test_w2p;' -U postgres; fi
+  #Temporal solution to travis issue #155
+  - sudo chmod 777 /dev/shm
+  - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
+script: PYTHONPATH=. unit2 -v gluon.tests
+
+notifications:
+  email: false
+  irc:
+    channels: "irc.freenode.org#web2py"

CHANGELOG

@@ -1,4 +1,16 @@
-## 2.4.1- 2.4.2
+## 2.4.6
+
+- better tests
+- new ANY_OF and IS_IPV6 validators
+- new custom save option
+- many small bug fixes
+
+## 2.4.5
+
+- travis.ci integration (thanks Marc Abramowitz and Niphlod). Passes all tests (thanks Niplod).
+- IS_DATE and IS_DATETIME can specify timezone
+
+## 2.4.1- 2.4.3
 
 - 2D GEO API: geoPoint, getLine, geoPolygon
 - support for 'json' field type in DAL

LICENSE

@@ -3,7 +3,7 @@
 Web2py is Licensed under the LGPL license version 3 
 (http://www.gnu.org/licenses/lgpl.html)
 
-Copyrighted (c) by Massimo Di Pierro (2007-2011)
+Copyrighted (c) by Massimo Di Pierro (2007-2013)
 
 ### On Commercial Redistribution
 

Makefile

@@ -5,7 +5,7 @@ all:
 clean:
 	rm -f httpserver.log 
 	rm -f parameters*.py 
-	rm -f -r applications/*/compiled     	
+	rm -f -r applications/*/compiled
 	find ./ -name '*~' -exec rm -f {} \; 
 	find ./ -name '*.orig' -exec rm -f {} \; 
 	find ./ -name '*.rej' -exec rm -f {} \; 
@@ -30,7 +30,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.4.2-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.4.6-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
@@ -114,7 +114,6 @@ commit:
 	make src
 	echo '' > NEWINSTALL
 	hg commit -m "$(S)"
-	#bzr commit -m "$(S)"
 	git commit -a -m "$(S)"
 push:
 	hg push

NEWINSTALL

@@ -1 +0,0 @@
-

README.markdown

@@ -6,6 +6,11 @@ It is written and programmable in Python. LGPLv3 License
 
 Learn more at http://web2py.com
 
+
+## Tests
+
+[![Build Status](https://travis-ci.org/web2py/web2py.png)](https://travis-ci.org/web2py/web2py)
+
 ## Installation Instructions
 
 To start web2py there is NO NEED to install it. Just unzip and do:

VERSION

@@ -1 +1 @@
-Version 2.4.2-stable+timestamp.2013.03.03.21.22.42
+Version 2.4.6-stable+timestamp.2013.04.06.12.11.51

app.example.yaml

@@ -21,6 +21,10 @@ default_expiration: "24h"   # for static files
 
 handlers:
 
+# Warning! Static mapping - below - isn't compatible with 
+# the parametric router's language logic. 
+# You cannot use them together.
+
 - url: /(?P<a>.+?)/static/(?P<b>.+)
   static_files: applications/\1/static/\2
   upload: applications/(.+?)/static/(.+)

applications/admin/controllers/appadmin.py

@@ -54,6 +54,10 @@ response.menu = [[T('design'), False, URL('admin', 'default', 'design',
 # ## auxiliary functions
 # ###########################################################
 
+if False and request.tickets_db:
+    from gluon.restricted import TicketStorage
+    ts = TicketStorage()
+    ts._get_table(request.tickets_db, ts.tablename, request.application)
 
 def get_databases(request):
     dbs = {}
@@ -319,6 +323,9 @@ def state():
 
 
 def ccache():
+    cache.ram.initialize()
+    cache.disk.initialize()
+
     form = FORM(
         P(TAG.BUTTON(
             T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
@@ -385,7 +392,7 @@ def ccache():
 
         return (hours, minutes, seconds)
 
-    for key, value in cache.ram.storage.items():
+    for key, value in cache.ram.storage.iteritems():
         if isinstance(value, dict):
             ram['hits'] = value['hit_total'] - value['misses']
             ram['misses'] = value['misses']

applications/admin/controllers/default.py

@@ -27,7 +27,7 @@ from gluon.languages import (read_possible_languages, read_dict, write_dict,
                              read_plural_dict, write_plural_dict)
 
 
-if DEMO_MODE and request.function in ['change_password', 'pack', 'pack_plugin', 'upgrade_web2py', 'uninstall', 'cleanup', 'compile_app', 'remove_compiled_app', 'delete', 'delete_plugin', 'create_file', 'upload_file', 'update_languages', 'reload_routes', 'git_push', 'git_pull']:
+if DEMO_MODE and request.function in ['change_password', 'pack', 'pack_custom','pack_plugin', 'upgrade_web2py', 'uninstall', 'cleanup', 'compile_app', 'remove_compiled_app', 'delete', 'delete_plugin', 'create_file', 'upload_file', 'update_languages', 'reload_routes', 'git_push', 'git_pull']:
     session.flash = T('disabled in demo mode')
     redirect(URL('site'))
 
@@ -146,11 +146,9 @@ def check_version():
     elif new_version != True:
         return A(T('web2py is up to date'), _href=WEB2PY_URL)
     elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"):
-        return SPAN('You should upgrade to version %s.%s.%s' % version_number[:3])
+        return SPAN('You should upgrade to version %s' % version_number)
     else:
-        return sp_button(URL('upgrade_web2py'), T('upgrade now')) \
+        return sp_button(URL('upgrade_web2py'), T('upgrade now to %s') % version_number.split('-')[0])
-            + XML(' <strong class="upgrade_version">%s.%s.%s</strong>'
-                  % version_number[:3])
 
 
 def logout():
@@ -205,14 +203,12 @@ def site():
 
     is_appname = IS_VALID_APPNAME()
     form_create = SQLFORM.factory(Field('name', requires=is_appname),
-                                  table_name='appcreate',
+                                  table_name='appcreate')
-                                  _class='well well-small')
     form_update = SQLFORM.factory(Field('name', requires=is_appname),
                                   Field('file', 'upload', uploadfield=False),
                                   Field('url'),
                                   Field('overwrite', 'boolean'),
-                                  table_name='appupdate',
+                                  table_name='appupdate')
-                                  _class='well well-small')
     form_create.process()
     form_update.process()
 
@@ -345,7 +341,6 @@ def pack():
         session.flash = T('internal error: %s' % e)
         redirect(URL('site'))
 
-
 def pack_plugin():
     app = get_app()
     if len(request.args) == 2:
@@ -360,6 +355,33 @@ def pack_plugin():
         session.flash = T('internal error')
         redirect(URL('plugin', args=request.args))
 
+def pack_custom():
+    app = get_app()
+    base = apath(app, r=request)
+    if request.post_vars.file:
+        files = request.post_vars.file
+        files = [files] if not isinstance(files,list) else files
+        fname = 'web2py.app.%s.w2p' % app
+        try:
+            filename = app_pack(app, request, raise_ex=True, filenames=files)
+        except Exception, e:
+            filename = None
+        if filename:
+            response.headers['Content-Type'] = 'application/w2p'
+            disposition = 'attachment; filename=%s' % fname
+            response.headers['Content-Disposition'] = disposition
+            return safe_read(filename, 'rb')
+        else:
+            session.flash = T('internal error: %s' % e)
+            redirect(URL(args=request.args))
+    def ignore(fs):
+        return [f for f in fs if not (
+                f[:1] in '#' or f.endswith('~') or f.endswith('.bak'))]
+    files = {}
+    for (r,d,f) in os.walk(base):
+        files[r] = {'folders':ignore(d),'files':ignore(f)}
+    return locals()
+
 
 def upgrade_web2py():
     dialog = FORM.confirm(T('Upgrade'),
@@ -686,7 +708,7 @@ def edit():
         cfilename = os.path.join(request.args[0], 'controllers',
                                  request.args[2] + '.py')
         if os.path.exists(apath(cfilename, r=request)):
-            edit_controller = URL('edit', args=[cfilename])
+            edit_controller = URL('edit',args=[cfilename.replace(os.sep, "/")])
             view = request.args[3].replace('.html', '')
             view_link = URL(request.args[0], request.args[2], view)
     elif filetype == 'python' and request.args[1] == 'controllers':
@@ -1430,7 +1452,7 @@ def errors():
                     hash2error[hash]['count'] += 1
                 except KeyError:
                     error_lines = error['traceback'].split("\n")
-                    last_line = error_lines[-2]
+                    last_line = error_lines[-2] if len(error_lines)>1 else 'unknown'
                     error_causer = os.path.split(error['layer'])[1]
                     hash2error[hash] = dict(count=1, pickel=error,
                                             causer=error_causer,
@@ -1667,7 +1689,7 @@ def twitter():
             d = dict()
             for e in data:
                 d[e["id"]] = e
-            r = reversed(sorted(d))
+                r = reversed(sorted(d))
             return dict(tweets=[d[k] for k in r])
         else:
             return 'disabled'

applications/admin/languages/cs.py

@@ -1,390 +1,480 @@
-# coding: utf8
+# coding: utf8
-{
+{
-'!langcode!': 'cs-cz',
+'!langcode!': 'cs-cz',
-'!langname!': '?e?tina',
+'!langname!': 'čeština',
-'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinn? v?raz, nap??klad "pole1=\'nov?hodnota\'". V?sledky datab?zov?ho JOINu nem??ete mazat ani upravovat.',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinný výraz, například "pole1=\'nováhodnota\'". Výsledky databázového JOINu nemůžete mazat ani upravovat.',
-'%%{Row} in Table': '%%{??dek} v tabulce',
+'"User Exception" debug mode. An error ticket could be issued!': '"User Exception" debug mode. An error ticket could be issued!',
-'%%{Row} selected': 'ozna?en?ch %%{??dek}',
+'%%{Row} in Table': '%%{řádek} v tabulce',
-'%s %%{row} deleted': '%s smazan?ch %%{z?znam}',
+'%%{Row} selected': 'označených %%{řádek}',
-'%s %%{row} updated': '%s upraven?ch %%{z?znam}',
+'%s %%{row} deleted': '%s smazaných %%{záznam}',
-'%s selected': '%s ozna?en?ch',
+'%s %%{row} updated': '%s upravených %%{záznam}',
-'%Y-%m-%d': '%d.%m.%Y',
+'%s selected': '%s označených',
-'%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
+'%Y-%m-%d': '%d.%m.%Y',
-'(requires internet access)': '(vy?aduje p?ipojen? k internetu)',
+'%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
-'(something like "it-it")': '(nap??klad "cs-cs")',
+'(requires internet access)': '(vyžaduje připojení k internetu)',
-'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
-'@markmin\x01Searching: **%s** %%{file}': 'Hled?n?: **%s** %%{soubor}',
+'(something like "it-it")': '(například "cs-cs")',
-'About': 'O programu',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
-'About application': 'O aplikaci',
+'@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
-'Access Control': '??zen? p??stupu',
+'About': 'O programu',
-'Add breakpoint': 'P?idat bod p?eru?en?',
+'About application': 'O aplikaci',
-'Additional code for your application': 'Dal?? k?d pro Va?i aplikaci',
+'Access Control': 'Řízení přístupu',
-'Admin language': 'jazyk rozhran?',
+'Add breakpoint': 'Přidat bod přerušení',
-'Administrative interface': 'pro administr?torsk? rozhran? klikn?te sem',
+'Additional code for your application': 'Další kód pro Vaši aplikaci',
-'Administrative Interface': 'Administr?torsk? rozhran?',
+'Admin design page': 'Admin design page',
-'administrative interface': 'rozhran? pro spr?vu',
+'Admin language': 'jazyk rozhraní',
-'Administrator Password:': 'Administr?torsk? heslo:',
+'Administrative interface': 'pro administrátorské rozhraní klikněte sem',
-'Ajax Recipes': 'Recepty s ajaxem',
+'Administrative Interface': 'Administrátorské rozhraní',
-'and rename it:': 'a p?ejmenovat na:',
+'administrative interface': 'rozhraní pro správu',
-'appadmin': 'appadmin',
+'Administrator Password:': 'Administrátorské heslo:',
-'appadmin is disabled because insecure channel': 'appadmin je zak?zan? bez zabezpe?en?ho spojen?',
+'Ajax Recipes': 'Recepty s ajaxem',
-'application "%s" uninstalled': 'application "%s" odinstalov?na',
+'An error occured, please %s the page': 'An error occured, please %s the page',
-'application compiled': 'aplikace zkompilov?na',
+'and rename it:': 'a přejmenovat na:',
-'Application name:': 'N?zev aplikace:',
+'appadmin': 'appadmin',
-'are not used': 'nepou?ita',
+'appadmin is disabled because insecure channel': 'appadmin je zakázaná bez zabezpečeného spojení',
-'are not used yet': 'je?t? nepou?ita',
+'Application': 'Application',
-'Are you sure you want to delete this object?': 'Opravdu chcete odstranit tento objekt?',
+'application "%s" uninstalled': 'application "%s" odinstalována',
-'Are you sure you want to uninstall application "%s"?': 'Opravdu chcete odinstalovat aplikaci "%s"?',
+'application compiled': 'aplikace zkompilována',
-'Available Databases and Tables': 'Dostupn? datab?ze a tabulky',
+'Application name:': 'Název aplikace:',
-'back': 'zp?t',
+'are not used': 'nepoužita',
-'Basics': 'Basics',
+'are not used yet': 'ještě nepoužita',
-'Begin': 'Za??t',
+'Are you sure you want to delete this object?': 'Opravdu chcete odstranit tento objekt?',
-'breakpoint': 'bod p?eru?en?',
+'Are you sure you want to uninstall application "%s"?': 'Opravdu chcete odinstalovat aplikaci "%s"?',
-'Breakpoints': 'Body p?eru?en?',
+'arguments': 'arguments',
-'breakpoints': 'body p?eru?en?',
+'at char %s': 'at char %s',
-'Buy this book': 'Koupit web2py knihu',
+'at line %s': 'at line %s',
-'Cache': 'Cache',
+'ATTENTION:': 'ATTENTION:',
-'cache': 'cache',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
-'Cache Keys': 'Kl??e cache',
+'Available Databases and Tables': 'Dostupné databáze a tabulky',
-'cache, errors and sessions cleaned': 'cache, chyby a relace byly pro?i?t?ny',
+'back': 'zpět',
-'can be a git repo': 'm??e to b?t git repo',
+'Back to wizard': 'Back to wizard',
-'Cancel': 'Storno',
+'Basics': 'Basics',
-'Cannot be empty': 'Nem??e b?t pr?zdn?',
+'Begin': 'Začít',
-'Change admin password': 'Zm?nit heslo pro str?vu aplikac?',
+'breakpoint': 'bod přerušení',
-'Change password': 'Zm?na hesla',
+'Breakpoints': 'Body přerušení',
-'check all': 'v?e ozna?it',
+'breakpoints': 'body přerušení',
-'Check for upgrades': 'Zkusit aktualizovat',
+'Buy this book': 'Koupit web2py knihu',
-'Check to delete': 'Ozna?it ke smaz?n?',
+'Cache': 'Cache',
-'Check to delete:': 'Ozna?it ke smaz?n?:',
+'cache': 'cache',
-'Checking for upgrades...': 'Zji??uji, zda jsou k dispozici aktualizace...',
+'Cache Keys': 'Klíče cache',
-'Clean': 'Pro?istit',
+'cache, errors and sessions cleaned': 'cache, chyby a relace byly pročištěny',
-'Clear CACHE?': 'Vymazat CACHE?',
+'can be a git repo': 'může to být git repo',
-'Clear DISK': 'Vymazat DISK',
+'Cancel': 'Storno',
-'Clear RAM': 'Vymazat RAM',
+'Cannot be empty': 'Nemůže být prázdné',
-'Click row to expand traceback': 'Pro rozbalen? stopy, klikn?te na ??dek',
+'Change Admin Password': 'Změnit heslo pro správu',
-'Click row to view a ticket': 'Pro zobrazen? chyby (ticketu), klikn?te na ??dku...',
+'Change admin password': 'Změnit heslo pro správu aplikací',
-'Client IP': 'IP adresa klienta',
+'Change password': 'Změna hesla',
-'collapse/expand all': 'v?e sbalit/rozbalit',
+'check all': 'vše označit',
-'Community': 'Komunita',
+'Check for upgrades': 'Zkusit aktualizovat',
-'Compile': 'Zkompilovat',
+'Check to delete': 'Označit ke smazání',
-'compiled application removed': 'zkompilovan? aplikace smaz?na',
+'Check to delete:': 'Označit ke smazání:',
-'Components and Plugins': 'Komponenty a z?suvn? moduly',
+'Checking for upgrades...': 'Zjišťuji, zda jsou k dispozici aktualizace...',
-'Condition': 'Podm?nka',
+'Clean': 'Pročistit',
-'Controller': 'Kontrol?r (Controller)',
+'Clear CACHE?': 'Vymazat CACHE?',
-'Controllers': 'Kontrol?ry',
+'Clear DISK': 'Vymazat DISK',
-'controllers': 'kontrol?ry',
+'Clear RAM': 'Vymazat RAM',
-'Copyright': 'Copyright',
+'Click row to expand traceback': 'Pro rozbalení stopy, klikněte na řádek',
-'Count': 'Po?et',
+'Click row to view a ticket': 'Pro zobrazení chyby (ticketu), klikněte na řádku...',
-'Create': 'Vytvo?it',
+'Client IP': 'IP adresa klienta',
-'create file with filename:': 'vytvo?it soubor s n?zvem:',
+'code': 'code',
-'created by': 'vytvo?il',
+'Code listing': 'Code listing',
-'Created By': 'Vytvo?eno - k?m',
+'collapse/expand all': 'vše sbalit/rozbalit',
-'Created On': 'Vytvo?eno - kdy',
+'Community': 'Komunita',
-'crontab': 'crontab',
+'Compile': 'Zkompilovat',
-'Current request': 'Aktu?ln? po?adavek',
+'compiled application removed': 'zkompilovaná aplikace smazána',
-'Current response': 'Aktu?ln? odpov??',
+'Components and Plugins': 'Komponenty a zásuvné moduly',
-'Current session': 'Aktu?ln? relace',
+'Condition': 'Podmínka',
-'currently running': 'pr?v? b???',
+'continue': 'continue',
-'currently saved or': 'ulo?eno nebo',
+'Controller': 'Kontrolér (Controller)',
-'customize me!': 'upravte m?!',
+'Controllers': 'Kontroléry',
-'data uploaded': 'data nahr?na',
+'controllers': 'kontroléry',
-'Database': 'Rozhran? datab?ze',
+'Copyright': 'Copyright',
-'Database %s select': 'datab?ze %s v?b?r',
+'Count': 'Počet',
-'database administration': 'spr?va datab?ze',
+'Create': 'Vytvořit',
-'Date and Time': 'Datum a ?as',
+'create file with filename:': 'vytvořit soubor s názvem:',
-'day': 'den',
+'created by': 'vytvořil',
-'db': 'db',
+'Created By': 'Vytvořeno - kým',
-'DB Model': 'Datab?zov? model',
+'Created On': 'Vytvořeno - kdy',
-'Debug': 'Lad?n?',
+'crontab': 'crontab',
-'Delete': 'Smazat',
+'Current request': 'Aktuální požadavek',
-'delete': 'smazat',
+'Current response': 'Aktuální odpověď',
-'delete all checked': 'smazat v?e ozna?en?',
+'Current session': 'Aktuální relace',
-'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete po??d?n o potvrzen? maz?n?)',
+'currently running': 'právě běží',
-'Delete:': 'Smazat:',
+'currently saved or': 'uloženo nebo',
-'deleted after first hit': 'smazat po prvn?m dosa?en?',
+'customize me!': 'upravte mě!',
-'Demo': 'Demo',
+'data uploaded': 'data nahrána',
-'Deploy': 'Nahr?t',
+'Database': 'Rozhraní databáze',
-'Deploy on Google App Engine': 'Nahr?t na Google App Engine',
+'Database %s select': 'databáze %s výběr',
-'Deploy to OpenShift': 'Nahr?t na OpenShift',
+'Database administration': 'Database administration',
-'Deployment Recipes': 'Postupy pro deployment',
+'database administration': 'správa databáze',
-'Description': 'Popis',
+'Date and Time': 'Datum a čas',
-'design': 'n?vrh',
+'day': 'den',
-'direction: ltr': 'direction: ltr',
+'db': 'db',
-'Disable': 'Zablokovat',
+'DB Model': 'Databázový model',
-'DISK': 'DISK',
+'Debug': 'Ladění',
-'Disk Cache Keys': 'Kl??e diskov? cache',
+'defines tables': 'defines tables',
-'Disk Cleared': 'Disk smaz?n',
+'Delete': 'Smazat',
-'docs': 'dokumentace',
+'delete': 'smazat',
-'Documentation': 'Dokumentace',
+'delete all checked': 'smazat vše označené',
-"Don't know what to do?": 'Nev?te kudy kam?',
+'delete plugin': 'delete plugin',
-'done!': 'hotovo!',
+'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete požádán o potvrzení mazání)',
-'Download': 'St?hnout',
+'Delete:': 'Smazat:',
-'download layouts': 'st?hnout moduly rozvr?en? str?nky',
+'deleted after first hit': 'smazat po prvním dosažení',
-'download plugins': 'st?hnout z?suvn? moduly',
+'Demo': 'Demo',
-'E-mail': 'E-mail',
+'Deploy': 'Nahrát',
-'Edit': 'Upravit',
+'Deploy on Google App Engine': 'Nahrát na Google App Engine',
-'edit all': 'edit all',
+'Deploy to OpenShift': 'Nahrát na OpenShift',
-'Edit application': 'Spr?va aplikace',
+'Deployment Recipes': 'Postupy pro deployment',
-'Edit current record': 'Upravit aktu?ln? z?znam',
+'Description': 'Popis',
-'Edit Profile': 'Upravit profil',
+'design': 'návrh',
-'Editing file "%s"': '?prava souboru "%s"',
+'Detailed traceback description': 'Podrobný výpis prostředí',
-'Editing Language file': '?prava jazykov?ho souboru',
+'details': 'podrobnosti',
-'Email and SMS': 'Email a SMS',
+'direction: ltr': 'směr: ltr',
-'Enable': 'Odblokovat',
+'Disable': 'Zablokovat',
-'enter a number between %(min)g and %(max)g': 'zadejte ??slo mezi %(min)g a %(max)g',
+'DISK': 'DISK',
-'enter an integer between %(min)g and %(max)g': 'zadejte cel? ??slo mezi %(min)g a %(max)g',
+'Disk Cache Keys': 'Klíče diskové cache',
-'Error': 'Chyba',
+'Disk Cleared': 'Disk smazán',
-'Error logs for "%(app)s"': 'Seznam v?skytu chyb pro aplikaci "%(app)s"',
+'docs': 'dokumentace',
-'Errors': 'Chyby',
+'Documentation': 'Dokumentace',
-'export as csv file': 'exportovat do .csv souboru',
+"Don't know what to do?": 'Nevíte kudy kam?',
-'exposes': 'vystavuje',
+'done!': 'hotovo!',
-'extends': 'roz?i?uje',
+'Download': 'Stáhnout',
-'FAQ': '?asto kladen? dotazy',
+'download layouts': 'stáhnout moduly rozvržení stránky',
-'File': 'Soubor',
+'download plugins': 'stáhnout zásuvné moduly',
-'file': 'soubor',
+'E-mail': 'E-mail',
-'file saved on %(time)s': 'soubor ulo?en %(time)s',
+'Edit': 'Upravit',
-'Filename': 'N?zev souboru',
+'edit all': 'edit all',
-'filter': 'filtr',
+'Edit application': 'Správa aplikace',
-'Find Next': 'Naj?t dal??',
+'edit controller': 'edit controller',
-'Find Previous': 'Naj?t p?edchoz?',
+'Edit current record': 'Upravit aktuální záznam',
-'First name': 'K?estn? jm?no',
+'Edit Profile': 'Upravit profil',
-'Forgot username?': 'Zapomn?l jste svoje p?ihla?ovac? jm?no?',
+'edit views:': 'upravit pohled:',
-'forgot username?': 'zapomn?l jste svoje p?ihla?ovac? jm?no?',
+'Editing file "%s"': 'Úprava souboru "%s"',
-'Forms and Validators': 'Formul??e a valid?tory',
+'Editing Language file': 'Úprava jazykového souboru',
-'Free Applications': 'Aplikace zdarma',
+'Editing Plural Forms File': 'Editing Plural Forms File',
-'Generate': 'Vytvo?it',
+'Email and SMS': 'Email a SMS',
-'Get from URL:': 'St?hnout z internetu:',
+'Enable': 'Odblokovat',
-'Git Pull': 'Git Pull',
+'enter a number between %(min)g and %(max)g': 'zadejte číslo mezi %(min)g a %(max)g',
-'Git Push': 'Git Push',
+'enter an integer between %(min)g and %(max)g': 'zadejte celé číslo mezi %(min)g a %(max)g',
-'Globals##debug': 'Glob?ln? prom?nn?',
+'Error': 'Chyba',
-'go!': 'OK!',
+'Error logs for "%(app)s"': 'Seznam výskytu chyb pro aplikaci "%(app)s"',
-'Group %(group_id)s created': 'Skupina %(group_id)s vytvo?ena',
+'Error snapshot': 'Snapshot chyby',
-'Group ID': 'ID skupiny',
+'Error ticket': 'Ticket chyby',
-'Groups': 'Skupiny',
+'Errors': 'Chyby',
-'Hello World': 'Ahoj sv?te',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
-'Help': 'N?pov?da',
+'Exception %s': 'Exception %s',
-'Hide/Show Translated strings': 'Skr?t/Zobrazit p?elo?en? texty',
+'Exception instance attributes': 'Prvky instance výjimky',
-'Hits': 'Kolikr?t dosa?eno',
+'Expand Abbreviation': 'Expand Abbreviation',
-'Home': 'Domovsk? str?nka',
+'export as csv file': 'exportovat do .csv souboru',
-'honored only if the expression evaluates to true': 'br?t v potaz jen kdy? se tato podm?nka vyhodnot? kladn?',
+'exposes': 'vystavuje',
-'How did you get here?': 'Jak jste se sem vlastn? dostal?',
+'exposes:': 'vystavuje funkce:',
-'import': 'import',
+'extends': 'rozšiřuje',
-'Import/Export': 'Import/Export',
+'failed to compile file because:': 'soubor se nepodařilo zkompilovat, protože:',
-'includes': 'zahrnuje',
+'FAQ': 'Často kladené dotazy',
-'Index': 'Index',
+'File': 'Soubor',
-'insert new': 'vlo?it nov? z?znam ',
+'file': 'soubor',
-'insert new %s': 'vlo?it nov? z?znam %s',
+'file "%(filename)s" created': 'file "%(filename)s" created',
-'Install': 'Instalovat',
+'file saved on %(time)s': 'soubor uložen %(time)s',
-'Installed applications': 'Nainstalovan? aplikace',
+'file saved on %s': 'soubor uložen %s',
-'Internal State': 'Vnit?n? stav',
+'Filename': 'Název souboru',
-'Introduction': '?vod',
+'filter': 'filtr',
-'Invalid email': 'Neplatn? email',
+'Find Next': 'Najít další',
-'Invalid password': 'Nespr?vn? heslo',
+'Find Previous': 'Najít předchozí',
-'invalid password.': 'neplatn? heslo',
+'First name': 'Křestní jméno',
-'Invalid Query': 'Neplatn? dotaz',
+'Forgot username?': 'Zapomněl jste svoje přihlašovací jméno?',
-'invalid request': 'Neplatn? po?adavek',
+'forgot username?': 'zapomněl jste svoje přihlašovací jméno?',
-'Is Active': 'Je aktivn?',
+'Forms and Validators': 'Formuláře a validátory',
-'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
+'Frames': 'Frames',
-'Key': 'Kl??',
+'Free Applications': 'Aplikace zdarma',
-'Key bindings': 'Vazby kl???',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
-'languages': 'jazyky',
+'Generate': 'Vytvořit',
-'Languages': 'Jazyky',
+'Get from URL:': 'Stáhnout z internetu:',
-'Last name': 'P??jmen?',
+'Git Pull': 'Git Pull',
-'Last saved on:': 'Naposledy ulo?eno:',
+'Git Push': 'Git Push',
-'Layout': 'Rozvr?en? str?nky (layout)',
+'Globals##debug': 'Globální proměnné',
-'Layout Plugins': 'Moduly rozvr?en? str?nky (Layout Plugins)',
+'go!': 'OK!',
-'Layouts': 'Rozvr?en? str?nek',
+'Goto': 'Goto',
-'License for': 'Licence pro',
+'graph model': 'graph model',
-'Line number': '??slo ??dku',
+'Group %(group_id)s created': 'Skupina %(group_id)s vytvořena',
-'LineNo': '?.??dku',
+'Group ID': 'ID skupiny',
-'Live Chat': 'Online pokec',
+'Groups': 'Skupiny',
-'loading...': 'nahr?v?m...',
+'Hello World': 'Ahoj světe',
-'Locals##debug': 'Lok?ln? prom?nn?',
+'Help': 'Nápověda',
-'Logged in': 'P?ihl??en? prob?hlo ?sp??n?',
+'Hide/Show Translated strings': 'Skrýt/Zobrazit přeložené texty',
-'Logged out': 'Odhl??en? prob?hlo ?sp??n?',
+'Hits': 'Kolikrát dosaženo',
-'Login': 'P?ihl?sit se',
+'Home': 'Domovská stránka',
-'login': 'p?ihl?sit se',
+'honored only if the expression evaluates to true': 'brát v potaz jen když se tato podmínka vyhodnotí kladně',
-'Login to the Administrative Interface': 'P?ihl?sit se do Spr?vce aplikac?',
+'How did you get here?': 'Jak jste se sem vlastně dostal?',
-'logout': 'odhl?sit se',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
-'Logout': 'Odhl?sit se',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
-'Lost Password': 'Zapomn?l jste heslo',
+'import': 'import',
-'Lost password?': 'Zapomn?l jste heslo?',
+'Import/Export': 'Import/Export',
-'lost password?': 'zapomn?l jste heslo?',
+'includes': 'zahrnuje',
-'Manage Cache': 'Manage Cache',
+'Index': 'Index',
-'Menu Model': 'Model rozbalovac? nab?dky',
+'insert new': 'vložit nový záznam ',
-'Models': 'Modely',
+'insert new %s': 'vložit nový záznam %s',
-'models': 'modely',
+'inspect attributes': 'inspect attributes',
-'Modified By': 'Zm?n?no - k?m',
+'Install': 'Instalovat',
-'Modified On': 'Zm?n?no - kdy',
+'Installed applications': 'Nainstalované aplikace',
-'Modules': 'Moduly',
+'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
-'modules': 'moduly',
+'Interactive console': 'Interaktivní příkazová řádka',
-'My Sites': 'Spr?va aplikac?',
+'Internal State': 'Vnitřní stav',
-'Name': 'Jm?no',
+'Introduction': 'Úvod',
-'New Application Wizard': 'Nov? pr?vodce aplikac?',
+'Invalid email': 'Neplatný email',
-'New application wizard': 'Nov? pr?vodce aplikac?',
+'Invalid password': 'Nesprávné heslo',
-'New password': 'Nov? heslo',
+'invalid password.': 'neplatné heslo',
-'New Record': 'Nov? z?znam',
+'Invalid Query': 'Neplatný dotaz',
-'new record inserted': 'nov? z?znam byl zalo?en',
+'invalid request': 'Neplatný požadavek',
-'New simple application': 'Vytvo?it primitivn? aplikaci',
+'Is Active': 'Je aktivní',
-'next 100 rows': 'dal??ch 100 ??dk?',
+'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
-'No databases in this application': 'V t?to aplik?ci nejsou ??dn? datab?ze',
+'Key': 'Klíč',
-'No Interaction yet': 'Je?t? ??dn? interakce nenastala',
+'Key bindings': 'Vazby klíčů',
-'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adres??i /private nenalezen',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
-'Object or table name': 'Objekt ?i tabulka',
+'languages': 'jazyky',
-'Old password': 'P?vodn? heslo',
+'Languages': 'Jazyky',
-'online designer': 'online n?vrh??',
+'Last name': 'Příjmení',
-'Online examples': 'P??klady online',
+'Last saved on:': 'Naposledy uloženo:',
-'or import from csv file': 'nebo importovat z .csv souboru',
+'Layout': 'Rozvržení stránky (layout)',
-'Origin': 'P?vod',
+'Layout Plugins': 'Moduly rozvržení stránky (Layout Plugins)',
-'Original/Translation': 'Origin?l/P?eklad',
+'Layouts': 'Rozvržení stránek',
-'Other Plugins': 'Ostatn? moduly',
+'License for': 'Licence pro',
-'Other Recipes': 'Ostatn? z?suvn? moduly',
+'Line number': 'Číslo řádku',
-'Overview': 'P?ehled',
+'LineNo': 'Č.řádku',
-'Overwrite installed app': 'P?epsat instalovanou aplikaci',
+'Live Chat': 'Online pokec',
-'Pack all': 'Zabalit',
+'loading...': 'nahrávám...',
-'Pack compiled': 'Zabalit zkompilovan?',
+'locals': 'locals',
-'password': 'heslo',
+'Locals##debug': 'Lokální proměnné',
-'Password': 'Heslo',
+'Logged in': 'Přihlášení proběhlo úspěšně',
-"Password fields don't match": 'Hesla se neshoduj?',
+'Logged out': 'Odhlášení proběhlo úspěšně',
-'Please': 'Pros?m',
+'Login': 'Přihlásit se',
-'plugins': 'z?suvn? moduly',
+'login': 'přihlásit se',
-'Plugins': 'Z?suvn? moduly',
+'Login to the Administrative Interface': 'Přihlásit se do Správce aplikací',
-'Plural-Forms:': 'Mno?n? ??sla:',
+'logout': 'odhlásit se',
-'Powered by': 'Poh?n?no',
+'Logout': 'Odhlásit se',
-'Preface': 'P?edmluva',
+'Lost Password': 'Zapomněl jste heslo',
-'previous 100 rows': 'p?edchoz?ch 100 ??dk?',
+'Lost password?': 'Zapomněl jste heslo?',
-'Private files': 'Soukrom? soubory',
+'lost password?': 'zapomněl jste heslo?',
-'private files': 'soukrom? soubory',
+'Manage': 'Manage',
-'profile': 'profil',
+'Manage Cache': 'Manage Cache',
-'Project Progress': 'V?voj projektu',
+'Menu Model': 'Model rozbalovací nabídky',
-'Python': 'Python',
+'Models': 'Modely',
-'Query:': 'Dotaz:',
+'models': 'modely',
-'Quick Examples': 'Kr?tk? p??klady',
+'Modified By': 'Změněno - kým',
-'RAM': 'RAM',
+'Modified On': 'Změněno - kdy',
-'RAM Cache Keys': 'Kl??e RAM Cache',
+'Modules': 'Moduly',
-'Ram Cleared': 'RAM smaz?na',
+'modules': 'moduly',
-'Readme': 'N?pov?da',
+'My Sites': 'Správa aplikací',
-'Recipes': 'Postupy jak na to',
+'Name': 'Jméno',
-'Record': 'Z?znam',
+'new application "%s" created': 'nová aplikace "%s" vytvořena',
-'record does not exist': 'z?znam neexistuje',
+'New Application Wizard': 'Nový průvodce aplikací',
-'Record ID': 'ID z?znamu',
+'New application wizard': 'Nový průvodce aplikací',
-'Record id': 'id z?znamu',
+'New password': 'Nové heslo',
-'refresh': 'obnovte',
+'New Record': 'Nový záznam',
-'register': 'registrovat',
+'new record inserted': 'nový záznam byl založen',
-'Register': 'Zaregistrovat se',
+'New simple application': 'Vytvořit primitivní aplikaci',
-'Registration identifier': 'Registra?n? identifik?tor',
+'next': 'next',
-'Registration key': 'Registra?n? kl??',
+'next 100 rows': 'dalších 100 řádků',
-'Reload routes': 'Znovu nahr?t cesty',
+'No databases in this application': 'V této aplikaci nejsou žádné databáze',
-'Remember me (for 30 days)': 'Zapamatovat na 30 dn?',
+'No Interaction yet': 'Ještě žádná interakce nenastala',
-'Remove compiled': 'Odstranit zkompilovan?',
+'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adresáři /private nenalezen',
-'Removed Breakpoint on %s at line %s': 'Bod p?eru?en? smaz?n - soubor %s na ??dce %s',
+'Object or table name': 'Objekt či tabulka',
-'Replace': 'Zam?nit',
+'Old password': 'Původní heslo',
-'Replace All': 'Zam?nit v?e',
+'online designer': 'online návrhář',
-'Reset Password key': 'Reset registra?n?ho kl??e',
+'Online examples': 'Příklady online',
-'restart': 'restart',
+'Open new app in new window': 'Open new app in new window',
-'restore': 'obnovit',
+'or alternatively': 'or alternatively',
-'Retrieve username': 'Z?skat p?ihla?ovac? jm?no',
+'Or Get from URL:': 'Or Get from URL:',
-'revert': 'vr?tit se k p?vodn?mu',
+'or import from csv file': 'nebo importovat z .csv souboru',
-'Role': 'Role',
+'Origin': 'Původ',
-'Rows in Table': 'Z?znamy v tabulce',
+'Original/Translation': 'Originál/Překlad',
-'Rows selected': 'Z?znam? zobrazeno',
+'Other Plugins': 'Ostatní moduly',
-'rules are not defined': 'pravidla nejsou definov?na',
+'Other Recipes': 'Ostatní zásuvné moduly',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spust? testy v tomto souboru (ke spu?t?n? v?ech test?, pou?ijte tla??tko 'test')",
+'Overview': 'Přehled',
-'Running on %s': 'B??? na %s',
+'Overwrite installed app': 'Přepsat instalovanou aplikaci',
-'Save': 'Ulo?it',
+'Pack all': 'Zabalit',
-'Save via Ajax': 'Ulo?it pomoc? Ajaxu',
+'Pack compiled': 'Zabalit zkompilované',
-'Saved file hash:': 'hash ulo?en?ho souboru:',
+'pack plugin': 'pack plugin',
-'Semantic': 'Modul semantic',
+'password': 'heslo',
-'Services': 'Slu?by',
+'Password': 'Heslo',
-'Set Breakpoint on %s at line %s: %s': 'Bod p?eru?en? nastaven v souboru %s na ??dce %s: %s',
+"Password fields don't match": 'Hesla se neshodují',
-'shell': 'p??kazov? ??dka',
+'Peeking at file': 'Peeking at file',
-'Site': 'Spr?va aplikac?',
+'Please': 'Prosím',
-'Size of cache:': 'Velikost cache:',
+'Plugin "%s" in application': 'Plugin "%s" in application',
-'skip to generate': 'skip to generate',
+'plugins': 'zásuvné moduly',
-'Sorry, could not find mercurial installed': 'Bohu?el mercurial nen? nainstalov?n.',
+'Plugins': 'Zásuvné moduly',
-'Start a new app': 'Vytvo?it novou aplikaci',
+'Plural Form #%s': 'Plural Form #%s',
-'Start searching': 'Za??t hled?n?',
+'Plural-Forms:': 'Množná čísla:',
-'Start wizard': 'Spustit pr?vodce',
+'Powered by': 'Poháněno',
-'state': 'stav',
+'Preface': 'Předmluva',
-'static': 'statick? soubory',
+'previous 100 rows': 'předchozích 100 řádků',
-'Static files': 'Statick? soubory',
+'Private files': 'Soukromé soubory',
-'Statistics': 'Statistika',
+'private files': 'soukromé soubory',
-'Step': 'Step',
+'profile': 'profil',
-'Stylesheet': 'CSS styly',
+'Project Progress': 'Vývoj projektu',
-'submit': 'odeslat',
+'Python': 'Python',
-'Submit': 'Odeslat',
+'Query:': 'Dotaz:',
-'successful': '?sp??n?',
+'Quick Examples': 'Krátké příklady',
-'Support': 'Podpora',
+'RAM': 'RAM',
-'Sure you want to delete this object?': 'Opravdu chcete smazat tento objekt?',
+'RAM Cache Keys': 'Klíče RAM Cache',
-'Table': 'tabulka',
+'Ram Cleared': 'RAM smazána',
-'Table name': 'N?zev tabulky',
+'Readme': 'Nápověda',
-'Temporary': 'Do?asn?',
+'Recipes': 'Postupy jak na to',
-'test': 'test',
+'Record': 'Záznam',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podm?nka, nap??klad "db.tabulka1.pole1==\'hodnota\'". Podm?nka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvo?? SQL JOIN.',
+'record does not exist': 'záznam neexistuje',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: ka?d? URL je mapov?na na funkci vystavovanou kontrol?rem.',
+'Record ID': 'ID záznamu',
-'The Core': 'J?dro (The Core)',
+'Record id': 'id záznamu',
-'The data representation, define database tables and sets': 'Reprezentace dat: definovat tabulky datab?ze a z?znamy',
+'refresh': 'obnovte',
-'The output of the file is a dictionary that was rendered by the view %s': 'V?stup ze souboru je slovn?k, kter? se zobrazil v pohledu %s.',
+'register': 'registrovat',
-'The presentations layer, views are also known as templates': 'Prezenta?n? vrstva: pohledy ?i templaty (?ablony)',
+'Register': 'Zaregistrovat se',
-'The Views': 'Pohledy (The Views)',
+'Registration identifier': 'Registrační identifikátor',
-'There are no plugins': '??dn? moduly nejsou instalov?ny.',
+'Registration key': 'Registrační klíč',
-'There are no private files': '??dn? soukrom? soubory neexistuj?.',
+'reload': 'reload',
-'These files are not served, they are only available from within your app': 'Tyto soubory jsou klient?m nep??stupn?. K dispozici jsou pouze v r?mci aplikace.',
+'Reload routes': 'Znovu nahrát cesty',
-'These files are served without processing, your images go here': 'Tyto soubory jsou serv?rov?ny bez p??davn? logiky, sem pat?? nap?. obr?zky.',
+'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
-'This App': 'Tato aplikace',
+'Remove compiled': 'Odstranit zkompilované',
-'This is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
+'Removed Breakpoint on %s at line %s': 'Bod přerušení smazán - soubor %s na řádce %s',
-'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto str?nku, abyste uvid?li, zda se dos?hlo bodu p?eru?en?.',
+'Replace': 'Zaměnit',
-'Ticket': 'Ticket',
+'Replace All': 'Zaměnit vše',
-'Time in Cache (h:m:s)': '?as v Cache (h:m:s)',
+'request': 'request',
-'Timestamp': '?asov? raz?tko',
+'Reset Password key': 'Reset registračního klíče',
-'to  previous version.': 'k p?edchoz? verzi.',
+'response': 'response',
-'To create a plugin, name a file/folder plugin_[name]': 'Z?suvn? modul vytvo??te tak, ?e pojmenujete soubor/adres?? plugin_[jm?no modulu]',
+'restart': 'restart',
-'To emulate a breakpoint programatically, write:': 'K nastaven? bodu p?eru?en? v k?du programu, napi?te:',
+'restore': 'obnovit',
-'to use the debugger!': ', abyste mohli lad?c? program pou??vat!',
+'Retrieve username': 'Získat přihlašovací jméno',
-'toggle breakpoint': 'vyp./zap. bod p?eru?en?',
+'return': 'return',
-'Toggle Fullscreen': 'Na celou obrazovku a zp?t',
+'revert': 'vrátit se k původnímu',
-'too short': 'P??li? kr?tk?',
+'Role': 'Role',
-'Translation strings for the application': 'P?eklad text? pro aplikaci',
+'Rows in Table': 'Záznamy v tabulce',
-'Try the mobile interface': 'Zkuste rozhran? pro mobiln? za??zen?',
+'Rows selected': 'Záznamů zobrazeno',
-'Twitter': 'Twitter',
+'rules are not defined': 'pravidla nejsou definována',
-'unable to parse csv file': 'csv soubor ned? sa zpracovat',
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spustí testy v tomto souboru (ke spuštění všech testů, použijte tlačítko 'test')",
-'uncheck all': 'v?e odzna?it',
+'Running on %s': 'Běží na %s',
-'Uninstall': 'Odinstalovat',
+'Save': 'Uložit',
-'update': 'aktualizovat',
+'Save file:': 'Save file:',
-'update all languages': 'aktualizovat v?echny jazyky',
+'Save via Ajax': 'Uložit pomocí Ajaxu',
-'Update:': 'Upravit:',
+'Saved file hash:': 'hash uloženého souboru:',
-'upload': 'nahr?t',
+'Semantic': 'Modul semantic',
-'Upload a package:': 'Nahr?t bal?k:',
+'Services': 'Služby',
-'Upload and install packed application': 'Nahr?t a instalovat zabalenou aplikaci',
+'session': 'session',
-'upload file:': 'nahr?t soubor:',
+'session expired': 'session expired',
-'upload plugin file:': 'nahr?t soubor modulu:',
+'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Pou?ijte (...)&(...) pro AND, (...)|(...) pro OR a ~(...) pro NOT pro sestaven? slo?it?j??ch dotaz?.',
+'shell': 'příkazová řádka',
-'User %(id)s Logged-in': 'U?ivatel %(id)s p?ihl??en',
+'Singular Form': 'Singular Form',
-'User %(id)s Logged-out': 'U?ivatel %(id)s odhl??en',
+'Site': 'Správa aplikací',
-'User %(id)s Password changed': 'U?ivatel %(id)s zm?nil heslo',
+'Size of cache:': 'Velikost cache:',
-'User %(id)s Profile updated': 'U?ivatel %(id)s upravil profil',
+'skip to generate': 'skip to generate',
-'User %(id)s Registered': 'U?ivatel %(id)s se zaregistroval',
+'Sorry, could not find mercurial installed': 'Bohužel mercurial není nainstalován.',
-'User %(id)s Username retrieved': 'U?ivatel %(id)s si nachal zaslat p?ihla?ovac? jm?no',
+'Start a new app': 'Vytvořit novou aplikaci',
-'User ID': 'ID u?ivatele',
+'Start searching': 'Začít hledání',
-'Username': 'P?ihla?ovac? jm?no',
+'Start wizard': 'Spustit průvodce',
-'Verify Password': 'Zopakujte heslo',
+'state': 'stav',
-'Version %s.%s.%s (%s) %s': 'Verze %s.%s.%s (%s) %s',
+'Static': 'Static',
-'Versioning': 'Verzov?n?',
+'static': 'statické soubory',
-'Videos': 'Videa',
+'Static files': 'Statické soubory',
-'View': 'Pohled (View)',
+'Statistics': 'Statistika',
-'Views': 'Pohledy',
+'Step': 'Step',
-'views': 'pohledy',
+'step': 'step',
-'Web Framework': 'Web Framework',
+'stop': 'stop',
-'web2py is up to date': 'M?te aktu?ln? verzi web2py.',
+'Stylesheet': 'CSS styly',
-'web2py online debugger': 'Lad?c? online web2py program',
+'submit': 'odeslat',
-'web2py Recent Tweets': '?t?bet?n? na Twitteru o web2py',
+'Submit': 'Odeslat',
-'Welcome': 'V?tejte',
+'successful': 'úspěšně',
-'Welcome to web2py': 'Vitejte ve web2py',
+'Support': 'Podpora',
-'Welcome to web2py!': 'V?tejte ve web2py!',
+'Sure you want to delete this object?': 'Opravdu chcete smazat tento objekt?',
-'Which called the function %s located in the file %s': 'kter? zavolala funkci %s v souboru (kontrol?ru) %s.',
+'Table': 'tabulka',
-'You are successfully running web2py': '?sp??n? jste spustili web2py.',
+'Table name': 'Název tabulky',
-'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Nastavovat a mazat body p?eru?en? je t?? mo?no v r?mci editov?n? zdrojov?ho souboru p?es tla??tko Vyp./Zap. bod p?eru?en?',
+'Temporary': 'Dočasný',
-'You can modify this application and adapt it to your needs': 'Tuto aplikaci si m??ete upravit a p?izp?sobit ji sv?m pot?eb?m.',
+'test': 'test',
-'You need to set up and reach a': 'Je t?eba nejprve nastavit a doj?t a? na',
+'Testing application': 'Testing application',
-'You visited the url %s': 'Nav?t?vili jste str?nku %s,',
+'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podmínka, například "db.tabulka1.pole1==\'hodnota\'". Podmínka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvoří SQL JOIN.',
-}
+'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: každá URL je mapována na funkci vystavovanou kontrolérem.',
+'The Core': 'Jádro (The Core)',
+'The data representation, define database tables and sets': 'Reprezentace dat: definovat tabulky databáze a záznamy',
+'The output of the file is a dictionary that was rendered by the view %s': 'Výstup ze souboru je slovník, který se zobrazil v pohledu %s.',
+'The presentations layer, views are also known as templates': 'Prezentační vrstva: pohledy či templaty (šablony)',
+'The Views': 'Pohledy (The Views)',
+'There are no controllers': 'There are no controllers',
+'There are no modules': 'There are no modules',
+'There are no plugins': 'Žádné moduly nejsou instalovány.',
+'There are no private files': 'Žádné soukromé soubory neexistují.',
+'There are no static files': 'There are no static files',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
+'These files are not served, they are only available from within your app': 'Tyto soubory jsou klientům nepřístupné. K dispozici jsou pouze v rámci aplikace.',
+'These files are served without processing, your images go here': 'Tyto soubory jsou servírovány bez přídavné logiky, sem patří např. obrázky.',
+'This App': 'Tato aplikace',
+'This is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'This is the %(filename)s template',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto stránku, abyste uviděli, zda se dosáhlo bodu přerušení.',
+'Ticket': 'Ticket',
+'Ticket ID': 'Ticket ID',
+'Time in Cache (h:m:s)': 'Čas v Cache (h:m:s)',
+'Timestamp': 'Časové razítko',
+'to  previous version.': 'k předchozí verzi.',
+'To create a plugin, name a file/folder plugin_[name]': 'Zásuvný modul vytvoříte tak, že pojmenujete soubor/adresář plugin_[jméno modulu]',
+'To emulate a breakpoint programatically, write:': 'K nastavení bodu přerušení v kódu programu, napište:',
+'to use the debugger!': ', abyste mohli ladící program používat!',
+'toggle breakpoint': 'vyp./zap. bod přerušení',
+'Toggle Fullscreen': 'Na celou obrazovku a zpět',
+'too short': 'Příliš krátké',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Překlad textů pro aplikaci',
+'try something like': 'try something like',
+'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
+'try view': 'try view',
+'Twitter': 'Twitter',
+'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
+'unable to parse csv file': 'csv soubor nedá sa zpracovat',
+'uncheck all': 'vše odznačit',
+'Uninstall': 'Odinstalovat',
+'update': 'aktualizovat',
+'update all languages': 'aktualizovat všechny jazyky',
+'Update:': 'Upravit:',
+'Upgrade': 'Upgrade',
+'upgrade now': 'upgrade now',
+'upgrade now to %s': 'upgrade now to %s',
+'upload': 'nahrát',
+'Upload': 'Upload',
+'Upload a package:': 'Nahrát balík:',
+'Upload and install packed application': 'Nahrát a instalovat zabalenou aplikaci',
+'upload file:': 'nahrát soubor:',
+'upload plugin file:': 'nahrát soubor modulu:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Použijte (...)&(...) pro AND, (...)|(...) pro OR a ~(...) pro NOT pro sestavení složitějších dotazů.',
+'User %(id)s Logged-in': 'Uživatel %(id)s přihlášen',
+'User %(id)s Logged-out': 'Uživatel %(id)s odhlášen',
+'User %(id)s Password changed': 'Uživatel %(id)s změnil heslo',
+'User %(id)s Profile updated': 'Uživatel %(id)s upravil profil',
+'User %(id)s Registered': 'Uživatel %(id)s se zaregistroval',
+'User %(id)s Username retrieved': 'Uživatel %(id)s si nachal zaslat přihlašovací jméno',
+'User ID': 'ID uživatele',
+'Username': 'Přihlašovací jméno',
+'variables': 'variables',
+'Verify Password': 'Zopakujte heslo',
+'Version': 'Verze',
+'Version %s.%s.%s (%s) %s': 'Verze %s.%s.%s (%s) %s',
+'Versioning': 'Verzování',
+'Videos': 'Videa',
+'View': 'Pohled (View)',
+'Views': 'Pohledy',
+'views': 'pohledy',
+'Web Framework': 'Web Framework',
+'web2py is up to date': 'Máte aktuální verzi web2py.',
+'web2py online debugger': 'Ladící online web2py program',
+'web2py Recent Tweets': 'Štěbetání na Twitteru o web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'Welcome': 'Vítejte',
+'Welcome to web2py': 'Vitejte ve web2py',
+'Welcome to web2py!': 'Vítejte ve web2py!',
+'Which called the function %s located in the file %s': 'která zavolala funkci %s v souboru (kontroléru) %s.',
+'You are successfully running web2py': 'Úspěšně jste spustili web2py.',
+'You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button': 'Nastavovat a mazat body přerušení je též možno v rámci editování zdrojového souboru přes tlačítko Vyp./Zap. bod přerušení',
+'You can modify this application and adapt it to your needs': 'Tuto aplikaci si můžete upravit a přizpůsobit ji svým potřebám.',
+'You need to set up and reach a': 'Je třeba nejprve nastavit a dojít až na',
+'You visited the url %s': 'Navštívili jste stránku %s,',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Aplikace bude blokována než se klikne na jedno z tlačítek (další, krok, pokračovat, atd.)',
+'Your can inspect variables using the console bellow': 'Níže pomocí příkazové řádky si můžete prohlédnout proměnné',
+}

applications/admin/models/menu.py

@@ -23,9 +23,9 @@ if request.vars.app or request.args:
 
 if os.path.exists('applications/examples'):
     response.menu.append(
-        (T('Help'), False, URL('examples', 'default', 'index')))
+        (T('Help'), False, URL('examples', 'default', 'documentation')))
 else:
-    response.menu.append((T('Help'), False, 'http://web2py.com/examples'))
+    response.menu.append((T('Help'), False, 'http://web2py.com/examples/default/documentation'))
 
 if not session.authorized:
     response.menu = [(T('Login'), True, URL('site'))]

applications/admin/static/css/web2py_bootstrap.css

@@ -102,6 +102,7 @@ td.w2p_fl,td.w2p_fc {padding:0;}
 ==============================================================*/
 
 /* because web2py handles this via js */
+textarea { width:90%}
 .hidden{visibility:visible;}
 /* right folder for bootstrap black images/icons */
 [class^="icon-"],[class*=" icon-"]{

applications/admin/views/default/design.html

@@ -1,69 +1,69 @@
 {{extend 'layout.html'}}
 {{
 def all(items):
-	return reduce(lambda a,b:a and b,items,True)
+    return reduce(lambda a,b:a and b,items,True)
 def peekfile(path,file,vars={},title=None):
-	args=(path,file) if 'app' in vars else (app,path,file)
+    args=(path,file) if 'app' in vars else (app,path,file)
-	return A(file.replace('\\\\','/'),_title=title,_href=URL('peek', args=args, vars=vars))
+    return A(file.replace('\\\\','/'),_title=title,_href=URL('peek', args=args, vars=vars))
 def editfile(path,file,vars={}):
-	args=(path,file) if 'app' in vars else (app,path,file)
+    args=(path,file) if 'app' in vars else (app,path,file)
-	return A(SPAN(T('Edit')),_class='button editbutton btn',_href=URL('edit', args=args, vars=vars))
+    return A(SPAN(T('Edit')),_class='button editbutton btn btn-mini',_href=URL('edit', args=args, vars=vars))
 def testfile(path,file):
-	return A(TAG[''](IMG(_src=URL('static', 'images/test_icon.png'), _alt=T('test')), 
+    return A(TAG[''](IMG(_src=URL('static', 'images/test_icon.png'), _alt=T('test')), 
-						SPAN(T("Run tests in this file (to run all files, you may also use the button labelled 'test')"))), 
+                        SPAN(T("Run tests in this file (to run all files, you may also use the button labelled 'test')"))), 
-						_class='icon test',
+                        _class='icon test',
-						_href=URL('test', args=(app, file)),
+                        _href=URL('test', args=(app, file)),
-						_rel="tooltip",
+                        _rel="tooltip",
-						**{'_data-placement':'right',
+                        **{'_data-placement':'right',
-							'_data-original-title':T("Run tests in this file (to run all files, you may also use the button labelled 'test')")})
+                            '_data-original-title':T("Run tests in this file (to run all files, you may also use the button labelled 'test')")})
 def editlanguagefile(path,file,vars={}):
-	return A(SPAN(T('Edit')),_class='button editbutton btn',_href=URL('edit_language', args=(app, path, file), vars=vars))
+    return A(SPAN(T('Edit')),_class='button editbutton btn btn-mini',_href=URL('edit_language', args=(app, path, file), vars=vars))
 def editpluralsfile(path,file,vars={}):
-	return A(SPAN(T('Edit')),_class='button editbutton btn',_href=URL('edit_plurals', args=(app, path, file), vars=vars))
+    return A(SPAN(T('Edit')),_class='button editbutton btn btn-mini',_href=URL('edit_plurals', args=(app, path, file), vars=vars))
 def file_upload_form(location, anchor=None):
-	form=FORM(
+    form=FORM(
-			LABEL(T("upload file:")),
+            LABEL(T("upload file:")),
-			INPUT(_type="file",_name="file"),
+            INPUT(_type="file",_name="file"),
-			LABEL(T("and rename it:")),
+            LABEL(T("and rename it:")),
-			INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY,_class=""),
+            INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY,_class=""),
-			DIV(TAG['BUTTON'](T("Upload"),_type="submit",_class="btn"),_class="controls"),
+            DIV(TAG['BUTTON'](T("Upload"),_type="submit",_class="btn"),_class="controls"),
-			INPUT(_type="hidden",_name="location",_value=location),
+            INPUT(_type="hidden",_name="location",_value=location),
-			INPUT(_type="hidden",_name="token",_value=session.token),
+            INPUT(_type="hidden",_name="token",_value=session.token),
-			INPUT(_type="hidden",_name="sender",_value=URL('design',args=app, anchor=anchor)),
+            INPUT(_type="hidden",_name="sender",_value=URL('design',args=app, anchor=anchor)),
-			_action=URL('upload_file'),
+            _action=URL('upload_file'),
-			_class="generatedbyw2p well well-small")
+            _class="generatedbyw2p well well-small")
-	return form
+    return form
 def file_create_form(location, anchor=None, helptext=""):
-	form=FORM(
+    form=FORM(
-			LABEL(T("create file with filename:")),
+            LABEL(T("create file with filename:")),
-			INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY,_class=''),
+            INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY,_class=''),
-			TAG['SMALL'](helptext,_class="help-block"),
+            TAG['SMALL'](helptext,_class="help-block"),
-			DIV(TAG['BUTTON'](T("Create"),_type="submit",_class="btn"),_class="controls"),
+            DIV(TAG['BUTTON'](T("Create"),_type="submit",_class="btn"),_class="controls"),
-			INPUT(_type="hidden",_name="location",_value=location),
+            INPUT(_type="hidden",_name="location",_value=location),
-			INPUT(_type="hidden",_name="sender",_value=URL('design',args=app)),
+            INPUT(_type="hidden",_name="sender",_value=URL('design',args=app)),
-			INPUT(_type="hidden",_name="token",_value=session.token),
+            INPUT(_type="hidden",_name="token",_value=session.token),
-			INPUT(_type="hidden",_name="id",_value=anchor),
+            INPUT(_type="hidden",_name="id",_value=anchor),
-			_action=URL('create_file'),
+            _action=URL('create_file'),
-			_class="generatedbyw2p well well-small")
+            _class="generatedbyw2p well well-small")
-	return form
+    return form
 def upload_plugin_form(app, anchor=None):
-	form=FORM(
+    form=FORM(
-			LABEL(T("upload plugin file:")),
+            LABEL(T("upload plugin file:")),
-			INPUT(_type="file",_name="pluginfile"),
+            INPUT(_type="file",_name="pluginfile"),
-			INPUT(_type="hidden",_name="id",_value=anchor),
+            INPUT(_type="hidden",_name="id",_value=anchor),
-			INPUT(_type="hidden",_name="token",_value=session.token),
+            INPUT(_type="hidden",_name="token",_value=session.token),
-			DIV(TAG['BUTTON'](T("Upload"),_type="submit",_class="btn"),_class="controls"),
+            DIV(TAG['BUTTON'](T("Upload"),_type="submit",_class="btn"),_class="controls"),
-			_class="generatedbyw2p well well-small")
+            _class="generatedbyw2p well well-small")
-	return form
+    return form
 def deletefile(arglist, vars={}):
-	vars.update({'sender':request.function+'/'+app})
+    vars.update({'sender':request.function+'/'+app})
-	return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), 
+    return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), 
-						SPAN(T('Delete this file (you will be asked to confirm deletion)'))),
+                        SPAN(T('Delete this file (you will be asked to confirm deletion)'))),
-						_href=URL('delete',args=arglist,vars=vars),
+                        _href=URL('delete',args=arglist,vars=vars),
-						_class='icon delete',
+                        _class='icon delete',
-						_rel="tooltip",
+                        _rel="tooltip",
-						**{'_data-placement':'right',
+                        **{'_data-placement':'right',
-							'_data-original-title':T('Delete this file (you will be asked to confirm deletion)')})
+                            '_data-original-title':T('Delete this file (you will be asked to confirm deletion)')})
 }}
 
 {{block sectionclass}}design{{end}}
@@ -91,44 +91,45 @@ def deletefile(arglist, vars={}):
 
 <!-- MODELS -->
 <h3 id="_models" rel="pagebookmark">
-	<span class="component" onclick="collapse('models_inner');">{{=T("Models")}}</span>
+    <span class="component" onclick="collapse('models_inner');">{{=T("Models")}}</span>
-	<a href="#models" rel="tooltip" data-placement="right" data-original-title="{{=T('The data representation, define database tables and sets')}}">
+    <a href="#models" rel="tooltip" data-placement="right" data-original-title="{{=T('The data representation, define database tables and sets')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("The data representation, define database tables and sets")}}</span>
+    <span>{{=T("The data representation, define database tables and sets")}}</span>
-	</a><span id="models" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="models" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="models_inner" class="component_contents">
-	{{if not models:}}<p><strong>{{=T("There are no models")}}</strong></p>{{else:}}
+    {{if not models:}}<p><strong>{{=T("There are no models")}}</strong></p>{{else:}}
-	<div class="controls comptools">
+    <div class="controls comptools">
-		{{=button(URL(a=app,c='appadmin',f='index'), T('database administration'))}}
+        {{=button(URL(a=app,c='appadmin',f='index'), T('database administration'))}}
-		{{if os.access(os.path.join(request.folder,'..',app,'databases','sql.log'),os.R_OK):}}
+        {{if os.access(os.path.join(request.folder,'..',app,'databases','sql.log'),os.R_OK):}}
-			{{=button(URL('peek/%s/databases/sql.log'%app), 'sql.log')}}
+            {{=button(URL('peek/%s/databases/sql.log'%app), 'sql.log')}}
-		{{pass}}
+        {{pass}}
                 {{=button(URL(a=app, c='appadmin',f='graph_model'), T('graph model'))}}
-	</div>
+    </div>
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-		{{for m in models:}}
+        {{for m in models:}}
-			{{id="models__"+m.replace('.','__')}}
+            {{id="models__"+m.replace('.','__')}}
-		<li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-			<span class="filetools controls">
+            <span class="filetools controls">
-				{{=editfile('models',m, dict(id=id))}}
+                {{=editfile('models',m, dict(id=id))}}
-				{{=deletefile([app, 'models', m], dict(id=id, id2='models'))}}
+                {{=deletefile([app, 'models', m], dict(id=id, id2='models'))}}
-			</span>
+            </span>
-			<span class="file">
+            <span class="file">
-				{{=peekfile('models',m, dict(id=id))}}
+                {{=peekfile('models',m, dict(id=id))}}
-			</span>
+            </span>
-			<span class="extras">
+            <span class="extras">
-				{{if len(defines[m]):}}{{=T("defines tables")}} {{pass}}{{=XML(', '.join([B(table).xml() for table in defines[m]]))}}
+                {{if len(defines[m]):}}{{=T("defines tables")}} {{pass}}{{=XML(', '.join([B(table).xml() for table in defines[m]]))}}
-			</span>
+            </span>
-		</li>
+        </li>
-		{{pass}}
+        {{pass}}
-	</ul>
+    </ul>
-	{{pass}}
+    {{pass}}
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form1').slideToggle()" class="btn btn-mini">Create</button>
-			<div class="span3">{{=file_create_form('%s/models/' % app, 'models')}}</div>
+      <div id="form1" class="row-fluid" style="display:none">
-		</div>
+        <div class="span3">{{=file_create_form('%s/models/' % app, 'models')}}</div>
-	</div>
+      </div>
+    </div>
 </div>
 
 <!-- FIND CONTROLLER FUNCTIONS -->
@@ -139,322 +140,330 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 
 <!-- CONTROLLERS -->
 <h3 id="_controllers" rel="pagebookmark">
-	<span class="component" onclick="collapse('controllers_inner');">{{=T("Controllers")}}</span>
+    <span class="component" onclick="collapse('controllers_inner');">{{=T("Controllers")}}</span>
-	<a href="#controllers" rel="tooltip" data-placement="right" data-original-title="{{=T('The application logic, each URL path is mapped in one exposed function in the controller')}}">
+    <a href="#controllers" rel="tooltip" data-placement="right" data-original-title="{{=T('The application logic, each URL path is mapped in one exposed function in the controller')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("The application logic, each URL path is mapped in one exposed function in the controller")}}</span>
+    <span>{{=T("The application logic, each URL path is mapped in one exposed function in the controller")}}</span>
-	</a><span id="controllers" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="controllers" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="controllers_inner" class="component_contents">
-	{{if not controllers:}}<p><strong>{{=T("There are no controllers")}}</strong></p>{{else:}}
+    {{if not controllers:}}<p><strong>{{=T("There are no controllers")}}</strong></p>{{else:}}
-	<div class="controls comptools">
+    <div class="controls comptools">
-		{{=button(URL(r=request,c='shell',f='index',args=app), T("shell"))}}
+        {{=button(URL(r=request,c='shell',f='index',args=app), T("shell"))}}
-		{{=button(URL('test',args=app), T("test"))}}
+        {{=button(URL('test',args=app), T("test"))}}
-		{{=button(URL('edit',args=[app,'cron','crontab']), T("crontab"))}}
+        {{=button(URL('edit',args=[app,'cron','crontab']), T("crontab"))}}
-	</div>
+    </div>
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-		{{for c in controllers:}}
+        {{for c in controllers:}}
-		{{id="controllers__"+c.replace('.','__')}}
+        {{id="controllers__"+c.replace('.','__')}}
-		<li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-		<span class="filetools controls">
+        <span class="filetools controls">
-		{{=editfile('controllers',c, dict(id=id))}}
+        {{=editfile('controllers',c, dict(id=id))}}
-		{{=deletefile([app, 'controllers', c], dict(id=id, id2='controllers'))}}
+        {{=deletefile([app, 'controllers', c], dict(id=id, id2='controllers'))}}
-		{{=testfile('controllers',c)}}
+        {{=testfile('controllers',c)}}
-		</span>
+        </span>
-		<span class="file">
+        <span class="file">
-		{{=peekfile('controllers',c, dict(id=id))}}
+        {{=peekfile('controllers',c, dict(id=id))}}
-		</span>
+        </span>
-		<span class="extras celled">
+        <span class="extras celled">
-			{{if functions[c]:}}{{=T("exposes")}}{{pass}} {{=XML(', '.join([A(f,_href=URL(a=app,c=c[:-3],f=f)).xml() for f in functions[c]]))}}
+            {{if functions[c]:}}{{=T("exposes")}}{{pass}} {{=XML(', '.join([A(f,_href=URL(a=app,c=c[:-3],f=f)).xml() for f in functions[c]]))}}
-		</span>
+        </span>
-		</li>
+        </li>
-		{{pass}}
+        {{pass}}
-	</ul>
+    </ul>
-	{{pass}}
+    {{pass}}
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form2').slideToggle()" class="btn btn-mini">Create</button>
-			<div class="span3">{{=file_create_form('%s/controllers/' % app, 'controllers')}}</div>
+      <div id="form2" class="row-fluid" style="display:none">
-		</div>
+        <div class="span3">{{=file_create_form('%s/controllers/' % app, 'controllers')}}</div>
-	</div>
+      </div>
+    </div>
 </div>
 
 <!-- VIEWS -->
 <h3 id="_views" rel="pagebookmark">
-	<span class="component" onclick="collapse('views_inner');">{{=T("Views")}}</span>
+    <span class="component" onclick="collapse('views_inner');">{{=T("Views")}}</span>
-	<a href="#views" rel="tooltip" data-placement="right" data-original-title="{{=T('The presentations layer, views are also known as templates')}}">
+    <a href="#views" rel="tooltip" data-placement="right" data-original-title="{{=T('The presentations layer, views are also known as templates')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("The presentations layer, views are also known as templates")}}</span>
+    <span>{{=T("The presentations layer, views are also known as templates")}}</span>
-	</a><span id="views" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="views" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="views_inner" class="component_contents">
   {{if not views:}}<p><strong>{{=T("There are no views")}}</strong></p>{{else:}}
-	<div class="controls comptools">
+    <div class="controls comptools">
-		{{=button(LAYOUTS_APP, T("download layouts"))}}
+        {{=button(LAYOUTS_APP, T("download layouts"))}}
-	</div>
+    </div>
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-		{{for c in views:}}
+        {{for c in views:}}
-			{{id="views__"+c.replace('/','__').replace('.','__')}}
+            {{id="views__"+c.replace('/','__').replace('.','__')}}
-		<li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-			<span class="filetools controls">
+            <span class="filetools controls">
-				{{=editfile('views',c, dict(id=id))}}
+                {{=editfile('views',c, dict(id=id))}}
-				{{=deletefile([app, 'views', c], dict(id=id, id2='views'))}}
+                {{=deletefile([app, 'views', c], dict(id=id, id2='views'))}}
-			</span>
+            </span>
-			<span class="file">
+            <span class="file">
-				{{=peekfile('views',c, dict(id=id))}}
+                {{=peekfile('views',c, dict(id=id))}}
-			</span>
+            </span>
-			<span class="extras celled celled-one">
+            <span class="extras celled celled-one">
-				{{if extend.has_key(c):}}{{=T("extends")}} <b>{{=extend[c]}}</b> {{pass}}
+                {{if extend.has_key(c):}}{{=T("extends")}} <b>{{=extend[c]}}</b> {{pass}}
-				{{if include[c]:}}{{=T("includes")}} {{pass}}{{=XML(', '.join([B(f).xml() for f in include[c]]))}}
+                {{if include[c]:}}{{=T("includes")}} {{pass}}{{=XML(', '.join([B(f).xml() for f in include[c]]))}}
-			</span>
+            </span>
-		</li>
+        </li>
-		{{pass}}
+        {{pass}}
-	</ul>
+    </ul>
-	{{pass}}
+    {{pass}}
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form3').slideToggle()" class="btn btn-mini">Create</button>
-			<div class="span3">{{=file_create_form('%s/views/' % app, 'views')}}</div>
+      <div id="form3" class="row-fluid" style="display:none">
-		</div>
+        <div class="span3">{{=file_create_form('%s/views/' % app, 'views')}}</div>
-	</div>
+      </div>
+    </div>
 </div>
 
 <!-- LANGUAGES -->
 <h3 id="_languages" rel="pagebookmark">
-	<span class="component" onclick="collapse('languages_inner');">{{=T("Languages")}}</span>
+    <span class="component" onclick="collapse('languages_inner');">{{=T("Languages")}}</span>
-	<a href="#languages" rel="tooltip" data-placement="right" data-original-title="{{=T('Translation strings for the application')}}">
+    <a href="#languages" rel="tooltip" data-placement="right" data-original-title="{{=T('Translation strings for the application')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("Translation strings for the application")}}</span>
+    <span>{{=T("Translation strings for the application")}}</span>
-	</a><span id="languages" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="languages" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="languages_inner" class="component_contents">
-	{{if not languages:}}<p><strong>{{=T("There are no translators, only default language is supported")}}</strong></p>{{else:}}
+    {{if not languages:}}<p><strong>{{=T("There are no translators, only default language is supported")}}</strong></p>{{else:}}
-	<div class="controls comptools">
+    <div class="controls comptools">
-		{{=button(URL('update_languages/'+app), T('update all languages'))}}
+        {{=button(URL('update_languages/'+app), T('update all languages'))}}
-	</div>
+    </div>
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-		{{for lang in sorted(languages):
+        {{for lang in sorted(languages):
-			file = lang+'.py'
+            file = lang+'.py'
-			id = "languages__"+file.replace('.','__')}}
+            id = "languages__"+file.replace('.','__')}}
-		<li id="{{='_'+id}}" rel="pagebookmark" class="li-row"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <li id="{{='_'+id}}" rel="pagebookmark" class="li-row"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-			<span class="li-controls">
+            <span class="li-controls">
-				<span class="filetools controls">
+                <span class="filetools controls">
-				 {{=editlanguagefile('languages',file)}}
+                 {{=editlanguagefile('languages',file)}}
-				 {{=deletefile([app, 'languages', file], dict(id=id, id2='languages'))}}
+                 {{=deletefile([app, 'languages', file], dict(id=id, id2='languages'))}}
-				</span>
+                </span>
-				<span class="">
+                <span class="">
-				  {{=peekfile('languages',file, dict(id=id))}}
+                  {{=peekfile('languages',file, dict(id=id))}}
-				</span>
+                </span>
-			</span> <!-- /li-row -->
+            </span> <!-- /li-row -->
-			<span class="extras celled">
+            <span class="extras celled">
-				(
+                (
-				{{=T("Plural-Forms:")}}
+                {{=T("Plural-Forms:")}}
-				{{p=languages[lang][3:7]}}
+                {{p=languages[lang][3:7]}}
-				{{if p[2] == 'default':}}
+                {{if p[2] == 'default':}}
-				   <span class='error text-error'>{{=T("rules are not defined")}}</span> {{=T.M("(file **gluon/contrib/plural_rules/%s.py** is not found)",lang[:2])}}
+                   <span class='error text-error'>{{=T("rules are not defined")}}</span> {{=T.M("(file **gluon/contrib/plural_rules/%s.py** is not found)",lang[:2])}}
-				{{else:}}
+                {{else:}}
-				 {{if p[3] == 1:}}
+                 {{if p[3] == 1:}}
-				   {{=B(T("are not used"))}}
+                   {{=B(T("are not used"))}}
-				 {{else:}}
+                 {{else:}}
-				   {{pfile=p[0]}}
+                   {{pfile=p[0]}}
-					{{if p[1]!=0:}}<span style="display:inline-block;margin-top:-10px;">
+                    {{if p[1]!=0:}}<span style="display:inline-block;margin-top:-10px;">
-					 <span class="filetools controls">
+                     <span class="filetools controls">
-					   {{=editpluralsfile('languages',pfile,dict(nplurals=p[3]))}}
+                       {{=editpluralsfile('languages',pfile,dict(nplurals=p[3]))}}
-					 </span>
+                     </span>
-					 <span class="file">
+                     <span class="file">
-						{{=peekfile('languages',pfile,dict(id=id))}}
+                        {{=peekfile('languages',pfile,dict(id=id))}}
-					 </span></span>
+                     </span></span>
-				   {{else:}}
+                   {{else:}}
-					  <b>{{=T("are not used yet")}}</b>
+                      <b>{{=T("are not used yet")}}</b>
-					{{pass}}
+                    {{pass}}
-				  {{pass}}
+                  {{pass}}
-				{{pass}}
+                {{pass}}
-				)
+                )
-			</span>
+            </span>
-		</li>
+        </li>
-		{{pass}}
+        {{pass}}
-	</ul>
+    </ul>
-	{{pass}}
+    {{pass}}
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form4').slideToggle()" class="btn btn-mini">Create</button>
-			<div class="span3">{{=file_create_form('%s/languages/' % app, 'languages', T('(something like "it-it")'))}}</div>
+      <div id="form4" class="row-fluid" style="display:none">
-		</div>
+        <div class="span3">{{=file_create_form('%s/languages/' % app, 'languages', T('(something like "it-it")'))}}</div>
-	</div>
+      </div>
+    </div>
 </div>
 
 <!-- STATIC -->
 <h3 id="_static" rel="pagebookmark">
-	<span class="component" onclick="collapse('static_inner');">{{=T("Static")}}</span>
+    <span class="component" onclick="collapse('static_inner');">{{=T("Static")}}</span>
-	<a href="#static" rel="tooltip" data-placement="right" data-original-title="{{=T('These files are served without processing, your images go here')}}">
+    <a href="#static" rel="tooltip" data-placement="right" data-original-title="{{=T('These files are served without processing, your images go here')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("These files are served without processing, your images go here")}}</span>
+    <span>{{=T("These files are served without processing, your images go here")}}</span>
-	</a><span id="static" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="static" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="static_inner" class="component_contents">
-	{{if not statics:}}<p><strong>{{=T("There are no static files")}}</strong></p>{{else:}}
+    {{if not statics:}}<p><strong>{{=T("There are no static files")}}</strong></p>{{else:}}
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-	{{
+    {{
-		path=[]
+        path=[]
-		for file in statics+['']:
+        for file in statics+['']:
-			items=file.split('/')
+            items=file.split('/')
-			file_path=items[:-1]
+            file_path=items[:-1]
-			filename=items[-1]
+            filename=items[-1]
-			while path!=file_path:
+            while path!=file_path:
-				if len(file_path)>=len(path) and all([v==file_path[k] for k,v in enumerate(path)]):
+                if len(file_path)>=len(path) and all([v==file_path[k] for k,v in enumerate(path)]):
-					path.append(file_path[len(path)])
+                    path.append(file_path[len(path)])
-					thispath='static__'+'__'.join(path)
+                    thispath='static__'+'__'.join(path)
-	}}
+    }}
-		<li class="folder"><i>&nbsp;</i>
+        <li class="folder"><i>&nbsp;</i>
-			<a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
+            <a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
-			<ul id="{{=thispath}}" style="display: none;" class="sublist">{{
+            <ul id="{{=thispath}}" style="display: none;" class="sublist">{{
-				else:
+                else:
-					path = path[:-1]
+                    path = path[:-1]
-		}}
+        }}
-		</ul></li>
+        </ul></li>
-	{{
+    {{
-				pass
+                pass
-			pass
+            pass
-		if filename:
+        if filename:
-	}}
+    }}
-		<li>
+        <li>
-			<span class="filetools controls">
+            <span class="filetools controls">
-				{{=editfile('static',file, dict(id="static"))}} {{=deletefile([app,'static',file], dict(id="static",id2="static"))}}
+                {{=editfile('static',file, dict(id="static"))}} {{=deletefile([app,'static',file], dict(id="static",id2="static"))}}
-			</span>
+            </span>
-			<span class="file">
+            <span class="file">
-				<a href="{{=URL(a=app,c='static',f=file)}}">{{=filename}}</a>
+                <a href="{{=URL(a=app,c='static',f=file)}}">{{=filename}}</a>
-			</span>
+            </span>
-		</li>{{
+        </li>{{
-		pass
+        pass
-	pass
+    pass
-	}}
+    }}
-	</ul>
+    </ul>
-	{{pass}}
+    {{pass}}
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form5').slideToggle()" class="btn btn-mini">Create/Upload</button>
-			<div class="span3">{{=file_create_form('%s/static/' % app, 'static')}}<em>{{=T('or alternatively')}}</em></div>
+      <div id="form5" class="row-fluid" style="display:none">
-			<div class="span3">{{=file_upload_form('%s/static/' % app, 'static')}}</div>
+        <div class="span3">{{=file_create_form('%s/static/' % app, 'static')}}<em>{{=T('or alternatively')}}</em></div>
-		</div>
+        <div class="span3">{{=file_upload_form('%s/static/' % app, 'static')}}</div>
-	</div>
+      </div>
+    </div>
 </div>
 
 <!-- MODULES -->
 <h3 id="_modules" rel="pagebookmark">
-	<span class="component" onclick="collapse('modules_inner');">{{=T("Modules")}}</span>
+    <span class="component" onclick="collapse('modules_inner');">{{=T("Modules")}}</span>
-	<a href="#modules" rel="tooltip" data-placement="right" data-original-title="{{=T('Additional code for your application')}}">
+    <a href="#modules" rel="tooltip" data-placement="right" data-original-title="{{=T('Additional code for your application')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("Additional code for your application")}}</span>
+    <span>{{=T("Additional code for your application")}}</span>
-	</a><span id="modules" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="modules" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="modules_inner" class="component_contents">
-	{{if not modules:}}<p><strong>{{=T("There are no modules")}}</strong></p>{{else:}}
+    {{if not modules:}}<p><strong>{{=T("There are no modules")}}</strong></p>{{else:}}
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-		{{for m in modules:}}
+        {{for m in modules:}}
-			{{id="modules__"+m.replace('/','__').replace('.','__')}}
+            {{id="modules__"+m.replace('/','__').replace('.','__')}}
-		<li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-			<span class="filetols controls">
+            <span class="filetols controls">
-				{{=editfile('modules',m,dict(id=id))}}
+                {{=editfile('modules',m,dict(id=id))}}
-				{{if m!='__init__.py':}}
+                {{if m!='__init__.py':}}
-					{{=deletefile([app, 'modules', m], dict(id=id, id2='modules'))}}
+                    {{=deletefile([app, 'modules', m], dict(id=id, id2='modules'))}}
-				{{pass}}
+                {{pass}}
-			</span>
+            </span>
-			<span class="file">
+            <span class="file">
-				{{=peekfile('modules',m, dict(id=id))}}
+                {{=peekfile('modules',m, dict(id=id))}}
-			</span>
+            </span>
-		</li>
+        </li>
-		{{pass}}
+        {{pass}}
-	</ul>
+    </ul>
-	{{pass}}
+    {{pass}}
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form6').slideToggle()" class="btn btn-mini">Create/Upload</button>
-			<div class="span3">{{=file_create_form('%s/modules/' % app, 'modules')}}<em>{{=T('or alternatively')}}</em></div>
+      <div id="form6" class="row-fluid" style="display:none">
-			<div class="span3">{{=file_upload_form('%s/modules/' % app, 'modules')}}</div>
+        <div class="span3">{{=file_create_form('%s/modules/' % app, 'modules')}}<em>{{=T('or alternatively')}}</em></div>
-		</div>
+        <div class="span3">{{=file_upload_form('%s/modules/' % app, 'modules')}}</div>
-	</div>
+      </div>
+    </div>
 </div>
 
 <!-- PRIVATE -->
 <h3 id="_private" rel="pagebookmark">
-	<span class="component" onclick="collapse('private_inner');">{{=T("Private files")}}</span>
+    <span class="component" onclick="collapse('private_inner');">{{=T("Private files")}}</span>
-	<a href="#private" rel="tooltip" data-placement="right" data-original-title="{{=T('These files are not served, they are only available from within your app')}}">
+    <a href="#private" rel="tooltip" data-placement="right" data-original-title="{{=T('These files are not served, they are only available from within your app')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("These files are not served, they are only available from within your app")}}</span>
+    <span>{{=T("These files are not served, they are only available from within your app")}}</span>
-	</a><span id="private" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="private" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="private_inner" class="component_contents">
-	{{if not privates:}}<p><strong>{{=T("There are no private files")}}</strong></p>{{else:}}
+    {{if not privates:}}<p><strong>{{=T("There are no private files")}}</strong></p>{{else:}}
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-		{{
+        {{
-		path=[]
+        path=[]
-		for file in privates+['']:
+        for file in privates+['']:
-			items=file.split('/')
+            items=file.split('/')
-			file_path=items[:-1]
+            file_path=items[:-1]
-			filename=items[-1]
+            filename=items[-1]
-			while path!=file_path:
+            while path!=file_path:
-				if len(file_path)>=len(path) and all([v==file_path[k] for k,v in enumerate(path)]):
+                if len(file_path)>=len(path) and all([v==file_path[k] for k,v in enumerate(path)]):
-					path.append(file_path[len(path)])
+                    path.append(file_path[len(path)])
-					thispath='private__'+'__'.join(path)
+                    thispath='private__'+'__'.join(path)
-		}}
+        }}
-		<li class="folder">
+        <li class="folder">
-			<a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
+            <a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
-			<ul id="{{=thispath}}" style="display: none;" class="sublist">{{
+            <ul id="{{=thispath}}" style="display: none;" class="sublist">{{
-				else:
+                else:
-					path = path[:-1]
+                    path = path[:-1]
-			}}
+            }}
-			</ul>
+            </ul>
-		</li>
+        </li>
-		{{
+        {{
-				pass
+                pass
-			pass
+            pass
-			if filename:
+            if filename:
-		}}
+        }}
-		<li>
+        <li>
-			<span class="filetools controls">
+            <span class="filetools controls">
-				{{=editfile('private',file, dict(id="private"))}} {{=deletefile([app,'private',file], dict(id="private",id2="private"))}}
+                {{=editfile('private',file, dict(id="private"))}} {{=deletefile([app,'private',file], dict(id="private",id2="private"))}}
-			</span>
+            </span>
-			<span class="file">
+            <span class="file">
-				{{=peekfile('private',file, dict(id="private"))}}
+                {{=peekfile('private',file, dict(id="private"))}}
-			</span>
+            </span>
-		</li>{{
+        </li>{{
-			pass
+            pass
-		pass
+        pass
-		}}
+        }}
-	{{pass}}
+    {{pass}}
-	</ul>
+    </ul>
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form7').slideToggle()" class="btn btn-mini">Create/Upload</button>
-			<div class="span3">{{=file_create_form('%s/private/' % app, 'private')}}<em>{{=T('or alternatively')}}</em></div>
+      <div id="form7" class="row-fluid" style="display:none">
-			<div class="span3">{{=file_upload_form('%s/private/' % app, 'private')}}</div>
+        <div class="span3">{{=file_create_form('%s/private/' % app, 'private')}}<em>{{=T('or alternatively')}}</em></div>
-		</div>
+        <div class="span3">{{=file_upload_form('%s/private/' % app, 'private')}}</div>
-	</div>
+      </div>
+    </div>
 </div>
 
 <!-- PLUGINS -->
 <h3 id="_plugins" rel="pagebookmark">
-	<span class="component" onclick="collapse('plugins_inner');">{{=T("Plugins")}}</span>
+    <span class="component" onclick="collapse('plugins_inner');">{{=T("Plugins")}}</span>
-	<a href="#plugins" rel="tooltip" data-placement="right" data-original-title="{{=T('To create a plugin, name a file/folder plugin_[name]')}}">
+    <a href="#plugins" rel="tooltip" data-placement="right" data-original-title="{{=T('To create a plugin, name a file/folder plugin_[name]')}}">
-	{{=helpicon()}}
+    {{=helpicon()}}
-	<span>{{=T("To create a plugin, name a file/folder plugin_[name]")}}</span>
+    <span>{{=T("To create a plugin, name a file/folder plugin_[name]")}}</span>
-	</a><span id="plugins" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
+    </a><span id="plugins" class="hashstick">&nbsp;</span><a href="#" class="tophashlink btn btn-mini btn-warning"><span>top</span></a>
 </h3>
 <div id="plugins_inner" class="component_contents">
-	<div class="controls comptools">
+    <div class="controls comptools">
-		{{=button(PLUGINS_APP, T('download plugins'))}}
+        {{=button(PLUGINS_APP, T('download plugins'))}}
-	</div>
+    </div>
-	{{if plugins:}}
+    {{if plugins:}}
-	<ul class="unstyled act_edit">
+    <ul class="unstyled act_edit">
-		{{for plugin in plugins:}}
+        {{for plugin in plugins:}}
-			{{id="plugins__"+plugin.replace('/','__').replace('.','__')}}
+            {{id="plugins__"+plugin.replace('/','__').replace('.','__')}}
-		<li id="{{=id}}">
+        <li id="{{=id}}">
-			{{=A('plugin_%s' % plugin, _class='file', _href=URL('plugin', args=[app, plugin], vars=dict(id=id, id2='plugins')))}}
+            {{=A('plugin_%s' % plugin, _class='file', _href=URL('plugin', args=[app, plugin], vars=dict(id=id, id2='plugins')))}}
-		</li>
+        </li>
-		{{pass}}
+        {{pass}}
-	</ul>
+    </ul>
-	{{else:}}
+    {{else:}}
-	<p><strong>{{=T('There are no plugins')}}</strong></p>
+    <p><strong>{{=T('There are no plugins')}}</strong></p>
-	{{pass}}
+    {{pass}}
-	<div class="controls formfield">
+    <div class="controls formfield">
-		<div class="row-fluid">
+      <button onclick="jQuery('#form8').slideToggle()" class="btn btn-mini">Upload</button>
-			<div class="span3">{{=upload_plugin_form(app, 'plugins')}}</div>
+      <div id="form8" class="row-fluid" style="display:none">
-		</div>
+        <div class="row-fluid">
-	</div>
+          <div class="span3">{{=upload_plugin_form(app, 'plugins')}}</div>
+        </div>
+      </div>
 </div>
 
 <script>
@@ -465,7 +474,7 @@ function filter_files() {
           files=data['files'];
           message=data['message'];
           for(var i=0; i<files.length; i++)
-            jQuery('li#'+files[i].replace(/\//g,'__').replace('.','__')).slideDown();
+            jQuery('li#_'+files[i].replace(/\//g,'__').replace('.','__')).slideDown();
           jQuery('.flash').html(message).slideDown();
           });
       } else {

applications/admin/views/default/edit.html

@@ -132,7 +132,7 @@ jQuery(document).ready(function(){
   <form action="{{=URL('edit',args=filename)}}" method="post" name="editform" id="editform">
 	<div class="editor-bar-column">
 		<label>{{=T('Save file:')}}</label>
-		<a value="save" name="save" onclick="return doClickSave();" class="icon saveicon btn btn-mini" style="background-image: -webkit-linear-gradient(top,white,#E6E6E6);">
+		<a value="save" name="save" onclick="return doClickSave();" class="icon saveicon" style="background-image: -webkit-linear-gradient(top,white,#E6E6E6);">
 		{{=IMG(_src=URL('static', 'images/save_icon.png'), _alt=T('Save'))}}
 		</a>
 	</div>

applications/admin/views/default/pack_custom.html

@@ -0,0 +1,32 @@
+{{extend 'layout.html'}}
+{{import os}}
+
+{{def tree(path):}}
+    <input type="checkbox" onclick="jQuery(this).parent().find(':checkbox').attr('checked',this.checked)" checked="checked"/>
+    <a href="#" onclick="jQuery(this).next().slideToggle();return false;">
+      {{=path[len(base):] or '/%s' % app}}
+    </a>
+    <ul class="collapsible">
+      {{for file in files[path]['files']:}}
+       <li style="list-style-type: none;">
+	 {{p = os.path.relpath(os.path.join(path,file),base)}}
+	 <input type="checkbox" value="{{=p}}" name="file" checked="checked"/>
+	 {{=file}}
+       </li>
+       {{pass}}
+       {{for dir in files[path]['folders']:}}
+       <li style="list-style-type: none;">
+	 {{tree(os.path.join(path,dir))}}
+       </li>
+       {{pass}}
+    </ul> 
+    {{return}}    
+
+<form action="{{=URL(args=request.args)}}" method="POST">
+<h2>{{=T('Select Files to Package')}}</h2>
+<input type="submit" value="{{=T('Download .w2p')}}" class="btn"/>
+<div style="margin-top:20px">
+{{tree(base)}}
+</div>
+</form>
+<script>jQuery(function(){jQuery('.collapsible').hide();});</script>

applications/admin/views/default/plugin.html

@@ -6,7 +6,7 @@ def all(items):
 def peekfile(path,file):
     return A(file.replace('\\\\','/'),_href=URL('peek', args=(app, path, file)))
 def editfile(path,file):
-	return A(SPAN(T('Edit')),_class='button editbutton btn',_href=URL('edit', args=(app, path, file)))
+	return A(SPAN(T('Edit')),_class='button editbutton btn btn-mini',_href=URL('edit', args=(app, path, file)))
 def testfile(path,file):
 	return A(TAG[''](IMG(_src=URL('static', 'images/test_icon.png'), _alt=T('test')), 
 						SPAN(T("Run tests in this file"))), 
@@ -16,7 +16,7 @@ def testfile(path,file):
 						**{'_data-placement':'right',
 							'_data-original-title':T("Run tests in this file")})
 def editlanguagefile(path,file):
-    return A(SPAN(T('Edit')),_class='button editbutton',_href=URL('edit_language', args=(app, path, file)))
+    return A(SPAN(T('Edit')),_class='button editbutton btn-mini',_href=URL('edit_language', args=(app, path, file)))
 def file_upload_form(location):
     form=FORM(T("upload file:")," ",
               INPUT(_type="file",_name="file")," ",T("and rename it:")," ",
@@ -220,4 +220,4 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 	</ul>
 	{{pass}}
 </div>
-<!-- end "plugin" block -->
+<!-- end "plugin" block -->

applications/admin/views/default/site.html

@@ -3,143 +3,158 @@
 {{block sectionclass}}site{{end}}
 <!-- begin "site" block -->
 <div class="row-fluid">
-	<div class="applist f60 span7">
+  <div class="applist f60 span7">
-		<div class="applist_inner">
+    <div class="applist_inner">
-			<h2>{{=T("Installed applications")}}</h2>
+      <h2>{{=T("Installed applications")}}</h2>
-			<ul class="unstyled">
+      <table width="100%" class="table">
-			{{for a in apps:}}
+	{{for a in apps:}}
-				<li class="application"> <!-- onmouseover="jQuery(this).children('p').show()" onmouseout="jQuery(this).children('p').hide()"-->
+	<tr>{{buttons = []}}
-				{{if a==request.application:}}
+	  <td>			   
-					<h3 class="currentapp muted">{{=a}} ({{=T('currently running')}})</h3>
+	      {{if a==request.application:}}
-					<p class="controls row-buttons">
+  	        <h4 class="currentapp">{{=a}} ({{=T('currently running')}})</h4>
-				{{else:}}
+	      {{else:}}
-					<h3 class="editableapp muted">{{=A(a,_href=URL(a,'default','index'))}}</h3>
+	        <h4 class="editableapp">{{=A(a,_href=URL(a,'default','index'))}}</h4>
-					{{if MULTI_USER_MODE and db.app(name=a):}}(created by {{="%(first_name)s %(last_name)s" % db.auth_user[db.app(name=a).owner]}}){{pass}}
+	        {{if MULTI_USER_MODE and db.app(name=a):}}(created by {{="%(first_name)s %(last_name)s" % db.auth_user[db.app(name=a).owner]}}){{pass}}
-					<p class="controls row-buttons">
+		{{if not os.path.exists('applications/%s/compiled' % a):}}
-					{{if not os.path.exists('applications/%s/compiled' % a):}}
+		  {{buttons.append((URL('design',args=a), T("Edit")))}}
-						{{=sp_button(URL('design',args=a), T("Edit"))}}
+		{{else:}}
-					{{else:}}
+		  {{buttons.append((URL(a,'appadmin','index'), T("appadmin")))}}
-						{{=button(URL(a,'appadmin','index'), T("appadmin"))}}
+		{{pass}}
-					{{pass}}
+		{{buttons.append((URL('about',args=a), T("About")))}}
-						{{=button(URL('about',args=a), T("About"))}}
+	      {{pass}}
-				{{pass}}
+	      {{buttons.append((URL('errors',args=a), T("Errors")))}}
-						{{=button(URL('errors',args=a), T("Errors"))}}
+	      {{buttons.append((URL('cleanup',args=a), T("Clean")))}}
-						{{=button(URL('cleanup',args=a), T("Clean"))}}
+	      {{buttons.append((URL('pack',args=a), T("Pack all")))}}
-						{{=button(URL('pack',args=a), T("Pack all"))}}
+	      {{buttons.append((URL('pack_custom',args=a), T("Pack custom")))}}
-				{{if not os.path.exists('applications/%s/compiled' % a):}}
+	      {{if not os.path.exists('applications/%s/compiled' % a):}}
-						{{=button(URL('compile_app',args=a), T("Compile"))}}
+                {{buttons.append((URL('compile_app',args=a), T("Compile")))}}
-				{{else:}}
+	      {{else:}}
-						{{=button(URL('pack',args=(a, 'compiled')), T("Pack compiled"))}}
+ 		{{buttons.append((URL('pack',args=(a, 'compiled')), T("Pack compiled")))}}
-					{{if glob.glob('applications/%s/controllers/*.py' % a):}}
+		{{if glob.glob('applications/%s/controllers/*.py' % a):}}
-						{{=button(URL('remove_compiled_app',args=a), T("Remove compiled"))}}
+		  {{buttons.append((URL('remove_compiled_app',args=a), T("Remove compiled")))}}
-					{{pass}}
+		{{pass}}
-				{{pass}}
+	      {{pass}}
-				{{if os.path.exists(os.path.join(apath(r=request),a,'.git')): }}
+	      {{if os.path.exists(os.path.join(apath(r=request),a,'.git')): }}
-						{{=button(URL('git_pull',args=a), T("Git Pull"))}}
+		{{buttons.append((URL('git_pull',args=a), T("Git Pull")))}}
-						{{=button(URL('git_push',args=a), T("Git Push"))}}
+		{{buttons.append((URL('git_push',args=a), T("Git Push")))}}
-				{{pass}}
+	      {{pass}}
-				{{if a!=request.application:}}
+	      {{if a!=request.application:}}
-						{{=button(URL('uninstall',args=a), T("Uninstall"))}}
+		{{buttons.append((URL('uninstall',args=a), T("Uninstall")))}}
-						{{=button_enable(URL('enable',args=a), a)}}
+	      {{pass}}
-				{{pass}}
+	  </td>
-					</p>
+	  <td>
-				</li>
+	    <div class="btn-group">
-			{{pass}}
+	      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-			</ul>
+		{{=T('Manage')}}
-		</div>
+		<span class="caret"></span>
-	</div> <!-- /applist -->
+	      </a>
-	<div class="sidebar fl60 span5">
+	      <ul class="dropdown-menu">
-		<div class="sidebar_inner controls well well-small">
+		{{for link,name in buttons:}}
-			<!-- CHANGE ADMIN PWD -->
+		{{=LI(A(name,_href=link))}}
-			<div class="pwdchange pull-right">
+		{{pass}}
-				{{if MULTI_USER_MODE:}}
+	      </ul>
-					{{=auth.navbar()}}
+	    </div>
-				{{else:}}
+	    {{=button_enable(URL('enable',args=a), a)}}
-					{{=sp_button(URL('change_password'), T('Change admin password'))}}
+	  </td>
-				{{pass}}
+	</tr>
-			</div> <!-- /CHANGE ADMIN PWD -->
+	{{pass}}
-			{{if is_manager():}}
+      </table>
-			<!-- VERSION -->
+    </div>
-			<div class="box">
+  </div> <!-- /applist -->
-				<h3>{{=T("Version %s.%s.%s %s (%s)", myversion)}}</h3>
+  <div class="sidebar fl60 span5">
-				<p id="check_version" class="row-buttons">
+    <div class="sidebar_inner controls well well-small">
-				{{if session.check_version:}}
+      <!-- CHANGE ADMIN PWD -->
-					{{=T('Checking for upgrades...')}}
+      <div class="pwdchange pull-right">
-				</p>
+	{{if MULTI_USER_MODE:}}
-				<script>ajax('{{=URL('check_version')}}',[],'check_version');</script>
+	{{=auth.navbar()}}
-				{{session.check_version=False}}
+	{{else:}}
-				{{else:}}
+	{{=sp_button(URL('change_password'), T('Change admin password'))}}
-				{{=button("javascript:ajax('"+URL('check_version')+"',[],'check_version')", T('Check for upgrades'))}}
+	{{=button(URL('default','reload_routes'), T('Reload routes'))}}
-				{{=button(URL('default','reload_routes'), T('Reload routes'))}}
+	{{pass}}
-				</p>
+      </div> <!-- /CHANGE ADMIN PWD -->
-				{{pass}}
+      {{if is_manager():}}
-				<p>{{=T("Running on %s", request.env.server_software)}}</p>
+      <!-- VERSION -->
-				{{if session.is_mobile=='auto':}}
+      <div class="box">
-				<p>{{=A(T('Try the mobile interface'),_href=URL('plugin_jqmobile','about'))}}</p>
+	<h4>{{=T("Version")}}</h4>
-				{{pass}}
+	<p>
-			</div> <!-- /VERSION -->
+	  <tt>{{=myversion}}</tt><br/>
-			{{pass}}
+	  ({{=T("Running on %s", request.env.server_software)}})
-			{{if MULTI_USER_MODE and is_manager():}}
+	</p>
-			<!-- MULTI_USER_INTERFACE -->
+	<p id="check_version" class="row-buttons">
-			<div class="box">
+	  {{if session.check_version:}}
-				<h3>{{=T("Multi User Mode")}}</h3>
+	    {{=T('Checking for upgrades...')}}
-				<p class="row-buttons">
+  	    <script>ajax('{{=URL('check_version')}}',[],'check_version');</script>
-				{{=button(URL('bulk_register'),T('Bulk Register'))}}
+	    {{session.check_version=False}}
-				{{=button(URL('manage_students',vars={'order':'auth_user.id'}),T('Manage Students'))}}
+	  {{else:}}
-				</p>
+	    {{=button("javascript:ajax('"+URL('check_version')+"',[],'check_version')", T('Check for upgrades'))}}
-			</div> <!-- /MULTI_USER_INTERFACE -->
+	  {{pass}}
-			{{pass}}
+	</p>
-			<!-- APP WIZARD -->
+	{{if session.is_mobile=='auto':}}
-			<div class="box">
+  	  <p>{{=A(T('Try the mobile interface'),_href=URL('plugin_jqmobile','about'))}}</p>
-				<h3>{{=T("New application wizard")}}</h3>
+	{{pass}}
-				<p>{{=button(URL('wizard','index'), T('Start wizard'))}}
+      </div> <!-- /VERSION -->
-				{{=T("(requires internet access)")}}</p>
+      {{pass}}
-			</div> <!-- /APP WIZARD -->
+      {{if MULTI_USER_MODE and is_manager():}}
-			<!-- SCAFFOLD APP -->
+      <!-- MULTI_USER_INTERFACE -->
-			<div class="box">
+      <div class="box">
-				<h3>{{=T("New simple application")}}</h3>
+	<h4>{{=T("Multi User Mode")}}</h4>
-				{{=form_create.custom.begin}}
+	<p class="row-buttons">
-				{{=LABEL(T("Application name:"))}}
+	  {{=button(URL('bulk_register'),T('Bulk Register'))}}
-				{{=form_create.custom.widget.name}}
+	  {{=button(URL('manage_students',vars={'order':'auth_user.id'}),T('Manage Students'))}}
-				<div class="controls"><button type="submit" class="btn">{{=T('Create')}}</button></div>
+	</p>
-				{{=form_create.custom.end}}
+      </div> <!-- /MULTI_USER_INTERFACE -->
-			</div> <!-- /SCAFFOLD APP -->
+      {{pass}}
-			<!-- UPLOAD PACKAGE -->
+      <!-- SCAFFOLD APP -->
-			<div class="box">
+      <div class="box">
-				<h3>{{=T("Upload and install packed application")}}</h3>
+	<h4>{{=T("New simple application")}}</h4>
-				{{=form_update.custom.begin}}
+	{{=form_create.custom.begin}}
-				<label for="appupdate_name">{{=T("Application name:")}}</label>
+	{{=LABEL(T("Application name:"))}}
-				{{=form_update.custom.widget.name}}
+	{{=form_create.custom.widget.name}}
-				<label for="appupdate_file">{{=T("Upload a package:")}}</label>
+	<div class="controls"><button type="submit" class="btn">{{=T('Create')}}</button></div>
-				{{=form_update.custom.widget.file}}
+	{{=form_create.custom.end}}
-				<label for="appupdate_url">{{=T("Or Get from URL:")}}</label>
+      </div> <!-- /SCAFFOLD APP -->
-				{{=form_update.custom.widget.url}}<small class="help-block">({{=T('can be a git repo')}})</small>
+      <!-- UPLOAD PACKAGE -->
-				<div class="controls">
+      <div class="box">
-					<label class="checkbox">
+	<h4>{{=T("Upload and install packed application")}}</h4>
-						{{=form_update.custom.widget.overwrite}} {{=T("Overwrite installed app")}}
+	{{=form_update.custom.begin}}
-					</label>
+	<label for="appupdate_name">{{=T("Application name:")}}</label>
-					<button type="submit" class='btn'>{{=T('Install')}}</button>
+	{{=form_update.custom.widget.name}}
-				</div>
+	<label for="appupdate_file">{{=T("Upload a package:")}}</label>
-				{{=form_update.custom.end}}
+	{{=form_update.custom.widget.file}}
-			</div> <!-- /UPLOAD PACKAGE -->
+	<label for="appupdate_url">{{=T("Or Get from URL:")}}</label>
-			<!-- DEPLOY ON GAE -->
+	{{=form_update.custom.widget.url}}<small class="help-block">({{=T('can be a git repo')}})</small>
-			<div class="box">
+	<div class="controls">
-				<h3>{{=T("Deploy")}}</h3>
+	  <label class="checkbox">
-				<p class="row-buttons">
+	    {{=form_update.custom.widget.overwrite}} {{=T("Overwrite installed app")}}
-				{{=button(URL('gae','deploy'), T('Deploy on Google App Engine'))}}
+	  </label>
-				{{=button(URL('openshift','deploy'),T('Deploy to OpenShift'))}}
+	  <button type="submit" class='btn'>{{=T('Install')}}</button>
-				</p>
+	</div>
-			</div> <!-- /DEPLOY ON GAE -->
+	{{=form_update.custom.end}}
-			<br/>
+      </div> <!-- /UPLOAD PACKAGE -->
-			{{if TWITTER_HASH:}}
+      <!-- DEPLOY ON GAE -->
-			<!-- TWITTER -->
+      <div class="box">
-			<div class="box">
+	<h4>{{=T("Deploy")}}</h4>
-				<h3>{{=T("%s Recent Tweets"%TWITTER_HASH)}}</h3>
+	<p class="row-buttons">
-				<div id="tweets">{{=T('loading...')}}</div>
+	  {{=button(URL('gae','deploy'), T('Deploy on Google App Engine'))}}
-				<script>jQuery(document).ready(function(){jQuery('#tweets').load('{{=URL('twitter.load')}}');});</script>
+	  {{=button(URL('openshift','deploy'),T('Deploy to OpenShift'))}}
-			</div> <!-- /TWITTER -->
+	</p>
-			{{pass}}
+      </div> <!-- /DEPLOY ON GAE -->
-		</div>
+      <!-- APP WIZARD -->
-	</div> <!-- /sidebar -->
+      <div class="box">
+	<h4>{{=T("New application wizard")}}</h4>
+	<p>{{=button(URL('wizard','index'), T('Start wizard'))}}<br/>
+	  {{=T("(requires internet access, experimental)")}}</p>
+      </div> <!-- /APP WIZARD -->
+      {{if TWITTER_HASH:}}
+      <!-- TWITTER -->
+      <div class="box">
+	<h4>{{=T("%s Recent Tweets"%TWITTER_HASH)}}</h4>
+	<div id="tweets">{{=T('loading...')}}</div>
+	<script>jQuery(document).ready(function(){jQuery('#tweets').load('{{=URL('twitter.load')}}');});</script>
+      </div> <!-- /TWITTER -->
+      {{pass}}
+    </div>
+  </div> <!-- /sidebar -->
 </div> <!-- /row-fluid
 <!-- end "site" block -->
+	    

applications/admin/views/default/ticket.html

@@ -10,7 +10,7 @@
   <tbody>
     <tr>
       <th>web2py&trade;</th>
-      <td>{{=myversion}}</td>
+      <td>Version {{=myversion}}</td>
     </tr>
     {{if snapshot:}}
     <tr>

applications/admin/views/default/twitter.load

@@ -27,8 +27,17 @@ Tweet attributes
 """
 }}
 
+{{import re}}
+{{hashtag = re.compile('([#@])(\w+)')}}
+{{link = re.compile('(?!<")https?\:\/\/[\w\./?&]+')}}
+<table class="twitter">
 {{ for t in tweets: }}
-  {{ =DIV(H5(t["from_user_name"])) }}
+   <tr class="tweet">
-  {{ =DIV(t["text"]) }}
+   <td><img src="{{=t['profile_image_url_https']}}"/></td>
-  {{ =BR() }}
+   <td>
+       <a href="http://twitter.com/{{=t['from_user']}}">{{=t["from_user_name"]}}</a>:
+              {{=XML(hashtag.sub('<a href="http://twitter.com/\\g<2>">\\g<1>\\g<2></a>',link.sub('<a href="\\g<0>">\\g<0></a>',t["text"].encode('utf8'))),sanitize=True)}}
+   </td>
+  </tr>
 {{ pass }}
+</table>

applications/admin/views/layout.html

@@ -8,6 +8,7 @@
         <title>{{=response.title or URL()}}</title>
         {{
         response.files.append(URL('static','css/bootstrap.min.css'))
+        #response.files.append(URL('static','css/styles.css'))
         response.files.append(URL('static','css/bootstrap_essentials.css'))
         # response.files.append(URL('static','css/bootstrap_adapters.css'))
         response.files.append(URL('static','css/bootstrap-responsive.min.css'))
@@ -79,6 +80,11 @@
                 jQuery("[rel=tooltip]").tooltip();  
             });
         </script>
-
+	{{if request.function in ('index','site'):}}
+	<a style="position:fixed;bottom:0;left:0;z-index:1000" href="https://groups.google.com/forum/?fromgroups#!forum/web2py" target="_blank">
+	  <!-- http://webchat.freenode.net/?channels=web2py" //-->
+	  <img src="{{=URL('static','images/questions.png')}}" />
+	</a>
+	{{pass}}
     </body>
 </html>

applications/admin/views/mercurial/commit.html

@@ -7,7 +7,6 @@ for application "{{=request.args[0]}}"</h2>
 <h3>Commit form</h3>
 {{=form}}
 
-
 {{if repo['.'].rev()>=0:}}
 <h3>Last Revision</h3>
 <table>

applications/examples/controllers/appadmin.py

@@ -54,6 +54,10 @@ response.menu = [[T('design'), False, URL('admin', 'default', 'design',
 # ## auxiliary functions
 # ###########################################################
 
+if False and request.tickets_db:
+    from gluon.restricted import TicketStorage
+    ts = TicketStorage()
+    ts._get_table(request.tickets_db, ts.tablename, request.application)
 
 def get_databases(request):
     dbs = {}
@@ -319,6 +323,9 @@ def state():
 
 
 def ccache():
+    cache.ram.initialize()
+    cache.disk.initialize()
+
     form = FORM(
         P(TAG.BUTTON(
             T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
@@ -385,7 +392,7 @@ def ccache():
 
         return (hours, minutes, seconds)
 
-    for key, value in cache.ram.storage.items():
+    for key, value in cache.ram.storage.iteritems():
         if isinstance(value, dict):
             ram['hits'] = value['hit_total'] - value['misses']
             ram['misses'] = value['misses']

applications/examples/controllers/default.py

@@ -20,7 +20,7 @@ def what():
     import urllib
     try:
         images = XML(urllib.urlopen(
-            'http://web2py.com/poweredby/default/images').read())
+            'http://www.web2py.com/poweredby/default/images').read())
     except:
         images = []
     return response.render(images=images)
@@ -61,11 +61,11 @@ def videos():
 
 
 def security():
-    redirect('http://www.web2py.com/book/default/chapter/01#security')
+    redirect('http://www.web2py.com/book/default/chapter/01#Security')
 
 
 def api():
-    redirect('http://web2py.com/book/default/chapter/04#API')
+    redirect('http://www.web2py.com/book/default/chapter/04#API')
 
 
 @cache('license', time_expire=cache_expire)
@@ -74,10 +74,14 @@ def license():
     filename = os.path.join(request.env.gluon_parent, 'LICENSE')
     return response.render(dict(license=MARKMIN(read_file(filename))))
 
-
 def version():
-    return 'Version %s.%s.%s (%s) %s' % request.env.web2py_version
+    if request.args(0)=='raw':
-
+        return request.env.web2py_version
+    from gluon.fileutils import parse_version
+    (a, b, c, pre_release, build) = parse_version(request.env.web2py_version)
+    return 'Version %i.%i.%i (%.4i-%.2i-%.2i %.2i:%.2i:%.2i) %s' % (
+        a,b,c,build.year,build.month,build.day,
+        build.hour,build.minute,build.second,pre_release)
 
 @cache('examples', time_expire=cache_expire)
 def examples():

applications/examples/controllers/global.py

@@ -1,75 +1,49 @@
 session.forget()
 
-response.menu = [['home', False, '/%s/default/index'
+def get(args):
-                  % request.application], ['docs', True,
+    if args[0].startswith('__'):
-                 '/%s/global/vars' % request.application]]
+        return None
-
+    try:
-
+        obj = globals(),get(args[0])
+        for k in range(1,len(args)):        
+            obj = getattr(obj,args[k])
+        return obj
+    except:
+        return None
+            
 def vars():
     """the running controller function!"""
-
+    title = '.'.join(request.args)
+    attributes = {}
     if not request.args:
-        (
+        (doc,keys,t,c,d,value)=('Global variables',globals(),None,None,[],None)
-            doc,
-            keys,
-            t,
-            c,
-            d,
-            value,
-        ) = (
-            'Global variables',
-            globals(),
-            None,
-            None,
-            (),
-            None,
-        )
-        (title, args) = ('globals()', '')
     elif len(request.args) < 3:
-        args = '.'.join(request.args)
+        obj = get(request.args)
-        try:
+        if obj:
-            doc = eval(args + '.__doc__')
+            doc = getattr(obj,'__doc__','no documentation')
-        except:
+            keys = dir(obj)
-            doc = 'no documentation'
+            t = type(obj)
-        try:
+            c = getattr(obj,'__class__',None)
-            keys = eval('dir(%s)' % args)
+            d = getattr(obj,'__bases__',None)
-        except:
+
+            for key in keys:
+                a = getattr(obj,key,None)        
+                if a and not isinstance(a,DAL):
+                    doc1 = getattr(a, '__doc__', '')
+                    t1 = type(a)
+                    c1 = getattr(a,'__class__',None)
+                    d1 = getattr(a,'__bases__',None)
+                    key = '.'.join(request.args)+'.'+key
+                    attributes[key] = (doc1, t1, c1, d1)
+        else:
+            doc = 'Unkown'
             keys = []
-        t = eval('type(%s)' % args)
+            t = c = d = None            
-        try:
-            c = eval('%s.__class__' % args)
-        except:
-            c = None
-        try:
-            d = eval('%s.__bases__' % args)
-        except:
-            d = None
-        title = args
-        args += '.'
     else:
         raise HTTP(400)
-    attributes = {}
-    for key in keys:
-        a = args + key
-        if eval('isinstance(%s,SQLDB)' % a) or a == 'vars':
-            continue
-        try:
-            doc1 = eval(a + '.__doc__')
-        except:
-            doc1 = 'no documentation'
-        t1 = eval('type(%s)' % a)
-        try:
-            c1 = eval('%s.__class__' % a)
-        except:
-            c1 = None
-        try:
-            d1 = eval('%s.__bases__' % a)
-        except:
-            d1 = ()
-        attributes[a] = (doc1, t1, c1, d1)
     return dict(
         title=title,
-        args=args,
+        args=request.args,
         t=t,
         c=c,
         d=d,

applications/examples/controllers/simple_examples.py

@@ -54,13 +54,6 @@ def raisehttp():
     raise HTTP(400, 'internal error')
 
 
-def raiseexception():
-    """ generates an exeption, logs the event and returns a ticket number """
-
-    1 / 0
-    return 'oops'
-
-
 def servejs():
     """ serves a js document """
 
@@ -69,7 +62,6 @@ def servejs():
         gluon.contenttype.contenttype('.js')
     return 'alert("This is a Javascript document, it is not supposed to run!");'
 
-
 def makejson():
     import gluon.contrib.simplejson as sj
     return sj.dumps(['foo', {'bar': ('baz', None, 1.0, 2)}])

applications/examples/controllers/spreadsheet.py

@@ -1,6 +1,5 @@
 from gluon.contrib.spreadsheet import Sheet
 
-
 def callback():
     return cache.ram('sheet1', lambda: None, None).process(request)
 

applications/examples/models/session.py

@@ -0,0 +1 @@
+session.connect(request,response,cookie_key='yoursecret')

applications/examples/private/content/en/default/what/whyweb2py.markmin

@@ -47,7 +47,7 @@ Here is a more complex complete application that lets the visitor upload images
 ``
 db=DAL('sqlite://storage.db')
 db.define_table('image', 
-    Field('name'),
+    Field('name', notnull=True),
     Field('file','upload'))
 ``:code_python
 
@@ -55,10 +55,10 @@ db.define_table('image',
 
 ``
 def index():
-    form = SQLFORM(db.image)
+    form = SQLFORM(db.image).process()
-    if form.process().accepted:
+    if form.accepted:
         response.flash = 'image uploaded'
-    return dict(form = form)""",counter=None,_class='boxCode')}}
+    return locals()
 ``:code_python
 
 ### In View
@@ -66,7 +66,7 @@ def index():
 ``
 {{extend 'layout.html'}}
 <h1>Image upload form</h1>
-{{form}}
+{{=form}}
 ``:code_python
    
     Uploaded images are safely renamed to avoid directory traversal vulnerabilities, stored on the filesystem (or database) and a corresponding entry is inserted in the database, linking the file. A built-in mechanism prevents involuntary double form submission. All DB IO is transaction safe by default. Any exception in the code causes the transaction to rollback.

applications/examples/static/403.html

@@ -0,0 +1 @@
+403

applications/examples/static/404.html

@@ -0,0 +1 @@
+404

applications/examples/static/500.html

@@ -0,0 +1 @@
+500

applications/examples/static/css/examples.css

@@ -1,117 +1,16 @@
-footer-content {position: relative; bottom: 0; width: 100%;}
+@import url(http://fonts.googleapis.com/css?family=Economica);
-
+@@import url(http://fonts.googleapis.com/css?family=Belleza);
-.statusbar {
-    padding: 2px 0; 
-    border: 0; 
-    margin-bottom: 15px;
-    background-color: #C1CDCD;
-    /*background: url('../images/menu.png') repeat-x;*/
-}
-.statusbar a, .statusbar a:visited {
-    color: #406361;
-}
-
-.footer {
-    position: relative;
-}
-.footer-content {
-    height: 100%;
-    position: absolute;
-}
 
+body { font-family: Arial, Helvetica; }
 a, a:visited, a:hover, h1,h2,h3,h4,h5 {color: #658883}
-a.button {color: #658883}
+a.btn-danger, a.btn-warning, a.btn-success {color:white} 
-
+h1,h2,h3,h4,h5 { font-family: "Economica", Arial, Helevtica; }
-.sf-menu li, .sf-menu li a { border-radius: 5px;}
+body {
-
+    background: url('../images/stripes.png') repeat-x;
-.wrapper { 
-    background: url('../images/back-02.png') repeat-x; 
-    padding-top:10px;
 }
-h1 { font-size: 32px }
+#header {
-h2 { font-size: 24px }
+    margin-top: 40px;
-h3 { font-size: 20px }
-h4 { font-size: 14px }
-sup  { 
-    font-size: 0.5em; 
-    line-height: 2em; 
-    vertical-align: top;
-}
-ul { list-style: circle outside; padding-left: 30px;}
-
-.frame { 
-    border: 3px solid #959595; 
-    margin-bottom: 5px; 
-}
-
-.header h5 {
-	float: left;
-}
-.logo: {
-	float:left;
-}
-
-.announce {
-    text-align: center;
-    color: white;
-    top: 0;
-    font-weight: bold;
-    text-align: center;
-    left: 0;
-    position: relative;
-    background: #000;
-    border-radius: 5px;
-    margin: 7px 0 15px;
-}
-.announce a {color: white}
-
-input:focus, textarea:focus {background:#f0f0f0}
-
-table.downloads { width:100%; }
-table.downloads th, table.downloads td {text-align:center;}
-table.downloads a.button { width: 150px; }
-th,td {padding-right: 10px;}
-
-p {text-align: left;}
-
-p + p {
-	margin-bottom: .75em;
-}
-
-strong {color: inherit;}
-
-img.centered {
-    margin: 0 auto;
-    display: block;
-}
-
-.tagCloud {
-    width: 100%;
-    max-width: 489px;
-}
-.mainbody {
-    margin-bottom: 20px;
-}
-.aboutW2P {
-    margin-top: 23px;
-    margin-bottom: 15px;
-}
-.aboutW2P p {
-    padding: 0 0.5em;
-    font-size: 1.15em;
-}
-.aboutW2P h3 {
-    padding: 0 0.3em;
-}
-.userQuotes {
-    /*border-top: #eee 2px solid;*/
-    padding-top: 15px;
-}
-.userQuotes p {
-    text-align: left;
-    font-size: 111%;
-    color: #777;
-}
-#menu {
-    padding: 0.1em 0.5em;
 }
+.btn-180 {
+    width: 180px;
+}

applications/examples/static/css/skeleton.css

@@ -1,629 +0,0 @@
-/*
-* Skeleton V1.1
-* Copyright 2011, Dave Gamache
-* www.getskeleton.com
-* Free to use under the MIT license.
-* http://www.opensource.org/licenses/mit-license.php
-* 8/17/2011
-*/
-
-
-/* Table of Content
-==================================================
-	#Reset & Basics
-	#Basic Styles
-	#Site Styles
-	#Typography
-	#Links
-	#Lists
-	#Images
-	#Buttons
-	#Tabs
-	#Forms
-	#Misc */
-
-
-/* #Reset & Basics (Inspired by E. Meyers)
-================================================== */
-	html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
-		margin: 0;
-		padding: 0;
-		border: 0;
-		font-size: 100%;
-		font: inherit;
-		vertical-align: baseline; }
-	article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
-		display: block; }
-	body {
-		line-height: 1; }
-	// ol, ul { list-style: none; } /* WEB2PY EDIT */
-	blockquote, q {
-		quotes: none; }
-	blockquote:before, blockquote:after,
-	q:before, q:after {
-		content: '';
-		content: none; }
-	table {
-		border-collapse: collapse;
-		border-spacing: 0; }
-
-
-/* #Basic Styles
-================================================== */
-	body {
-		background: #fff;
-		font: 14px/21px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
-		color: #444;
-		-webkit-font-smoothing: antialiased; /* Fix for webkit rendering */
-		-webkit-text-size-adjust: 100%;
- }
-
-
-/* #Typography
-================================================== */
-	h1, h2, h3, h4, h5, h6 {
-		color: #181818;
-		font-family: "Georgia", "Times New Roman", Helvetica, Arial, sans-serif;
-		font-weight: normal; }
-	h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { font-weight: inherit; }
-	h1 { font-size: 46px; line-height: 50px; }
-	h2 { font-size: 35px; line-height: 40px; }
-	h3 { font-size: 28px; line-height: 34px; }
-	h4 { font-size: 21px; line-height: 30px; }
-	h5 { font-size: 17px; line-height: 24px; }
-	h6 { font-size: 14px; line-height: 21px; }
-
-	.subheader { color: #777; }
-
-	p { margin: 0 0 20px 0; }
-	p img { margin: 0; }
-	p.lead { font-size: 21px; line-height: 27px; color: #777;  }
-
-	em { font-style: italic; }
-	strong { font-weight: bold; color: #333; }
-	small { font-size: 80%; }
-
-/*	Blockquotes  */
-	blockquote, blockquote p { font-size: 17px; line-height: 24px; color: #777; font-style: italic; }
-	blockquote { margin: 0 0 20px; padding: 9px 20px 0 19px;} /* WEB2PY EDIT */
-	blockquote cite { display: block; font-size: 12px; color: #555; }
-	blockquote cite:before { content: "\2014 \0020"; }
-	blockquote cite a, blockquote cite a:visited, blockquote cite a:visited { color: #555; }
-
-	hr { border: solid #ddd; border-width: 1px 0 0; clear: both; margin: 10px 0 30px; height: 0; }
-
-
-/* #Links
-================================================== */
-	a, a:visited { color: #333; text-decoration: underline; outline: 0; }
-	a:hover, a:focus { color: #000; }
-	p a, p a:visited { line-height: inherit; }
-
-
-/* #Lists
-================================================== */
-	ul, ol { margin-bottom: 20px; }
-	// ul { list-style: none outside; } /* WEB2PY EDIT */
-	ol { list-style: decimal; }
-	ol, ul.square, ul.circle, ul.disc { margin-left: 30px; }
-	ul.square { list-style: square outside; }
-	ul.circle { list-style: circle outside; }
-	ul.disc { list-style: disc outside; }
-	ul ul, ul ol,
-	ol ol, ol ul { margin: 4px 0 5px 30px; font-size: 90%;  }
-	ul ul li, ul ol li,
-	ol ol li, ol ul li { margin-bottom: 6px; }
-	li { line-height: 18px; margin-bottom: 12px; }
-	ul.large li { line-height: 21px; }
-	li p { line-height: 21px; }
-
-/* #Images
-================================================== */
-
-	img.scale-with-grid {
-		max-width: 100%;
-		height: auto; }
-
-
-/* #Buttons
-================================================== */
-
-	a.button,
-	button,
-	input[type="submit"],
-	input[type="reset"],
-	input[type="button"] {
-		background: #eee; /* Old browsers */
-		background: #eee -moz-linear-gradient(top, rgba(255,255,255,.2) 0%, rgba(0,0,0,.2) 100%); /* FF3.6+ */
-		background: #eee -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,.2)), color-stop(100%,rgba(0,0,0,.2))); /* Chrome,Safari4+ */
-		background: #eee -webkit-linear-gradient(top, rgba(255,255,255,.2) 0%,rgba(0,0,0,.2) 100%); /* Chrome10+,Safari5.1+ */
-		background: #eee -o-linear-gradient(top, rgba(255,255,255,.2) 0%,rgba(0,0,0,.2) 100%); /* Opera11.10+ */
-		background: #eee -ms-linear-gradient(top, rgba(255,255,255,.2) 0%,rgba(0,0,0,.2) 100%); /* IE10+ */
-		background: #eee linear-gradient(top, rgba(255,255,255,.2) 0%,rgba(0,0,0,.2) 100%); /* W3C */
-	  border: 1px solid #aaa;
-	  border-top: 1px solid #ccc;
-	  border-left: 1px solid #ccc;
-	  padding: 4px 12px;
-	  -moz-border-radius: 3px;
-	  -webkit-border-radius: 3px;
-	  border-radius: 3px;
-	  color: #444;
-	  display: inline-block;
-	  font-size: 1em; /** WEB2PY EDIT **/
-	  font-weight: bold;
-	  text-decoration: none;
-	  text-shadow: 0 1px rgba(255, 255, 255, .75);
-	  cursor: pointer;
-	  margin-bottom: 5px; /** WEB2PY EDIT **/
-	  line-height: 21px;
-	  font-family: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; }
-
-	a.button:hover,
-	button:hover,
-	input[type="submit"]:hover,
-	input[type="reset"]:hover,
-	input[type="button"]:hover {
-		color: #222;
-		background: #ddd; /* Old browsers */
-		background: #ddd -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); /* FF3.6+ */
-		background: #ddd -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,.3)), color-stop(100%,rgba(0,0,0,.3))); /* Chrome,Safari4+ */
-		background: #ddd -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%,rgba(0,0,0,.3) 100%); /* Chrome10+,Safari5.1+ */
-		background: #ddd -o-linear-gradient(top, rgba(255,255,255,.3) 0%,rgba(0,0,0,.3) 100%); /* Opera11.10+ */
-		background: #ddd -ms-linear-gradient(top, rgba(255,255,255,.3) 0%,rgba(0,0,0,.3) 100%); /* IE10+ */
-		background: #ddd linear-gradient(top, rgba(255,255,255,.3) 0%,rgba(0,0,0,.3) 100%); /* W3C */
-	  border: 1px solid #888;
-	  border-top: 1px solid #aaa;
-	  border-left: 1px solid #aaa; }
-
-	a.button:active,
-	button:active,
-	input[type="submit"]:active,
-	input[type="reset"]:active,
-	input[type="button"]:active {
-		border: 1px solid #666;
-		background: #ccc; /* Old browsers */
-		background: #ccc -moz-linear-gradient(top, rgba(255,255,255,.35) 0%, rgba(10,10,10,.4) 100%); /* FF3.6+ */
-		background: #ccc -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,.35)), color-stop(100%,rgba(10,10,10,.4))); /* Chrome,Safari4+ */
-		background: #ccc -webkit-linear-gradient(top, rgba(255,255,255,.35) 0%,rgba(10,10,10,.4) 100%); /* Chrome10+,Safari5.1+ */
-		background: #ccc -o-linear-gradient(top, rgba(255,255,255,.35) 0%,rgba(10,10,10,.4) 100%); /* Opera11.10+ */
-		background: #ccc -ms-linear-gradient(top, rgba(255,255,255,.35) 0%,rgba(10,10,10,.4) 100%); /* IE10+ */
-		background: #ccc linear-gradient(top, rgba(255,255,255,.35) 0%,rgba(10,10,10,.4) 100%); /* W3C */ }
-
-	.button.full-width,
-	button.full-width,
-	input[type="submit"].full-width,
-	input[type="reset"].full-width,
-	input[type="button"].full-width {
-		width: 100%;
-		padding-left: 0 !important;
-		padding-right: 0 !important;
-		text-align: center; }
-
-
-/* #Tabs (activate in tabs.js)
-================================================== */
-	ul.tabs {
-		display: block;
-		margin: 0 0 20px 0;
-		padding: 0;
-		border-bottom: solid 1px #ddd; }
-	ul.tabs li {
-		display: block;
-		width: auto;
-		height: 30px;
-		padding: 0;
-		float: left;
-		margin-bottom: 0; }
-	ul.tabs li a {
-		display: block;
-		text-decoration: none;
-		width: auto;
-		height: 29px;
-		padding: 0px 20px;
-		line-height: 30px;
-		border: solid 1px #ddd;
-		border-width: 1px 1px 0 0;
-		margin: 0;
-		background: #f5f5f5;
-		font-size: 13px; }
-	ul.tabs li a.active {
-		background: #fff;
-		height: 30px;
-		position: relative;
-		top: -4px;
-		padding-top: 4px;
-		border-left-width: 1px;
-		margin: 0 0 0 -1px;
-		color: #111;
-		-moz-border-radius-topleft: 2px;
-		-webkit-border-top-left-radius: 2px;
-		border-top-left-radius: 2px;
-		-moz-border-radius-topright: 2px;
-		-webkit-border-top-right-radius: 2px;
-		border-top-right-radius: 2px; }
-	ul.tabs li:first-child a.active {
-		margin-left: 0; }
-	ul.tabs li:first-child a {
-		border-width: 1px 1px 0 1px;
-		-moz-border-radius-topleft: 2px;
-		-webkit-border-top-left-radius: 2px;
-		border-top-left-radius: 2px; }
-	ul.tabs li:last-child a {
-		-moz-border-radius-topright: 2px;
-		-webkit-border-top-right-radius: 2px;
-		border-top-right-radius: 2px; }
-
-	ul.tabs-content { margin: 0; display: block; }
-	ul.tabs-content > li { display:none; }
-	ul.tabs-content > li.active { display: block; }
-
-	/* Clearfixing tabs for beautiful stacking */
-	ul.tabs:before,
-	ul.tabs:after {
-	  content: '\0020';
-	  display: block;
-	  overflow: hidden;
-	  visibility: hidden;
-	  width: 0;
-	  height: 0; }
-	ul.tabs:after {
-	  clear: both; }
-	ul.tabs {
-	  zoom: 1; }
-
-
-/* #Forms
-================================================== */
-
-	form {
-		margin-bottom: 5px; } /** WEB2PY EDIT **/
-	fieldset {
-		margin-bottom: 5px; } /** WEB2PY EDIT **/
-	input[type="text"],
-	input[type="password"],
-	input[type="email"],
-	textarea,
-	select {
-		border: 1px solid #ccc;
-		padding: 6px 4px;
-		outline: none;
-		-moz-border-radius: 2px;
-		-webkit-border-radius: 2px;
-		border-radius: 2px;
-		font: 13px "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
-		color: #777;
-		margin: 0;
-		width: 210px;
-		max-width: 100%;
-		// display: block;  /** WEB2PY EDIT **/
-		margin-bottom: 0; /** WEB2PY EDIT **/
-		background: #fff; }
-	select {
-		padding: 0; }
-	input[type="text"]:focus,
-	input[type="password"]:focus,
-	input[type="email"]:focus,
-	textarea:focus {
-		border: 1px solid #aaa;
- 		color: #444;
- 		-moz-box-shadow: 0 0 3px rgba(0,0,0,.2);
-		-webkit-box-shadow: 0 0 3px rgba(0,0,0,.2);
-		box-shadow:  0 0 3px rgba(0,0,0,.2); }
-	textarea {
-		min-height: 60px; }
-	label,
-	legend {
-		display: block;
-		font-weight: bold;
-		font-size: 13px;  }
-	select {
-		width: 220px; }
-	input[type="checkbox"] {
-		display: inline; }
-	label span,
-	legend span {
-		font-weight: normal;
-		font-size: 13px;
-		color: #444; }
-
-/* #Misc
-================================================== */
-	.remove-bottom { margin-bottom: 0 !important; }
-	.half-bottom { margin-bottom: 10px !important; }
-	.add-bottom { margin-bottom: 20px !important; }
-
-
-/*
-* Skeleton V1.1
-* Copyright 2011, Dave Gamache
-* www.getskeleton.com
-* Free to use under the MIT license.
-* http://www.opensource.org/licenses/mit-license.php
-* 8/17/2011
-*/
-
-/* Table of Content
-==================================================
-	#Site Styles
-	#Page Styles
-	#Media Queries
-	#Font-Face */
-
-/* #Site Styles
-================================================== */
-
-/* #Page Styles
-================================================== */
-
-/* #Media Queries
-================================================== */
-
-	/* Smaller than standard 960 (devices and browsers) */
-	@media only screen and (max-width: 959px) {}
-
-	/* Tablet Portrait size to standard 960 (devices and browsers) */
-	@media only screen and (min-width: 768px) and (max-width: 959px) {}
-
-	/* All Mobile Sizes (devices and browser) */
-	@media only screen and (max-width: 767px) {}
-
-	/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-	@media only screen and (min-width: 480px) and (max-width: 767px) {}
-
-	/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-	@media only screen and (max-width: 479px) {}
-
-
-/* #Font-Face
-================================================== */
-/* 	This is the proper syntax for an @font-face file
-		Just create a "fonts" folder at the root,
-		copy your FontName into code below and remove
-		comment brackets */
-
-/*	@font-face {
-	    font-family: 'FontName';
-	    src: url('../fonts/FontName.eot');
-	    src: url('../fonts/FontName.eot?iefix') format('eot'),
-	         url('../fonts/FontName.woff') format('woff'),
-	         url('../fonts/FontName.ttf') format('truetype'),
-	         url('../fonts/FontName.svg#webfontZam02nTh') format('svg');
-	    font-weight: normal;
-	    font-style: normal; }
-*//*
-* Skeleton V1.1
-* Copyright 2011, Dave Gamache
-* www.getskeleton.com
-* Free to use under the MIT license.
-* http://www.opensource.org/licenses/mit-license.php
-* 8/17/2011
-*/
-
-
-/* Table of Contents
-==================================================
-    #Base 960 Grid
-    #Tablet (Portrait)
-    #Mobile (Portrait)
-    #Mobile (Landscape)
-    #Clearing */
-
-
-
-/* #Base 960 Grid
-================================================== */
-
-    .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
-    .column, .columns                           { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
-    .row                                        { margin-bottom: 20px; }
-
-    /* Nested Column Classes */
-    .column.alpha, .columns.alpha               { margin-left: 0; }
-    .column.omega, .columns.omega               { margin-right: 0; }
-
-    /* Base Grid */
-    .container .one.column                      { width: 40px;  }
-    .container .two.columns                     { width: 100px; }
-    .container .three.columns                   { width: 160px; }
-    .container .four.columns                    { width: 220px; }
-    .container .five.columns                    { width: 280px; }
-    .container .six.columns                     { width: 340px; }
-    .container .seven.columns                   { width: 400px; }
-    .container .eight.columns                   { width: 460px; }
-    .container .nine.columns                    { width: 520px; }
-    .container .ten.columns                     { width: 580px; }
-    .container .eleven.columns                  { width: 640px; }
-    .container .twelve.columns                  { width: 700px; }
-    .container .thirteen.columns                { width: 760px; }
-    .container .fourteen.columns                { width: 820px; }
-    .container .fifteen.columns                 { width: 880px; }
-    .container .sixteen.columns                 { width: 940px; }
-
-    .container .one-third.column                { width: 300px; }
-    .container .two-thirds.column               { width: 620px; }
-
-    /* Offsets */
-    .container .offset-by-one                   { padding-left: 60px;  }
-    .container .offset-by-two                   { padding-left: 120px; }
-    .container .offset-by-three                 { padding-left: 180px; }
-    .container .offset-by-four                  { padding-left: 240px; }
-    .container .offset-by-five                  { padding-left: 300px; }
-    .container .offset-by-six                   { padding-left: 360px; }
-    .container .offset-by-seven                 { padding-left: 420px; }
-    .container .offset-by-eight                 { padding-left: 480px; }
-    .container .offset-by-nine                  { padding-left: 540px; }
-    .container .offset-by-ten                   { padding-left: 600px; }
-    .container .offset-by-eleven                { padding-left: 660px; }
-    .container .offset-by-twelve                { padding-left: 720px; }
-    .container .offset-by-thirteen              { padding-left: 780px; }
-    .container .offset-by-fourteen              { padding-left: 840px; }
-    .container .offset-by-fifteen               { padding-left: 900px; }
-
-
-
-/* #Tablet (Portrait)
-================================================== */
-
-    /* Note: Design for a width of 768px */
-
-    @media only screen and (min-width: 768px) and (max-width: 959px) {
-        .container                                  { width: 768px; }
-        .container .column,
-        .container .columns                         { margin-left: 10px; margin-right: 10px;  }
-        .column.alpha, .columns.alpha               { margin-left: 0; margin-right: 10px; }
-        .column.omega, .columns.omega               { margin-right: 0; margin-left: 10px; }
-
-        .container .one.column                      { width: 28px; }
-        .container .two.columns                     { width: 76px; }
-        .container .three.columns                   { width: 124px; }
-        .container .four.columns                    { width: 172px; }
-        .container .five.columns                    { width: 220px; }
-        .container .six.columns                     { width: 268px; }
-        .container .seven.columns                   { width: 316px; }
-        .container .eight.columns                   { width: 364px; }
-        .container .nine.columns                    { width: 412px; }
-        .container .ten.columns                     { width: 460px; }
-        .container .eleven.columns                  { width: 508px; }
-        .container .twelve.columns                  { width: 556px; }
-        .container .thirteen.columns                { width: 604px; }
-        .container .fourteen.columns                { width: 652px; }
-        .container .fifteen.columns                 { width: 700px; }
-        .container .sixteen.columns                 { width: 748px; }
-
-        .container .one-third.column                { width: 236px; }
-        .container .two-thirds.column               { width: 492px; }
-
-        /* Offsets */
-        .container .offset-by-one                   { padding-left: 48px; }
-        .container .offset-by-two                   { padding-left: 96px; }
-        .container .offset-by-three                 { padding-left: 144px; }
-        .container .offset-by-four                  { padding-left: 192px; }
-        .container .offset-by-five                  { padding-left: 240px; }
-        .container .offset-by-six                   { padding-left: 288px; }
-        .container .offset-by-seven                 { padding-left: 336px; }
-        .container .offset-by-eight                 { padding-left: 348px; }
-        .container .offset-by-nine                  { padding-left: 432px; }
-        .container .offset-by-ten                   { padding-left: 480px; }
-        .container .offset-by-eleven                { padding-left: 528px; }
-        .container .offset-by-twelve                { padding-left: 576px; }
-        .container .offset-by-thirteen              { padding-left: 624px; }
-        .container .offset-by-fourteen              { padding-left: 672px; }
-        .container .offset-by-fifteen               { padding-left: 720px; }
-    }
-
-
-/*  #Mobile (Portrait)
-================================================== */
-
-    /* Note: Design for a width of 320px */
-
-    @media only screen and (max-width: 767px) {
-        .container { width: 300px; }
-        .columns, .column { margin: 0; }
-
-        .container .one.column,
-        .container .two.columns,
-        .container .three.columns,
-        .container .four.columns,
-        .container .five.columns,
-        .container .six.columns,
-        .container .seven.columns,
-        .container .eight.columns,
-        .container .nine.columns,
-        .container .ten.columns,
-        .container .eleven.columns,
-        .container .twelve.columns,
-        .container .thirteen.columns,
-        .container .fourteen.columns,
-        .container .fifteen.columns,
-        .container .sixteen.columns,
-        .container .one-third.column,
-        .container .two-thirds.column  { width: 300px; }
-
-        /* Offsets */
-        .container .offset-by-one,
-        .container .offset-by-two,
-        .container .offset-by-three,
-        .container .offset-by-four,
-        .container .offset-by-five,
-        .container .offset-by-six,
-        .container .offset-by-seven,
-        .container .offset-by-eight,
-        .container .offset-by-nine,
-        .container .offset-by-ten,
-        .container .offset-by-eleven,
-        .container .offset-by-twelve,
-        .container .offset-by-thirteen,
-        .container .offset-by-fourteen,
-        .container .offset-by-fifteen { padding-left: 0; }
-
-    }
-
-
-/* #Mobile (Landscape)
-================================================== */
-
-    /* Note: Design for a width of 480px */
-
-    @media only screen and (min-width: 480px) and (max-width: 767px) {
-        .container { width: 420px; }
-        .columns, .column { margin: 0; }
-
-        .container .one.column,
-        .container .two.columns,
-        .container .three.columns,
-        .container .four.columns,
-        .container .five.columns,
-        .container .six.columns,
-        .container .seven.columns,
-        .container .eight.columns,
-        .container .nine.columns,
-        .container .ten.columns,
-        .container .eleven.columns,
-        .container .twelve.columns,
-        .container .thirteen.columns,
-        .container .fourteen.columns,
-        .container .fifteen.columns,
-        .container .sixteen.columns,
-        .container .one-third.column,
-        .container .two-thirds.column { width: 420px; }
-    }
-
-
-/* #Clearing
-================================================== */
-
-    /* Self Clearing Goodness */
-    .container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; }
-
-    /* Use clearfix class on parent to clear nested columns,
-    or wrap each row of columns in a <div class="row"> */
-    .clearfix:before,
-    .clearfix:after,
-    .row:before,
-    .row:after {
-      content: '\0020';
-      display: block;
-      overflow: hidden;
-      visibility: hidden;
-      width: 0;
-      height: 0; }
-    .row:after,
-    .clearfix:after {
-      clear: both; }
-    .row,
-    .clearfix {
-      zoom: 1; }
-
-    /* You can also use a <br class="clear" /> to clear columns */
-    .clear {
-      clear: both;
-      display: block;
-      overflow: hidden;
-      visibility: hidden;
-      width: 0;
-      height: 0;
-    }
-
-
-

applications/examples/static/css/superfish.css

@@ -1,152 +0,0 @@
-
-/*** ESSENTIAL STYLES ***/
-.sf-menu, .sf-menu * {
-	margin:			0;
-	padding:		0;
-	list-style:		none;
-}
-.sf-menu {
-	line-height:	1.0;
-}
-.sf-menu ul {
-	position:		absolute;
-	top:			-999em;
-	width:			10em; /* left offset of submenus need to match (see below) */
-}
-.sf-menu ul li {
-	width:			100%;
-}
-.sf-menu li:hover {
-	visibility:		inherit; /* fixes IE7 'sticky bug' */
-}
-.sf-menu li {
-	float:			left;
-	position:		relative;
-}
-.sf-menu a {
-    padding:        5px;
-	display:		block;
-	position:		relative;
-}
-.sf-menu li:hover ul,
-.sf-menu li.sfHover ul {
-	left:			0;
-	top:			26px; /* match top ul list item height */
-	z-index:		99;
-}
-ul.sf-menu li:hover li ul,
-ul.sf-menu li.sfHover li ul {
-	top:			-999em;
-}
-ul.sf-menu li li:hover ul,
-ul.sf-menu li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
-}
-ul.sf-menu li li:hover li ul,
-ul.sf-menu li li.sfHover li ul {
-	top:			-999em;
-}
-ul.sf-menu li li li:hover ul,
-ul.sf-menu li li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
-}
-
-/*** DEMO SKIN ***/
-.sf-menu {
-	float:			left;
-	/*margin-bottom:	1em;*/
-}
-.sf-menu a {
-	padding-left: 		1em;
-	padding-right: 		1em;
-	text-decoration:none;
-}
-.sf-menu a, .sf-menu a:visited  { /* visited pseudo selector so IE6 applies text colour*/
-//	color: #959595;
-	background-color: transparent;
-    font-weight: bold;
-}
-.sf-menu li {
-	background-color: transparent;
-}
-.sf-menu li li {
-	background: #232323;
-        text-align: left;
-}
-.sf-menu li li a {
-        padding-top: 0.25em;
-        padding-bottom: 0.25em;
-	color: #959595;
-}
-.sf-menu li li li {
-	background: #232323;
-        text-align: left;
-}
-.sf-menu li li li a {
-        padding-top: 0.25em;
-        padding-bottom: 0.25em;
-        color: #959595;
-}
-.sf-menu li:hover, .sf-menu a:focus, .sf-menu a:active, .sf-menu li.sfHover, .sf-menu a:hover {
-	color: #FFFFFF;
-	background-color: #303030;
-	outline:		0;
-}
-
-
-/*** arrows **/
-.sf-menu a.sf-with-ul {
-	padding-right: 	2.25em;
-	min-width:		1px; /* trigger IE7 hasLayout so spans position accurately */
-}
-.sf-sub-indicator {
-	position:		absolute;
-	display:		block;
-	right:			.75em;
-	top:			1.05em; /* IE6 only */
-	width:			10px;
-	height:			10px;
-	text-indent: 	-999em;
-	overflow:		hidden;
-	background:		url('../images/arrows-ffffff.png') no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
-}
-a > .sf-sub-indicator {  /* give all except IE6 the correct values */
-	top:			.8em;
-	background-position: 0 -100px; /* use translucent arrow for modern browsers*/
-}
-/* apply hovers to modern browsers */
-a:focus > .sf-sub-indicator,
-a:hover > .sf-sub-indicator,
-a:active > .sf-sub-indicator,
-li:hover > a > .sf-sub-indicator,
-li.sfHover > a > .sf-sub-indicator {
-	background-position: -10px -100px; /* arrow hovers for modern browsers*/
-}
-
-/* point right for anchors in subs */
-.sf-menu ul .sf-sub-indicator { background-position:  -10px 0; }
-.sf-menu ul a > .sf-sub-indicator { background-position:  0 0; }
-/* apply hovers to modern browsers */
-.sf-menu ul a:focus > .sf-sub-indicator,
-.sf-menu ul a:hover > .sf-sub-indicator,
-.sf-menu ul a:active > .sf-sub-indicator,
-.sf-menu ul li:hover > a > .sf-sub-indicator,
-.sf-menu ul li.sfHover > a > .sf-sub-indicator {
-	background-position: -10px 0; /* arrow hovers for modern browsers*/
-}
-
-/*** shadows for all but IE6 ***/
-.sf-shadow ul {
-	background:	url('../images/shadow.png') no-repeat bottom right;
-	padding: 0 8px 9px 0;
-	-moz-border-radius-bottomleft: 17px;
-	-moz-border-radius-topright: 17px;
-	-webkit-border-top-right-radius: 17px;
-	-webkit-border-bottom-left-radius: 17px;
-}
-.sf-shadow ul.sf-shadow-off {
-	background: transparent;
-}
-

applications/examples/static/css/web2py_bootstrap.css

@@ -0,0 +1,232 @@
+/*=============================================================
+                       CUSTOM RULES
+==============================================================*/
+
+body{height:auto;} /* to avoid vertical scroll bar */
+div.flash.flash-center{left:25%;right:25%;}
+div.flash.flash-top,div.flash.flash-top:hover{
+  position:relative;
+  display:block;
+  margin:0;
+  padding:1em;
+  top:0;
+  left:0;
+  width:100%;
+  text-align:center;
+  text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
+  color:#865100;
+  background:#feea9a;
+  border:1px solid;
+  border-top:0px;
+  border-left:0px;
+  border-right:0px;
+  border-radius:0;
+  opacity:1;
+}
+#header{margin-top:60px;}
+.mastheader h1 {
+  margin-bottom:9px;
+  font-size:81px;
+  font-weight:bold;
+  letter-spacing:-1px;
+  line-height:1;
+  font-size:54px;
+}
+.mastheader small {
+  font-size:20px;
+  font-weight:300;
+}
+/* auth navbar - primitive style */
+.auth_navbar,.auth_navbar a{color:inherit;}
+.ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
+.auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */
+.auth_navbar a:hover{color:white;text-decoration:none;}
+ul#navbar>.auth_navbar{
+  display:inline-block;
+  padding:5px;
+}
+/* form errors message box customization */
+div.error_wrapper{margin-bottom:9px;}
+div.error_wrapper .error{
+  border-radius: 4px;
+  -o-border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+}
+/* below rules are only for formstyle = bootstrap
+trying to make errors look like bootstrap ones */
+div.controls .error_wrapper{
+  display:inline-block;
+  margin-bottom:0;
+  vertical-align:middle;
+}
+div.controls .error{
+  min-width:5px;
+  background:inherit;
+  color:#B94A48;
+  border:none;
+  padding:0;
+  margin:0;
+  /*display:inline;*/ /* uncommenting this, the animation effect is lost */
+}
+div.controls .help-inline{color:#3A87AD;}
+div.controls .error_wrapper +.help-inline {margin-left:-99999px;}
+div.controls select +.error_wrapper {margin-left:5px;}
+.ie-lte7 div.error{color:#fff;}
+
+/* beautify brand */
+.navbar-inverse .brand{color:#c6cecc;}
+.navbar-inverse .brand b{display:inline-block;margin-top:-1px;}
+.navbar-inverse .brand b>span{font-size:22px;color:white}
+.navbar-inverse .brand:hover b>span{color:white}
+/* beautify web2py link in navbar */
+span.highlighted{color:#d8d800;}
+.open span.highlighted{color:#ffff00;}
+
+/*=============================================================
+                 OVERRIDING WEB2PY.CSS RULES
+==============================================================*/
+
+/* reset to default */
+a{white-space:normal;}
+li{margin-bottom:0;}
+textarea,button{display:block;}
+/*reset ul padding */
+ul#navbar{padding:0;}
+/* label aligned to related input */
+td.w2p_fl,td.w2p_fc {padding:0;}
+#web2py_user_form td{vertical-align:middle;}
+
+/*=============================================================
+                 OVERRIDING BOOTSTRAP.CSS RULES
+==============================================================*/
+
+/* because web2py handles this via js */
+textarea { width:90%}
+.hidden{visibility:visible;}
+/* right folder for bootstrap black images/icons */
+[class^="icon-"],[class*=" icon-"]{
+  background-image:url("../images/glyphicons-halflings.png")
+}
+/* right folder for bootstrap white images/icons */
+.icon-white,
+.nav-tabs > .active > a > [class^="icon-"],
+.nav-tabs > .active > a > [class*=" icon-"],
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"] {
+  background-image:url("../images/glyphicons-halflings-white.png");
+}
+/* bootstrap has a label as input's wrapper while web2py has a div */
+div>input[type="radio"],div>input[type="checkbox"]{margin:0;}
+/* bootstrap has button instead of input */
+input[type="button"], input[type="submit"]{margin-right:8px;}
+
+/*=============================================================
+RULES FOR SOLVING CONFLICTS BETWEEN WEB2PY.CSS AND BOOTSTRAP.CSS
+==============================================================*/
+
+/*when formstyle=table3cols*/
+tr#auth_user_remember__row>td.w2p_fw>div{padding-bottom:8px;}
+td.w2p_fw div>label{vertical-align:middle;}
+td.w2p_fc {padding-bottom:5px;}
+/*when formstyle=divs*/
+div#auth_user_remember__row{margin-top:4px;}
+div#auth_user_remember__row>.w2p_fl{display:none;}
+div#auth_user_remember__row>.w2p_fw{min-height:39px;}
+div.w2p_fw,div.w2p_fc{
+  display:inline-block;
+  vertical-align:middle;
+  margin-bottom:0;
+}
+div.w2p_fc{
+  padding-left:5px;
+  margin-top:-8px;
+}
+/*when formstyle=ul*/
+form>ul{
+  list-style:none;
+  margin:0;
+}
+li#auth_user_remember__row{margin-top:4px;}
+li#auth_user_remember__row>.w2p_fl{display:none;}
+li#auth_user_remember__row>.w2p_fw{min-height:39px;}
+/*when formstyle=bootstrap*/
+#auth_user_remember__row  label.checkbox{display:block;}
+span.inline-help{display:inline-block;}
+input[type="text"].input-xlarge,input[type="password"].input-xlarge{width:270px;}
+/*when recaptcha is used*/
+#recaptcha{min-height:30px;display:inline-block;margin-bottom:0;line-height:30px;vertical-align:middle;}
+td>#recaptcha{margin-bottom:6px;}
+div>#recaptcha{margin-bottom:9px;}
+div.control-group.error{
+width:auto;
+background:transparent;
+border:0;
+color:inherit;
+padding:0;
+background-repeat:repeat;
+}
+
+/*=============================================================
+                       OTHER RULES
+==============================================================*/
+
+/* Massimo Di Pierro fixed alignment in forms with list:string */
+form table tr{margin-bottom:9px;}
+td.w2p_fw ul{margin-left:0px;}
+
+/* web2py_console in grid and smartgrid */
+.hidden{visibility:visible;}
+.web2py_console input{
+  display: inline-block;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.web2py_console input[type="submit"],
+.web2py_console input[type="button"],
+.web2py_console button{
+  padding-top:4px;
+  padding-bottom:4px;
+  margin:3px 0 0 2px;
+}
+.web2py_console a,
+.web2py_console select,
+.web2py_console input
+{
+  margin:3px 0 0 2px;
+}
+.web2py_grid form table{width:auto;}
+/* auth_user_remember checkbox extrapadding in IE fix */
+.ie-lte9 input#auth_user_remember.checkbox {padding-left:0;}
+
+/*=============================================================
+                       MEDIA QUERIES
+==============================================================*/
+
+@media only screen and (max-width:979px){
+  body{padding-top:0px;}
+  #navbar{top:5px;}
+  div.flash{right:5px;}
+  .dropdown-menu ul{visibility:visible;}
+}
+@media only screen and (max-width:479px){
+  body{
+    padding-left:10px;
+    padding-right:10px;
+  }
+  .navbar-fixed-top,.navbar-fixed-bottom {
+    margin-left:-10px;
+    margin-right:-10px;
+  }
+  input[type="text"],input[type="password"],select{
+    width:95%;
+  }
+}

applications/examples/static/css/web2py_bootstrap_nojs.css

@@ -0,0 +1,122 @@
+/*=============================================================
+                 BOOTSTRAP DROPDOWN MENU
+==============================================================*/
+
+.dropdown-menu ul{
+  left:100%;
+  position:absolute;
+  top:0;
+  visibility:hidden;
+  margin-top:-1px;
+}
+.dropdown-menu li:hover ul{visibility:visible;}
+.navbar .dropdown-menu ul:before{
+  border-bottom:7px solid transparent;
+  border-left:none;
+  border-right:7px solid rgba(0, 0, 0, 0.2);
+  border-top:7px solid transparent;
+  left:-7px;
+  top:5px;
+}
+.nav > li.dropdown > a:after {
+    border-left: 4px solid transparent;
+    border-right: 4px solid transparent;
+    border-top: 4px solid #000000;
+    content: "";
+    display: inline-block;
+    height: 0;
+    opacity: 0.7;
+    vertical-align: top;
+    width: 0;
+
+    margin-left: 2px;
+    margin-top: 8px;
+
+    border-bottom-color: #FFFFFF;
+    border-top-color: #FFFFFF;
+}
+.dropdown-menu span{display:inline-block;}
+ul.dropdown-menu li.dropdown > a:after {
+    border-left: 4px solid #000;
+    border-right: 4px solid transparent;
+    border-bottom: 4px solid transparent;
+    border-top: 4px solid transparent;
+    content: "";
+    display: inline-block;
+    height: 0;
+    opacity: 0.7;
+    vertical-align: top;
+    width: 0;
+
+    margin-left: 8px;
+    margin-top: 6px;
+}
+
+ul.nav li.dropdown:hover ul.dropdown-menu {
+   display: block;    
+}
+
+.open >.dropdown-menu  ul{display:block;} /* fix menu issue when BS2.0.4 is applied */
+
+/*=============================================================
+                 BOOTSTRAP SUBMIT BUTTON
+==============================================================*/
+
+input[type='submit']:not(.btn) {
+display: inline-block;
+padding: 4px 14px;
+margin-bottom: 0;
+font-size: 14px;
+line-height: 20px;
+color: #333;
+text-align: center;
+text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+vertical-align: middle;
+cursor: pointer;
+background-color: whiteSmoke;
+background-image: -webkit-gradient(linear,0 0,0 100%,from(white),to(#E6E6E6));
+background-image: -webkit-linear-gradient(top,white,#E6E6E6);
+background-image: -o-linear-gradient(top,white,#E6E6E6);
+background-image: linear-gradient(to bottom,white,#E6E6E6);
+background-image: -moz-linear-gradient(top,white,#E6E6E6);
+background-repeat: repeat-x;
+border: 1px solid #BBB;
+border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+border-bottom-color: #A2A2A2;
+-webkit-border-radius: 4px;
+-moz-border-radius: 4px;
+border-radius: 4px;
+filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);
+filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);
+-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);
+box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+input[type='submit']:not(.btn):hover {
+color: #333;
+text-decoration: none;
+background-color: #E6E6E6;
+background-position: 0 -15px;
+-webkit-transition: background-position .1s linear;
+-moz-transition: background-position .1s linear;
+-o-transition: background-position .1s linear;
+transition: background-position .1s linear;
+}
+
+input[type='submit']:not(.btn).active, input[type='submit']:not(.btn):active {
+background-color: #E6E6E6;
+background-color: #D9D9D9 9;
+background-image: none;
+outline: 0;
+-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
+box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+/*=============================================================
+                         OTHER
+==============================================================*/
+
+.ie-lte8 .navbar-fixed-top {position:static;}
+

applications/examples/static/js/share.js

@@ -0,0 +1,44 @@
+/**
+
+   Created and copyrighted by Massimo Di Pierro <massimo.dipierro@gmail.com>
+   (MIT license)  
+
+   Example:
+
+   <script src="share.js"></script>
+
+**/
+
+jQuery(function(){
+	var script_source = jQuery('script[src*="share.js"]').attr('src');
+        var params = function(name,default_value) {
+            var match = RegExp('[?&]' + name + '=([^&]*)').exec(script_source);
+            return match && decodeURIComponent(match[1].replace(/\+/g, ' '))||default_value;
+        }
+	var path = params('static','social');
+	var url = encodeURIComponent(window.location.href);
+	var host =  window.location.hostname;
+	var title = escape(jQuery('title').text());
+	var twit = 'http://twitter.com/home?status='+title+'%20'+url;
+	var facebook = 'http://www.facebook.com/sharer.php?u='+url;
+	var gplus = 'https://plus.google.com/share?url='+url;
+	var tbar = '<div id="socialdrawer"><span>Share<br/></span><div id="sicons"><a href="'+twit+'" id="twit" title="Share on twitter"><img src="'+path+'/twitter.png"  alt="Share on Twitter" width="32" height="32" /></a><a href="'+facebook+'" id="facebook" title="Share on Facebook"><img src="'+path+'/facebook.png"  alt="Share on facebook" width="32" height="32" /></a><a href="'+gplus+'" id="gplus" title="Share on Google Plus"><img src="'+path+'/gplus-32.png"  alt="Share on Google Plus" width="32" height="32" /></a></div></div>';	
+	// Add the share tool bar.
+	jQuery('body').append(tbar); 
+	var st = jQuery('#socialdrawer');
+	st.css({'opacity':'.7','z-index':'3000','background':'#FFF','border':'solid 1px #666','border-width':' 1px 0 0 1px','height':'20px','width':'40px','position':'fixed','bottom':'0','right':'0','padding':'2px 5px','overflow':'hidden','-webkit-border-top-left-radius':' 12px','-moz-border-radius-topleft':' 12px','border-top-left-radius':' 12px','-moz-box-shadow':' -3px -3px 3px rgba(0,0,0,0.5)','-webkit-box-shadow':' -3px -3px 3px rgba(0,0,0,0.5)','box-shadow':' -3px -3px 3px rgba(0,0,0,0.5)'});
+	jQuery('#socialdrawer a').css({'float':'left','width':'32px','margin':'3px 2px 2px 2px','padding':'0','cursor':'pointer'});
+	jQuery('#socialdrawer span').css({'float':'left','margin':'2px 3px','text-shadow':' 1px 1px 1px #FFF','color':'#444','font-size':'12px','line-height':'1em'});
+        jQuery('#socialdrawer img').hide();
+	// hover
+	st.click(function(){
+		jQuery(this).animate({height:'40px', width:'160px', opacity: 0.95}, 300);
+		jQuery('#socialdrawer img').show();
+	    });
+	//leave
+	st.mouseleave(function(){ 
+	    st.animate({height:'20px', width: '40px', opacity: .7}, 300); 
+	    jQuery('#socialdrawer img').hide();
+	    return false;
+	    }  );
+    });

applications/examples/static/js/superfish.js

@@ -1,223 +0,0 @@
-
-/*
- * Superfish v1.4.8 - jQuery menu widget
- * Copyright (c) 2008 Joel Birch
- *
- * Dual licensed under the MIT and GPL licenses:
- * 	http://www.opensource.org/licenses/mit-license.php
- * 	http://www.gnu.org/licenses/gpl.html
- *
- * CHANGELOG: http://users.tpg.com.au/j_birch/plugins/superfish/changelog.txt
- */
-
-;(function($){
-	$.fn.superfish = function(op){
-
-		var sf = $.fn.superfish,
-			c = sf.c,
-			$arrow = $(['<span class="',c.arrowClass,'"> &#187;</span>'].join('')),
-			over = function(){
-				var $$ = $(this), menu = getMenu($$);
-				clearTimeout(menu.sfTimer);
-				$$.showSuperfishUl().siblings().hideSuperfishUl();
-			},
-			out = function(){
-				var $$ = $(this), menu = getMenu($$), o = sf.op;
-				clearTimeout(menu.sfTimer);
-				menu.sfTimer=setTimeout(function(){
-					o.retainPath=($.inArray($$[0],o.$path)>-1);
-					$$.hideSuperfishUl();
-					if (o.$path.length && $$.parents(['li.',o.hoverClass].join('')).length<1){over.call(o.$path);}
-				},o.delay);
-			},
-			getMenu = function($menu){
-				var menu = $menu.parents(['ul.',c.menuClass,':first'].join(''))[0];
-				sf.op = sf.o[menu.serial];
-				return menu;
-			},
-			addArrow = function($a){ $a.addClass(c.anchorClass).append($arrow.clone()); };
-
-		return this.each(function() {
-			var s = this.serial = sf.o.length;
-			var o = $.extend({},sf.defaults,op);
-			o.$path = $('li.'+o.pathClass,this).slice(0,o.pathLevels).each(function(){
-				$(this).addClass([o.hoverClass,c.bcClass].join(' '))
-					.filter('li:has(ul)').removeClass(o.pathClass);
-			});
-			sf.o[s] = sf.op = o;
-
-			$('li:has(ul)',this)[($.fn.hoverIntent && !o.disableHI) ? 'hoverIntent' : 'hover'](over,out).each(function() {
-				if (o.autoArrows) addArrow( $('>a:first-child',this) );
-			})
-			.not('.'+c.bcClass)
-				.hideSuperfishUl();
-
-			var $a = $('a',this);
-			$a.each(function(i){
-				var $li = $a.eq(i).parents('li');
-				$a.eq(i).focus(function(){over.call($li);}).blur(function(){out.call($li);});
-			});
-			o.onInit.call(this);
-
-		}).each(function() {
-			var menuClasses = [c.menuClass];
-			if (sf.op.dropShadows  && !($.browser.msie && $.browser.version < 7)) menuClasses.push(c.shadowClass);
-			$(this).addClass(menuClasses.join(' '));
-		});
-	};
-
-	var sf = $.fn.superfish;
-	sf.o = [];
-	sf.op = {};
-	sf.IE7fix = function(){
-		var o = sf.op;
-		if ($.browser.msie && $.browser.version > 6 && o.dropShadows && o.animation.opacity!=undefined)
-			this.toggleClass(sf.c.shadowClass+'-off');
-		};
-	sf.c = {
-		bcClass     : 'sf-breadcrumb',
-		menuClass   : 'sf-js-enabled',
-		anchorClass : 'sf-with-ul',
-		arrowClass  : 'sf-sub-indicator',
-		shadowClass : 'sf-shadow'
-	};
-	sf.defaults = {
-		hoverClass	: 'sfHover',
-		pathClass	: 'overideThisToUse',
-		pathLevels	: 1,
-		delay		: 800,
-		animation	: {opacity:'show'},
-		speed		: 'normal',
-		autoArrows	: true,
-		dropShadows : true,
-		disableHI	: false,		// true disables hoverIntent detection
-		onInit		: function(){}, // callback functions
-		onBeforeShow: function(){},
-		onShow		: function(){},
-		onHide		: function(){}
-	};
-	$.fn.extend({
-		hideSuperfishUl : function(){
-			var o = sf.op,
-				not = (o.retainPath===true) ? o.$path : '';
-			o.retainPath = false;
-			var $ul = $(['li.',o.hoverClass].join(''),this).add(this).not(not).removeClass(o.hoverClass)
-					.find('>ul').hide().css('visibility','hidden');
-			o.onHide.call($ul);
-			return this;
-		},
-		showSuperfishUl : function(){
-			var o = sf.op,
-				sh = sf.c.shadowClass+'-off',
-				$ul = this.addClass(o.hoverClass)
-					.find('>ul:hidden').css('visibility','visible');
-			sf.IE7fix.call($ul);
-			o.onBeforeShow.call($ul);
-			$ul.animate(o.animation,o.speed,function(){ sf.IE7fix.call($ul); o.onShow.call($ul); });
-			return this;
-		}
-	});
-
-})(jQuery);
-
-
-/*
- * Supersubs v0.2b - jQuery plugin
- * Copyright (c) 2008 Joel Birch
- *
- * Dual licensed under the MIT and GPL licenses:
- * 	http://www.opensource.org/licenses/mit-license.php
- * 	http://www.gnu.org/licenses/gpl.html
- *
- *
- * This plugin automatically adjusts submenu widths of suckerfish-style menus to that of
- * their longest list item children. If you use this, please expect bugs and report them
- * to the jQuery Google Group with the word 'Superfish' in the subject line.
- *
- */
-
-;(function($){ // $ will refer to jQuery within this closure
-
-	$.fn.supersubs = function(options){
-		var opts = $.extend({}, $.fn.supersubs.defaults, options);
-		// return original object to support chaining
-		return this.each(function() {
-			// cache selections
-			var $$ = $(this);
-			// support metadata
-			var o = $.meta ? $.extend({}, opts, $$.data()) : opts;
-			// get the font size of menu.
-			// .css('fontSize') returns various results cross-browser, so measure an em dash instead
-			var fontsize = $('<li id="menu-fontsize">&#8212;</li>').css({
-				'padding' : 0,
-				'position' : 'absolute',
-				'top' : '-999em',
-				'width' : 'auto'
-			}).appendTo($$).width(); //clientWidth is faster, but was incorrect here
-			// remove em dash
-			$('#menu-fontsize').remove();
-			// cache all ul elements
-			$ULs = $$.find('ul');
-			// loop through each ul in menu
-			$ULs.each(function(i) {
-				// cache this ul
-				var $ul = $ULs.eq(i);
-				// get all (li) children of this ul
-				var $LIs = $ul.children();
-				// get all anchor grand-children
-				var $As = $LIs.children('a');
-				// force content to one line and save current float property
-				var liFloat = $LIs.css('white-space','nowrap').css('float');
-				// remove width restrictions and floats so elements remain vertically stacked
-				var emWidth = $ul.add($LIs).add($As).css({
-					'float' : 'none',
-					'width'	: 'auto'
-				})
-				// this ul will now be shrink-wrapped to longest li due to position:absolute
-				// so save its width as ems. Clientwidth is 2 times faster than .width() - thanks Dan Switzer
-				.end().end()[0].clientWidth / fontsize;
-				// add more width to ensure lines don't turn over at certain sizes in various browsers
-				emWidth += o.extraWidth;
-				// restrict to at least minWidth and at most maxWidth
-				if (emWidth > o.maxWidth)		{ emWidth = o.maxWidth; }
-				else if (emWidth < o.minWidth)	{ emWidth = o.minWidth; }
-				emWidth += 'em';
-				// set ul to width in ems
-				$ul.css('width',emWidth);
-				// restore li floats to avoid IE bugs
-				// set li width to full width of this ul
-				// revert white-space to normal
-				$LIs.css({
-					'float' : liFloat,
-					'width' : '100%',
-					'white-space' : 'normal'
-				})
-				// update offset position of descendant ul to reflect new width of parent
-				.each(function(){
-					var $childUl = $('>ul',this);
-					var offsetDirection = $childUl.css('left')!==undefined ? 'left' : 'right';
-					$childUl.css(offsetDirection,$ul.width());
-				});
-			});
-
-		});
-	};
-	// expose defaults
-	$.fn.supersubs.defaults = {
-		minWidth		: 9,		// requires em unit.
-		maxWidth		: 25,		// requires em unit.
-		extraWidth		: 0			// extra width can ensure lines don't sometimes turn over due to slight browser differences in how they round-off values
-	};
-
-})(jQuery); // plugin code ends
-
-/**
-* hoverIntent r6 // 2011.02.26 // jQuery 1.5.1+
-* <http://cherne.net/brian/resources/jquery.hoverIntent.html>
-*
-* @param  f  onMouseOver function || An object with configuration options
-* @param  g  onMouseOut function  || Nothing (use configuration options object)
-* @author    Brian Cherne brian(at)cherne(dot)net
-*/
-(function($){$.fn.hoverIntent=function(f,g){var cfg={sensitivity:7,interval:100,timeout:0};cfg=$.extend(cfg,g?{over:f,out:g}:f);var cX,cY,pX,pY;var track=function(ev){cX=ev.pageX;cY=ev.pageY};var compare=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);if((Math.abs(pX-cX)+Math.abs(pY-cY))<cfg.sensitivity){$(ob).unbind("mousemove",track);ob.hoverIntent_s=1;return cfg.over.apply(ob,[ev])}else{pX=cX;pY=cY;ob.hoverIntent_t=setTimeout(function(){compare(ev,ob)},cfg.interval)}};var delay=function(ev,ob){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t);ob.hoverIntent_s=0;return cfg.out.apply(ob,[ev])};var handleHover=function(e){var ev=jQuery.extend({},e);var ob=this;if(ob.hoverIntent_t){ob.hoverIntent_t=clearTimeout(ob.hoverIntent_t)}if(e.type=="mouseenter"){pX=ev.pageX;pY=ev.pageY;$(ob).bind("mousemove",track);if(ob.hoverIntent_s!=1){ob.hoverIntent_t=setTimeout(function(){compare(ev,ob)},cfg.interval)}}else{$(ob).unbind("mousemove",track);if(ob.hoverIntent_s==1){ob.hoverIntent_t=setTimeout(function(){delay(ev,ob)},cfg.timeout)}}};return this.bind('mouseenter',handleHover).bind('mouseleave',handleHover)}})(jQuery);
-

applications/examples/static/js/web2py_bootstrap.js

@@ -0,0 +1,28 @@
+// this code improves bootstrap menus and adds dropdown support
+jQuery(function(){
+  jQuery('.nav>li>a').each(function(){
+    if(jQuery(this).parent().find('ul').length)
+      jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('<b class="caret"></b>');
+  });
+  jQuery('.nav li li').each(function(){
+    if(jQuery(this).find('ul').length)
+      jQuery(this).addClass('dropdown-submenu');
+  });
+  function hoverMenu(){
+    var wid = document.documentElement.clientWidth; //faster than $(window).width() and cross browser
+    if (wid>=980){
+        jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){
+            mi = jQuery(this).addClass('open');
+            mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
+        }, function(){
+            mi = jQuery(this);
+            mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
+        });
+    };
+  }
+  hoverMenu(); // first page load
+  jQuery(window).resize(hoverMenu); // on resize event
+  jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
+  // make all buttons bootstrap buttons
+  jQuery('button, form input[type="submit"], form input[type="button"]').addClass('btn');
+});

applications/examples/views/default/download.html

@@ -5,38 +5,32 @@
 
 <h2>web2py<sup style="font-size:0.5em;">TM</sup> Download</h2>
 
-<div style="width: 90%; margin: 0 auto;">
+<center style="padding:20px">
-<center>
   <table class="downloads">
     <tr>
-      <th>Current ({{="%s.%s.%s %s" % (version[0],version[1],version[2],version[4])}})</th>
+      <th>For Normal Users</th>
-      <th>Nightly Build (for testers)</th>
+      <th>For Testers</th>
-      <th>Trunk (for developers)</th>
+      <th>For Developers</th>
-      <th>plugin_wiki (add-on)</th>
     </tr>
     <tr>
-      <td><a class="button" href="http://www.web2py.com/examples/static/web2py_win.zip">For Windows</a></td>
+      <td><a class="btn btn-180 btn-success" href="http://www.web2py.com/examples/static/web2py_win.zip">For Windows</a></td>
-      <td><a class="button" href="http://www.web2py.com/examples/static/nightly/web2py_win.zip">For Windows</a></td>
+      <td><a class="btn btn-180 btn-warning" href="http://www.web2py.com/examples/static/nightly/web2py_win.zip">For Windows</a></td>
-      <td><a class="button" href="http://github.com/web2py/web2py/" target="_blank">Git Repository</a></td>
+      <td><a class="btn btn-180 btn-danger" href="http://github.com/web2py/web2py/">Git Repository</a></td>
-      <td><a class="button" href="http://web2py.com/examples/static/web2py.plugin.wiki.w2p">Download</a></td>
     </tr>
     <tr>
-      <td><a class="button" href="http://www.web2py.com/examples/static/web2py_osx.zip">For Mac</a></td>
+      <td><a class="btn btn-180 btn-success" href="http://www.web2py.com/examples/static/web2py_osx.zip">For Mac</a></td>
-      <td><a class="button" href="http://www.web2py.com/examples/static/nightly/web2py_osx.zip">For Mac</a></td>
+      <td><a class="btn btn-180 btn-warning" href="http://www.web2py.com/examples/static/nightly/web2py_osx.zip">For Mac</a></td>
-      <td><a class="button" href="http://code.google.com/p/web2py/" target="_blank">Mercurial Repository</a></td>
+      <td><a class="btn btn-180 btn-danger" href="http://code.google.com/p/web2py/">Mercurial Repository</a></td>
-      <td><a class="button" href="http://code.google.com/p/cube2py/" target="_blank">Mercurial Repository</a>
     </tr>
     <tr>
-      <td><a class="button" href="http://www.web2py.com/examples/static/web2py_src.zip">Source Code</a></td>
+      <td><a class="btn btn-180 btn-success" href="http://www.web2py.com/examples/static/web2py_src.zip">Source Code</a></td>
-      <td><a class="button" href="http://www.web2py.com/examples/static/nightly/web2py_src.zip">Source Code</a></td>
+      <td><a class="btn btn-180 btn-warning" href="http://www.web2py.com/examples/static/nightly/web2py_src.zip">Source Code</a></td>
-      <td><a class="button" href="{{=URL('static', 'epydoc/index.html')}}" target="_blank">Source Code Docs</a></td>
+      <td><a class="btn btn-180 btn-danger" href="{{=URL('static', 'epydoc/index.html')}}">Epydoc</a></td>
-      <td><a class="button" href="http://vimeo.com/13485916" target="_blank">What is plugin_wiki?</a></td>
     </tr>
     <tr>
-      <td><a class="button" href="{{=URL('changelog')}}">Change Log</a></td>
+      <td><a class="btn btn-180 btn-success" href="https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf">Manual</a></td>
-      <td><a class="button" href="http://www.web2py.com/examples/static/nightly/tests.log">Unittest Log</a></td>
+      <td><a class="btn btn-180" href="{{=URL('changelog')}}">Change Log</a></td>
-      <td><a class="button" href="http://code.google.com/p/web2py/issues/list" target="_blank">Issue Tracker</a></td>
+      <td><a class="btn btn-180" href="http://code.google.com/p/web2py/issues/list">Report a Bug</a></td>
-      <td></td>
     </tr>
   </table>
 </center>
@@ -64,28 +58,28 @@
 <p>Applications built with web2py can be released under any license the author wishes as long they do not contain web2py code. They can link unmodified web2py libraries and they can be distributed with official web2py binaries. In particular web2py applications can be distributed in closed source. The admin interface provides a button to byte-code compile.</p>
 <p>It is fine to distribute web2py (source or compiled) with your applications as long as you make it clear in the license where your application ends and web2py starts.</p>
 <p>web2py is copyrighted by Massimo Di Pierro. The web2py trademark is owned by Massimo Di Pierro.</p>
-[<a href="{{=URL('license')}}">read more</a>]
+<a class="btn btn-small" href="{{=URL('license')}}">read more</a>
 
 <h3>Artwork</h3>
-  <center>
+<center>
-    <a href="{{=URL('static', 'images/logo_lb.png')}}"><img src="{{=URL('static', 'images/logo_lb.png')}}" width="200px"/></a>
+  <a href="{{=URL('static', 'images/logo_lb.png')}}"><img src="{{=URL('static', 'images/logo_lb.png')}}" width="200px"/></a>
-    <a href="{{=URL('static', 'images/logo_db.png')}}"><img src="{{=URL('static', '\
+  <a href="{{=URL('static', 'images/logo_db.png')}}"><img src="{{=URL('static', '\
-							      images/logo_db.png')}}" width="200px"/></a>
+							       images/logo_db.png')}}" width="200px"/></a>
-    <a href="{{=URL('static', 'images/logo_bw.png')}}"><img src="{{=URL('static', '\
+  <a href="{{=URL('static', 'images/logo_bw.png')}}"><img src="{{=URL('static', '\
-							      images/logo_bw.png')}}" width="200px"/></a>
+							       images/logo_bw.png')}}" width="200px"/></a>
-  </center>
+</center>
-  <h3>Stickers</h3>
+<h3>Stickers</h3>
-  <center>
+<center>
-    <a  href="{{=URL('static', 'images/Stickers1.png')}}"><img src="{{=URL('static', 'images/Stickers1.png')}}" /></a>
+  <a  href="{{=URL('static', 'images/Stickers1.png')}}"><img src="{{=URL('static', 'images/Stickers1.png')}}" /></a>
-    <a  href="{{=URL('static', 'images/Stickers2.png')}}"><img src="{{=URL('static', 'images/Stickers2.png')}}" /></a>
+  <a  href="{{=URL('static', 'images/Stickers2.png')}}"><img src="{{=URL('static', 'images/Stickers2.png')}}" /></a>
-    <a  href="{{=URL('static', 'images/Stickers3.png')}}"><img src="{{=URL('static', 'images/Stickers3.png')}}" /></a>
+  <a  href="{{=URL('static', 'images/Stickers3.png')}}"><img src="{{=URL('static', 'images/Stickers3.png')}}" /></a>
-    <a  href="{{=URL('static', 'images/Stickers4.png')}}"><img src="{{=URL('static', 'images/Stickers4.png')}}" /></a>
+  <a  href="{{=URL('static', 'images/Stickers4.png')}}"><img src="{{=URL('static', 'images/Stickers4.png')}}" /></a>
   <a  href="{{=URL('static', 'images/Stickers5.png')}}"><img src="{{=URL('static', 'images/Stickers5.png')}}" /></a>
   <a  href="{{=URL('static', 'images/Stickers6.png')}}"><img src="{{=URL('static', 'images/Stickers6.png')}}" /></a>
   <a  href="{{=URL('static', 'images/Stickers7.png')}}"><img src="{{=URL('static', 'images/Stickers7.png')}}" /></a>
-  <a  href="{{=URL('static', 'images/Stickers8.png')}}"><img src="{{=URL('static', 'images/Stickers8.png')}}" /></a>
+    <a  href="{{=URL('static', 'images/Stickers8.png')}}"><img src="{{=URL('static', 'images/Stickers8.png')}}" /></a>
-  </center>
+</center>
-
+<p></p>
 <p>
   <a href="{{=URL('static', 'artwork.tar.gz')}}" >Download WEB2PY artwork pack in editable .png format</a>
 </p>
@@ -99,6 +93,3 @@
   Icon set made by <a href="http://chrfb.deviantart.com">Christian Burprich</a> licensed under a <a rel="license" target="_blank" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-Noncommercial-Share Alike 3.0 License</a>
 </p>
 
-{{block sidebar}}{{end}}
-{{block leftbadges}}{{end}}
-</div>

applications/examples/views/default/examples.html

@@ -119,7 +119,6 @@ def raiseexception():
     return 'oops'
     """.strip(),language='web2py',link=URL('global','vars'),_class='boxCode')}}
     <p>If an exception occurs (other than HTTP) a ticket is generated and the event is logged for the administrator. These tickets and logs can be accessed, reviewed and deleted at any later time.
-    <br/>Try it here: <a href="/{{=request.application}}/simple_examples/raiseexception">raiseexception</a></p>
 
     <h3>Example {{=c}}{{c+=1}}</h3><b>In controller: simple_examples.py</b>
     {{=CODE("""
@@ -605,7 +604,7 @@ def fade():
 
     <h3>Excel-like spreadsheet via Ajax</h3>
     Web2py includes a widget that acts like an Excel-like spreadsheet and can be used to build forms
-    [<a href="{{=URL('spreadsheet','index')}}">read more</a>].
+    <a class="btn btn-small" href="{{=URL('spreadsheet','index')}}">read more</a>.
 
     <h2 id="testing_examples">Testing Examples</h2>
 

applications/examples/views/default/index.html

@@ -1,4 +1,3 @@
-{{right_sidebar_enabled=True}}
 {{extend 'layout.html'}}
 {{
 import random
@@ -14,73 +13,70 @@ quotes = [
 random.shuffle(quotes)
 }}
 
-<table width="100%">
+<div class="row-fluid">
-  <tr>
+  <div class="span12">
-    <td>
+    <div class="span8">
-      <a href="http://web2py.com/book">
+      <h3>web2py<sup>TM</sup> Web Framework</h3>
-	<img src="{{=URL('static','images/book-4th.png')}}" />
+      <p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#Security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a>.</p>
-      </a>
+      <table width="100%">
-    </td>
+	<tr>
-    <td>
+	  <td>
-      <a href="http://link.packtpub.com/SUlnrN">
+	    <a href="http://web2py.com/book">
-	<img src="{{=URL('static','images/book-recipes.png')}}" />
+	      <img src="{{=URL('static','images/book-5th.png')}}" />
-      </a>
+	    </a>
-    </td>
+	  </td>
-    <td>
+	  <td>
-      <a href="http://www.youtube.com/playlist?list=PL5E2E223FE3777851">
+	    <a href="http://link.packtpub.com/SUlnrN">
-	<img src="{{=URL('static','images/videos.png')}}" />
+	      <img src="{{=URL('static','images/book-recipes.png')}}" />
-      </a>
+	    </a>
-    </td>
+	  </td>
-  </tr>
+	  <td>
-</table>
+	    <a href="http://www.youtube.com/playlist?list=PL5E2E223FE3777851">
-
+	      <img src="{{=URL('static','images/videos.png')}}" />
-
+	    </a>
-<h3>WEB2PY<sup>TM</sup> WEB FRAMEWORK</h3>
+	  </td>
-<p>Free open source full-stack framework for rapid development of fast, scalable, <a href="http://www.web2py.com/book/default/chapter/01#security" target="_blank">secure</a> and portable database-driven web-based applications. Written and programmable in <a href="http://www.python.org" target="_blank">Python</a>. <a href="http://www.gnu.org/licenses/lgpl.html">LGPLv3 License</a>.
+	</tr>
-Current version: {{="%s.%s.%s (%s) %s" % request.env.web2py_version}}</p>
+      </table>
-
+      <p>Current version: <a href="{{=URL('download')}}">{{=request.env.web2py_version}} (<a href="http://www.gnu.org/licenses/lgpl.html">LGPLv3 License</a>)</p>
-{{block extra}}
-<div class="container aboutW2P">
-  <div class="sixteen columns">
-    <div class="one-third column alpha">
-      <h3><a href="{{=URL('what')}}">BATTERIES INCLUDED</a></h3>
-      <p>Everything you need in one package including fast multi-threaded web server, SQL database and web-based interface. No third party dependencies but works with <a href={{=URL('what')}}>third party tools</a>.</p>
     </div>
-    <div class="one-third column">
+    <div class="span4" style="text-align:center">
-      <h3><a href="http://web2py.com/demo_admin">WEB-BASED IDE</a></h3>
+      <a href="http://www.infoworld.com/slideshow/24605/infoworlds-2012-technology-of-the-year-award-winners-183313#slide23"><img src="{{=URL('static','images/infoworld2012.jpeg')}}" width="200px"/></a><br/>
-      <p>Create, modify, deploy and manage application from anywhere using your browser. One web2py instance can run multiple web sites using different databases. Try the <a href="http://web2py.com/demo_admin">interactive demo</a>.</p>
+      <a class="btn btn-danger" href="{{=URL('download')}}" style="margin-top:10px; width:180px; color:white">Download Now</a><br/>
-    </div>
+      <a class="btn btn-danger" href="http://web2py.com/demo_admin" style="margin-top:10px; width:180px; color:white">Online Demo</a><br/>
-    <div class="one-third column omega">
+      <a class="btn btn-danger" href="http://web2py.com/poweredby" style="margin-top:10px; width:180px; color:white">Sites Powered by web2py</a>
-      <h3><a href="{{=URL('documentation')}}">EXTENSIVE DOCS</a></h3>
-      <p>Start with some <a href="{{=URL('examples')}}">quick examples</a>, then read the <a href="http://web2py.com/book" target="_blank">manual</a>, watch <a href="http://vimeo.com/album/178500" target="_blank">videos</a>, and join a <a href="{{=URL('default', 'usergroups')}}">user group</a> for discussion. Take advantage of the <a href="http://web2py.com/layouts" target="_blank">layouts</a>, <a href="http://dev.s-cubism.com/web2py_plugins" target="_blank">plugins</a>, <a href="http://www.web2py.com/appliances" target="_blank">appliances</a>, and <a href="http://web2pyslices.com" target="_blank">recipes</a>.</p>
     </div>
   </div>
 </div>
-<img class="scale-with-grid centered" src="/examples/static/images/shadow-bottom.png">
+<div class="row-fluid">
-<div class="container userQuotes">
+  <div class="span12">
-  <div class="sixteen columns">
+    <div class="span4">
-    <!-- img src="{{=URL('static','images/shadow-bottom.png')}}" width="100%"/ -->
+      <h3><a href="{{=URL('what')}}">Batteries Included</a></h3>
+      <p>Everything you need in one package including fast multi-threaded web server, SQL database and web-based interface. No third party dependencies but works with <a href={{=URL('what')}}>third party tools</a>.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="http://web2py.com/demo_admin">Web-Based IDE</a></h3>
+      <p>Create, modify, deploy and manage application from anywhere using your browser. One web2py instance can run multiple web sites using different databases. Try the <a href="http://www.web2py.com/demo_admin">interactive demo</a>.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="{{=URL('documentation')}}">Extensive Docs</a></h3>
+      <p>Start with some <a href="{{=URL('examples')}}">quick examples</a>, then read the <a href="http://www.web2py.com/book" target="_blank">manual</a>, watch <a href="http://vimeo.com/album/178500" target="_blank">videos</a>, and join a <a href="{{=URL('default', 'usergroups')}}">user group</a> for discussion. Take advantage of the <a href="http://www.web2py.com/layouts" target="_blank">layouts</a>, <a href="http://dev.s-cubism.com/web2py_plugins" target="_blank">plugins</a>, <a href="http://www.web2py.com/appliances" target="_blank">appliances</a>, and <a href="http://web2pyslices.com" target="_blank">recipes</a>.</p>
+    </div>
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span12">
+    <img class="scale-with-grid centered" src="/examples/static/images/shadow-bottom.png">
+  </div>
+</div>
+<div class="row-fluid">
+  <div class="span12">
     {{for k,quote in enumerate(quotes[:3]):}}
-    <div class="one-third column {{=[' alpha', '', ' omega'][k]}}">
+    <div class="span4">
-      <em>
+      <p style="text-align: left"><em>{{=quote[0]}}</em></p>
-    <p>{{=quote[0]}}</p>
-      </em>
       <span class="right">
-    <a href="{{=quote[2]}}"><em>&mdash;{{=quote[1]}}</em></a>
+	<a href="{{=quote[2]}}">{{=quote[1]}}</a>
       </span>
     </div>
     {{pass}}
   </div>
 </div>
-{{end}}
-
-{{block right_sidebar}}
-<div class="one-third column" style="text-align:center">
-  <img class="scale-with-grid centered" src="{{=URL('static','images/tag-cloud-color-small.png')}}" width="300px"/>
-  <br/>
-  <a class="button" href="{{=URL('download')}}" style="width:90%">DOWNLOAD NOW</a><br/>
-  <a class="button" href="http://web2py.com/demo_admin" style="width:90%">ONLINE DEMO</a><br/>
-  <a class="button" href="http://web2py.com/poweredby" style="width:90%">SITES POWERED BY WEB2PY</a><br/>
-  <a class="button" href="http://www.chipin.com/contribute/id/dcd384d58839aa4d" style="width:90%">SUPPORT/DONATE</a></br>
-</div>
-{{end}}

applications/examples/views/default/who.html

@@ -147,8 +147,7 @@
 
 <li><a href="http://www.python.org">Python</a> created by Guido van Rossum.</li>
 <li>Rocket Web Server developed by Timothy Farrell.</li>
-<li><a href="http://www.cdolivet.com/index.php?page=editArea">EditArea</a> developed by Christophe Dolivet</li>
+<li><a href="http://codemirror.net/">CodeMirror</a></li>
-<li><a href="http://nicedit.com">nicEdit</a> developed by <a href="http://bkirchoff.com">Brian Kirchoff</a></li>
 <li><a href="http://cheeseshop.python.org/pypi/simplejson">simplejson</a> developed by Bob Ippolito</li>
 <li><a href="http://pyrtf.sourceforge.net/">PyRTF</a> developed by Simon Cusack and revised by Grant Edwards</li>
 <li><a href="http://www.dalkescientific.com/Python/PyRSS2Gen.html">PyRSS2Gen</a> developed by Dalke Scientific Software</li>
@@ -159,8 +158,8 @@
 <li><a href="http://jquery.com/">jQuery</a> developed by John Resig</li>
 <li>A syntax highlighter inspired by the code of <a href="http://www.petersblog.org/node/763">Peter Wilkinson</a></li>
 <li><a href="https://github.com/jtauber/pyuca">pyUCA</a> developed by <a href="http://jtauber.com/blog/2006/01/27/python_unicode_collation_algorithm/">James Tauber</a></li>
-
       </ul>
+(... and other third party modules in the contrib folder).
 
 </div>
 

applications/examples/views/global/vars.html

@@ -2,46 +2,53 @@
 {{import cgi}}
 
 <div class="contentleft">
-    <h1>{{=T('Docs for')}} {{=title}}</h1>
+  <h1>{{=T('Docs for')}} {{=title}}</h1>
-
+  
-    <div align="right">
+  <div align="right">
     [ <a href="http://docs.python.org/tut/">Python Tutorial</a> ]
     [ <a href="http://docs.python.org/lib/">Python Libraries</a> ]
     [ <a href="/{{=request.application}}/static/epydoc/index.html">web2py epydoc</a> ]
-    </div>
+  </div>
-
+  
-    <h2>{{=T('Description')}}</h2>
+  <h2>{{=T('Description')}}</h2>
-
+  
-    <br/>
+  <br/>
-    {{if t:}}
+  {{if t:}}
-    {{=t}}{{if d:}} extends {{=d}}{{pass}}
+  {{=t}}{{if d:}} extends {{=d}}{{pass}}
-    {{pass}}
+  {{pass}}
-    <br/>
+  <br/>
-    {{pass}}
+  {{pass}}
-
+  
-    {{if doc:}}<br/><br/>{{=CODE(str(doc),language=None,counter=None,_class='boxCode')}}{{pass}}
+  {{if doc:}}<br/><br/>{{=MARKMIN(doc)}}{{pass}}
-    <br/><br/>
+  <br/><br/>
-    <div class="boxInfo">
+  <div class="boxInfo">
+    {{if attributes:}}
     <h2>{{=T('Attributes')}}</h2>
-
+    
-    {{keys=attributes.keys(); keys.sort()}}
     <table>
-    <tr><td colspan=2><hr/></td></tr>
+      <tr><td colspan=2><hr/></td></tr>
-    {{for a in keys:}}
+      {{for key in sorted(attributes):}}
-    {{doc1,t1,c1,d1=attributes[a]}}
+      {{doc1,t1,c1,d1=attributes[key]}}
-    <tr>
+      <tr>
-    <td><b>{{#=a}}</b>{{=A(a,_href=URL(r=request,args=a.split('.')))}}</td>
+	<td>
-    <td>
+	{{if key.count('.')<2:}}
-    {{if t1:}}
+          {{=A(key,_rel="nofollow",_href=URL(args=key.split('.')))}}
-    {{=t1}}{{if d1:}} extends {{=d1}}{{pass}}
+	{{else:}}
-    {{if c1:}} belongs to class {{=c1}}{{pass}}
+          {{=key}}
-    <br/>
+        {{pass}}	
-    {{pass}}
+	</td>
-    {{if doc1:}}{{=XML(cgi.escape(str(doc1)).replace(chr(13),'<br/>'))}}{{pass}}
+        <td>
+	  {{if t1:}}
+	  {{=t1}}{{if d1:}} extends {{=d1}}{{pass}}
+	  {{if c1:}} belongs to class {{=c1}}{{pass}}
+	  <br/>
+	  {{pass}}
+	  {{if doc1:}}{{=MARKMIN(doc1)}}{{pass}}
     </td>
-    </tr>
+      </tr>
-    <tr><td colspan=2><hr/></td></tr>
+      <tr><td colspan=2><hr/></td></tr>
-    {{pass}}
+      {{pass}}
     </table>
-    </div>
+  </div>
+  {{pass}}
 </div>

applications/examples/views/layout.html

@@ -1,3 +1,4 @@
+<!--[if HTML5]><![endif]-->
 <!DOCTYPE html>
 <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
 <!--[if lt IE 7]><html class="ie ie6 ie-lte9 ie-lte8 ie-lte7 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
@@ -6,139 +7,167 @@
 <!--[if IE 9]><html class="ie9 ie-lte9 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
 <!--[if (gt IE 9)|!(IE)]><!--> <html class="no-js" lang="{{=T.accepted_language or 'en'}}"> <!--<![endif]-->
 <head>
-  <meta charset="utf-8" />
+<title>{{=response.title or request.application}}</title>
+  <!--[if !HTML5]>
+      <meta http-equiv="X-UA-Compatible" content="IE=edge{{=not request.is_local and ',chrome=1' or ''}}">
+  <![endif]-->
   <!-- www.phpied.com/conditional-comments-block-downloads/ -->
   <!-- Always force latest IE rendering engine
-	   (even in intranet) & Chrome Frame
+       (even in intranet) & Chrome Frame
-	   Remove this if you use the .htaccess -->
+       Remove this if you use the .htaccess -->
-  <!--[if IE]>
+	   
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta charset="utf-8" />
-  <![endif]-->
+
-  
-  <title>{{=response.title or request.application}}</title>
-  
   <!-- http://dev.w3.org/html5/markup/meta.name.html -->
   <meta name="application-name" content="{{=request.application}}" />
-  
+
   <!-- Speaking of Google, don't forget to set your site up:
-	   http://google.com/webmasters -->
+       http://google.com/webmasters -->
   <meta name="google-site-verification" content="" />
 
   <!--  Mobile Viewport Fix
-	  j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
+        j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
-	  device-width: Occupy full width of the screen in its current orientation
+        device-width: Occupy full width of the screen in its current orientation
-	  initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
+        initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
-	  user-scalable = yes allows the user to zoom in -->
+        user-scalable = yes allows the user to zoom in -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  
-  <!-- Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references -->
-  <link rel="shortcut icon" href="{{=URL('static','favicon.ico')}}" type="image/x-icon">
-  <link rel="apple-touch-icon" href="{{=URL('static','favicon.png')}}">
 
-  <!-- All JavaScript at the bottom, except for Modernizr which enables 
+  <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
-	   HTML5 elements & feature detects -->
+  <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
-  <script src="{{=URL('static','js/modernizr.custom.js')}}"></script>  
+
+  <!-- All JavaScript at the bottom, except for Modernizr which enables
+       HTML5 elements & feature detects -->
+  <script src="{{=URL('static','js/modernizr.custom.js')}}"></script>
 
   <!-- include stylesheets -->
-  {{
+  {{  
-  response.files.append(URL('static','css/skeleton.css'))
   response.files.append(URL('static','css/web2py.css'))
+  response.files.append(URL('static','css/bootstrap.min.css'))
+  response.files.append(URL('static','css/bootstrap-responsive.min.css'))
+  response.files.append(URL('static','css/web2py_bootstrap.css'))
   response.files.append(URL('static','css/examples.css'))
-  response.files.append(URL('static','css/superfish.css'))
-  response.files.append(URL('static','js/superfish.js'))
   }}
 
   {{include 'web2py_ajax.html'}}
 
-  <script type="text/javascript">
-    jQuery(function(){jQuery('.sf-menu').superfish();});
-  </script>
-
   {{
+  # using sidebars need to know what sidebar you want to use
+  left_sidebar_enabled = globals().get('left_sidebar_enabled',False)
   right_sidebar_enabled = globals().get('right_sidebar_enabled',False)
+  middle_columns = {0:'span12',1:'span9',2:'span6'}[
+    (left_sidebar_enabled and 1 or 0)+(right_sidebar_enabled and 1 or 0)]
   }}
 
   <!-- uncomment here to load jquery-ui
-  <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css" type="text/css" media="all" />
+       <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css" type="text/css" media="all" />
-  <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
+       <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
-  uncomment to load jquery-ui //-->
+       uncomment to load jquery-ui //-->
-  </style>
+  <noscript><link href="{{=URL('static', 'css/web2py_bootstrap_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
+  {{block head}}{{end}}
 </head>
+
 <body>
-  <div class="wrapper"><!-- for sticky footer -->    
+  <!-- Navbar ================================================== -->
-    <div class="flash">{{=response.flash or ''}}</div>    
+  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="header">
+    <div class="flash">{{=response.flash or ''}}</div>
+    <div class="navbar-inner">
       <div class="container">
-        <div class="sixteen columns">
+        <!-- the next tag is necessary for bootstrap menus, do not remove -->
-	  		<img src="{{=URL('static','images/web2py_logo.png')}}" class="logo" alt="web2py logo" />
+        <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-         	<h5>{{=response.subtitle or ''}}</h5>
+          <span class="icon-bar"></span>
-        </div>
+          <span class="icon-bar"></span>
-        
+          <span class="icon-bar"></span>
-        <div class="sixteen columns statusbar">
+        </button>
-	  	{{block statusbar}}
+	{{=response.logo or ''}}
-	  	{{is_mobile=request.user_agent().is_mobile}}
+        <ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul>
-          	<div id="menu" class="clearfix">{{=MENU(response.menu,_class='mobile-menu' if is_mobile else 'sf-menu',mobile=is_mobile)}}
+        <div class="nav-collapse">
-	    {{end}}
+          {{is_mobile=request.user_agent().is_mobile}}
-            <!-- AddToAny BEGIN -->
+          {{if response.menu:}}
-            <div style="float:right;padding-top:6px;" class="a2a_kit a2a_default_style">
+          {{=MENU(response.menu, _class='mobile-menu nav' if is_mobile else 'nav',mobile=is_mobile,li_class='dropdown',ul_class='dropdown-menu')}}
-            <a class="a2a_dd" href="http://www.addtoany.com/share_save">Share</a></div>
+          {{pass}}
-            <script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
+        </div><!--/.nav-collapse -->
-            <!-- AddToAny END -->
-        	</div>
-		</div>
-		<div class="sixteen columns announce">
-	    	<a href="http://www.infoworld.com/slideshow/24605/infoworlds-2012-technology-of-the-year-award-winners-183313#slide23"target="_blank">InfoWorld's 2012 Technology of the Year Award Winner</a>
-		</div>
       </div>
     </div>
-    <div class="main">
+  </div><!--/top navbar -->
-      <div class="container mainbody">	
+
-        <div class="sixteen columns">
+  <div class="container">
-          <div class="{{=right_sidebar_enabled and 'two-thirds column alpha' or 'sixteen columns alpha omega'}}">
+    <!-- Masthead ================================================== -->
+    <header class="mastheader" id="header">
+      <div class="span4">
+        <div class="page-header">
+	  <img src="{{=URL('static','images/web2py_logo.png')}}" class="logo" alt="web2py logo" />
+        </div>
+      </div>
+    </header>
+  </div>
+  <div class="container">
+
+    <section id="main" class="main row">
+        {{if left_sidebar_enabled:}}
+        <div class="span3 left-sidebar">
+            {{block left_sidebar}}
+            <h3>Left Sidebar</h3>
+            <p></p>
+            {{end}}
+        </div>
+        {{pass}}
+
+        <div class="{{=middle_columns}}">
             {{block center}}
             {{include}}
             {{end}}
-          </div>
+        </div>
-          
+
-          {{if right_sidebar_enabled:}}
+        {{if right_sidebar_enabled:}}
-          <div class="one-third column omega">
+        <div class="span3">
             {{block right_sidebar}}
             <h3>Right Sidebar</h3>
             <p></p>
             {{end}}
-          </div>    
-          {{pass}}
         </div>
-      </div><!-- container -->
+        {{pass}}
-      {{block extra}}{{end}}      
+    </section><!--/main-->
-      
-    </div><!-- main -->
-    
-    <div class="push"></div>
-  </div><!-- wrapper -->
 
-  <div class="footer">
+    <!-- Footer ================================================== -->
-    <div class="container header">    
+    <div class="row">
-      <div class="sixteen columns">
+        <footer class="footer span12" id="footer">
-        {{block footer}} <!-- this is default footer -->
+            <div class="footer-content">
-        <div class="footer-content" >
+                {{block footer}} <!-- this is default footer -->
-          {{=T('Copyright')}} &#169; {{=request.now.year}}
+                <div id="poweredBy" class="pull-right">
-	  - User communities in <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py" target="_blank">English<a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-fr" target="_blank">French</a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-japan" target="_blank">Japanese</a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-users-brazil" target="_blank">Portuguese</a>, and <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-usuarios" target="_blank">Spanish</a>.
+		  {{=T('Copyright')}} &#169; {{=request.now.year}} -
-          <div style="float: right;">
+                    {{=T('Powered by')}}
-            <a href="http://www.web2py.com/" style="float: left; padding-right: 6px;">
+                    <a href="http://www.web2py.com/">web2py</a> -
-            <img style="padding-bottom: 0;" src="{{=URL('static','images/poweredby.png')}}"/>
+		    {{=T('Hosted by')}}
-            </a>
+                    <a href="http://pythonanywhere.com">PythonAnywhere</a>
-          </div>
+                </div>
-        </div>
+                {{end}}
-        {{end}}	
+            </div>
-      </div>
+        </footer>
-    </div><!-- container -->
+    </div>
-  </div><!-- footer -->
+
-  
+  </div> <!-- /container -->
+
+  <!-- The javascript =============================================
+       (Placed at the end of the document so the pages load faster) -->
+  <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
+  <script src="{{=URL('static','js/web2py_bootstrap.js')}}"></script>
   <!--[if lt IE 7 ]>
-	<script src="{{=URL('static','js/dd_belatedpng.js')}}"></script>
+      <script src="{{=URL('static','js/dd_belatedpng.js')}}"></script>
-	<script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
+      <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
-	<![endif]-->
+      <![endif]-->
-  {{if response.google_analytics_id:}}<script>/* http://mathiasbynens.be/notes/async-analytics-snippet */ var _gaq=[['_setAccount','{{=response.google_analytics_id}}'],['_trackPageview']];(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)}(document,'script')) </script>{{pass}}
+  
+  {{if response.google_analytics_id:}}
+  <script src="{{=URL('static','js/analytics.min.js')}}"></script>
+  <script type="text/javascript">
+  analytics.initialize({
+    'Google Analytics':{trackingId:'{{=response.google_analytics_id}}'} 
+  });</script>
+  {{pass}}
+  <script src="{{=URL('static','js/share.js',vars=dict(static=URL('static','images')))}}"></script>
+  <a style="position:fixed;bottom:0;left:0;z-index:1000" href="https://groups.google.com/forum/?fromgroups#!forum/web2py" target="_blank">
+    <img src="{{=URL('static','images/questions.png')}}" />
+  </a>
+
 </body>
 </html>
+

applications/examples/views/spreadsheet/index.html

@@ -1,5 +1,9 @@
 {{extend 'layout.html'}}
-
+<style>
+input {width: 70px;}
+input:focus {background-color: yellow}
+table, td, tr { border: 0; margin: 0; padding: 0}
+</style>
 <h1>Excel-like spreadsheet widget</h1>
 
 Try insert "=r0c1+1" in cell r0c0 and "2" in r0c1. Formulas start with "=" as in Excel. You can use a subset of python commands and math function, and reference cells by r[row]c[col]. All computations are performed serverside via Ajax (input is validated for security). Cell values and formulas can be set and locked serverside. The shape of the spreadsheet can be modifed serverside and does not need to be tabular (think of it as a graph of css-friendly widgets you can place where you want). Cells can be given arbistrary names. This example is distributed with web2py so look at the source code of the example to learn more.

applications/welcome/controllers/appadmin.py

@@ -54,6 +54,10 @@ response.menu = [[T('design'), False, URL('admin', 'default', 'design',
 # ## auxiliary functions
 # ###########################################################
 
+if False and request.tickets_db:
+    from gluon.restricted import TicketStorage
+    ts = TicketStorage()
+    ts._get_table(request.tickets_db, ts.tablename, request.application)
 
 def get_databases(request):
     dbs = {}
@@ -319,6 +323,9 @@ def state():
 
 
 def ccache():
+    cache.ram.initialize()
+    cache.disk.initialize()
+
     form = FORM(
         P(TAG.BUTTON(
             T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
@@ -385,7 +392,7 @@ def ccache():
 
         return (hours, minutes, seconds)
 
-    for key, value in cache.ram.storage.items():
+    for key, value in cache.ram.storage.iteritems():
         if isinstance(value, dict):
             ram['hits'] = value['hit_total'] - value['misses']
             ram['misses'] = value['misses']

applications/welcome/languages/cs.py

@@ -3,6 +3,7 @@
 '!langcode!': 'cs-cz',
 '!langname!': 'čeština',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': 'Kolonka "Upravit" je nepovinný výraz, například "pole1=\'nováhodnota\'". Výsledky databázového JOINu nemůžete mazat ani upravovat.',
+'"User Exception" debug mode. An error ticket could be issued!': '"User Exception" debug mode. An error ticket could be issued!',
 '%%{Row} in Table': '%%{řádek} v tabulce',
 '%%{Row} selected': 'označených %%{řádek}',
 '%s %%{row} deleted': '%s smazaných %%{záznam}',
@@ -11,6 +12,7 @@
 '%Y-%m-%d': '%d.%m.%Y',
 '%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
 '(requires internet access)': '(vyžaduje připojení k internetu)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(například "cs-cs")',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(soubor **gluon/contrib/plural_rules/%s.py** nenalezen)',
 '@markmin\x01Searching: **%s** %%{file}': 'Hledání: **%s** %%{soubor}',
@@ -19,15 +21,18 @@
 'Access Control': 'Řízení přístupu',
 'Add breakpoint': 'Přidat bod přerušení',
 'Additional code for your application': 'Další kód pro Vaši aplikaci',
+'Admin design page': 'Admin design page',
 'Admin language': 'jazyk rozhraní',
 'Administrative interface': 'pro administrátorské rozhraní klikněte sem',
 'Administrative Interface': 'Administrátorské rozhraní',
 'administrative interface': 'rozhraní pro správu',
 'Administrator Password:': 'Administrátorské heslo:',
 'Ajax Recipes': 'Recepty s ajaxem',
+'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it:': 'a přejmenovat na:',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin je zakázaná bez zabezpečeného spojení',
+'Application': 'Application',
 'application "%s" uninstalled': 'application "%s" odinstalována',
 'application compiled': 'aplikace zkompilována',
 'Application name:': 'Název aplikace:',
@@ -36,8 +41,13 @@
 'Are you sure you want to delete this object?': 'Opravdu chcete odstranit tento objekt?',
 'Are you sure you want to uninstall application "%s"?': 'Opravdu chcete odinstalovat aplikaci "%s"?',
 'arguments': 'arguments',
+'at char %s': 'at char %s',
+'at line %s': 'at line %s',
+'ATTENTION:': 'ATTENTION:',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.',
 'Available Databases and Tables': 'Dostupné databáze a tabulky',
 'back': 'zpět',
+'Back to wizard': 'Back to wizard',
 'Basics': 'Basics',
 'Begin': 'Začít',
 'breakpoint': 'bod přerušení',
@@ -51,7 +61,8 @@
 'can be a git repo': 'může to být git repo',
 'Cancel': 'Storno',
 'Cannot be empty': 'Nemůže být prázdné',
-'Change admin password': 'Změnit heslo pro strávu aplikací',
+'Change Admin Password': 'Změnit heslo pro správu',
+'Change admin password': 'Změnit heslo pro správu aplikací',
 'Change password': 'Změna hesla',
 'check all': 'vše označit',
 'Check for upgrades': 'Zkusit aktualizovat',
@@ -94,6 +105,7 @@
 'data uploaded': 'data nahrána',
 'Database': 'Rozhraní databáze',
 'Database %s select': 'databáze %s výběr',
+'Database administration': 'Database administration',
 'database administration': 'správa databáze',
 'Date and Time': 'Datum a čas',
 'day': 'den',
@@ -104,6 +116,7 @@
 'Delete': 'Smazat',
 'delete': 'smazat',
 'delete all checked': 'smazat vše označené',
+'delete plugin': 'delete plugin',
 'Delete this file (you will be asked to confirm deletion)': 'Smazat tento soubor (budete požádán o potvrzení mazání)',
 'Delete:': 'Smazat:',
 'deleted after first hit': 'smazat po prvním dosažení',
@@ -114,9 +127,9 @@
 'Deployment Recipes': 'Postupy pro deployment',
 'Description': 'Popis',
 'design': 'návrh',
-'Detailed traceback description': 'Detailed traceback description',
+'Detailed traceback description': 'Podrobný výpis prostředí',
-'details': 'details',
+'details': 'podrobnosti',
-'direction: ltr': 'direction: ltr',
+'direction: ltr': 'směr: ltr',
 'Disable': 'Zablokovat',
 'DISK': 'DISK',
 'Disk Cache Keys': 'Klíče diskové cache',
@@ -132,29 +145,37 @@
 'Edit': 'Upravit',
 'edit all': 'edit all',
 'Edit application': 'Správa aplikace',
+'edit controller': 'edit controller',
 'Edit current record': 'Upravit aktuální záznam',
 'Edit Profile': 'Upravit profil',
 'edit views:': 'upravit pohled:',
 'Editing file "%s"': 'Úprava souboru "%s"',
 'Editing Language file': 'Úprava jazykového souboru',
+'Editing Plural Forms File': 'Editing Plural Forms File',
 'Email and SMS': 'Email a SMS',
 'Enable': 'Odblokovat',
 'enter a number between %(min)g and %(max)g': 'zadejte číslo mezi %(min)g a %(max)g',
 'enter an integer between %(min)g and %(max)g': 'zadejte celé číslo mezi %(min)g a %(max)g',
 'Error': 'Chyba',
 'Error logs for "%(app)s"': 'Seznam výskytu chyb pro aplikaci "%(app)s"',
-'Error snapshot': 'Error snapshot',
+'Error snapshot': 'Snapshot chyby',
-'Error ticket': 'Error ticket',
+'Error ticket': 'Ticket chyby',
 'Errors': 'Chyby',
-'Exception instance attributes': 'Exception instance attributes',
+'Exception %(extype)s: %(exvalue)s': 'Exception %(extype)s: %(exvalue)s',
+'Exception %s': 'Exception %s',
+'Exception instance attributes': 'Prvky instance výjimky',
+'Expand Abbreviation': 'Expand Abbreviation',
 'export as csv file': 'exportovat do .csv souboru',
 'exposes': 'vystavuje',
 'exposes:': 'vystavuje funkce:',
 'extends': 'rozšiřuje',
+'failed to compile file because:': 'soubor se nepodařilo zkompilovat, protože:',
 'FAQ': 'Často kladené dotazy',
 'File': 'Soubor',
 'file': 'soubor',
+'file "%(filename)s" created': 'file "%(filename)s" created',
 'file saved on %(time)s': 'soubor uložen %(time)s',
+'file saved on %s': 'soubor uložen %s',
 'Filename': 'Název souboru',
 'filter': 'filtr',
 'Find Next': 'Najít další',
@@ -165,12 +186,15 @@
 'Forms and Validators': 'Formuláře a validátory',
 'Frames': 'Frames',
 'Free Applications': 'Aplikace zdarma',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
 'Generate': 'Vytvořit',
 'Get from URL:': 'Stáhnout z internetu:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
 'Globals##debug': 'Globální proměnné',
 'go!': 'OK!',
+'Goto': 'Goto',
+'graph model': 'graph model',
 'Group %(group_id)s created': 'Skupina %(group_id)s vytvořena',
 'Group ID': 'ID skupiny',
 'Groups': 'Skupiny',
@@ -181,6 +205,8 @@
 'Home': 'Domovská stránka',
 'honored only if the expression evaluates to true': 'brát v potaz jen když se tato podmínka vyhodnotí kladně',
 'How did you get here?': 'Jak jste se sem vlastně dostal?',
+'If start the upgrade, be patient, it may take a while to download': 'If start the upgrade, be patient, it may take a while to download',
+'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.': 'If the report above contains a ticket number it indicates a failure in executing the controller, before any attempt to execute the doctests. This is usually due to an indentation error or an error outside function code.\nA green title indicates that all tests (if defined) passed. In this case test results are not shown.',
 'import': 'import',
 'Import/Export': 'Import/Export',
 'includes': 'zahrnuje',
@@ -190,8 +216,8 @@
 'inspect attributes': 'inspect attributes',
 'Install': 'Instalovat',
 'Installed applications': 'Nainstalované aplikace',
-'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
-'Interactive console': 'Interactive console',
+'Interactive console': 'Interaktivní příkazová řádka',
 'Internal State': 'Vnitřní stav',
 'Introduction': 'Úvod',
 'Invalid email': 'Neplatný email',
@@ -203,6 +229,7 @@
 'It is %s %%{day} today.': 'Dnes je to %s %%{den}.',
 'Key': 'Klíč',
 'Key bindings': 'Vazby klíčů',
+'Key bindings for ZenCoding Plugin': 'Key bindings for ZenCoding Plugin',
 'languages': 'jazyky',
 'Languages': 'Jazyky',
 'Last name': 'Příjmení',
@@ -227,6 +254,7 @@
 'Lost Password': 'Zapomněl jste heslo',
 'Lost password?': 'Zapomněl jste heslo?',
 'lost password?': 'zapomněl jste heslo?',
+'Manage': 'Manage',
 'Manage Cache': 'Manage Cache',
 'Menu Model': 'Model rozbalovací nabídky',
 'Models': 'Modely',
@@ -237,6 +265,7 @@
 'modules': 'moduly',
 'My Sites': 'Správa aplikací',
 'Name': 'Jméno',
+'new application "%s" created': 'nová aplikace "%s" vytvořena',
 'New Application Wizard': 'Nový průvodce aplikací',
 'New application wizard': 'Nový průvodce aplikací',
 'New password': 'Nové heslo',
@@ -245,13 +274,16 @@
 'New simple application': 'Vytvořit primitivní aplikaci',
 'next': 'next',
 'next 100 rows': 'dalších 100 řádků',
-'No databases in this application': 'V této aplikáci nejsou žádné databáze',
+'No databases in this application': 'V této aplikaci nejsou žádné databáze',
 'No Interaction yet': 'Ještě žádná interakce nenastala',
 'No ticket_storage.txt found under /private folder': 'Soubor ticket_storage.txt v adresáři /private nenalezen',
 'Object or table name': 'Objekt či tabulka',
 'Old password': 'Původní heslo',
 'online designer': 'online návrhář',
 'Online examples': 'Příklady online',
+'Open new app in new window': 'Open new app in new window',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'nebo importovat z .csv souboru',
 'Origin': 'Původ',
 'Original/Translation': 'Originál/Překlad',
@@ -261,12 +293,16 @@
 'Overwrite installed app': 'Přepsat instalovanou aplikaci',
 'Pack all': 'Zabalit',
 'Pack compiled': 'Zabalit zkompilované',
+'pack plugin': 'pack plugin',
 'password': 'heslo',
 'Password': 'Heslo',
 "Password fields don't match": 'Hesla se neshodují',
+'Peeking at file': 'Peeking at file',
 'Please': 'Prosím',
+'Plugin "%s" in application': 'Plugin "%s" in application',
 'plugins': 'zásuvné moduly',
 'Plugins': 'Zásuvné moduly',
+'Plural Form #%s': 'Plural Form #%s',
 'Plural-Forms:': 'Množná čísla:',
 'Powered by': 'Poháněno',
 'Preface': 'Předmluva',
@@ -292,6 +328,7 @@
 'Register': 'Zaregistrovat se',
 'Registration identifier': 'Registrační identifikátor',
 'Registration key': 'Registrační klíč',
+'reload': 'reload',
 'Reload routes': 'Znovu nahrát cesty',
 'Remember me (for 30 days)': 'Zapamatovat na 30 dní',
 'Remove compiled': 'Odstranit zkompilované',
@@ -313,6 +350,7 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Spustí testy v tomto souboru (ke spuštění všech testů, použijte tlačítko 'test')",
 'Running on %s': 'Běží na %s',
 'Save': 'Uložit',
+'Save file:': 'Save file:',
 'Save via Ajax': 'Uložit pomocí Ajaxu',
 'Saved file hash:': 'hash uloženého souboru:',
 'Semantic': 'Modul semantic',
@@ -321,6 +359,7 @@
 'session expired': 'session expired',
 'Set Breakpoint on %s at line %s: %s': 'Bod přerušení nastaven v souboru %s na řádce %s: %s',
 'shell': 'příkazová řádka',
+'Singular Form': 'Singular Form',
 'Site': 'Správa aplikací',
 'Size of cache:': 'Velikost cache:',
 'skip to generate': 'skip to generate',
@@ -329,6 +368,7 @@
 'Start searching': 'Začít hledání',
 'Start wizard': 'Spustit průvodce',
 'state': 'stav',
+'Static': 'Static',
 'static': 'statické soubory',
 'Static files': 'Statické soubory',
 'Statistics': 'Statistika',
@@ -345,6 +385,7 @@
 'Table name': 'Název tabulky',
 'Temporary': 'Dočasný',
 'test': 'test',
+'Testing application': 'Testing application',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': '"Dotaz" je podmínka, například "db.tabulka1.pole1==\'hodnota\'". Podmínka "db.tabulka1.pole1==db.tabulka2.pole2" pak vytvoří SQL JOIN.',
 'The application logic, each URL path is mapped in one exposed function in the controller': 'Logika aplikace: každá URL je mapována na funkci vystavovanou kontrolérem.',
 'The Core': 'Jádro (The Core)',
@@ -352,13 +393,19 @@
 'The output of the file is a dictionary that was rendered by the view %s': 'Výstup ze souboru je slovník, který se zobrazil v pohledu %s.',
 'The presentations layer, views are also known as templates': 'Prezentační vrstva: pohledy či templaty (šablony)',
 'The Views': 'Pohledy (The Views)',
+'There are no controllers': 'There are no controllers',
+'There are no modules': 'There are no modules',
 'There are no plugins': 'Žádné moduly nejsou instalovány.',
 'There are no private files': 'Žádné soukromé soubory neexistují.',
 'There are no static files': 'There are no static files',
+'There are no translators, only default language is supported': 'There are no translators, only default language is supported',
+'There are no views': 'There are no views',
 'These files are not served, they are only available from within your app': 'Tyto soubory jsou klientům nepřístupné. K dispozici jsou pouze v rámci aplikace.',
 'These files are served without processing, your images go here': 'Tyto soubory jsou servírovány bez přídavné logiky, sem patří např. obrázky.',
 'This App': 'Tato aplikace',
 'This is a copy of the scaffolding application': 'Toto je kopie aplikace skelet.',
+'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk': 'This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk',
+'This is the %(filename)s template': 'This is the %(filename)s template',
 'this page to see if a breakpoint was hit and debug interaction is required.': 'tuto stránku, abyste uviděli, zda se dosáhlo bodu přerušení.',
 'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
@@ -373,16 +420,24 @@
 'too short': 'Příliš krátké',
 'Traceback': 'Traceback',
 'Translation strings for the application': 'Překlad textů pro aplikaci',
+'try something like': 'try something like',
 'Try the mobile interface': 'Zkuste rozhraní pro mobilní zařízení',
+'try view': 'try view',
 'Twitter': 'Twitter',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Type python statement in here and hit Return (Enter) to execute it.',
+'Type some Python code in here and hit Return (Enter) to execute it.': 'Type some Python code in here and hit Return (Enter) to execute it.',
+'Unable to check for upgrades': 'Unable to check for upgrades',
 'unable to parse csv file': 'csv soubor nedá sa zpracovat',
 'uncheck all': 'vše odznačit',
 'Uninstall': 'Odinstalovat',
 'update': 'aktualizovat',
 'update all languages': 'aktualizovat všechny jazyky',
 'Update:': 'Upravit:',
+'Upgrade': 'Upgrade',
+'upgrade now': 'upgrade now',
+'upgrade now to %s': 'upgrade now to %s',
 'upload': 'nahrát',
+'Upload': 'Upload',
 'Upload a package:': 'Nahrát balík:',
 'Upload and install packed application': 'Nahrát a instalovat zabalenou aplikaci',
 'upload file:': 'nahrát soubor:',
@@ -409,6 +464,8 @@
 'web2py is up to date': 'Máte aktuální verzi web2py.',
 'web2py online debugger': 'Ladící online web2py program',
 'web2py Recent Tweets': 'Štěbetání na Twitteru o web2py',
+'web2py upgrade': 'web2py upgrade',
+'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
 'Welcome': 'Vítejte',
 'Welcome to web2py': 'Vitejte ve web2py',
 'Welcome to web2py!': 'Vítejte ve web2py!',

applications/welcome/languages/es.py

@@ -8,23 +8,23 @@
 '%s selected': '%s seleccionado(s)',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(something like "it-it")': '(algo como "it-it")',
+'(something like "it-it")': '(algo como "eso-eso")',
 'A new version of web2py is available': 'Hay una nueva versión de web2py disponible',
 'A new version of web2py is available: %s': 'Hay una nueva versión de web2py disponible: %s',
 'about': 'acerca de',
 'About': 'Acerca de',
 'About application': 'Acerca de la aplicación',
-'Access Control': 'Access Control',
+'Access Control': 'Control de Acceso',
 'additional code for your application': 'código adicional para su aplicación',
 'admin disabled because no admin password': ' por falta de contraseña',
 'admin disabled because not supported on google app engine': 'admin deshabilitado, no es soportado en GAE',
 'admin disabled because unable to access password file': 'admin deshabilitado, imposible acceder al archivo con la contraseña',
 'Admin is disabled because insecure channel': 'Admin deshabilitado, el canal no es seguro',
 'Admin is disabled because unsecure channel': 'Admin deshabilitado, el canal no es seguro',
-'Administrative Interface': 'Administrative Interface',
+'Administrative Interface': 'Interfaz Administrativa',
 'Administrative interface': 'Interfaz administrativa',
 'Administrator Password:': 'Contraseña del Administrador:',
-'Ajax Recipes': 'Ajax Recipes',
+'Ajax Recipes': 'Recetas AJAX',
 'and rename it (required):': 'y renombrela (requerido):',
 'and rename it:': ' y renombrelo:',
 'appadmin': 'appadmin',
@@ -33,37 +33,37 @@
 'application compiled': 'aplicación compilada',
 'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
 'Are you sure you want to delete file "%s"?': '¿Está seguro que desea eliminar el archivo "%s"?',
-'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Are you sure you want to delete this object?': '¿Está seguro que desea borrar este objeto?',
 'Are you sure you want to uninstall application "%s"': '¿Está seguro que desea desinstalar la aplicación "%s"',
 'Are you sure you want to uninstall application "%s"?': '¿Está seguro que desea desinstalar la aplicación "%s"?',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCION: Inicio de sesión requiere una conexión segura (HTTPS) o localhost.',
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATENCION: NO EJECUTE VARIAS PRUEBAS SIMULTANEAMENTE, NO SON THREAD SAFE.',
-'ATTENTION: you cannot edit the running application!': 'ATENCION: no puede modificar la aplicación que se ejecuta!',
+'ATTENTION: you cannot edit the running application!': 'ATENCION: no puede modificar la aplicación que está ejecutandose!',
 'Authentication': 'Autenticación',
 'Available Databases and Tables': 'Bases de datos y tablas disponibles',
-'Buy this book': 'Buy this book',
+'Buy this book': 'Compra este libro',
 'cache': 'cache',
 'Cache': 'Cache',
-'Cache Keys': 'Cache Keys',
+'Cache Keys': 'Llaves de la Cache',
 'cache, errors and sessions cleaned': 'cache, errores y sesiones eliminados',
 'Cannot be empty': 'No puede estar vacío',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se puede compilar: hay errores en su aplicación. Depure, corrija errores y vuelva a intentarlo.',
 'cannot create file': 'no es posible crear archivo',
 'cannot upload file "%(filename)s"': 'no es posible subir archivo "%(filename)s"',
-'Change Password': 'Cambie Contraseña',
+'Change Password': 'Cambie la contraseña',
-'change password': 'cambie contraseña',
+'change password': 'cambie la contraseña',
 'check all': 'marcar todos',
 'Check to delete': 'Marque para eliminar',
 'clean': 'limpiar',
-'Clear CACHE?': 'Clear CACHE?',
+'Clear CACHE?': '¿Limpiar CACHE?',
-'Clear DISK': 'Clear DISK',
+'Clear DISK': '¿Limpiar DISCO',
-'Clear RAM': 'Clear RAM',
+'Clear RAM': '¿Limpiar RAM',
 'click to check for upgrades': 'haga clic para buscar actualizaciones',
 'Client IP': 'IP del Cliente',
-'Community': 'Community',
+'Community': 'Comunidad',
 'compile': 'compilar',
 'compiled application removed': 'aplicación compilada removida',
-'Components and Plugins': 'Components and Plugins',
+'Components and Plugins': 'Componentes y Plugins',
 'Controller': 'Controlador',
 'Controllers': 'Controladores',
 'controllers': 'controladores',
@@ -83,24 +83,24 @@
 'database administration': 'administración base de datos',
 'Date and Time': 'Fecha y Hora',
 'db': 'db',
-'DB Model': 'Modelo "db"',
+'DB Model': 'Modelo "DB"',
 'defines tables': 'define tablas',
-'Delete': 'Elimine',
+'Delete': 'Eliminar',
 'delete': 'eliminar',
 'delete all checked': 'eliminar marcados',
-'Delete:': 'Elimine:',
+'Delete:': 'Eliminar:',
 'Demo': 'Demo',
-'Deploy on Google App Engine': 'Instale en Google App Engine',
+'Deploy on Google App Engine': 'Despliegue en Google App Engine',
-'Deployment Recipes': 'Deployment Recipes',
+'Deployment Recipes': 'Recetas de despliegue',
 'Description': 'Descripción',
 'DESIGN': 'DISEÑO',
 'design': 'modificar',
-'Design for': 'Diseño para',
+'Design for': 'Diseño por',
 'DISK': 'DISK',
-'Disk Cache Keys': 'Disk Cache Keys',
+'Disk Cache Keys': 'Llaves de Cache en Disco',
-'Disk Cleared': 'Disk Cleared',
+'Disk Cleared': 'Disco limpiado',
 'Documentation': 'Documentación',
-"Don't know what to do?": "Don't know what to do?",
+"Don't know what to do?": "¿No sabe que hacer?",
 'done!': 'listo!',
 'Download': 'Download',
 'E-mail': 'Correo electrónico',
@@ -115,9 +115,9 @@
 'Edit This App': 'Edite esta App',
 'Editing file': 'Editando archivo',
 'Editing file "%s"': 'Editando archivo "%s"',
-'Email and SMS': 'Email and SMS',
+'Email and SMS': 'Correo electrónico y SMS',
 'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
-'Errors': 'Errors',
+'Errors': 'Errores',
 'errors': 'errores',
 'export as csv file': 'exportar como archivo CSV',
 'exposes': 'expone',
@@ -134,17 +134,17 @@
 'file saved on %(time)s': 'archivo guardado %(time)s',
 'file saved on %s': 'archivo guardado %s',
 'First name': 'Nombre',
-'Forms and Validators': 'Forms and Validators',
+'Forms and Validators': 'Formularios y validadores',
-'Free Applications': 'Free Applications',
+'Free Applications': 'Aplicaciones Libres',
 'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
 'Group ID': 'ID de Grupo',
-'Groups': 'Groups',
+'Groups': 'Groupos',
 'Hello World': 'Hola Mundo',
 'help': 'ayuda',
 'Home': 'Home',
-'How did you get here?': 'How did you get here?',
+'How did you get here?': '¿Cómo llegasta hasta allá?',
 'htmledit': 'htmledit',
-'import': 'import',
+'import': 'importar',
 'Import/Export': 'Importar/Exportar',
 'includes': 'incluye',
 'Index': 'Indice',
@@ -153,14 +153,14 @@
 'Installed applications': 'Aplicaciones instaladas',
 'internal error': 'error interno',
 'Internal State': 'Estado Interno',
-'Introduction': 'Introduction',
+'Introduction': 'Introducción',
 'Invalid action': 'Acción inválida',
-'Invalid email': 'Correo inválido',
+'Invalid email': 'Correo electrónico inválido',
 'invalid password': 'contraseña inválida',
 'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitud inválida',
 'invalid ticket': 'tiquete inválido',
-'Key': 'Key',
+'Key': 'Llave',
 'language file "%(filename)s" created/updated': 'archivo de lenguaje "%(filename)s" creado/actualizado',
 'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
 'languages': 'lenguajes',
@@ -169,10 +169,10 @@
 'Last name': 'Apellido',
 'Last saved on:': 'Guardado en:',
 'Layout': 'Diseño de página',
-'Layout Plugins': 'Layout Plugins',
+'Layout Plugins': 'Plugins de diseño',
-'Layouts': 'Layouts',
+'Layouts': 'Diseños de páginas',
 'License for': 'Licencia para',
-'Live Chat': 'Live Chat',
+'Live Chat': 'Chat en vivo',
 'loading...': 'cargando...',
 'login': 'inicio de sesión',
 'Login': 'Inicio de sesión',
@@ -180,16 +180,16 @@
 'logout': 'fin de sesión',
 'Logout': 'Fin de sesión',
 'Lost Password': 'Contraseña perdida',
-'lost password?': '¿olvido la contraseña?',
+'lost password?': '¿Olvido la contraseña?',
 'Main Menu': 'Menú principal',
-'Manage Cache': 'Manage Cache',
+'Manage Cache': 'Manejar la Cache',
 'Menu Model': 'Modelo "menu"',
 'merge': 'combinar',
 'Models': 'Modelos',
 'models': 'modelos',
 'Modules': 'Módulos',
 'modules': 'módulos',
-'My Sites': 'My Sites',
+'My Sites': 'Mis Sitios',
 'Name': 'Nombre',
 'new application "%s" created': 'nueva aplicación "%s" creada',
 'New Record': 'Registro nuevo',
@@ -202,9 +202,9 @@
 'or provide application url:': 'o provea URL de la aplicación:',
 'Origin': 'Origen',
 'Original/Translation': 'Original/Traducción',
-'Other Plugins': 'Other Plugins',
+'Other Plugins': 'Otros Plugins',
-'Other Recipes': 'Other Recipes',
+'Other Recipes': 'Otas Recetas',
-'Overview': 'Overview',
+'Overview': 'Resumen',
 'pack all': 'empaquetar todo',
 'pack compiled': 'empaquete compiladas',
 'Password': 'Contraseña',
@@ -215,20 +215,20 @@
 'previous 100 rows': '100 filas anteriores',
 'Python': 'Python',
 'Query:': 'Consulta:',
-'Quick Examples': 'Quick Examples',
+'Quick Examples': 'Ejemplos Rápidos',
 'RAM': 'RAM',
-'RAM Cache Keys': 'RAM Cache Keys',
+'RAM Cache Keys':'Llaves de la RAM Cache',
-'Ram Cleared': 'Ram Cleared',
+'Ram Cleared': 'Ram Limpiada',
-'Recipes': 'Recipes',
+'Recipes': 'Recetas',
 'Record': 'registro',
 'record does not exist': 'el registro no existe',
 'Record ID': 'ID de Registro',
 'Record id': 'id de registro',
 'Register': 'Registrese',
 'register': 'registrese',
-'Registration key': 'Contraseña de Registro',
+'Registration key': 'Llave de Registro',
 'remove compiled': 'eliminar compiladas',
-'Reset Password key': 'Reset Password key',
+'Reset Password key': 'Restaurar LLavel de la Contraseña',
 'Resolve Conflict file': 'archivo Resolución de Conflicto',
 'restore': 'restaurar',
 'revert': 'revertir',
@@ -237,20 +237,20 @@
 'Rows selected': 'Filas seleccionadas',
 'save': 'guardar',
 'Saved file hash:': 'Hash del archivo guardado:',
-'Semantic': 'Semantic',
+'Semantic': 'Semantica',
-'Services': 'Services',
+'Services': 'Servicios',
 'session expired': 'sesión expirada',
-'shell': 'shell',
+'shell': 'terminal',
 'site': 'sitio',
-'Size of cache:': 'Size of cache:',
+'Size of cache:': 'Tamaño del Cache:',
 'some files could not be removed': 'algunos archivos no pudieron ser removidos',
 'state': 'estado',
 'static': 'estáticos',
 'Static files': 'Archivos estáticos',
-'Statistics': 'Statistics',
+'Statistics': 'Estadísticas',
 'Stylesheet': 'Hoja de estilo',
-'submit': 'submit',
+'submit': 'enviar',
-'Support': 'Support',
+'Support': 'Soporte',
 'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
 'Table': 'tabla',
 'Table name': 'Nombre de la tabla',
@@ -258,11 +258,11 @@
 'Testing application': 'Probando aplicación',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "consulta" es una condición como "db.tabla1.campo1==\'valor\'". Algo como "db.tabla1.campo1==db.tabla2.campo2" resulta en un JOIN SQL.',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'la lógica de la aplicación, cada ruta URL se mapea en una función expuesta en el controlador',
-'The Core': 'The Core',
+'The Core': 'El Núcleo',
 'the data representation, define database tables and sets': 'la representación de datos, define tablas y conjuntos de base de datos',
 'The output of the file is a dictionary that was rendered by the view %s': 'La salida del archivo es un diccionario escenificado por la vista %s',
 'the presentations layer, views are also known as templates': 'la capa de presentación, las vistas también son llamadas plantillas',
-'The Views': 'The Views',
+'The Views': 'Las Vistas',
 'There are no controllers': 'No hay controladores',
 'There are no models': 'No hay modelos',
 'There are no modules': 'No hay módulos',
@@ -270,14 +270,14 @@
 'There are no translators, only default language is supported': 'No hay traductores, sólo el lenguaje por defecto es soportado',
 'There are no views': 'No hay vistas',
 'these files are served without processing, your images go here': 'estos archivos son servidos sin procesar, sus imágenes van aquí',
-'This App': 'This App',
+'This App': 'Esta Aplicación',
 'This is a copy of the scaffolding application': 'Esta es una copia de la aplicación de andamiaje',
 'This is the %(filename)s template': 'Esta es la plantilla %(filename)s',
 'Ticket': 'Tiquete',
-'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
+'Time in Cache (h:m:s)': 'Tiempo en Cache (h:m:s)',
-'Timestamp': 'Timestamp',
+'Timestamp': 'Marca de tiempo',
 'to  previous version.': 'a la versión previa.',
-'translation strings for the application': 'cadenas de caracteres de traducción para la aplicación',
+'translation strings for the application': 'cadenas de carácteres de traducción para la aplicación',
 'try': 'intente',
 'try something like': 'intente algo como',
 'Twitter': 'Twitter',
@@ -306,12 +306,12 @@
 'views': 'vistas',
 'web2py is up to date': 'web2py está actualizado',
 'web2py Recent Tweets': 'Tweets Recientes de web2py',
-'Welcome': 'Welcome',
+'Welcome': 'Bienvenido',
 'Welcome %s': 'Bienvenido %s',
 'Welcome to web2py': 'Bienvenido a web2py',
-'Welcome to web2py!': 'Welcome to web2py!',
+'Welcome to web2py!': '¡Bienvenido to web2py!',
 'Which called the function %s located in the file %s': 'La cual llamó la función %s localizada en el archivo %s',
-'YES': 'SI',
+'YES': 'SÍ',
 'You are successfully running web2py': 'Usted está ejecutando web2py exitosamente',
 'You can modify this application and adapt it to your needs': 'Usted puede modificar esta aplicación y adaptarla a sus necesidades',
 'You visited the url %s': 'Usted visitó la url %s',

applications/welcome/languages/it.py

@@ -4,8 +4,8 @@
 '!langcode!': 'it',
 '!langname!': 'Italiano',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" è un\'espressione opzionale come "campo1=\'nuovo valore\'". Non si può fare "update" o "delete" dei risultati di un JOIN ',
-'%(nrows)s records found': '%(nrows)s records found',
+'%(nrows)s records found': '%(nrows)s record trovati',
-'%d seconds ago': '%d seconds ago',
+'%d seconds ago': '%d secondi fa',
 '%s %%{row} deleted': '%s righe ("record") cancellate',
 '%s %%{row} updated': '%s righe ("record") modificate',
 '%s selected': '%s selezionato',
@@ -16,40 +16,41 @@
 '=': '=',
 '>': '>',
 '>=': '>=',
-'@markmin\x01Number of entries: **%s**': 'Number of entries: **%s**',
+'@markmin\x01Number of entries: **%s**': 'Numero di entità: **%s**',
 'About': 'About',
-'Access Control': 'Access Control',
+'Access Control': 'Controllo Accessi',
-'Add': 'Add',
+'Add': 'Aggiungi',
-'Administrative Interface': 'Administrative Interface',
+'Administrative Interface': 'Interfaccia Amministrativa',
 'Administrative interface': 'Interfaccia amministrativa',
 'Ajax Recipes': 'Ajax Recipes',
-'And': 'And',
+'An error occured, please %s the page': "È stato rilevato un errore, prego %s la pagina",
+'And': 'E',
 'appadmin is disabled because insecure channel': 'Amministrazione (appadmin) disabilitata: comunicazione non sicura',
-'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Are you sure you want to delete this object?': 'Sicuro di voler cancellare questo oggetto ?',
 'Available Databases and Tables': 'Database e tabelle disponibili',
-'Back': 'Back',
+'Back': 'Indietro',
-'Buy this book': 'Buy this book',
+'Buy this book': 'Compra questo libro',
 'cache': 'cache',
 'Cache': 'Cache',
 'Cache Keys': 'Cache Keys',
 'Cannot be empty': 'Non può essere vuoto',
-'Change password': 'Change password',
+'Change password': 'Cambia Password',
 'change password': 'Cambia password',
 'Check to delete': 'Seleziona per cancellare',
-'Clear': 'Clear',
+'Clear': 'Resetta',
-'Clear CACHE?': 'Clear CACHE?',
+'Clear CACHE?': 'Resetta CACHE?',
-'Clear DISK': 'Clear DISK',
+'Clear DISK': 'Resetta DISK',
-'Clear RAM': 'Clear RAM',
+'Clear RAM': 'Resetta RAM',
 'Client IP': 'Client IP',
-'Close': 'Close',
+'Close': 'Chiudi',
 'Cognome': 'Cognome',
 'Community': 'Community',
-'Components and Plugins': 'Components and Plugins',
+'Components and Plugins': 'Componenti and Plugin',
-'contains': 'contains',
+'contains': 'contiene',
 'Controller': 'Controller',
 'Copyright': 'Copyright',
-'Created By': 'Created By',
+'Created By': 'Creato Da',
-'Created On': 'Created On',
+'Created On': 'Creato Il',
 'CSV': 'CSV',
 'CSV (hidden cols)': 'CSV (hidden cols)',
 'Current request': 'Richiesta (request) corrente',
@@ -61,7 +62,7 @@
 'Database %s select': 'Database %s select',
 'db': 'db',
 'DB Model': 'Modello di DB',
-'Delete': 'Delete',
+'Delete': 'Cancella',
 'Delete:': 'Cancella:',
 'Demo': 'Demo',
 'Deployment Recipes': 'Deployment Recipes',
@@ -71,7 +72,7 @@
 'Disk Cache Keys': 'Disk Cache Keys',
 'Disk Cleared': 'Disk Cleared',
 'Documentation': 'Documentazione',
-"Don't know what to do?": "Don't know what to do?",
+"Don't know what to do?": 'Non sai cosa fare?',
 'done!': 'fatto!',
 'Download': 'Download',
 'E-mail': 'E-mail',
@@ -79,18 +80,19 @@
 'Edit current record': 'Modifica record corrente',
 'edit profile': 'modifica profilo',
 'Edit This App': 'Modifica questa applicazione',
-'Email and SMS': 'Email and SMS',
+'Email and SMS': 'Email e SMS',
 'Email non valida': 'Email non valida',
-'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
+'enter an integer between %(min)g and %(max)g': 'inserisci un intero tra %(min)g e %(max)g',
-'Errors': 'Errors',
+'Errors': 'Errori',
-'Errors in form, please check it out.': 'Errors in form, please check it out.',
+'Errors in form, please check it out.': 'Errori nel form, ricontrollalo',
 'export as csv file': 'esporta come file CSV',
-'Export:': 'Export:',
+'Export:': 'Esporta:',
 'FAQ': 'FAQ',
 'First name': 'Nome',
-'Forgot username?': 'Forgot username?',
+'Forgot username?': 'Dimenticato lo username?',
 'Forms and Validators': 'Forms and Validators',
 'Free Applications': 'Free Applications',
+'Graph Model': 'Graph Model',
 'Group %(group_id)s created': 'Group %(group_id)s created',
 'Group ID': 'ID Gruppo',
 'Group uniquely assigned to user %(id)s': 'Group uniquely assigned to user %(id)s',
@@ -100,69 +102,70 @@
 'Hello World': 'Salve Mondo',
 'Hello World in a flash!': 'Salve Mondo in un flash!',
 'Home': 'Home',
-'How did you get here?': 'How did you get here?',
+'How did you get here?': 'Come sei arrivato qui?',
 'HTML': 'HTML',
-'import': 'import',
+'import': 'importa',
 'Import/Export': 'Importa/Esporta',
 'Index': 'Indice',
 'insert new': 'inserisci nuovo',
 'insert new %s': 'inserisci nuovo %s',
 'Internal State': 'Stato interno',
-'Introduction': 'Introduction',
+'Introduction': 'Introduzione',
 'Invalid email': 'Email non valida',
-'Invalid login': 'Invalid login',
+'Invalid login': 'Login non valido',
 'Invalid Query': 'Richiesta (query) non valida',
 'invalid request': 'richiesta non valida',
-'Is Active': 'Is Active',
+'Is Active': "E' attivo",
-'Key': 'Key',
+'Key': 'Chiave',
 'Last name': 'Cognome',
 'Layout': 'Layout',
 'Layout Plugins': 'Layout Plugins',
 'Layouts': 'Layouts',
 'Live Chat': 'Live Chat',
-'Logged in': 'Logged in',
+'Logged in': 'Loggato',
-'Logged out': 'Logged out',
+'Logged out': 'Disconnesso',
 'login': 'accesso',
 'Login': 'Login',
 'logout': 'uscita',
 'Logout': 'Logout',
-'Lost Password': 'Lost Password',
+'Lost Password': 'Password Smarrita',
-'Lost password?': 'Lost password?',
+'Lost password?': 'Password smarrita?',
 'lost password?': 'dimenticato la password?',
 'Main Menu': 'Menu principale',
 'Manage Cache': 'Manage Cache',
 'Menu Model': 'Menu Modelli',
-'Modified By': 'Modified By',
+'Modified By': 'Modificato da',
-'Modified On': 'Modified On',
+'Modified On': 'Modificato il',
 'My Sites': 'My Sites',
 'Name': 'Nome',
-'New': 'New',
+'New': 'Nuovo',
-'New password': 'New password',
+'New password': 'Nuova password',
 'New Record': 'Nuovo elemento (record)',
 'new record inserted': 'nuovo record inserito',
 'next 100 rows': 'prossime 100 righe',
 'No databases in this application': 'Nessun database presente in questa applicazione',
-'No records found': 'No records found',
+'No records found': 'Nessun record trovato',
 'Nome': 'Nome',
 'Non può essere vuoto': 'Non può essere vuoto',
 'not authorized': 'non autorizzato',
-'Object or table name': 'Object or table name',
+'Object or table name': 'Oggeto o nome tabella',
-'Old password': 'Old password',
+'Old password': 'Vecchia password',
 'Online examples': 'Vedere gli esempi',
-'Or': 'Or',
+'Or': 'O',
 'or import from csv file': 'oppure importa da file CSV',
 'Origin': 'Origine',
 'Other Plugins': 'Other Plugins',
 'Other Recipes': 'Other Recipes',
 'Overview': 'Overview',
 'Password': 'Password',
-"Password fields don't match": "Password fields don't match",
+"Password fields don't match": 'I campi password non sono uguali',
-'please input your password again': 'please input your password again',
+'please input your password again': 'perfavore reimmeti la tua password',
 'Plugins': 'Plugins',
 'Powered by': 'Powered by',
 'Preface': 'Preface',
 'previous 100 rows': '100 righe precedenti',
-'Profile': 'Profile',
+'Profile': 'Profilo',
+'pygraphviz library not found': 'pygraphviz library not found',
 'Python': 'Python',
 'Query:': 'Richiesta (query):',
 'Quick Examples': 'Quick Examples',
@@ -174,28 +177,30 @@
 'record does not exist': 'il record non esiste',
 'Record ID': 'Record ID',
 'Record id': 'Record id',
-'Register': 'Register',
+'Register': 'Registrati',
 'register': 'registrazione',
 'Registration identifier': 'Registration identifier',
 'Registration key': 'Chiave di Registazione',
-'Registration successful': 'Registration successful',
+'Registration successful': 'Registrazione avvenuta',
-'Remember me (for 30 days)': 'Remember me (for 30 days)',
+'reload': 'reload',
-'Request reset password': 'Request reset password',
+'Remember me (for 30 days)': 'Ricordami (per 30 giorni)',
+'Request reset password': 'Richiedi il reset della password',
 'Reset Password key': 'Resetta chiave Password ',
 'Role': 'Ruolo',
 'Rows in Table': 'Righe nella tabella',
 'Rows selected': 'Righe selezionate',
-'Save profile': 'Save profile',
+'Save model as...': 'Salva modello come...',
-'Search': 'Search',
+'Save profile': 'Salva profilo',
+'Search': 'Ricerca',
 'Semantic': 'Semantic',
-'Services': 'Services',
+'Services': 'Servizi',
 'Size of cache:': 'Size of cache:',
-'starts with': 'starts with',
+'starts with': 'comincia con',
 'state': 'stato',
 'Statistics': 'Statistics',
 'Stylesheet': 'Foglio di stile (stylesheet)',
-'submit': 'submit',
+'submit': 'Inviai',
-'Submit': 'Submit',
+'Submit': 'Invia',
 'Support': 'Support',
 'Sure you want to delete this object?': 'Vuoi veramente cancellare questo oggetto?',
 'Table': 'tabella',
@@ -208,12 +213,13 @@
 'This is a copy of the scaffolding application': "Questa è una copia dell'applicazione di base (scaffold)",
 'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
 'Timestamp': 'Ora (timestamp)',
-'too short': 'too short',
+'too short': 'troppo corto',
-'TSV (Excel compatible)': 'TSV (Excel compatible)',
+'Traceback': 'Traceback',
-'TSV (Excel compatible, hidden cols)': 'TSV (Excel compatible, hidden cols)',
+'TSV (Excel compatible)': 'TSV (Excel compatibile)',
+'TSV (Excel compatible, hidden cols)': 'TSV (Excel compatibile, hidden cols)',
 'Twitter': 'Twitter',
 'unable to parse csv file': 'non riesco a decodificare questo file CSV',
-'Update': 'Update',
+'Update': 'Aggiorna',
 'Update:': 'Aggiorna:',
 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Per costruire richieste (query) più complesse si usano (...)&(...) come "e" (AND), (...)|(...) come "o" (OR), e ~(...) come negazione (NOT).',
 'User %(id)s Logged-in': 'User %(id)s Logged-in',
@@ -223,14 +229,14 @@
 'User %(id)s Profile updated': 'User %(id)s Profile updated',
 'User %(id)s Registered': 'User %(id)s Registered',
 'User ID': 'ID Utente',
-'value already in database or empty': 'value already in database or empty',
+'value already in database or empty': 'valore già presente nel database o vuoto',
-'Verify Password': 'Verify Password',
+'Verify Password': 'Verifica Password',
 'Videos': 'Videos',
 'View': 'Vista',
 'Welcome': 'Welcome',
 'Welcome %s': 'Benvenuto %s',
 'Welcome to web2py': 'Benvenuto su web2py',
-'Welcome to web2py!': 'Welcome to web2py!',
+'Welcome to web2py!': 'Benvenuto in web2py!',
 'Which called the function %s located in the file %s': 'che ha chiamato la funzione %s presente nel file %s',
 'XML': 'XML',
 'You are successfully running web2py': 'Stai eseguendo web2py con successo',

applications/welcome/models/menu.py

@@ -7,8 +7,7 @@
 
 response.logo = A(B('web',SPAN(2),'py'),XML('™ '),
                   _class="brand",_href="http://www.web2py.com/")
-response.title = ' '.join(
+response.title = request.application.replace('_',' ').title()
-    word.capitalize() for word in request.application.split('_'))
 response.subtitle = T('customize me!')
 
 ## read more at http://dev.w3.org/html5/markup/meta.name.html

applications/welcome/static/css/web2py_bootstrap.css

@@ -102,6 +102,7 @@ td.w2p_fl,td.w2p_fc {padding:0;}
 ==============================================================*/
 
 /* because web2py handles this via js */
+textarea { width:90%}
 .hidden{visibility:visible;}
 /* right folder for bootstrap black images/icons */
 [class^="icon-"],[class*=" icon-"]{

applications/welcome/views/layout.html

@@ -91,16 +91,18 @@
 
   <div class="container">
     <!-- Masthead ================================================== -->
+    {{if response.title:}}
     <header class="mastheader row" id="header">
         <div class="span12">
             <div class="page-header">
                 <h1>
-                    {{=response.title or request.application}}
+                    {{=response.title}}
                     <small>{{=response.subtitle or ''}}</small>
                 </h1>
             </div>
         </div>
     </header>
+    {{pass}}
 
     <section id="main" class="main row">
         {{if left_sidebar_enabled:}}

gluon/admin.py

@@ -43,7 +43,7 @@ def apath(path='', r=None):
     return os.path.join(opath, path).replace('\\', '/')
 
 
-def app_pack(app, request, raise_ex=False):
+def app_pack(app, request, raise_ex=False, filenames=None):
     """
     Builds a w2p package for the application
 
@@ -60,9 +60,9 @@ def app_pack(app, request, raise_ex=False):
         filename of the w2p file or None on error
     """
     try:
-        app_cleanup(app, request)
+        if filenames is None: app_cleanup(app, request)
         filename = apath('../deposit/web2py.app.%s.w2p' % app, request)
-        w2p_pack(filename, apath(app, request))
+        w2p_pack(filename, apath(app, request), filenames=filenames)
         return filename
     except Exception, e:
         if raise_ex:
@@ -374,11 +374,15 @@ def check_new_version(myversion, version_URL):
     """
     try:
         from urllib import urlopen
-        version = parse_version(urlopen(version_URL).read())
+        version = urlopen(version_URL).read()
-    except Exception:
+        pversion = parse_version(version)
+        pmyversion = parse_version(myversion)
+    except Exception,e:
+        import traceback
+        print traceback.format_exc()
         return -1, myversion
 
-    if version > myversion:
+    if pversion[:3]+pversion[-6:] > pmyversion[:3]+pmyversion[-6:]:
         return True, version
     else:
         return False, version

gluon/cache.py

@@ -27,6 +27,8 @@ import thread
 import os
 import logging
 import re
+import hashlib
+import datetime
 try:
     import settings
     have_settings = True
@@ -241,7 +243,7 @@ class CacheOnDisk(CacheAbstract):
 
     This is implemented as a shelve object and it is shared by multiple web2py
     processes (and threads) as long as they share the same filesystem.
-    The file is locked wen accessed.
+    The file is locked when accessed.
 
     Disk cache provides persistance when web2py is started/stopped but it slower
     than `CacheInRam`
@@ -376,7 +378,6 @@ class CacheOnDisk(CacheAbstract):
             self._close_shelve_and_unlock()
         return value
 
-
 class CacheAction(object):
     def __init__(self, func, key, time_expire, cache, cache_model):
         self.__name__ = func.__name__
@@ -436,6 +437,89 @@ class Cache(object):
                 # been accounted for
                 logger.warning('no cache.disk (AttributeError)')
 
+    def client(self, time_expire=DEFAULT_TIME_EXPIRE, cache_model=None,
+             prefix=None, session=False, vars=True, lang=True,
+             user_agent=False, public=True, valid_statuses=None,
+             quick=None):
+        """
+        Experimental!
+        Currently only HTTP 1.1 compliant
+        reference : http://code.google.com/p/doctype-mirror/wiki/ArticleHttpCaching
+        time_expire: same as @cache
+        cache_model: same as @cache
+        prefix: add a prefix to the calculated key
+        session: adds response.session_id to the key
+        vars: adds request.env.query_string
+        lang: adds T.accepted_language
+        user_agent: if True, adds is_mobile and is_tablet to the key.
+            Pass a dict to use all the needed values (uses str(.items())) (e.g. user_agent=request.user_agent())
+            used only if session is not True
+        public: if False forces the Cache-Control to be 'private'
+        valid_statuses: by default only status codes starting with 1,2,3 will be cached.
+            pass an explicit list of statuses on which turn the cache on
+        quick: Session,Vars,Lang,User-agent,Public:
+            fast overrides with initial strings, e.g. 'SVLP' or 'VLP', or 'VLP'
+        """
+        from gluon import current
+        def wrap(func):
+            def wrapped_f():
+                if current.request.env.request_method == 'GET':
+                    if time_expire:
+                        cache_control = 'max-age=%(time_expire)s, s-maxage=%(time_expire)s' % dict(time_expire=time_expire)
+                        if quick:
+                            session_ = True if 'S' in quick else False
+                            vars_ = True if 'V' in quick else False
+                            lang_ = True if 'L' in quick else False
+                            user_agent_ = True if 'U' in quick else False
+                            public_ = True if 'P' in quick else False
+                        else:
+                            session_, vars_, lang_, user_agent_, public_ = session, vars, lang, user_agent, public
+                        if not session_ and public_:
+                            cache_control += ', public'
+                            expires = (current.request.utcnow + datetime.timedelta(seconds=time_expire)).strftime('%a, %d %b %Y %H:%M:%S GMT')
+                            vary = None
+                        else:
+                            cache_control += ', private'
+                            expires = 'Fri, 01 Jan 1990 00:00:00 GMT'
+                    if cache_model:
+                        cache_key = [current.request.env.path_info, current.response.view]
+                        if session_:
+                            cache_key.append(current.response.session_id)
+                        elif user_agent_:
+                            if user_agent_ is True:
+                                cache_key.append("%(is_mobile)s_%(is_tablet)s" % current.request.user_agent())
+                            else:
+                                cache_key.append(str(user_agent_.items()))
+                        if vars_:
+                            cache_key.append(current.request.env.query_string)
+                        if lang_:
+                            cache_key.append(current.T.accepted_language)
+                        cache_key = hashlib.md5('__'.join(cache_key)).hexdigest()
+                        if prefix:
+                            cache_key = prefix + cache_key
+                        rtn = cache_model(cache_key, lambda : func(), time_expire=time_expire)
+                    else:
+                        rtn = func()
+                    send_headers = False
+                    if isinstance(valid_statuses, list):
+                        if current.response.status in valid_statuses:
+                            send_headers = True
+                    elif valid_statuses is None:
+                        if str(current.response.status)[0] in '123':
+                            send_headers = True
+                    if send_headers:
+                        current.response.headers['Pragma'] = None
+                        current.response.headers['Expires'] = expires
+                        current.response.headers['Cache-Control'] = cache_control
+                    if cache_model and not send_headers:
+                        cache_model(cache_key, None)
+                    return rtn
+                return func()
+            wrapped_f.__name__ = func.__name__
+            wrapped_f.__doc__ = func.__doc__
+            return wrapped_f
+        return wrap
+
     def __call__(self,
                  key=None,
                  time_expire=DEFAULT_TIME_EXPIRE,
@@ -469,7 +553,7 @@ class Cache(object):
         refresh.
 
         If the function `f` is an action, we suggest using
-        `request.env.path_info` as key.
+        @cache.client instead
         """
 
         def tmp(func, cache=self, cache_model=cache_model):

gluon/contenttype.py

@@ -9,7 +9,7 @@ License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
 CONTENT_TYPE dictionary created against freedesktop.org' shared mime info
 database version 1.1.
 
-Deviations from official standards: 
+Deviations from official standards:
 - '.md': 'application/x-genesis-rom' --> 'text/x-markdown'
 - '.png': 'image/x-apple-ios-png' --> 'image/png'
 Additions:

gluon/contrib/fpdf/fpdf.py

@@ -52,7 +52,7 @@ def set_global(var, val):
 
 class FPDF(object):
     "PDF Generation class"
-    
+
     def __init__(self, orientation='P',unit='mm',format='A4'):
         # Some checks
         self._dochecks()
@@ -356,7 +356,7 @@ class FPDF(object):
                 elif (self.current_font['desc']['MissingWidth']) :
                     w += self.current_font['desc']['MissingWidth']
                 #elif (isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; }
-                else:   
+                else:
                     w += 500
         else:
             for i in xrange(0, l):
@@ -373,6 +373,21 @@ class FPDF(object):
         "Draw a line"
         self._out(sprintf('%.2f %.2f m %.2f %.2f l S',x1*self.k,(self.h-y1)*self.k,x2*self.k,(self.h-y2)*self.k))
 
+    def _set_dash(self, dash_length=False, space_length=False):
+        if(dash_length and space_length):
+            s = sprintf('[%.3f %.3f] 0 d', dash_length*self.k, space_length*self.k)
+        else:
+            s = '[] 0 d'
+        self._out(s)
+
+    def dashed_line(self, x1,y1,x2,y2, dash_length=1, space_length=1):
+        """Draw a dashed line. Same interface as line() except:
+           - dash_length: Length of the dash
+           - space_length: Length of the space between dashes"""
+        self._set_dash(dash_length, space_length)
+        self.line(x1, y1, x2, y2)
+        self._set_dash()
+
     def rect(self, x,y,w,h,style=''):
         "Draw a rectangle"
         if(style=='F'):
@@ -401,10 +416,10 @@ class FPDF(object):
             global SYSTEM_TTFONTS
             if os.path.exists(fname):
                 ttffilename = fname
-            elif (FPDF_FONT_DIR and 
+            elif (FPDF_FONT_DIR and
                 os.path.exists(os.path.join(FPDF_FONT_DIR, fname))):
                 ttffilename = os.path.join(FPDF_FONT_DIR, fname)
-            elif (SYSTEM_TTFONTS and 
+            elif (SYSTEM_TTFONTS and
                 os.path.exists(os.path.join(SYSTEM_TTFONTS, fname))):
                 ttffilename = os.path.join(SYSTEM_TTFONTS, fname)
             else:
@@ -450,7 +465,7 @@ class FPDF(object):
                     fh = open(unifilename, "w")
                     pickle.dump(font_dict, fh)
                     fh.close()
-                except IOError as e:
+                except IOError, e:
                     if not e.errno == errno.EACCES:
                         raise  # Not a permission error.
                 del ttf
@@ -459,11 +474,11 @@ class FPDF(object):
             else:
                 sbarr = range(0,32)
             self.fonts[fontkey] = {
-                'i': len(self.fonts)+1, 'type': font_dict['type'], 
+                'i': len(self.fonts)+1, 'type': font_dict['type'],
-                'name': font_dict['name'], 'desc': font_dict['desc'], 
+                'name': font_dict['name'], 'desc': font_dict['desc'],
-                'up': font_dict['up'], 'ut': font_dict['ut'], 
+                'up': font_dict['up'], 'ut': font_dict['ut'],
-                'cw': font_dict['cw'], 
+                'cw': font_dict['cw'],
-                'ttffile': font_dict['ttffile'], 'fontkey': fontkey, 
+                'ttffile': font_dict['ttffile'], 'fontkey': fontkey,
                 'subset': sbarr, 'unifilename': unifilename,
                 }
             self.font_files[fontkey] = {'length1': font_dict['originalsize'],
@@ -494,7 +509,7 @@ class FPDF(object):
                 if (type == 'TrueType'):
                     self.font_files[filename]={'length1': originalsize}
                 else:
-                    self.font_files[filename]={'length1': size1, 
+                    self.font_files[filename]={'length1': size1,
                                                'length2': size2}
 
     def set_font(self, family,style='',size=0):
@@ -660,7 +675,7 @@ class FPDF(object):
                 dx=self.c_margin
             if(self.color_flag):
                 s+='q '+self.text_color+' '
-                
+
             # If multibyte, Tw has no effect - do word spacing using an adjustment before each space
             if (self.ws and self.unifontsubset):
                 for uni in UTF8StringToArray(txt):
@@ -686,7 +701,7 @@ class FPDF(object):
                 else:
                     txt2 = self._escape(txt)
                 s += sprintf('BT %.2f %.2f Td (%s) Tj ET',(self.x+dx)*k,(self.h-(self.y+.5*h+.3*self.font_size))*k,txt2)
-            
+
             if(self.underline):
                 s+=' '+self._dounderline(self.x+dx,self.y+.5*h+.3*self.font_size,txt)
             if(self.color_flag):
@@ -764,7 +779,7 @@ class FPDF(object):
                 sep=i
                 ls=l
                 ns+=1
-            if self.unifontsubset:  
+            if self.unifontsubset:
                 l += self.get_string_width(c) / self.font_size*1000.0
             else:
                 l += cw.get(c,0)
@@ -848,7 +863,7 @@ class FPDF(object):
                 continue
             if(c==' '):
                 sep=i
-            if self.unifontsubset:  
+            if self.unifontsubset:
                 l += self.get_string_width(c) / self.font_size*1000.0
             else:
                 l += cw.get(c,0)
@@ -900,6 +915,24 @@ class FPDF(object):
                 info=self._parsepng(name)
             else:
                 #Allow for additional formats
+                #maybe the image is not showing the correct extension,
+                #but the header is OK,
+                succeed_parsing = False
+                #try all the parsing functions
+                parsing_functions = [self._parsejpg,self._parsepng,self._parsegif]
+                for pf in parsing_functions:
+                    try:
+                        info = pf(name)
+                        succeed_parsing = True
+                        break;
+                    except:
+                        pass
+                #last resource
+                if not succeed_parsing:
+                    mtd='_parse'+type
+                    if not hasattr(self,mtd):
+                        self.error('Unsupported image type: '+type)
+                    info=getattr(self, mtd)(name)
                 mtd='_parse'+type
                 if not hasattr(self,mtd):
                     self.error('Unsupported image type: '+type)
@@ -1202,7 +1235,7 @@ class FPDF(object):
                 self._out('<</Type /Font');
                 self._out('/Subtype /Type0');
                 self._out('/BaseFont /' + fontname + '');
-                self._out('/Encoding /Identity-H'); 
+                self._out('/Encoding /Identity-H');
                 self._out('/DescendantFonts [' + str(self.n + 1) + ' 0 R]')
                 self._out('/ToUnicode ' + str(self.n + 2) + ' 0 R')
                 self._out('>>')
@@ -1264,7 +1297,7 @@ class FPDF(object):
                 for kd in ('Ascent', 'Descent', 'CapHeight', 'Flags', 'FontBBox', 'ItalicAngle', 'StemV', 'MissingWidth'):
                     v = font['desc'][kd]
                     if (kd == 'Flags'):
-                        v = v | 4; 
+                        v = v | 4;
                         v = v & ~32; # SYMBOLIC font flag
                     self._out(' /%s %s' % (kd, v))
                 self._out('/FontFile2 ' + str(self.n + 2) + ' 0 R')
@@ -1286,7 +1319,7 @@ class FPDF(object):
                 self._putstream(cidtogidmap)
                 self._out('endobj')
 
-                #Font file 
+                #Font file
                 self._newobj()
                 self._out('<</Length ' + str(len(fontstream)))
                 self._out('/Filter /FlateDecode')
@@ -1341,14 +1374,14 @@ class FPDF(object):
                     font_dict['range'] = range_
                     pickle.dump(font_dict, fh)
                     fh.close()
-                except IOError as e:
+                except IOError, e:
                     if not e.errno == errno.EACCES:
                         raise  # Not a permission error.
             if (font['cw'][cid] == 0):
                 continue
             width = font['cw'][cid]
             if (width == 65535): width = 0
-            if (cid > 255 and (cid not in font['subset']) or not cid): #  
+            if (cid > 255 and (cid not in font['subset']) or not cid): #
                 continue
             if ('dw' not in font or (font['dw'] and width != font['dw'])):
                 if (cid == (prevcid + 1)):
@@ -1400,7 +1433,7 @@ class FPDF(object):
             if (len(set(ws)) == 1):
                 w.append(' %s %s %s' % (k, k + len(ws) - 1, ws[0]))
             else:
-                w.append(' %s [ %s ]\n' % (k, ' '.join([str(int(h)) for h in ws]))) ## 
+                w.append(' %s [ %s ]\n' % (k, ' '.join([str(int(h)) for h in ws]))) ##
         self._out('/W [%s]' % ''.join(w))
 
     def _putimages(self):
@@ -1412,7 +1445,7 @@ class FPDF(object):
             del info['data']
             if 'smask' in info:
                 del info['smask']
-            
+
     def _putimage(self, info):
         if 'data' in info:
             self._newobj()
@@ -1791,20 +1824,20 @@ class FPDF(object):
 
     def interleaved2of5(self, txt, x, y, w=1.0, h=10.0):
         "Barcode I2of5 (numeric), adds a 0 if odd lenght"
-        narrow = w / 3.0 
+        narrow = w / 3.0
         wide = w
-        
+
         # wide/narrow codes for the digits
         bar_char={'0': 'nnwwn', '1': 'wnnnw', '2': 'nwnnw', '3': 'wwnnn',
                   '4': 'nnwnw', '5': 'wnwnn', '6': 'nwwnn', '7': 'nnnww',
                   '8': 'wnnwn', '9': 'nwnwn', 'A': 'nn', 'Z': 'wn'}
-           
+
         self.set_fill_color(0)
         code = txt
         # add leading zero if code-length is odd
         if len(code) % 2 != 0:
             code = '0' + code
-        
+
         # add start and stop codes
         code = 'AA' + code.lower() + 'ZA'
 
@@ -1843,7 +1876,7 @@ class FPDF(object):
         narrow = w / 3.0
         gap = narrow
 
-        bar_char={'0': 'nnnwwnwnn', '1': 'wnnwnnnnw', '2': 'nnwwnnnnw', 
+        bar_char={'0': 'nnnwwnwnn', '1': 'wnnwnnnnw', '2': 'nnwwnnnnw',
                   '3': 'wnwwnnnnn', '4': 'nnnwwnnnw', '5': 'wnnwwnnnn',
                   '6': 'nnwwwnnnn', '7': 'nnnwnnwnw', '8': 'wnnwnnwnn',
                   '9': 'nnwwnnwnn', 'A': 'wnnnnwnnw', 'B': 'nnwnnwnnw',
@@ -1860,8 +1893,8 @@ class FPDF(object):
                   '+': 'nwnnnwnwn', '%': 'nnnwnwnwn'}
 
         self.set_fill_color(0)
-        code = txt      
+        code = txt
-            
+
         code = code.upper()
         for i in xrange (0, len(code), 2):
             char_bar = code[i]
@@ -1871,7 +1904,7 @@ class FPDF(object):
 
             seq= ''
             for s in xrange(0, len(bar_char[char_bar])):
-                seq += bar_char[char_bar][s] 
+                seq += bar_char[char_bar][s]
 
             for bar in xrange(0, len(seq)):
                 if seq[bar] == 'n':

gluon/contrib/login_methods/__init__.py

@@ -0,0 +1 @@
+

gluon/contrib/login_methods/ldap_auth.py

@@ -653,7 +653,8 @@ def ldap_auth(server='ldap', port=None,
         ldap_groups_of_the_user = list()
         for group_row in group_search_result:
             group = group_row[1]
-            ldap_groups_of_the_user.extend(group[group_name_attrib])
+            if type(group) == dict and group.has_key(group_name_attrib):
+                ldap_groups_of_the_user.extend(group[group_name_attrib])
 
         con.unbind()
         logger.debug('User groups: %s' % ldap_groups_of_the_user)
@@ -662,4 +663,3 @@ def ldap_auth(server='ldap', port=None,
     if filterstr[0] == '(' and filterstr[-1] == ')':  # rfc4515 syntax
         filterstr = filterstr[1:-1]  # parens added again where used
     return ldap_auth_aux
-

gluon/contrib/login_methods/linkedin_account.py

@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 

gluon/contrib/login_methods/oauth10a_account.py

@@ -15,8 +15,6 @@ Dependencies:
 import oauth2 as oauth
 import cgi
 
-from urllib2 import urlopen
-import urllib2
 from urllib import urlencode
 
 from gluon import current
@@ -64,9 +62,7 @@ class OAuthAccount(object):
         Appends the _next action to the generated url so the flows continues.
         """
         r = self.request
-        http_host = r.env.http_x_forwarded_for
+        http_host = r.env.http_host
-        if not http_host:
-            http_host = r.env.http_host
 
         url_scheme = r.env.wsgi_url_scheme
         if next:

gluon/contrib/login_methods/oauth20_account.py

@@ -103,9 +103,7 @@ server for requests.  It can be used for the optional"scope" parameters for Face
         """
 
         r = current.request
-        http_host = r.env.http_x_forwarded_for
+        http_host = r.env.http_host
-        if not http_host:
-            http_host = r.env.http_host
 
         if r.env.https == 'on':
             url_scheme = 'https'
@@ -149,7 +147,7 @@ server for requests.  It can be used for the optional"scope" parameters for Face
             # reuse token until expiration
             if expires == 0 or expires > time.time():
                         return current.session.token['access_token']
-            
+
         code = current.request.vars.code
 
         if code:
@@ -163,7 +161,7 @@ server for requests.  It can be used for the optional"scope" parameters for Face
             open_url = None
             opener = self.__build_url_opener(self.token_url)
             try:
-                open_url = opener.open(self.token_url, urlencode(data))
+                open_url = opener.open(self.token_url, urlencode(data), self.socket_timeout)
             except urllib2.HTTPError, e:
                 tmp = e.read()
                 raise Exception(tmp)
@@ -208,7 +206,7 @@ server for requests.  It can be used for the optional"scope" parameters for Face
 
     def __init__(self, g=None,
                  client_id=None, client_secret=None,
-                 auth_url=None, token_url=None, **args):
+                 auth_url=None, token_url=None, socket_timeout=60, **args):
         """
         first argument is unused. Here only for legacy reasons.
         """
@@ -224,6 +222,7 @@ server for requests.  It can be used for the optional"scope" parameters for Face
         self.auth_url = auth_url
         self.token_url = token_url
         self.args = args
+        self.socket_timeout = socket_timeout
 
     def login_url(self, next="/"):
         self.__oauth_login(next)

gluon/contrib/login_methods/openid_auth.py

@@ -135,7 +135,7 @@ class OpenIDAuth(object):
               Otherwise it's always 'openid' and you
               may not need it. This should be easy to changed.
               (Just remove the field of "type" and remove the
-              "and db.alt_logins.oidtype == type_" 
+              "and db.alt_logins.oidtype == type_"
               in _find_matched_openid function)
         """
         db = self.db

gluon/contrib/populate.py

@@ -75,7 +75,7 @@ def da_du_ma(n=4):
                     [random.randint(0, 11)] for i in range(n)])
 
 
-def populate(table, n, default=True, compute=False):
+def populate(table, n, default=True, compute=False, contents={}):
     ell = Learner()
     #ell.learn(open('20417.txt','r').read())
     #ell.save('frequencies.pickle')
@@ -84,7 +84,14 @@ def populate(table, n, default=True, compute=False):
     ids = {}
     for i in range(n):
         record = {}
+
+        record.update(contents) # load user supplied contents.
+
         for fieldname in table.fields:
+
+            if record.get(fieldname) is not None:
+                continue # if user supplied it, let it be.
+
             field = table[fieldname]
             if not isinstance(field.type, (str, unicode)):
                 continue

gluon/contrib/webclient.py

@@ -15,12 +15,12 @@ mostly for testing purposes
 
 Some examples at the bottom.
 """
-
 import re
 import time
 import urllib
 import urllib2
 
+
 DEFAULT_HEADERS = {
     'user-agent': 'Mozilla/4.0',  # some servers are picky
     'accept-language': 'en',
@@ -126,7 +126,11 @@ class WebClient(object):
             self.time = time.time() - t0
             self.response = error
 
-        self.status = self.response.getcode()
+        if hasattr(self.response, 'getcode'):
+            self.status = self.response.getcode()
+        else:#python2.5
+            self.status = None
+
         self.text = self.response.read()
         self.headers = dict(self.response.headers)
 

gluon/dal.py

@@ -117,10 +117,12 @@ Supported DAL URI strings:
 'firebird_embedded://username:password@c://path'
 'informix://user:password@server:3050/database'
 'informixu://user:password@server:3050/database' # unicode informix
+'ingres://database'  # or use an ODBC connection string, e.g. 'ingres://dsn=dsn_name'
 'google:datastore' # for google app engine datastore
 'google:sql' # for google app engine with sql (mysql compatible)
 'teradata://DSN=dsn;UID=user;PWD=pass; DATABASE=database' # experimental
 'imap://user:password@server:port' # experimental
+'mongodb://user:password@server:port/database' # experimental
 
 For more info:
 help(DAL)
@@ -198,7 +200,7 @@ TABLE_ARGS = set(
 
 SELECT_ARGS = set(
     ('orderby', 'groupby', 'limitby','required', 'cache', 'left',
-     'distinct', 'having', 'join','for_update', 'processor','cacheable'))
+     'distinct', 'having', 'join','for_update', 'processor','cacheable', 'orderby_on_limitby'))
 
 ogetattr = object.__getattribute__
 osetattr = object.__setattr__
@@ -350,8 +352,9 @@ if not 'google' in DRIVERS:
         DRIVERS.append('MSSQL(pyodbc)')
         DRIVERS.append('DB2(pyodbc)')
         DRIVERS.append('Teradata(pyodbc)')
+        DRIVERS.append('Ingres(pyodbc)')
     except ImportError:
-        LOGGER.debug('no MSSQL/DB2/Teradata driver pyodbc')
+        LOGGER.debug('no MSSQL/DB2/Teradata/Ingres driver pyodbc')
 
     try:
         import Sybase
@@ -368,7 +371,7 @@ if not 'google' in DRIVERS:
 
     try:
         import fdb
-        DRIVERS.append('Firbird(fdb)')
+        DRIVERS.append('Firebird(fdb)')
     except ImportError:
         LOGGER.debug('no Firebird driver fdb')
 #####
@@ -413,13 +416,6 @@ if not 'google' in DRIVERS:
         LOGGER.debug('no SQLite/PostgreSQL driver zxJDBC')
         is_jdbc = False
 
-    try:
-        import ingresdbi
-        DRIVERS.append('Ingres(ingresdbi)')
-    except ImportError:
-        LOGGER.debug('no Ingres driver ingresdbi')
-    # NOTE could try JDBC.......
-
     try:
         import couchdb
         DRIVERS.append('CouchDB(couchdb)')
@@ -638,6 +634,7 @@ class BaseAdapter(ConnectionPool):
 
     TRUE = 'T'
     FALSE = 'F'
+    T_SEP = ' '
     types = {
         'boolean': 'CHAR(1)',
         'string': 'CHAR(%(length)s)',
@@ -1130,6 +1127,9 @@ class BaseAdapter(ConnectionPool):
     def EPOCH(self, first):
         return self.EXTRACT(first, 'epoch')
 
+    def LENGTH(self, first):
+        return "LENGTH(%s)" % self.expand(first)
+
     def AGGREGATE(self, first, what):
         return "%s(%s)" % (what, self.expand(first))
 
@@ -1255,24 +1255,15 @@ class BaseAdapter(ConnectionPool):
         return '(%s LIKE %s)' % (self.expand(first),
                                  self.expand('%'+second, 'string'))
 
-    def CONTAINS(self, first, second, case_sensitive=False):
+    def CONTAINS(self,first,second,case_sensitive=False):     
-        if isinstance(second,Expression):
+        if first.type in ('string','text', 'json'):
-            field = self.expand(first)
+            second = Expression(None,self.CONCAT('%',Expression(
-            expr = self.expand(second,'string')
+                        None,self.REPLACE(second,('%','%%'))),'%'))
-            if first.type.startswith('list:'):
+        elif first.type.startswith('list:'):
-                expr = 'CONCAT("|", %s, "|")' % expr
+            second = Expression(None,self.CONCAT('%|',Expression(None,self.REPLACE(
-            elif not first.type in ('string', 'text', 'json'):
+                        Expression(None,self.REPLACE(second,('%','%%'))),('|','||'))),'|%'))
-                raise RuntimeError("Expression Not Supported")
+        op = case_sensitive and self.LIKE or self.ILIKE
-            return 'INSTR(%s,%s)' % (field, expr)
+        return op(first,second)
-        else:
-            if first.type in ('string', 'text', 'json'):
-                key = '%'+str(second).replace('%','%%')+'%'
-            elif first.type.startswith('list:'):
-                key = '%|'+str(second).replace('|','||').replace('%','%%')+'|%'
-            else:
-                raise RuntimeError("Expression Not Supported")
-            op = case_sensitive and self.LIKE or self.ILIKE
-            return op(first,key)
 
     def EQ(self, first, second=None):
         if second is None:
@@ -1310,9 +1301,24 @@ class BaseAdapter(ConnectionPool):
         return '(%s >= %s)' % (self.expand(first),
                                self.expand(second,first.type))
 
+    def is_numerical_type(self, ftype):
+        return ftype in ('integer','boolean','double','bigint') or \
+            ftype.startswith('decimal')
+
+    def REPLACE(self, first, (second, third)):
+        return 'REPLACE(%s,%s,%s)' % (self.expand(first,'string'), 
+                                      self.expand(second,'string'),
+                                      self.expand(third,'string'))
+
+    def CONCAT(self, *items):
+        return '(%s)' % ' || '.join(self.expand(x,'string') for x in items)
+
     def ADD(self, first, second):
-        return '(%s + %s)' % (self.expand(first),
+        if self.is_numerical_type(first.type):
-                              self.expand(second, first.type))
+            return '(%s + %s)' % (self.expand(first),
+                                  self.expand(second, first.type))
+        else:
+            return self.CONCAT(first, second)
 
     def SUB(self, first, second):
         return '(%s - %s)' % (self.expand(first),
@@ -1503,6 +1509,7 @@ class BaseAdapter(ConnectionPool):
             raise SyntaxError('invalid select attribute: %s' % key)
         args_get = attributes.get
         tablenames = tables(query)
+        tablenames_for_common_filters = tablenames
         for field in fields:
             if isinstance(field, basestring) \
                     and REGEX_TABLE_DOT_FIELD.match(field):
@@ -1529,6 +1536,7 @@ class BaseAdapter(ConnectionPool):
         orderby = args_get('orderby', False)
         having = args_get('having', False)
         limitby = args_get('limitby', False)
+        orderby_on_limitby = args_get('orderby_on_limitby', True)
         for_update = args_get('for_update', False)
         if self.can_select_for_update is False and for_update is True:
             raise SyntaxError('invalid select attribute: for_update')
@@ -1566,6 +1574,8 @@ class BaseAdapter(ConnectionPool):
                     dict.fromkeys(tables(t))) for t in joinon]
             joinont = [t.first._tablename for t in joinon]
             [tables_to_merge.pop(t) for t in joinont if t in tables_to_merge]
+            tablenames_for_common_filters = [t for t in tablenames
+                        if not t in joinont ]
             important_tablenames = joint + joinont + tables_to_merge.keys()
             excluded = [t for t in tablenames
                         if not t in important_tablenames ]
@@ -1573,7 +1583,7 @@ class BaseAdapter(ConnectionPool):
             excluded = tablenames
 
         if use_common_filters(query):
-            query = self.common_filter(query,excluded)
+            query = self.common_filter(query,tablenames_for_common_filters)
         sql_w = ' WHERE ' + self.expand(query) if query else ''
 
         def alias(t):
@@ -1620,7 +1630,7 @@ class BaseAdapter(ConnectionPool):
             else:
                 sql_o += ' ORDER BY %s' % self.expand(orderby)
         if limitby:
-            if not orderby and tablenames:
+            if orderby_on_limitby and not orderby and tablenames:
                 sql_o += ' ORDER BY %s' % ', '.join(['%s.%s'%(t,x) for t in tablenames for x in (hasattr(self.db[t],'_primarykey') and self.db[t]._primarykey or [self.db[t]._id.name])])
             # oracle does not support limitby
         sql = self.select_limitby(sql_s, sql_f, sql_t, sql_w, sql_o, limitby)
@@ -1815,7 +1825,7 @@ class BaseAdapter(ConnectionPool):
                 obj = str(obj)
         elif fieldtype == 'datetime':
             if isinstance(obj, datetime.datetime):
-                obj = obj.isoformat()[:19].replace('T',' ')
+                obj = obj.isoformat(self.T_SEP)[:19]
             elif isinstance(obj, datetime.date):
                 obj = obj.isoformat()[:10]+' 00:00:00'
             else:
@@ -1943,17 +1953,17 @@ class BaseAdapter(ConnectionPool):
         return value
 
     def parse_list_integers(self, value, field_type):
-        if not self.dbengine=='google:datastore':
+        if not isinstance(self, NoSQLAdapter):
             value = bar_decode_integer(value)
         return value
 
     def parse_list_references(self, value, field_type):
-        if not self.dbengine=='google:datastore':
+        if not isinstance(self, NoSQLAdapter):
             value = bar_decode_integer(value)
         return [self.parse_reference(r, field_type[5:]) for r in value]
 
     def parse_list_strings(self, value, field_type):
-        if not self.dbengine=='google:datastore':
+        if not isinstance(self, NoSQLAdapter):
             value = bar_decode_string(value)
         return value
 
@@ -2264,7 +2274,7 @@ class SpatiaLiteAdapter(SQLiteAdapter):
         # Linux uses libspatialite.so
         # Mac OS X uses libspatialite.dylib
         libspatialite = SPATIALLIBS[platform.system()]
-        self.execute(r'SELECT load_extension("%s");') % libspatialite
+        self.execute(r'SELECT load_extension("%s");' % libspatialite)
 
         self.connection.create_function('web2py_extract', 2,
                                         SQLiteAdapter.web2py_extract)
@@ -2414,6 +2424,9 @@ class MySQLAdapter(BaseAdapter):
     def EPOCH(self, first):
         return "UNIX_TIMESTAMP(%s)" % self.expand(first)
 
+    def CONCAT(self, *items):
+        return 'CONCAT(%s)' % ','.join(self.expand(x,'string') for x in items)
+
     def REGEXP(self,first,second):
         return '(%s REGEXP %s)' % (self.expand(first),
                                    self.expand(second,'string'))
@@ -2423,6 +2436,9 @@ class MySQLAdapter(BaseAdapter):
         return ['SET FOREIGN_KEY_CHECKS=0;','DROP TABLE %s;' % table,
                 'SET FOREIGN_KEY_CHECKS=1;']
 
+    def _insert_empty(self, table):
+        return 'INSERT INTO %s VALUES (DEFAULT);' % table
+
     def distributed_transaction_begin(self,key):
         self.execute('XA START;')
 
@@ -2607,7 +2623,11 @@ class PostgreSQLAdapter(BaseAdapter):
                    "port=%s password='%s'") \
                    % (db, user, host, port, password)
         # choose diver according uri
-        self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__)
+        if self.driver:
+            self.__version__ = "%s %s" % (self.driver.__name__,
+                                          self.driver.__version__)
+        else:
+            self.__version__ = None
         def connector(msg=msg,driver_args=driver_args):
             return self.driver.connect(msg,**driver_args)
         self.connector = connector
@@ -2662,14 +2682,6 @@ class PostgreSQLAdapter(BaseAdapter):
         return '(%s ILIKE %s)' % (self.expand(first),
                                   self.expand('%'+second,'string'))
 
-    def CONTAINS(self,first,second,case_sensitive=False):
-        if first.type in ('string','text', 'json'):
-            key = '%'+str(second).replace('%','%%')+'%'
-        elif first.type.startswith('list:'):
-            key = '%|'+str(second).replace('|','||').replace('%','%%')+'|%'
-        op = case_sensitive and self.LIKE or self.ILIKE
-        return op(first,key)
-
     # GIS functions
 
     def ST_ASGEOJSON(self, first, second):
@@ -3038,6 +3050,7 @@ class OracleAdapter(BaseAdapter):
 
 class MSSQLAdapter(BaseAdapter):
     drivers = ('pyodbc',)
+    T_SEP = 'T'
 
     types = {
         'boolean': 'BIT',
@@ -3103,7 +3116,9 @@ class MSSQLAdapter(BaseAdapter):
             (lmin, lmax) = limitby
             sql_s += ' TOP %i' % lmax
         if 'GROUP BY' in sql_o:
-            sql_o = sql_o[:sql_o.find('ORDER BY ')]
+            orderfound = sql_o.find('ORDER BY ')
+            if orderfound >= 0:
+                sql_o = sql_o[:orderfound]
         return 'SELECT %s %s FROM %s%s%s;' % (sql_s, sql_f, sql_t, sql_w, sql_o)
 
     TRUE = 1
@@ -3193,6 +3208,9 @@ class MSSQLAdapter(BaseAdapter):
     def EPOCH(self, first):
         return "DATEDIFF(second, '1970-01-01 00:00:00', %s)" % self.expand(first)
 
+    def CONCAT(self, *items):
+        return '(%s)' % ' + '.join(self.expand(x,'string') for x in items)
+
     # GIS Spatial Extensions
 
     # No STAsGeoJSON in MSSQL
@@ -3448,18 +3466,16 @@ class FireBirdAdapter(BaseAdapter):
     def SUBSTRING(self,field,parameters):
         return 'SUBSTRING(%s from %s for %s)' % (self.expand(field), parameters[0], parameters[1])
 
-    def CONTAINING(self,first,second):
+    def LENGTH(self, first):
-        "case in-sensitive like operator"
+        return "CHAR_LENGTH(%s)" % self.expand(first)
+
+    def CONTAINS(self,first,second,case_sensitive=False):
+        if first.type.startswith('list:'):
+            second = Expression(None,self.CONCAT('|',Expression(
+                        None,self.REPLACE(second,('|','||'))),'|'))
         return '(%s CONTAINING %s)' % (self.expand(first),
                                        self.expand(second, 'string'))
 
-    def CONTAINS(self, first, second, case_sensitive=False):
-        if first.type in ('string','text'):
-            key = str(second).replace('%','%%')
-        elif first.type.startswith('list:'):
-            key = '|'+str(second).replace('|','||').replace('%','%%')+'|'
-        return self.CONTAINING(first,second)
-
     def _drop(self,table,mode):
         sequence_name = table._sequence_name
         return ['DROP TABLE %s %s;' % (table, mode), 'DROP GENERATOR %s;' % sequence_name]
@@ -3862,7 +3878,7 @@ INGRES_SEQNAME='ii***lineitemsequence' # NOTE invalid database object name
                                        # to be a delimited identifier)
 
 class IngresAdapter(BaseAdapter):
-    drivers = ('ingresdbi',)
+    drivers = ('pyodbc',)
 
     types = {
         'boolean': 'CHAR(1)',
@@ -3913,6 +3929,7 @@ class IngresAdapter(BaseAdapter):
                  adapter_args={}, do_connect=True, after_connection=None):
         self.db = db
         self.dbengine = "ingres"
+        self._driver = pyodbc
         self.uri = uri
         if do_connect: self.find_driver(adapter_args,uri)
         self.pool_size = pool_size
@@ -3920,22 +3937,27 @@ class IngresAdapter(BaseAdapter):
         self.db_codec = db_codec
         self._after_connection = after_connection
         self.find_or_make_work_folder()
-        connstr = self._uri.split(':', 1)[1]
+        connstr = uri.split(':', 1)[1]
         # Simple URI processing
         connstr = connstr.lstrip()
         while connstr.startswith('/'):
             connstr = connstr[1:]
-        database_name=connstr # Assume only (local) dbname is passed in
+        if '=' in connstr:
-        vnode = '(local)'
+            # Assume we have a regular ODBC connection string and just use it
-        servertype = 'ingres'
+            ruri  = connstr
-        trace = (0, None) # No tracing
+        else:
-        driver_args.update(database=database_name,
+            # Assume only (local) dbname is passed in with OS auth
-                           vnode=vnode,
+            database_name = connstr
-                           servertype=servertype,
+            default_driver_name = 'Ingres'
-                           trace=trace)
+            vnode = '(local)'
-        def connector(driver_args=driver_args):
+            servertype = 'ingres'
-            return self.driver.connect(**driver_args)
+            ruri = 'Driver={%s};Server=%s;Database=%s' % (default_driver_name, vnode, database_name)
+        def connector(cnxn=ruri,driver_args=driver_args):
+            return self.driver.connect(cnxn,**driver_args)
+
         self.connector = connector
+
+        # TODO if version is >= 10, set types['id'] to Identity column, see http://community.actian.com/wiki/Using_Ingres_Identity_Columns
         if do_connect: self.reconnect()
 
     def create_sequence_and_triggers(self, query, table, **args):
@@ -3961,12 +3983,12 @@ class IngresAdapter(BaseAdapter):
         return int(self.cursor.fetchone()[0]) # don't really need int type cast here...
 
     def integrity_error_class(self):
-        return ingresdbi.IntegrityError
+        return self._driver.IntegrityError
 
 
 class IngresUnicodeAdapter(IngresAdapter):
 
-    drivers = ('ingresdbi',)
+    drivers = ('pyodbc',)
 
     types = {
         'boolean': 'CHAR(1)',
@@ -4352,13 +4374,14 @@ class NoSQLAdapter(BaseAdapter):
             elif fieldtype == 'blob':
                 pass
             elif fieldtype == 'json':
-                obj = self.to_unicode(obj)
+                if isinstance(obj, basestring):
-                if have_serializers:
+                    obj = self.to_unicode(obj)
-                    obj = serializers.loads_json(obj)
+                    if have_serializers:
-                elif simplejson:
+                        obj = serializers.loads_json(obj)
-                    obj = simplejson.loads(obj)
+                    elif simplejson:
-                else:
+                        obj = simplejson.loads(obj)
-                    raise RuntimeError("missing simplejson")
+                    else:
+                        raise RuntimeError("missing simplejson")
             elif is_string and field_is_type('list:string'):
                 return map(self.to_unicode,obj)
             elif is_list:
@@ -4416,6 +4439,7 @@ class NoSQLAdapter(BaseAdapter):
     def LOWER(self,first): raise SyntaxError("Not supported")
     def UPPER(self,first): raise SyntaxError("Not supported")
     def EXTRACT(self,first,what): raise SyntaxError("Not supported")
+    def LENGTH(self, first): raise SyntaxError("Not supported")
     def AGGREGATE(self,first,what): raise SyntaxError("Not supported")
     def LEFT_JOIN(self): raise SyntaxError("Not supported")
     def RANDOM(self): raise SyntaxError("Not supported")
@@ -4464,7 +4488,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
                  adapter_args={}, do_connect=True, after_connection=None):
         self.types.update({
                 'boolean': gae.BooleanProperty,
-                'string': (lambda: gae.StringProperty(multiline=True)),
+                'string': (lambda **kwargs: gae.StringProperty(multiline=True, **kwargs)),
                 'text': gae.TextProperty,
                 'json': gae.TextProperty,
                 'password': gae.StringProperty,
@@ -4480,9 +4504,9 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
                 'datetime': gae.DateTimeProperty,
                 'id': None,
                 'reference': gae.IntegerProperty,
-                'list:string': (lambda: gae.StringListProperty(default=None)),
+                'list:string': (lambda **kwargs: gae.StringListProperty(default=None, **kwargs)),
-                'list:integer': (lambda: gae.ListProperty(int,default=None)),
+                'list:integer': (lambda **kwargs: gae.ListProperty(int,default=None, **kwargs)),
-                'list:reference': (lambda: gae.ListProperty(int,default=None)),
+                'list:reference': (lambda **kwargs: gae.ListProperty(int,default=None, **kwargs)),
                 })
         self.db = db
         self.uri = uri
@@ -4505,7 +4529,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
             if isinstance(polymodel,Table) and field.name in polymodel.fields():
                 continue
             attr = {}
-            if isinstance(field.custom_qaulifier, dict):
+            if isinstance(field.custom_qualifier, dict):
                 #this is custom properties to add to the GAE field declartion
                 attr = field.custom_qualifier
             field_type = field.type
@@ -4653,7 +4677,7 @@ class GoogleDatastoreAdapter(NoSQLAdapter):
         return self.expand(first)
 
     def truncate(self,table,mode):
-        self.db(table._id).delete()
+        self.db(self.db._adapter.id_query(table)).delete()
 
     def select_raw(self,query,fields=None,attributes=None):
         db = self.db
@@ -5175,6 +5199,7 @@ class MongoDBAdapter(NoSQLAdapter):
                                  "Requires an integer or base 16 value")
         elif isinstance(arg, self.ObjectId):
             return arg
+
         if not isinstance(arg, (int, long)):
             raise TypeError("object_id argument must be of type " +
                             "ObjectId or an objectid representable integer")
@@ -5184,8 +5209,26 @@ class MongoDBAdapter(NoSQLAdapter):
             hexvalue = hex(arg)[2:].replace("L", "")
         return self.ObjectId(hexvalue)
 
+    def parse_reference(self, value, field_type):
+        # here we have to check for ObjectID before base parse
+        if isinstance(value, self.ObjectId):
+            value = int(str(value), 16)
+        return super(MongoDBAdapter,
+                     self).parse_reference(value, field_type)
+
+    def parse_id(self, value, field_type):
+        if isinstance(value, self.ObjectId):
+            value = int(str(value), 16)
+        return super(MongoDBAdapter,
+                     self).parse_id(value, field_type)
+
     def represent(self, obj, fieldtype):
-        value = NoSQLAdapter.represent(self, obj, fieldtype)
+        # the base adatpter does not support MongoDB ObjectId
+        if isinstance(obj, self.ObjectId):
+            value = obj
+        else:
+            value = NoSQLAdapter.represent(self, obj, fieldtype)
+        # reference types must be convert to ObjectID
         if fieldtype  =='date':
             if value == None:
                 return value
@@ -5202,15 +5245,24 @@ class MongoDBAdapter(NoSQLAdapter):
             # mongodb doesn't has a  time object and so it must datetime,
             # string or integer
             return datetime.datetime.combine(d, value)
-        elif fieldtype == 'list:string' or \
+        elif (isinstance(fieldtype, basestring) and
-             fieldtype == 'list:integer' or \
+              fieldtype.startswith('list:')):
-             fieldtype == 'list:reference':
+            if fieldtype.startswith('list:reference'):
+                newval = []
+                for v in value:
+                    newval.append(self.object_id(v))
+                return newval
             return value
+        elif ((isinstance(fieldtype, basestring) and
+               fieldtype.startswith("reference")) or
+               (isinstance(fieldtype, Table))):
+            value = self.object_id(value)
+
         return value
 
     # Safe determines whether a asynchronious request is done or a
     # synchronious action is done
-    # For safety, we use by default synchronious requests
+    # For safety, we use by default synchronous requests
     def insert(self, table, fields, safe=None):
         if safe==None:
             safe = self.safe
@@ -5258,14 +5310,18 @@ class MongoDBAdapter(NoSQLAdapter):
                 if expression.first.type == 'id':
                     expression.first.name = '_id'
                 # cast to Mongo ObjectId
-                expression.second = self.object_id(expression.second)
+                if isinstance(expression.second, (tuple, list, set)):
+                    expression.second = [self.object_id(item) for
+                                         item in expression.second]
+                else:
+                    expression.second = self.object_id(expression.second)
                 result = expression.op(expression.first, expression.second)
+
         if isinstance(expression, Field):
             if expression.type=='id':
                 result = "_id"
             else:
                 result =  expression.name
-
         elif isinstance(expression, (Expression, Query)):
             if not expression.second is None:
                 result = expression.op(expression.first, expression.second)
@@ -5276,7 +5332,7 @@ class MongoDBAdapter(NoSQLAdapter):
             else:
                 result = expression.op
         elif field_type:
-            result = str(self.represent(expression,field_type))
+            result = self.represent(expression,field_type)
         elif isinstance(expression,(list,tuple)):
             result = ','.join(self.represent(item,field_type) for
                               item in expression)
@@ -5330,7 +5386,6 @@ class MongoDBAdapter(NoSQLAdapter):
         else:
             raise SyntaxError("The table name could not be found in " +
                               "the query nor from the select statement.")
-
         mongoqry_dict = self.expand(query)
         fields = fields or self.db[tablename]
         for field in fields:
@@ -5380,15 +5435,12 @@ class MongoDBAdapter(NoSQLAdapter):
                 # record id's
                 if fieldname == "id": fieldname = "_id"
                 if fieldname in record:
-                    if isinstance(record[fieldname],
+                    value = record[fieldname]
-                                  self.ObjectId):
-                        value = int(str(record[fieldname]), 16)
-                    else:
-                        value = record[fieldname]
                 else:
                     value = None
                 row.append(value)
             rows.append(row)
+
         processor = attributes.get('processor', self.parse)
         result = processor(rows, fields, newnames, False)
         return result
@@ -5488,7 +5540,7 @@ class MongoDBAdapter(NoSQLAdapter):
     def BELONGS(self, first, second):
         if isinstance(second, str):
             return {self.expand(first) : {"$in" : [ second[:-1]]} }
-        elif second==[] or second==():
+        elif second==[] or second==() or second==set():
             return {1:0}
         items = [self.expand(item, first.type) for item in second]
         return {self.expand(first) : {"$in" : items} }
@@ -7051,15 +7103,13 @@ class DAL(object):
     Example::
 
        db = DAL('sqlite://test.db')
+
+       or
+
+       db = DAL({"uri": ..., "items": ...}) # experimental
+
        db.define_table('tablename', Field('fieldname1'),
                                     Field('fieldname2'))
-
-    (experimental)
-    you can pass a dict object as uri with the uri string
-    and table/field definitions. For an example of valid data check
-    the output of:
-
-    >>> db.as_dict(flat=True, sanitize=False)
     """
 
     def __new__(cls, uri='sqlite://dummy.db', *args, **kwargs):
@@ -7180,6 +7230,28 @@ class DAL(object):
 
         :uri: string that contains information for connecting to a database.
                (default: 'sqlite://dummy.db')
+
+                experimental: you can specify a dictionary as uri
+                parameter i.e. with
+                db = DAL({"uri": "sqlite://storage.sqlite",
+                          "items": {...}, ...})
+
+                for an example of dict input you can check the output
+                of the scaffolding db model with
+
+                db.as_dict()
+
+                Note that for compatibility with Python older than
+                version 2.6.5 you should cast your dict input keys
+                to str due to a syntax limitation on kwarg names.
+                for proper DAL dictionary input you can use one of:
+
+                obj = serializers.cast_keys(dict, [encoding="utf-8"])
+
+                or else (for parsing json input)
+
+                obj = serializers.loads_json(data, unicode_keys=False)
+
         :pool_size: How many open connections to make to the database object.
         :folder: where .table files will be created.
                  automatically set within web2py
@@ -8720,7 +8792,7 @@ class Expression(object):
 
     def len(self):
         db = self.db
-        return Expression(db, db._adapter.AGGREGATE, self, 'LENGTH', 'integer')
+        return Expression(db, db._adapter.LENGTH, self, None, 'integer')
 
     def avg(self):
         db = self.db
@@ -8738,6 +8810,10 @@ class Expression(object):
         db = self.db
         return Expression(db, db._adapter.UPPER, self, None, self.type)
 
+    def replace(self,a,b):
+        db = self.db
+        return Expression(db, db._adapter.REPLACE, self, (a,b), self.type)
+
     def year(self):
         db = self.db
         return Expression(db, db._adapter.EXTRACT, self, 'year', 'integer')
@@ -8816,6 +8892,8 @@ class Expression(object):
             result_type = 'integer'
         elif self.type in ['date','time','datetime','double','float']:
             result_type = 'double'
+        elif self.type.startswith('decimal('):
+            result_type = self.type
         else:
             raise SyntaxError("subtraction operation not supported for type")
         return Expression(db,db._adapter.SUB,self,other,result_type)
@@ -9036,7 +9114,7 @@ class FieldVirtual(object):
         (self.name, self.f) = (name, f) if f else ('unkown', name)
         self.type = ftype
         self.label = label or self.name.capitalize().replace('_',' ')
-        self.represent = IDENTITY 
+        self.represent = IDENTITY
         self.formatter = IDENTITY
         self.comment = None
         self.readable = True
@@ -9234,7 +9312,11 @@ class Field(Expression):
             dest_file.close()
         return newfilename
 
-    def retrieve(self, name, path=None):
+    def retrieve(self, name, path=None, nameonly=False):
+        """
+        if nameonly==True return (filename, fullfilename) instead of
+        (filename, stream)
+        """
         self_uploadfield = self.uploadfield
         if self.custom_retrieve:
             return self.custom_retrieve(name, path)
@@ -9262,7 +9344,12 @@ class Field(Expression):
             stream = self.uploadfs.open(name, 'rb')
         else:
             # ## if file is on regular filesystem
-            stream = pjoin(file_properties['path'], name)
+            # this is intentially a sting with filename and not a stream
+            # this propagates and allows stream_file_or_304_or_206 to be called
+            fullname = pjoin(file_properties['path'],name)
+            if nameonly:
+                return (filename, fullname)
+            stream = open(fullname,'rb')
         return (filename, stream)
 
     def retrieve_file_properties(self, name, path=None):
@@ -9389,7 +9476,7 @@ class Field(Expression):
                 if k == "other":
                     if isinstance(v, dict):
                         otype, other = v.popitem()
-                    else:    
+                    else:
                         otype = flatten(type(v))
                         other = v
                     newr[k] = {otype: filter_requires(otype, other,
@@ -9535,6 +9622,10 @@ class Query(object):
                         newd[k] = loop(v.__dict__)
                     elif isinstance(v, SERIALIZABLE_TYPES):
                         newd[k] = v
+                    elif isinstance(v, (datetime.date,
+                                        datetime.time,
+                                        datetime.datetime)):
+                        newd[k] = unicode(v)
                 elif k == "op":
                     if callable(v):
                         newd[k] = v.__name__

gluon/fileutils.py

@@ -47,8 +47,8 @@ __all__ = [
 
 def parse_semantic(version="Version 1.99.0-rc.1+timestamp.2011.09.19.08.23.26"):
     "http://semver.org/"
-    re_version = re.compile('Version (\d+)\.(\d+)\.(\d+)(\-(?P<pre>[^\s+]*))?(\+(?P<build>\S*))')
+    re_version = re.compile('(\d+)\.(\d+)\.(\d+)(\-(?P<pre>[^\s+]*))?(\+(?P<build>\S*))')
-    m = re_version.match(version)
+    m = re_version.match(version.strip().split()[-1])
     if not m:
         return None
     a, b, c = int(m.group(1)), int(m.group(2)), int(m.group(3))
@@ -223,19 +223,20 @@ def _extractall(filename, path='.', members=None):
     return ret
 
 
-def tar(file, dir, expression='^.+$'):
+def tar(file, dir, expression='^.+$', filenames=None):
     """
     tars dir into file, only tars file that match expression
     """
 
     tar = tarfile.TarFile(file, 'w')
     try:
-        for file in listdir(dir, expression, add_dirs=True):
+        if filenames is None:
+            filenames = listdir(dir, expression, add_dirs=True)
+        for file in filenames:
             tar.add(os.path.join(dir, file), file, False)
     finally:
         tar.close()
 
-
 def untar(file, dir):
     """
     untar file into dir
@@ -244,14 +245,14 @@ def untar(file, dir):
     _extractall(file, dir)
 
 
-def w2p_pack(filename, path, compiled=False):
+def w2p_pack(filename, path, compiled=False, filenames=None):
     filename = abspath(filename)
     path = abspath(path)
     tarname = filename + '.tar'
     if compiled:
         tar_compiled(tarname, path, '^[\w\.\-]+$')
     else:
-        tar(tarname, path, '^[\w\.\-]+$')
+        tar(tarname, path, '^[\w\.\-]+$', filenames=filenames)
     w2pfp = gzopen(filename, 'wb')
     tarfp = open(tarname, 'rb')
     w2pfp.write(tarfp.read())
@@ -366,16 +367,19 @@ def get_session(request, other_application='admin'):
     return osession
 
 
-def check_credentials(request, other_application='admin', expiration=60 * 60):
+def check_credentials(request, other_application='admin',
+                      expiration=60 * 60, gae_login=True):
     """ checks that user is authorized to access other_application"""
     if request.env.web2py_runtime_gae:
         from google.appengine.api import users
         if users.is_current_user_admin():
             return True
-        else:
+        elif gae_login:
             login_html = '<a href="%s">Sign in with your google account</a>.' \
                 % users.create_login_url(request.env.path_info)
             raise HTTP(200, '<html><body>%s</body></html>' % login_html)
+        else:
+            return False
     else:
         dt = time.time() - expiration
         s = get_session(request, other_application)

gluon/globals.py

@@ -56,6 +56,7 @@ current = threading.local()  # thread-local storage for request-scope globals
 css_template = '<link href="%s" rel="stylesheet" type="text/css" />'
 js_template = '<script src="%s" type="text/javascript"></script>'
 coffee_template = '<script src="%s" type="text/coffee"></script>'
+typescript_template = '<script src="%s" type="text/typescript"></script>'
 less_template = '<link href="%s" rel="stylesheet/less" type="text/css" />'
 css_inline = '<style type="text/css">\n%s\n</style>'
 js_inline = '<script type="text/javascript">\n%s\n</script>'
@@ -292,6 +293,9 @@ class Response(Storage):
                     s += js_template % item
                 elif f.endswith('.coffee'):
                     s += coffee_template % item
+                elif f.endswith('.ts'):
+                    # http://www.typescriptlang.org/
+                    s += typescript_template % item
                 elif f.endswith('.less'):
                     s += less_template % item
             elif isinstance(item, (list, tuple)):
@@ -400,7 +404,7 @@ class Response(Storage):
         except AttributeError:
             raise HTTP(404)
         try:
-            (filename, stream) = field.retrieve(name)
+            (filename, stream) = field.retrieve(name,nameonly=True)
         except IOError:
             raise HTTP(404)
         headers = self.headers
@@ -691,7 +695,7 @@ class Session(Storage):
 
     def forget(self, response=None):
         self._close(response)
-        self._forget = True        
+        self._forget = True
 
     def _try_store_in_cookie(self, request, response):
         if response.session_storage_type != 'cookie':

gluon/html.py

@@ -840,9 +840,8 @@ class DIV(XmlComponent):
                 c.latest = self.latest
                 c.session = self.session
                 c.formname = self.formname
-                if hideerror and not \
+                c['hideerror'] = hideerror or \
-                        self.attributes.get('hideerror', False):
+                        self.attributes.get('hideerror', False)
-                    c['hideerror'] = hideerror
                 newstatus = c._traverse(status, hideerror) and newstatus
 
         # for input, textarea, select, option
@@ -887,9 +886,8 @@ class DIV(XmlComponent):
 
         # get the attributes for this component
         # (they start with '_', others may have special meanings)
-        fa = ''
+        attr = []
-        for key in sorted(self.attributes):
+        for key, value in self.attributes.iteritems():
-            value = self[key]
             if key[:1] != '_':
                 continue
             name = key[1:]
@@ -897,8 +895,16 @@ class DIV(XmlComponent):
                 value = name
             elif value is False or value is None:
                 continue
+            attr.append((name, value))
+        data = self.attributes.get('data',{})
+        for key, value in data.iteritems():
+            name = 'data-' + key
+            value = data[key]
+            attr.append((name,value))
+        attr.sort()
+        fa = ''
+        for name,value in attr:
             fa += ' %s="%s"' % (name, xmlescape(value, True))
-
         # get the xml for the inner components
         co = join([xmlescape(component) for component in
                    self.components])
@@ -1479,7 +1485,7 @@ class A(DIV):
             self['_href'] = self['_href'] or '#null'
         elif self['callback']:
             returnfalse = "var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) {e.stopPropagation(); e.stopImmediatePropagation(); e.preventDefault();}"
-            if d:
+            if d and not self['noconfirm']:
                 self['_onclick'] = "if(confirm(w2p_ajax_confirm_message||'Are you sure you want to delete this object?')){ajax('%s',[],'%s');%s};%s" % \
                     (self['callback'], self['target'] or '', d, returnfalse)
             else:
@@ -2305,7 +2311,7 @@ class BEAUTIFY(DIV):
         for c in self.components:
             if hasattr(c, 'value') and not callable(c.value):
                 if c.value:
-                    components.append(c.value)                        
+                    components.append(c.value)
             if hasattr(c, 'xml') and callable(c.xml):
                 components.append(c)
                 continue

gluon/languages.py

@@ -237,7 +237,8 @@ def read_possible_languages_aux(langdir):
                 construct_plural_form)  # construct_plural_form() for current language
 
     plurals = {}
-    flist = oslistdir(langdir)
+    flist = oslistdir(langdir) if isdir(langdir) else []
+
     # scan languages directory for plural dict files:
     for pname in flist:
         if regex_plural_file.match(pname):

gluon/main.py

@@ -102,16 +102,14 @@ requests = 0    # gc timer
 # pattern used to validate client address
 regex_client = re.compile('[\w\-:]+(\.[\w\-]+)*\.?')  # ## to account for IPV6
 
-#try:
+try:
-if 1:
     version_info = open(pjoin(global_settings.gluon_parent, 'VERSION'), 'r')
-    raw_version_string = version_info.read().strip()
+    raw_version_string = version_info.read().split()[-1].strip()
     version_info.close()
-    global_settings.web2py_version = parse_version(raw_version_string)
+    global_settings.web2py_version = raw_version_string
-#except:
+    web2py_version = global_settings.web2py_version
-#    raise RuntimeError("Cannot determine web2py version")
+except:
-
+    raise RuntimeError("Cannot determine web2py version")
-web2py_version = global_settings.web2py_version
 
 try:
     import rocket
@@ -133,7 +131,7 @@ def get_client(env):
     """
     g = regex_client.search(env.get('http_x_forwarded_for', ''))
     client = (g.group() or '').split(',')[0] if g else None
-    if client in (None, '', 'unkown'):
+    if client in (None, '', 'unknown'):
         g = regex_client.search(env.get('remote_addr', ''))
         if g:
             client = g.group()

gluon/newcron.py

@@ -22,6 +22,7 @@ from settings import global_settings
 
 logger = logging.getLogger("web2py.cron")
 _cron_stopping = False
+_cron_subprocs = []
 
 
 def absolute_path_link(path):
@@ -42,7 +43,8 @@ def stopcron():
     "graceful shutdown of cron"
     global _cron_stopping
     _cron_stopping = True
-
+    while _cron_subprocs:
+        _cron_subprocs.pop().terminate()
 
 class extcron(threading.Thread):
 
@@ -232,6 +234,7 @@ class cronlauncher(threading.Thread):
 
     def run(self):
         import subprocess
+        global _cron_subprocs
         if isinstance(self.cmd, (list, tuple)):
             cmd = self.cmd
         else:
@@ -241,6 +244,7 @@ class cronlauncher(threading.Thread):
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE,
                                 shell=self.shell)
+        _cron_subprocs.append(proc)
         (stdoutdata, stderrdata) = proc.communicate()
         if proc.returncode != 0:
             logger.warning(

gluon/sanitizer.py

@@ -66,7 +66,7 @@ class XssCleaner(HTMLParser):
         # The only schemes allowed in URLs (for href and src attributes).
         # Adding "javascript" or "vbscript" to this list would not be smart.
 
-        self.allowed_schemes = ['http', 'https', 'ftp']
+        self.allowed_schemes = ['http', 'https', 'ftp', 'mailto']
 
         #to strip or escape disallowed tags?
         self.strip_disallowed = strip_disallowed
@@ -151,11 +151,12 @@ class XssCleaner(HTMLParser):
 
     def url_is_acceptable(self, url):
         """
-        Accepts relative and absolute urls
+        Accepts relative, absolute, and mailto urls
         """
 
         parsed = urlparse(url)
         return (parsed[0] in self.allowed_schemes and '.' in parsed[1]) \
+            or (parsed[0] in self.allowed_schemes and '@' in parsed[2]) \
             or (parsed[0] == '' and parsed[2].startswith('/'))
 
     def strip(self, rawstring, escape=True):
@@ -225,4 +226,3 @@ def sanitize(text, permitted_tags=[
         return str(text)
     return XssCleaner(permitted_tags=permitted_tags,
                       allowed_attributes=allowed_attributes).strip(text, escape)
-

gluon/scheduler.py

@@ -107,6 +107,7 @@ TERMINATE = 'TERMINATE'
 DISABLED = 'DISABLED'
 KILL = 'KILL'
 PICK = 'PICK'
+STOP_TASK = 'STOP_TASK'
 EXPIRED = 'EXPIRED'
 SECONDS = 1
 HEARTBEAT = 3 * SECONDS
@@ -398,7 +399,7 @@ class MetaScheduler(threading.Thread):
 
 TASK_STATUS = (QUEUED, RUNNING, COMPLETED, FAILED, TIMEOUT, STOPPED, EXPIRED)
 RUN_STATUS = (RUNNING, COMPLETED, FAILED, TIMEOUT, STOPPED)
-WORKER_STATUS = (ACTIVE, PICK, DISABLED, TERMINATE, KILL)
+WORKER_STATUS = (ACTIVE, PICK, DISABLED, TERMINATE, KILL, STOP_TASK)
 
 
 class TYPE(object):
@@ -562,16 +563,18 @@ class Scheduler(MetaScheduler):
             self.die()
 
     def wrapped_assign_tasks(self, db):
+        logger.debug('Assigning tasks...')
         db.commit()  #db.commit() only for Mysql
         x = 0
         while x < 10:
             try:
                 self.assign_tasks(db)
                 db.commit()
+                logger.debug('Tasks assigned...')
                 break
             except:
                 db.rollback()
-                logger.error('TICKER: error assigning tasks')
+                logger.error('TICKER: error assigning tasks (%s)', x)
                 x += 1
                 time.sleep(0.5)
 
@@ -746,7 +749,7 @@ class Scheduler(MetaScheduler):
                     # keep sleeping
                     self.worker_status[0] = DISABLED
                     if self.worker_status[1] == MAXHIBERNATION:
-                        logger.debug('........recording heartbeat')
+                        logger.debug('........recording heartbeat (%s)', self.worker_status[0])
                         db(sw.worker_name == self.worker_name).update(
                             last_heartbeat=now)
                 elif mybackedstatus == TERMINATE:
@@ -758,11 +761,14 @@ class Scheduler(MetaScheduler):
                     self.worker_status[0] = KILL
                     self.die()
                 else:
+                    if mybackedstatus == STOP_TASK:
+                        logger.info('Asked to kill the current task')
+                        self.terminate_process()
                     logger.debug('........recording heartbeat (%s)', self.worker_status[0])
                     db(sw.worker_name == self.worker_name).update(
                         last_heartbeat=now, status=ACTIVE)
                     self.worker_status[1] = 1  # re-activating the process
-                    if self.worker_status[0] <> RUNNING:
+                    if self.worker_status[0] != RUNNING:
                         self.worker_status[0] = ACTIVE
 
             self.do_assign_tasks = False
@@ -782,13 +788,17 @@ class Scheduler(MetaScheduler):
                         inactive_workers._select(sw.worker_name)))(st.status == RUNNING)\
                         .update(assigned_worker_name='', status=QUEUED)
                     inactive_workers.delete()
-                    self.is_a_ticker = self.being_a_ticker()
+                    try:
+                        self.is_a_ticker = self.being_a_ticker()
+                    except:
+                        logger.error('Error coordinating TICKER')
                     if self.worker_status[0] == ACTIVE:
                         self.do_assign_tasks = True
                 except:
-                    pass
+                    logger.error('Error cleaning up')
             db.commit()
         except:
+            logger.error('Error retrieving status')
             db.rollback()
         self.adj_hibernation()
         self.sleep()
@@ -802,14 +812,16 @@ class Scheduler(MetaScheduler):
         ticker = all_active.find(lambda row: row.is_ticker is True).first()
         not_busy = self.worker_status[0] == ACTIVE
         if not ticker:
+            #if no other tickers are around
             if not_busy:
-                #only if this worker isn't busy, otherwise wait for a free one
+                #only if I'm not busy
                 db(sw.worker_name == self.worker_name).update(is_ticker=True)
                 db(sw.worker_name != self.worker_name).update(is_ticker=False)
                 logger.info("TICKER: I'm a ticker")
             else:
-                #giving up, only if I'm not alone
+                #I'm busy
-                if len(all_active) > 1:
+                if len(all_active) >= 1:
+                    #so I'll "downgrade" myself to a "poor worker"
                     db(sw.worker_name == self.worker_name).update(is_ticker=False)
                 else:
                     not_busy = True
@@ -1007,6 +1019,40 @@ class Scheduler(MetaScheduler):
                       object_hook=_decode_dict) or None
         return row
 
+    def stop_task(self, ref):
+        """
+        Experimental!!!
+        Shortcut for task termination.
+        If the task is RUNNING it will terminate it --> execution will be set as FAILED
+        If the task is QUEUED, its stop_time will be set as to "now",
+            the enabled flag will be set to False, status to STOPPED
+
+        :param ref: can be
+            - integer --> lookup will be done by scheduler_task.id
+            - string  --> lookup will be done by scheduler_task.uuid
+        Returns:
+            - 1 if task was stopped (meaning an update has been done)
+            - None if task was not found, or if task was not RUNNING or QUEUED
+        """
+        from gluon.dal import Query
+        st, sw = self.db.scheduler_task, self.db.scheduler_worker
+        if isinstance(ref, int):
+            q = st.id == ref
+        elif isinstance(ref, str):
+            q = st.uuid == ref
+        else:
+            raise SyntaxError(
+                "You can retrieve results only by id or uuid")
+        task = self.db(q).select(st.id, st.status, st.assigned_worker_name).first()
+        rtn = None
+        if not task:
+            return rtn
+        if task.status == 'RUNNING':
+            rtn = self.db(sw.worker_name == task.assigned_worker_name).update(status=STOP_TASK)
+        elif task.status == 'QUEUED':
+            rtn = self.db(q).update(stop_time=self.now(), enabled=False, status=STOPPED)
+        return rtn
+
 
 def main():
     """

gluon/serializers.py

@@ -25,9 +25,52 @@ try:
 except ImportError:
     have_yaml = False
 
-def loads_json(o):
+def cast_keys(o, cast=str, encoding="utf-8"):
+    """ Builds a new object with <cast> type keys
+
+    Arguments:
+        o is the object input
+        cast (defaults to str) is an object type or function
+              which supports conversion such as:
+
+              >>> converted = cast(o)
+
+        encoding (defaults to utf-8) is the encoding for unicode
+                 keys. This is not used for custom cast functions
+
+    Use this funcion if you are in Python < 2.6.5
+    This avoids syntax errors when unpacking dictionary arguments.
+    """
+
+    if isinstance(o, (dict, Storage)):
+        if isinstance(o, dict):
+            newobj = dict()
+        else:
+            newobj = Storage()
+
+        for k, v in o.items():
+            if (cast == str) and isinstance(k, unicode):
+                key = k.encode(encoding)
+            else:
+                key = cast(k)
+            if isinstance(v, (dict, Storage)):
+                value = cast_keys(v, cast=cast, encoding=encoding)
+            else:
+                value = v
+            newobj[key] = value
+    else:
+        raise TypeError("Cannot cast keys: %s is not supported" % \
+                        type(o))
+    return newobj
+
+def loads_json(o, unicode_keys=True, **kwargs):
     # deserialize a json string
-    return json_parser.loads(o)
+    result = json_parser.loads(o, **kwargs)
+    if not unicode_keys:
+        # filter non-str keys in dictionary objects
+        result = cast_keys(result,
+                           encoding=kwargs.get("encoding", "utf-8"))
+    return result
 
 def custom_json(o):
     if hasattr(o, 'custom_json') and callable(o.custom_json):
@@ -117,18 +160,19 @@ def rss(feed):
     if not 'entries' in feed and 'items' in feed:
         feed['entries'] = feed['items']
     now = datetime.datetime.now()
-    rss = rss2.RSS2(title=str(feed.get('title', '(notitle)')),
+    rss = rss2.RSS2(title=str(feed.get('title', '(notitle)').encode('utf-8', 'replace')),
-                    link=str(feed.get('link', None)),
+                    link=str(feed.get('link', None).encode('utf-8', 'replace')),
-                    description=str(feed.get('description', '')),
+                    description=str(feed.get('description', '').encode('utf-8', 'replace')),
                     lastBuildDate=feed.get('created_on', now),
                     items=[rss2.RSSItem(
-                           title=str(entry.get('title', '(notitle)')),
+                           title=str(entry.get('title', '(notitle)').encode('utf-8', 'replace')),
-                           link=str(entry.get('link', None)),
+                           link=str(entry.get('link', None).encode('utf-8', 'replace')),
-                           description=str(entry.get('description', '')),
+                           description=str(entry.get('description', '').encode('utf-8', 'replace')),
                            pubDate=entry.get('created_on', now)
                            ) for entry in feed.get('entries', [])])
     return rss.to_xml(encoding='utf-8')
 
+
 def yaml(data):
     if have_yaml:
         return yamlib.dump(data)
@@ -138,4 +182,3 @@ def loads_yaml(data):
     if have_yaml:
         return yamlib.load(data)
     else: raise ImportError("No YAML serializer available")
-

gluon/sqlhtml.py

@@ -19,6 +19,7 @@ except ImportError:
     from cgi import parse_qs as psq
 import os
 from http import HTTP
+from html import XmlComponent
 from html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG, SCRIPT
 from html import FORM, INPUT, LABEL, OPTION, SELECT, BUTTON
 from html import TABLE, THEAD, TBODY, TR, TD, TH, STYLE
@@ -286,9 +287,9 @@ jQuery.fn.grow_input = function() {
 function pe(ul, e) {
   var new_line = ml(ul);
   rel(ul);
-  if ($(e.target).parent().is(':visible')) {
+  if (jQuery(e.target).parent().is(':visible')) {
     //make sure we didn't delete the element before we insert after
-    new_line.insertAfter($(e.target).parent());
+    new_line.insertAfter(jQuery(e.target).parent());
   } else {
     //the line we clicked on was deleted, just add to end of list
     new_line.appendTo(ul);
@@ -299,7 +300,7 @@ function pe(ul, e) {
 function rl(ul, e) {
   if (jQuery(ul).children().length > 1) {
     //only remove if we have more than 1 item so the list is never empty
-    $(e.target).parent().remove();
+    jQuery(e.target).parent().remove();
   }
 }
 function ml(ul) {
@@ -349,6 +350,12 @@ class RadioWidget(OptionsWidget):
         see also: :meth:`FormWidget.widget`
         """
 
+        if isinstance(value, (list,tuple)):
+            value = str(value[0])
+        else:
+            value = str(value)
+
+
         attr = cls._attributes(field, {}, **attributes)
         attr['_class'] = attr.get('_class', 'web2py_radiowidget')
 
@@ -461,8 +468,8 @@ class CheckboxesWidget(OptionsWidget):
         if opts:
             opts.append(
                 INPUT(requires=attr.get('requires', None),
-                      _style="display:none;", 
+                      _style="display:none;",
-                      _disabled="disabled", 
+                      _disabled="disabled",
                       _name=field.name,
                       hideerror=False))
         return parent(*opts, **attr)
@@ -542,7 +549,7 @@ class UploadWidget(FormWidget):
 
             requires = attr["requires"]
             if requires == [] or isinstance(requires, IS_EMPTY_OR):
-                inp = DIV(inp, 
+                inp = DIV(inp,
                           SPAN('[',
                                A(current.T(
                                 UploadWidget.GENERIC_DESCRIPTION), _href=url),
@@ -553,13 +560,13 @@ class UploadWidget(FormWidget):
                                LABEL(current.T(cls.DELETE_FILE),
                                      _for=field.name + cls.ID_DELETE_SUFFIX,
                                      _style='display:inline'),
-                               ']', _style='white-space:nowrap'), 
+                               ']', _style='white-space:nowrap'),
                           br, image)
             else:
-                inp = DIV(inp, 
+                inp = DIV(inp,
                           SPAN('[',
                                A(cls.GENERIC_DESCRIPTION, _href=url),
-                               ']', _style='white-space:nowrap'), 
+                               ']', _style='white-space:nowrap'),
                           br, image)
         return inp
 
@@ -1174,13 +1181,14 @@ class SQLFORM(FORM):
             xfields.append(
                 (self.FIELDKEY_DELETE_RECORD + SQLFORM.ID_ROW_SUFFIX,
                  LABEL(
-                 delete_label, separator,
+                        T(delete_label), separator,
-                 _for=self.FIELDKEY_DELETE_RECORD,
+                        _for=self.FIELDKEY_DELETE_RECORD,
-                 _id=self.FIELDKEY_DELETE_RECORD + SQLFORM.ID_LABEL_SUFFIX),
+                        _id=self.FIELDKEY_DELETE_RECORD + \
+                            SQLFORM.ID_LABEL_SUFFIX),
                  widget,
                  col3.get(self.FIELDKEY_DELETE_RECORD, '')))
             self.custom.delete = self.custom.deletable = widget
-            
+
 
         # when writable, add submit button
         self.custom.submit = ''
@@ -1223,7 +1231,8 @@ class SQLFORM(FORM):
                 table = TABLE()
                 for id, a, b, c in xfields:
                     newrows = formstyle(id, a, b, c)
-                    self.field_parent[id] = getattr(b, 'parent', None)
+                    self.field_parent[id] = getattr(b, 'parent', None) \
+                        if isinstance(b,XmlComponent) else None
                     if type(newrows).__name__ != "tuple":
                         newrows = [newrows]
                     for newrow in newrows:
@@ -1231,7 +1240,8 @@ class SQLFORM(FORM):
             else:
                 table = formstyle(self, xfields)
                 for id, a, b, c in xfields:
-                    self.field_parent[id] = getattr(b, 'parent', None)
+                    self.field_parent[id] = getattr(b, 'parent', None) \
+                        if isinstance(b,XmlComponent) else None
         else:
             raise RuntimeError('formstyle not supported')
         return table
@@ -1440,7 +1450,8 @@ class SQLFORM(FORM):
                             f = self.table[fieldname].default or ''
                             fields[fieldname] = f
                     else:
-                        fields[fieldname] = ''
+                        f = self.table[fieldname].default or ''
+                        fields[fieldname] = f
                     self.vars[fieldname] = fields[fieldname]
                     if not f:
                         continue
@@ -1580,7 +1591,7 @@ class SQLFORM(FORM):
 
         table_name = attributes.get('table_name', 'no_table')
 
-        # So it won't interfear with SQLDB.define_table
+        # So it won't interfere with SQLDB.define_table
         if 'table_name' in attributes:
             del attributes['table_name']
 
@@ -1654,7 +1665,7 @@ class SQLFORM(FORM):
                     value_input = SQLFORM.widgets.date.widget(field,field.default,_id=_id)
                 elif field.type == 'datetime':
                     value_input = SQLFORM.widgets.datetime.widget(field,field.default,_id=_id)
-                elif (field.type.startswith('reference ') or 
+                elif (field.type.startswith('reference ') or
                       field.type.startswith('list:reference ')) and \
                       hasattr(field.requires,'options'):
                     value_input = SELECT(
@@ -1669,7 +1680,7 @@ class SQLFORM(FORM):
                 else:
                     value_input = INPUT(
                         _type='text', _id=_id, _class=field.type)
-                        
+
                 new_button = INPUT(
                     _type="button", _value=T('New'), _class="btn",
                     _onclick="%s_build_query('new','%s')" % (prefix,field))
@@ -1759,8 +1770,10 @@ class SQLFORM(FORM):
              createargs={},
              editargs={},
              viewargs={},
+             selectable_submit_button='Submit',
              buttons_placement = 'right',
-             links_placement = 'right'
+             links_placement = 'right',
+             noconfirm=False
              ):
 
         # jQuery UI ThemeRoller classes (empty if ui is disabled)
@@ -1816,7 +1829,7 @@ class SQLFORM(FORM):
 
         def url(**b):
             b['args'] = args + b.get('args', [])
-            localvars = request.vars.copy()
+            localvars = request.get_vars.copy()
             localvars.update(b.get('vars', {}))
             b['vars'] = localvars
             b['hash_vars'] = False
@@ -1825,7 +1838,7 @@ class SQLFORM(FORM):
 
         def url2(**b):
             b['args'] = request.args + b.get('args', [])
-            localvars = request.vars.copy()
+            localvars = request.get_vars.copy()
             localvars.update(b.get('vars', {}))
             b['vars'] = localvars
             b['hash_vars'] = False
@@ -1849,7 +1862,7 @@ class SQLFORM(FORM):
 
         def gridbutton(buttonclass='buttonadd', buttontext=T('Add'),
                        buttonurl=url(args=[]), callback=None,
-                       delete=None, trap=True):
+                       delete=None, trap=True, noconfirm=None):
             if showbuttontext:
                 return A(SPAN(_class=ui.get(buttonclass)),
                          SPAN(T(buttontext), _title=buttontext,
@@ -1857,12 +1870,14 @@ class SQLFORM(FORM):
                          _href=buttonurl,
                          callback=callback,
                          delete=delete,
+                         noconfirm=noconfirm,
                          _class=trap_class(ui.get('button'), trap))
             else:
                 return A(SPAN(_class=ui.get(buttonclass)),
                          _href=buttonurl,
                          callback=callback,
                          delete=delete,
+                         noconfirm=noconfirm,
                          _title=buttontext,
                          _class=trap_class(ui.get('buttontext'), trap))
 
@@ -1888,7 +1903,7 @@ class SQLFORM(FORM):
         tablename = table._tablename
         if upload == '<default>':
             upload = lambda filename: url(args=['download', filename])
-            if len(request.args) > 1 and request.args[-2] == 'download':
+            if request.args(-2) == 'download':
                 stream = response.download(request, db)
                 raise HTTP(200, stream, **response.headers)
 
@@ -1925,7 +1940,7 @@ class SQLFORM(FORM):
         create_form = update_form = view_form = search_form = None
         sqlformargs = dict(formargs)
 
-        if create and len(request.args) > 1 and request.args[-2] == 'new':
+        if create and request.args(-2) == 'new':
             table = db[request.args[-1]]
             sqlformargs.update(createargs)
             create_form = SQLFORM(
@@ -1944,7 +1959,7 @@ class SQLFORM(FORM):
             res.search_form = search_form
             return res
 
-        elif details and len(request.args) > 2 and request.args[-3] == 'view':
+        elif details and request.args(-3) == 'view':
             table = db[request.args[-2]]
             record = table(request.args[-1]) or redirect(referrer)
             sqlformargs.update(viewargs)
@@ -1959,7 +1974,7 @@ class SQLFORM(FORM):
             res.view_form = view_form
             res.search_form = search_form
             return res
-        elif editable and len(request.args) > 2 and request.args[-3] == 'edit':
+        elif editable and request.args(-3) == 'edit':
             table = db[request.args[-2]]
             record = table(request.args[-1]) or redirect(URL('error'))
             sqlformargs.update(editargs)
@@ -1984,7 +1999,7 @@ class SQLFORM(FORM):
             res.view_form = view_form
             res.search_form = search_form
             return res
-        elif deletable and len(request.args) > 2 and request.args[-3] == 'delete':
+        elif deletable and request.args(-3) == 'delete':
             table = db[request.args[-2]]
             if ondelete:
                 ondelete(table, request.args[-1])
@@ -2056,7 +2071,8 @@ class SQLFORM(FORM):
         elif not request.vars.records:
             request.vars.records = []
 
-        session['_web2py_grid_referrer_' + formname] = url2(vars=request.vars)
+        session['_web2py_grid_referrer_' + formname] = \
+            url2(vars=request.get_vars)
         console = DIV(_class='web2py_console %(header)s %(cornertop)s' % ui)
         error = None
         if create:
@@ -2106,10 +2122,15 @@ class SQLFORM(FORM):
         if subquery:
             dbset = dbset(subquery)
         try:
-            if left or groupby:
+            if groupby:
                 c = 'count(*)'
-                nrows = dbset.select(c, left=left, cacheable=True,
+                nrows = db.executesql(
-                                     groupby=groupby).first()[c]
+                    'select count(*) from (%s);' %
+                    dbset._select(c, left=left, cacheable=True,
+                                  groupby=groupby)[:-1])[0][0]
+            elif left:
+                c = 'count(*)'
+                nrows = dbset.select(c, left=left, cacheable=True).first()[c]
             elif dbset._db._adapter.dbengine=='google:datastore':
                 #if we don't set a limit, this can timeout for a large table
                 nrows = dbset.db._adapter.count(dbset.query, limit=1000)
@@ -2341,6 +2362,7 @@ class SQLFORM(FORM):
                             'buttondelete', 'Delete',
                             url(args=['delete', tablename, id]),
                             callback=url(args=['delete', tablename, id]),
+                            noconfirm=noconfirm,
                             delete='tr'))
                     if buttons_placement in ['right', 'both']:
                         trcols.append(row_buttons)
@@ -2362,9 +2384,12 @@ class SQLFORM(FORM):
                     tr = TR(*trcols, **dict(_class=classtr))
                 tbody.append(tr)
             htmltable.append(tbody)
-            htmltable = DIV(htmltable, _style='width:100%;overflow-x:auto')
+            htmltable = DIV(
+                htmltable, _class='web2py_htmltable',
+                _style='width:100%;overflow-x:auto;-ms-overflow-x:scroll')
             if selectable:
-                htmltable = FORM(htmltable, INPUT(_type="submit"))
+                htmltable = FORM(htmltable, INPUT(
+                        _type="submit", _value=T(selectable_submit_button)))
                 if htmltable.process(formname=formname).accepted:
                     htmltable.vars.records = htmltable.vars.records or []
                     htmltable.vars.records = htmltable.vars.records if type(htmltable.vars.records) == list else [htmltable.vars.records]
@@ -2458,6 +2483,16 @@ class SQLFORM(FORM):
         if constraints is None:
             constraints = {}
         field = None
+        name = None
+        def format(table,row):
+            if not row:
+                return 'Unknown'
+            elif isinstance(table._format,str):
+                return table._format % row
+            elif callable(table._format):
+                return table._format(row)
+            else:
+                return '#'+str(row.id)
         try:
             nargs = len(args) + 1
             previous_tablename, previous_fieldname, previous_id = \
@@ -2484,14 +2519,7 @@ class SQLFORM(FORM):
                             raise HTTP(400)
                     previous_tablename, previous_fieldname, previous_id = \
                         tablename, fieldname, id
-                    try:
+                    name = format(db[referee],record)
-                        format = db[referee]._format
-                        if callable(format):
-                            name = format(record)
-                        else:
-                            name = format % record
-                    except TypeError:
-                        name = id
                     breadcrumbs.append(
                         LI(A(T(db[referee]._plural),
                              _class=trap_class(),
@@ -2509,8 +2537,9 @@ class SQLFORM(FORM):
                     break
             if nargs > len(args) + 1:
                 query = (field == id)
-                if isinstance(linked_tables, dict):
+                # cjk
-                    linked_tables = linked_tables.get(table._tablename, [])
+                # if isinstance(linked_tables, dict):
+                #     linked_tables = linked_tables.get(table._tablename, [])
                 if linked_tables is None or referee in linked_tables:
                     field.represent = lambda id, r=None, referee=referee, rep=field.represent: A(callable(rep) and rep(id) or id, _class=trap_class(), _href=url(args=['view', referee, id]))
         except (KeyError, ValueError, TypeError):
@@ -2535,31 +2564,70 @@ class SQLFORM(FORM):
             check[rfield.tablename] = \
                 check.get(rfield.tablename, []) + [rfield.name]
         if isinstance(linked_tables, dict):
-            linked_tables = linked_tables.get(table._tablename, [])
+            for tbl in linked_tables.keys():
-        for tablename in sorted(check):
+                tb = db[tbl]
-            linked_fieldnames = check[tablename]
+                if isinstance(linked_tables[tbl], list):
-            tb = db[tablename]
+                        if len(linked_tables[tbl]) > 1:
-            multiple_links = len(linked_fieldnames) > 1
+                            t = T('%s(%s)' %(tbl, fld))
-            for fieldname in linked_fieldnames:
+                        else:
-                if linked_tables is None or tablename in linked_tables:
+                            t = T(tb._plural)
-                    t = T(tb._plural) if not multiple_links else \
+                        for fld in linked_tables[tbl]:
-                        T(tb._plural + '(' + fieldname + ')')
+                            if fld not in db[tbl].fields:
-                    args0 = tablename + '.' + fieldname
+                                raise ValueError('Field %s not in table' %fld)
+                            args0 = tbl + '.' + fld
+                            links.append(
+                                lambda row, t=t, nargs=nargs, args0=args0:
+                                A(SPAN(t), _class=trap_class(), _href=url(
+                                  args=[args0, row[id_field_name]])))
+                else:
+                    t = T(tb._plural)
+                    fld = linked_tables[tbl]
+                    if fld not in db[tbl].fields:
+                        raise ValueError('Field %s not in table' %fld)
+                    args0 = tbl + '.' + fld
                     links.append(
                         lambda row, t=t, nargs=nargs, args0=args0:
                         A(SPAN(t), _class=trap_class(), _href=url(
                           args=[args0, row[id_field_name]])))
+        else:
+            for tablename in sorted(check):
+                linked_fieldnames = check[tablename]
+                tb = db[tablename]
+                multiple_links = len(linked_fieldnames) > 1
+                for fieldname in linked_fieldnames:
+                    if linked_tables is None or tablename in linked_tables:
+                        t = T(tb._plural) if not multiple_links else \
+                            T(tb._plural + '(' + fieldname + ')')
+                        args0 = tablename + '.' + fieldname
+                        links.append(
+                            lambda row, t=t, nargs=nargs, args0=args0:
+                            A(SPAN(t), _class=trap_class(), _href=url(
+                              args=[args0, row[id_field_name]])))
 
         grid = SQLFORM.grid(query, args=request.args[:nargs], links=links,
                             links_in_grid=links_in_grid,
                             user_signature=user_signature, **kwargs)
+
         if isinstance(grid, DIV):
-            header = table._plural + (field and ' for ' + field.label or '')
+            header = table._plural
-            breadcrumbs.append(LI(A(T(header), _class=trap_class(),
+            next = grid.create_form or grid.update_form or grid.view_form
-                                    _href=url()), _class='active w2p_grid_breadcrumb_elem'))
+            breadcrumbs.append(LI(
+                    A(T(header), _class=trap_class(),_href=url()),
+                    SPAN(divider, _class='divider') if next else '',
+                    _class='active w2p_grid_breadcrumb_elem'))
+            if grid.create_form:
+                header = T('New %s' % table._singular)
+            elif grid.update_form:
+                header = T('Edit %s' % format(table,grid.update_form.record))
+            elif grid.view_form:
+                header = T('View %s' % format(table,grid.view_form.record))
+            if next:
+                breadcrumbs.append(LI(
+                            A(T(header), _class=trap_class(),_href=url()),
+                            _class='active w2p_grid_breadcrumb_elem'))
             grid.insert(
                 0, DIV(UL(*breadcrumbs, **{'_class': breadcrumbs_class}),
-                              _class='web2py_breadcrumbs'))
+                       _class='web2py_breadcrumbs'))
         return grid
 
 
@@ -2612,7 +2680,7 @@ class SQLTABLE(TABLE):
     :param selectid: The id you want to select
     :param renderstyle: Boolean render the style with the table
 
-    :param extracolums = [{'label':A('Extra',_href='#'),
+    :param extracolumns = [{'label':A('Extra',_href='#'),
                     'class': '', #class name of the header
                     'width':'', #width in pixels or %
                     'content':lambda row, rc: A('Edit',_href='edit/%s'%row.id),
@@ -2634,8 +2702,8 @@ class SQLTABLE(TABLE):
                                 },
                }
 
-    table = SQLTABLE(rows, headers=headers, extracolums=extracolums)
+    table = SQLTABLE(rows, headers=headers, extracolumns=extracolumns)
-
+`<
 
     """
 
@@ -2994,4 +3062,3 @@ class ExporterJSON(ExportClass):
             return self.rows.as_json()
         else:
             return 'null'
-