welcome3 is standard (but not final)

applications/welcome/controllers/default.py

@@ -17,8 +17,8 @@ def index():
     if you need a simple wiki simply replace the two lines below with:
     return auth.wiki()
     """
-    response.flash = T("Welcome to web2py!")
-    return dict(message=T('Hello World'))
+    response.flash = T("Hello World")
+    return dict(message=T('Welcome to web2py!'))
 
 
 def user():

applications/welcome/languages/ca.py

@@ -1,492 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-'!langcode!': 'ca',
-'!langname!': 'Català',
-'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"actualizi" és una expressió opcional com "camp1=\'nou_valor\'". No es poden actualitzar o eliminar resultats de un JOIN',
-'%(nrows)s records found': '%(nrows)s registres trobats',
-'%s %%{position}': '%s %%{posició}',
-'%s %%{row} deleted': '%s %%{fila} %%{eliminada}',
-'%s %%{row} updated': '%s %%{fila} %%{actualitzada}',
-'%s selected': '%s %%{seleccionat}',
-'%Y-%m-%d': '%d/%m/%Y',
-'%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
-'(something like "it-it")': '(similar a "això-això")',
-'@markmin\x01An error occured, please [[reload %s]] the page': 'Hi ha hagut un error, si us plau [[recarregui %s]] la pàgina',
-'@markmin\x01Number of entries: **%s**': "Nombre d'entrades: **%s**",
-'A new version of web2py is available': 'Hi ha una nova versió de wep2py disponible',
-'A new version of web2py is available: %s': 'Hi ha una nova versió de wep2py disponible: %s',
-'About': 'Sobre',
-'about': 'sobre',
-'About application': "Sobre l'aplicació",
-'Access Control': "Control d'Accés",
-'Add': 'Afegir',
-'Add Record': 'Afegeix registre',
-'additional code for your application': '`codi addicional per a la seva aplicació',
-'admin disabled because no admin password': 'admin inhabilitat per falta de contrasenya',
-'admin disabled because not supported on google app engine': 'admin inhabilitat, no és suportat en GAE',
-'admin disabled because unable to access password file': 'admin inhabilitat, impossible accedir al fitxer con la contrasenya',
-'Admin is disabled because insecure channel': 'Admin inhabilitat, el canal no és segur',
-'Admin is disabled because unsecure channel': 'Admin inhabilitat, el canal no és segur',
-'Administrative interface': 'Interfície administrativa',
-'Administrative Interface': 'Interfície Administrativa',
-'administrative interface': 'interfície administrativa',
-'Administrator Password:': 'Contrasenya del Administrador:',
-'Ajax Recipes': 'Receptes AJAX',
-'An error occured, please %s the page': 'Hi ha hagut un error, per favor %s la pàgina',
-'And': 'I',
-'and rename it (required):': 'i renombri-la (requerit):',
-'and rename it:': " i renombri'l:",
-'appadmin': 'appadmin',
-'appadmin is disabled because insecure channel': 'admin inhabilitat, el canal no és segur',
-'application "%s" uninstalled': 'aplicació "%s" desinstal·lada',
-'application compiled': 'aplicació compilada',
-'application is compiled and cannot be designed': 'la aplicació està compilada i no pot ser modificada',
-'Apply changes': 'Aplicar canvis',
-'Appointment': 'Nomenament',
-'Are you sure you want to delete file "%s"?': 'Està segur que vol eliminar el arxiu "%s"?',
-'Are you sure you want to delete this object?': 'Està segur que vol esborrar aquest objecte?',
-'Are you sure you want to uninstall application "%s"': '¿Està segur que vol desinstalar la aplicació "%s"',
-'Are you sure you want to uninstall application "%s"?': '¿Està segur que vol desinstalar la aplicació "%s"?',
-'at': 'a',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATENCIÓ: Inici de sessió requereix una connexió 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!': 'ATENCIO: no pot modificar la aplicació que està ejecutant-se!',
-'Authentication': 'Autenticació',
-'Authentication failed at client DB!': '¡La autenticació ha fallat en la BDD client!',
-'Authentication failed at main DB!': '¡La autenticació ha fallat en la BDD principal!',
-'Available Databases and Tables': 'Bases de dades i taules disponibles',
-'Back': 'Endarrera',
-'Buy this book': 'Compra aquest lllibre',
-'Cache': 'Caché',
-'cache': 'caché',
-'Cache Cleared': 'Caché Netejada',
-'Cache Keys': 'Claus de la Caché',
-'cache, errors and sessions cleaned': 'caché, errors i sessions eliminats',
-'Cannot be empty': 'No pot estar buit',
-'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'No se pot compilar: hi ha errors en la seva aplicació. Depuri, corregeixi errors i torni a intentar-ho.',
-'cannot upload file "%(filename)s"': 'no és possible pujar fitxer "%(filename)s"',
-'Change Password': 'Canviï la Contrasenya',
-'Change password': 'Canviï la contrasenya',
-'change password': 'canviï la contrasenya',
-'Changelog': 'Changelog',
-'check all': 'marcar tots',
-'Check to delete': 'Marqui per a eliminar',
-'choose one': 'escolliu un',
-'clean': 'neteja',
-'Clear': 'Netejar',
-'Clear CACHE?': 'Netejar Memòrica Cau?',
-'Clear DISK': 'Netejar DISC',
-'Clear RAM': 'Netejar RAM',
-'Click on the link %(link)s to reset your password': "Cliqui en l'enllaç %(link)s per a reiniciar la seva contrasenya",
-'click to check for upgrades': 'feu clic per buscar actualitzacions',
-'client': 'cliente',
-'Client IP': 'IP del Client',
-'Close': 'Tancar',
-'Comma-separated export including columns not shown; fields from other tables are exported as raw values for faster export': 'Comma-separated export including columns not shown; fields from other tables are exported as raw values for faster export',
-'Comma-separated export of visible columns. Fields from other tables are exported as they appear on-screen but this may be slow for many rows': 'Comma-separated export of visible columns. Fields from other tables are exported as they appear on-screen but this may be slow for many rows',
-'Community': 'Comunitat',
-'compile': 'compilar',
-'compiled application removed': 'aplicació compilada eliminada',
-'Components and Plugins': 'Components i Plugins',
-'contains': 'conté',
-'Controller': 'Controlador',
-'Controllers': 'Controladors',
-'controllers': 'controladors',
-'Copyright': 'Copyright',
-'Correo electrónico invàlid': 'Correu electrònic invàlid',
-'create file with filename:': 'crear el fitxer amb el nom:',
-'Create new application': 'Crear una nova aplicació',
-'create new application:': 'crear una nova aplicació:',
-'Create New Page': 'Crear Pàgina Nova',
-'Create Page from Slug': 'Create Page from Slug',
-'Created By': 'Creat Per',
-'Created On': 'Creat a',
-'CSV': 'CSV',
-'CSV (hidden cols)': 'CSV (columnas ocultes)',
-'Current request': 'Sol·licitud en curs',
-'Current response': 'Resposta en curs',
-'Current session': 'Sessió en curs',
-'currently saved or': 'actualment guardat o',
-'customize me!': "¡Adapta'm!",
-'data uploaded': 'dades pujades',
-'Database': 'Base de dades',
-'Database %s select': 'selecció a base de dades %s',
-'database administration': 'administració de base de dades',
-'Database Administration (appadmin)': 'Administració de Base de Dades (appadmin)',
-'Date and Time': 'Data i Hora',
-'DB': 'BDD',
-'db': 'bdd',
-'DB Model': 'Model BDD',
-'defines tables': 'defineix taules',
-'Delete': 'Eliminar',
-'delete': 'eliminar',
-'delete all checked': 'eliminar marcats',
-'Delete:': 'Eliminar:',
-'Demo': 'Demostració',
-'Deploy on Google App Engine': 'Desplegament a Google App Engine',
-'Deployment Recipes': 'Receptes de desplegament',
-'Description': 'Descripció',
-'design': 'diseny',
-'DESIGN': 'DISENY',
-'Design for': 'Diseny per a',
-'detecting': 'detectant',
-'DISK': 'DISC',
-'Disk Cache Keys': 'Claus de Caché en Disc',
-'Disk Cleared': 'Disc netejat',
-'Documentation': 'Documentació',
-"Don't know what to do?": 'No sap què fer?',
-'done!': '¡fet!',
-'Download': 'Descàrregues',
-'E-mail': 'Correu electrònic',
-'edit': 'editar',
-'EDIT': 'EDITAR',
-'Edit': 'Editar',
-'Edit application': 'Editar aplicació',
-'edit controller': 'editar controlador',
-'Edit current record': 'Editar el registre actual',
-'Edit Menu': 'Editar Menu',
-'Edit Page': 'Editar Pàgina',
-'Edit Page Media': 'Edit Page Media',
-'Edit Profile': 'Editar Perfil',
-'edit profile': 'editar perfil',
-'Edit This App': 'Editi aquesta App',
-'Editing file': 'Editant fitxer',
-'Editing file "%s"': 'Editant fitxer "%s"',
-'El fitxer ha de ser PDF': 'El fitxer ha de ser PDF',
-'El fitxer ha de ser PDF o XML': 'El fitxer ha de ser PDF o XML',
-'Email': 'Email',
-'Email and SMS': 'Correu electrònic i SMS',
-'Email sent': 'Correu electrònic enviat',
-'End of impersonation': 'Fi de suplantació',
-'enter a number between %(min)g and %(max)g': 'introdueixi un número entre %(min)g i %(max)g',
-'Enter a valid email address': 'Entri una adreça email vàlida',
-'enter a value': 'entri un valor',
-'Enter a value': 'Entri un valor',
-'Enter an integer between %(min)g and %(max)g': 'Entri un numero enter entre %(min)g i %(max)g',
-'enter an integer between %(min)g and %(max)g': 'entri numero enter entre %(min)g i %(max)g',
-'enter date and time as %(format)s': 'entri data i hora com %(format)s',
-'Enter from %(min)g to %(max)g characters': 'Entri des de %(min)g a %(max)g caràcters',
-'Enter valid filename': 'Entri nom de fitxer vàlid',
-'Error logs for "%(app)s"': 'Bitàcora de errors a "%(app)s"',
-'errors': 'errors',
-'Errors': 'Errors',
-'Errors in form, please check it out.': 'Hi ha errors en el formulari, per favor comprovi-ho.',
-'export as csv file': 'exportar com fitxer CSV',
-'Export:': 'Exportar:',
-'exposes': 'exposa',
-'extends': 'extén',
-'failed to reload module': 'la recàrrega del mòdul ha fallat',
-'FAQ': 'FAQ',
-'file': 'fitxer',
-'file "%(filename)s" created': 'fitxer "%(filename)s" creat',
-'file "%(filename)s" deleted': 'fitxer "%(filename)s" eliminat',
-'file "%(filename)s" uploaded': 'fitxer "%(filename)s" pujat',
-'file "%(filename)s" was not deleted': 'fitxer "%(filename)s" no fou eliminat',
-'file "%s" of %s restored': 'fitxer "%s" de %s restaurat',
-'file ## download': 'file ',
-'file changed on disk': 'fitxer modificat en el disco',
-'file does not exist': 'fitxer no existeix',
-'file saved on %(time)s': 'fitxer guardat a %(time)s',
-'file saved on %s': 'fitxer guardat a %s',
-'First name': 'Nom',
-'Forgot username?': 'Ha oblidat el nom de usuari?',
-'Forms and Validators': 'Formularis i validadors',
-'Free Applications': 'Aplicacions Lliures',
-'Functions with no doctests will result in [passed] tests.': 'Funcions sense doctests equivalen a pruebas [aceptades].',
-'Group %(group_id)s created': 'Grupo %(group_id)s creat',
-'Group ID': 'ID de Grup',
-'Group uniquely assigned to user %(id)s': 'Grup assignat únicament al usuari %(id)s',
-'Groups': 'Grups',
-'Hello': 'Hola',
-'Hello World': 'Hola Món',
-'help': 'ajuda',
-'Home': 'Inici',
-'Hosted by': 'Hosted by',
-'How did you get here?': 'Com has arribat aquí?',
-'HTML': 'HTML',
-'HTML export of visible columns': 'HTML export de columnes visibles',
-'htmledit': 'htmledit',
-'Impersonate': 'Suplantar',
-'import': 'importar',
-'Import/Export': 'Importar/Exportar',
-'in': 'a',
-'includes': 'inclou',
-'Index': 'Índex',
-'insert new': 'inserti nou',
-'insert new %s': 'inserti nou %s',
-'Installed applications': 'Aplicacions instalades',
-'Insufficient privileges': 'Privilegis insuficients',
-'internal error': 'error intern',
-'Internal State': 'Estat Intern',
-'Introduction': 'Introducció',
-'Invalid action': 'Acció invàlida',
-'Invalid email': 'Correo electrónico invàlid',
-'invalid expression': 'expressió invàlida',
-'Invalid login': 'Inici de sessió invàlida',
-'invalid password': 'contrasenya invàlida',
-'Invalid Query': 'Consulta invàlida',
-'invalid request': 'sol·licitud invàlida',
-'Invalid reset password': 'Reinici de contrasenya invàlid',
-'invalid ticket': 'tiquet invàlid',
-'Is Active': 'Està Actiu',
-'Key': 'Clau',
-'language file "%(filename)s" created/updated': 'fitxer de llenguatge "%(filename)s" creat/actualitzat',
-'Language files (static strings) updated': 'Fitxers de llenguatge (cadenes estàtiques) actualitzats',
-'languages': 'llenguatges',
-'Languages': 'Llenguatges',
-'languages updated': 'llenguatges actualitzats',
-'Last name': 'Cognom',
-'Last saved on:': 'Guardat a:',
-'Layout': 'Diseny de pàgina',
-'Layout Plugins': 'Plugins de disseny',
-'Layouts': 'Dissenys de pàgines',
-'License for': 'Llicència per a',
-'Live Chat': 'Xat en viu',
-'loading...': 'carregant...',
-'Log In': 'Log In',
-'Log Out': 'Log Out',
-'Logged in': 'Sessió iniciada',
-'Logged out': 'Sessió finalitzada',
-'Login': 'Inici de sessió',
-'login': 'inici de sessió',
-'Login disabled by administrator': 'Inici de sessió inhabilitat pel administrador',
-'Login to the Administrative Interface': 'Inici de sessió per a la Interfície Administrativa',
-'logout': 'fi de sessió',
-'Logout': 'Fi de sessió',
-'Lost Password': 'Contrasenya perdida',
-'Lost password?': 'Ha oblidat la contrasenya?',
-'lost password?': '¿ha oblidat la contrasenya?',
-'Main Menu': 'Menú principal',
-'Manage %(action)s': 'Manage %(action)s',
-'Manage Access Control': 'Manage Access Control',
-'Manage Cache': 'Gestionar la Caché',
-'Menu Model': 'Model "menu"',
-'merge': 'combinar',
-'Models': 'Models',
-'models': 'models',
-'Modified By': 'Modificat Per',
-'Modified On': 'Modificat A',
-'Modules': 'Mòduls',
-'modules': 'mòduls',
-'must be YYYY-MM-DD HH:MM:SS!': '¡debe ser DD/MM/YYYY HH:MM:SS!',
-'must be YYYY-MM-DD!': '¡debe ser DD/MM/YYYY!',
-'My Sites': 'Els Meus Llocs',
-'Name': 'Nombre',
-'New': 'Nuevo',
-'New %(entity)s': 'Nou %(entity)s',
-'new application "%s" created': 'nova aplicació "%s" creada',
-'New password': 'Contrasenya nova',
-'New Record': 'Registre nou',
-'new record inserted': 'nou registre insertat',
-'New Search': 'Cerca nova',
-'next %s rows': 'següents %s files',
-'next 100 rows': '100 files següents',
-'NO': 'NO',
-'No databases in this application': 'No hi ha bases de dades en esta aplicació',
-'No records found': "No s'han trobat registres",
-'Not authorized': 'No autoritzat',
-'not in': 'no a',
-'Object or table name': 'Nom del objecte o taula',
-'Old password': 'Contrasenya anterior',
-'Online examples': 'Ejemples en línia',
-'Or': 'O',
-'or import from csv file': 'o importar desde fitxer CSV',
-'or provide application url:': 'o proveeix URL de la aplicació:',
-'Origin': 'Origen',
-'Original/Translation': 'Original/Traducció',
-'Other Plugins': 'Altres Plugins',
-'Other Recipes': 'Altres Receptes',
-'Overview': 'Resum',
-'pack all': 'empaquetar tot',
-'pack compiled': 'empaquetar compilats',
-'Password': 'Contrasenya',
-'Password changed': 'Contrasenya cambiada',
-"Password fields don't match": 'Els camps de contrasenya no coincideixen',
-'Password reset': 'Reinici de contrasenya',
-'Peeking at file': 'Visualitzant fitxer',
-'Permission': 'Permís',
-'Permissions': 'Permisos',
-'Phone': 'Telèfon',
-'please input your password again': 'si us plau, entri un altre cop la seva contrasenya',
-'Plugins': 'Plugins',
-'Powered by': 'Aquest lloc utilitza',
-'Preface': 'Prefaci',
-'Presentar Factures': 'Presentar Factures',
-'Presentar factures': 'Presentar factures',
-'previous %s rows': '%s files prèvies',
-'previous 100 rows': '100 files anteriors',
-'Profile': 'Perfil',
-'Profile updated': 'Perfil actualitzat',
-'pygraphviz library not found': 'pygraphviz library not found',
-'Python': 'Python',
-'Query Not Supported: %s': 'Consulta No Suportada: %s',
-'Query:': 'Consulta:',
-'Quick Examples': 'Exemple Ràpids',
-'RAM': 'RAM',
-'RAM Cache Keys': 'Claus de la Caché en RAM',
-'Ram Cleared': 'Ram Netjeda',
-'Recipes': 'Receptes',
-'Record': 'Registre',
-'Record %(id)s created': 'Registre %(id)s creat',
-'Record Created': 'Registre Creat',
-'record does not exist': 'el registre no existe',
-'Record ID': 'ID de Registre',
-'Record id': 'Id de registre',
-'Ref APB': 'Ref APB',
-'register': "registri's",
-'Register': "Registri's",
-'Registration identifier': 'Identificador de Registre',
-'Registration key': 'Clau de registre',
-'Registration successful': 'Registre amb èxit',
-'reload': 'recarregar',
-'Remember me (for 30 days)': "Recordi'm (durant 30 dies)",
-'remove compiled': 'eliminar compilades',
-'Request reset password': 'Sol·licitud de restabliment de contrasenya',
-'Reset password': 'Reiniciar contrasenya',
-'Reset Password key': 'Restaurar Clau de la Contrasenya',
-'Resolve Conflict file': 'Resolgui el Conflicte de fitxer',
-'restore': 'restaurar',
-'Retrieve username': 'Recuperar nom de usuari',
-'revert': 'revertir',
-'Role': 'Rol',
-'Roles': 'Rols',
-'Rows in Table': 'Files a la taula',
-'Rows selected': 'Files seleccionades',
-'save': 'guardar',
-'Save model as...': 'Save model as...',
-'Saved file hash:': 'Hash del fitxer guardat:',
-'Search': 'Buscar',
-'Search Pages': 'Search Pages',
-'Semantic': 'Semàntica',
-'Services': 'Serveis',
-'session expired': 'sessió expirada',
-'shell': 'terminal',
-'Sign Up': 'Sign Up',
-'site': 'lloc',
-'Size of cache:': 'Mida de la Caché:',
-'Slug': 'Slug',
-'some files could not be removed': 'algunos archivos no pudieron ser removidos',
-'Spreadsheet-optimised export of tab-separated content including hidden columns. May be slow': 'Spreadsheet-optimised export of tab-separated content including hidden columns. May be slow',
-'Spreadsheet-optimised export of tab-separated content, visible columns only. May be slow.': 'Spreadsheet-optimised export of tab-separated content, visible columns only. May be slow.',
-'start': 'inici',
-'Start building a new search': 'Start building a new search',
-'starts with': 'comença per',
-'state': 'estat',
-'static': 'estàtics',
-'Static files': 'Fitxers estàtics',
-'Statistics': 'Estadístiques',
-'Stylesheet': "Fulla d'estil",
-'Submit': 'Enviar',
-'submit': 'enviar',
-'Success!': 'Correcte!',
-'Support': 'Suport',
-'Sure you want to delete this object?': '¿Està segur que vol eliminar aquest objecte?',
-'Table': 'taula',
-'Table name': 'Nom de la taula',
-'test': 'provar',
-'Testing application': 'Provant aplicació',
-'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" és una condición com "db.tabla1.campo1==\'valor\'". Algo com "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ó, cada ruta URL es mapeja en una funció exposada en el controlador',
-'The Core': 'El Nucli',
-'the data representation, define database tables and sets': 'la representació de dades, defineix taules i conjunts de base de dades',
-'The output of the file is a dictionary that was rendered by the view %s': 'El resultat de aquesta funció és un diccionari que és desplegat per la vista %s',
-'the presentations layer, views are also known as templates': 'la capa de presentació, les vistes també són anomenades plantilles',
-'The Views': 'Les Vistes',
-'There are no controllers': 'No hi ha controladors',
-'There are no models': 'No hi ha models',
-'There are no modules': 'No hi ha mòduls',
-'There are no static files': 'No hi ha fitxers estàtics',
-'There are no translators, only default language is supported': 'No hi ha traductors, només el llenguatge per defecte és suportat',
-'There are no views': 'No hi ha vistes',
-'these files are served without processing, your images go here': 'aquests fitxers són servits sense processar, les seves imatges van aquí',
-'This App': 'Aquesta Aplicació',
-'This email already has an account': 'Aquest correu electrònic ja té un compte',
-'This is a copy of the scaffolding application': 'Aquesta és una còpia de la aplicació de bastiment',
-'This is the %(filename)s template': 'Aquesta és la plantilla %(filename)s',
-'Ticket': 'Tiquet',
-'Time in Cache (h:m:s)': 'Temps en Caché (h:m:s)',
-'Timestamp': 'Marca de temps',
-'Title': 'Títol',
-'to  previous version.': 'a la versió prèvia.',
-'To emulate a breakpoint programatically, write:': 'Emular un punto de ruptura programàticament, escribir:',
-'to use the debugger!': 'usar el depurador!',
-'toggle breakpoint': 'alternar punt de ruptura',
-'Toggle comment': 'Alternar comentari',
-'Toggle Fullscreen': 'Alternar pantalla completa',
-'too short': 'massa curt',
-'Traceback': 'Traceback',
-'translation strings for the application': 'cadenes de caracters de traducció per a la aplicació',
-'try': 'intenti',
-'try something like': 'intenti algo com',
-'TSV (Excel compatible)': 'TSV (compatible Excel)',
-'TSV (Excel compatible, hidden cols)': 'TSV (compatible Excel, columnes ocultes)',
-'TSV (Spreadsheets)': 'TSV (Fulls de càlcul)',
-'TSV (Spreadsheets, hidden cols)': 'TSV (Fulls de càlcul, columnes amagades)',
-'Twitter': 'Twitter',
-'Unable to check for upgrades': 'No és possible verificar la existencia de actualitzacions',
-'unable to create application "%s"': 'no és possible crear la aplicació "%s"',
-'unable to delete file "%(filename)s"': 'no és possible eliminar el fitxer "%(filename)s"',
-'Unable to download': 'No és possible la descàrrega',
-'Unable to download app': 'No és possible descarregar la aplicació',
-'unable to parse csv file': 'no és possible analitzar el fitxer CSV',
-'unable to uninstall "%s"': 'no és possible instalar "%s"',
-'uncheck all': 'desmarcar tots',
-'uninstall': 'desinstalar',
-'unknown': 'desconocido',
-'update': 'actualitzar',
-'update all languages': 'actualitzar tots els llenguatges',
-'Update:': 'Actualizi:',
-'upload application:': 'pujar aplicació:',
-'Upload existing application': 'Puji aquesta aplicació',
-'upload file:': 'puji fitxer:',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, i ~(...) para NOT, para crear consultas més complexes.',
-'User': 'Usuari',
-'User %(id)s is impersonating %(other_id)s': 'El usuari %(id)s està suplantant %(other_id)s',
-'User %(id)s Logged-in': 'El usuari %(id)s inicià la sessió',
-'User %(id)s Logged-out': 'El usuari %(id)s finalitzà la sessió',
-'User %(id)s Password changed': 'Contrasenya del usuari %(id)s canviada',
-'User %(id)s Password reset': 'Contrasenya del usuari %(id)s reiniciada',
-'User %(id)s Profile updated': 'Actualitzat el perfil del usuari %(id)s',
-'User %(id)s Registered': 'Usuari %(id)s Registrat',
-'User %(id)s Username retrieved': 'Se ha recuperat el nom de usuari del usuari %(id)s',
-'User %(username)s Logged-in': 'El usuari %(username)s inicià la sessió',
-"User '%(username)s' Logged-in": "El usuari '%(username)s' inicià la sessió",
-"User '%(username)s' Logged-out": "El usuari '%(username)s' finalitzà la sessió",
-'User Id': 'Id de Usuari',
-'User ID': 'ID de Usuari',
-'User Logged-out': 'El usuari finalitzà la sessió',
-'Username': 'Nom de usuari',
-'Username retrieve': 'Recuperar nom de usuari',
-'Users': 'Usuaris',
-'Value already in database or empty': 'El valor ya existeix en la base de dades o està buit',
-'value already in database or empty': 'el valor ya existeix en la base de dades o està buit',
-'value not allowed': 'valor no permès',
-'Value not in database': 'El valor no està a la base de dades',
-'value not in database': 'el valor no està a la base de dades',
-'Verify Password': 'Verificar Contrasenya',
-'Version': 'Versió',
-'versioning': 'versions',
-'Videos': 'Videos',
-'View': 'Vista',
-'view': 'vista',
-'View %(entity)s': 'Veure %(entity)s',
-'View Page': 'View Page',
-'Views': 'Vistes',
-'views': 'vistes',
-'web2py is up to date': 'web2py està actualitzat',
-'web2py Recent Tweets': 'Tweets Recents de web2py',
-'Welcome': 'Benvingut',
-'Welcome %s': 'Benvingut %s',
-'Welcome to web2py': 'Benvingut a web2py',
-'Welcome to web2py!': '¡Benvingut a web2py!',
-'Which called the function %s located in the file %s': 'La qual va cridar la funció %s localitzada en el fitxer %s',
-'Wiki Page': 'Wiki Page',
-'Working...': 'Treballant ...',
-'XML': 'XML',
-'XML export of columns shown': 'XML export of columns shown',
-'YES': 'SÍ',
-'You are successfully running web2py': 'Vostè està executant web2py amb èxit',
-'You can modify this application and adapt it to your needs': 'Vostè pot modificar aquesta aplicació i adaptar-la a les seves necessitats',
-'You visited the url %s': 'Vostè va visitar la url %s',
-'Your username is: %(username)s': 'El seu nom de usuari és: %(username)s',
-}

applications/welcome/languages/cs.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'cs-cz',
 '!langname!': 'čeština',

applications/welcome/languages/default.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'en-us',
 '!langname!': 'English (US)',

applications/welcome/languages/fr-ca.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'fr-ca',
 '!langname!': 'Français (Canadien)',

applications/welcome/languages/fr.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'fr',
 '!langname!': 'Français',

applications/welcome/languages/hi.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'hi-in',
 '!langname!': 'हिन्दी',

applications/welcome/languages/hu.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'hu',
 '!langname!': 'Magyar',

applications/welcome/languages/id.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'id',
 '!langname!': 'Indonesian',

applications/welcome/languages/it.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!=': '!=',
 '!langcode!': 'it',

applications/welcome/languages/my-mm.py

@@ -1,278 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-'!langcode!': 'my-mm',
-'!langname!': 'မြန်မာ',
-'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN',
-'%s %%{row} deleted': '%s %%{row} ဖျက်ပြီးပြီ',
-'%s %%{row} updated': '%s %%{row} ပြင်ပြီးပြီ',
-'%s selected': '%s ခု ရွေးထားသည်',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
-'(requires internet access, experimental)': '(requires internet access, experimental)',
-'(something like "it-it")': '(something like "it-it")',
-'@markmin\x01An error occured, please [[reload %s]] the page': 'An error occured, please [[reload %s]] the page',
-'About': 'အကြောင်း',
-'Access Control': 'အသုံးပြု ခြင်းဆိုင်ရာ ထိန်းချုပ်ရန်',
-'Additional code for your application': 'Additional code for your application',
-'Admin language': 'Admin language',
-'administrative interface': 'administrative interface',
-'Administrative Interface': 'စီမံခန့်ခွဲရာ အင်တာဖေ့စ်',
-'Administrator Password:': 'Administrator Password:',
-'Ajax Recipes': 'Ajax Recipes',
-'and rename it:': 'and rename it:',
-'appadmin is disabled because insecure channel': 'စိတ်မချရသော လမ်းကြောင်းမှ ဝင်ရောက်သဖြင့် appadmin ကို အသုံးပြု၍ မရပါ',
-'Application name:': 'Application name:',
-'are not used': 'အသုံးမပြုပါ',
-'are not used yet': 'အသုံးမပြုသေးပါ',
-'Are you sure you want to delete this object?': 'သင် ဒီအရာ ဖျက်ရန် သေချာပါသလား။',
-'Available Databases and Tables': 'အသုံးပြုနိုင်သော ဒေတာဘေစ့်များနှင့် ဇယားများ',
-'Buy this book': 'ဒီစာအုပ်ကို ဝယ်ပါ',
-'cache': 'cache',
-'Cache': 'Cache',
-'Cache Keys': 'Cache Keys',
-'can be a git repo': 'can be a git repo',
-'Cannot be empty': 'အလွတ် မဖြစ်ရပါ',
-'Change admin password': 'Change admin password',
-'Check to delete': 'ဖျက်ရန် စစ်ဆေးပါ',
-'Checking for upgrades...': 'အဆင့်မြှင့်တင်မှုများအတွက် စစ်ဆေးနေသည် ...',
-'Clean': 'ရှင်းလင်းရန်',
-'Clear CACHE?': 'CACHE ကို ရှင်းလင်းမည်မှာ ဟုတ်ပါသလား။',
-'Clear DISK': 'DISK ကို ရှင်းလင်းမည်။',
-'Clear RAM': 'RAM ကို ရှင်းလင်းမည်။',
-'Client IP': 'Client IP',
-'collapse/expand all': 'collapse/expand all',
-'Community': 'အသိုင်းအဝိုင်း',
-'Compile': 'Compile',
-'Components and Plugins': 'Components and Plugins',
-'Controller': 'ကွန်ထရိုလာ',
-'Controllers': 'ကွန်ထရိုလာများ',
-'controllers': 'controllers',
-'Copyright': 'မူပိုင်ခွင့်',
-'Create': 'ဖန်တီးရန်',
-'create file with filename:': 'create file with filename:',
-'Create/Upload': 'Create/Upload',
-'created by': 'ဖန်းတီးသူ',
-'Created By': 'ပြုလုပ်ဖန်တီးသူ',
-'Created On': 'ပြုလုပ်ဖန်တီးသည့်အချိန်',
-'crontab': 'crontab',
-'Current request': 'Current request',
-'Current response': 'Current response',
-'Current session': 'Current session',
-'currently running': 'လက်ရှိတွင် လုပ်ဆောင်နေသည်',
-'data uploaded': 'data uploaded',
-'Database': 'ဒေတာဘေစ့်',
-'Database %s select': 'Database %s select',
-'database administration': 'ဒေတာဘေ့(စ်) စီမံခန့်ခွဲခြင်း',
-'Database Administration (appadmin)': 'ဒေတာဘေစ့် စီမံခန့်ခွဲခြင်း (appadmin)',
-'db': 'db',
-'DB Model': 'DB Model',
-'Debug': 'အမှားရှာရန်',
-'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
-'Delete:': 'Delete:',
-'Demo': 'အစမ်း၊ သရုပ်ပြမှုများ',
-'Deploy': 'Deploy',
-'Deploy on Google App Engine': 'Deploy on Google App Engine',
-'Deploy to OpenShift': 'Deploy to OpenShift',
-'Deployment Recipes': 'Deployment Recipes',
-'Description': 'ဖော်ပြချက်',
-'design': 'design',
-'direction: ltr': 'direction: ltr',
-'Disable': 'ပိတ်ရန်',
-'DISK': 'DISK',
-'Disk Cache Keys': 'Disk Cache Keys',
-'Disk Cleared': 'Disk ရှင်းလင်းပြီးပြီ',
-'Documentation': 'စာရွက်စာတမ်း အထောက်အကူများ',
-"Don't know what to do?": 'ဘာလုပ်ရမည်မသိ ဖြစ်နေပါသလား။',
-'done!': 'လုပ်ငန်း ဆောင်ရွက်ပြီးပြီ!',
-'Download': 'Download',
-'Download layouts from repository': 'Download layouts from repository',
-'Download plugins from repository': 'Download plugins from repository',
-'E-mail': 'အီးမေးလ်',
-'Edit': 'ပြင်ဆင်ရန်',
-'Edit application': 'Application ကို ပြင်ရန်',
-'Edit current record': 'လက်ရှိ မှတ်တမ်းကို ပြင်ရန်',
-'Email and SMS': 'အီးမေးလ်နှင့် SMS',
-'Enable': 'ဖွင့်ရန်',
-'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
-'Errors': 'အမှားများ',
-'export as csv file': ' csv file အနေနဲ့ ထုတ်ပေးရန်',
-'exposes': 'exposes',
-'extends': 'extends',
-'FAQ': 'ဖြစ်လေ့ရှိသော ပြဿနာများ',
-'filter': 'filter',
-'First name': 'အမည်၏ ပထမဆုံး စာလုံး',
-'Forms and Validators': 'Forms and Validators',
-'Free Applications': 'အခမဲ့ Applications',
-'graph model': 'graph model',
-'Graph Model': 'Graph Model',
-'Group ID': 'Group ID',
-'Groups': 'အဖွဲ့များ',
-'Hello World': 'မင်္ဂလာပါ ကမ္ဘာကြီး။',
-'Help': 'အကူအညီ',
-'Home': 'မူလသို့',
-'How did you get here?': 'သင် ဘယ်လို ရောက်လာခဲ့သလဲ။',
-'import': 'သွင်းယူရန်',
-'Import/Export': 'သွင်းယူရန်/ထုတ်ယူရန်',
-'includes': 'includes',
-'Install': 'Install',
-'Installed applications': 'ထည့်သွင်းပြီး application များ',
-'Internal State': 'Internal State',
-'Introduction': 'မိတ်ဆက်',
-'Invalid email': 'အီးမေးလ် ဖြည့်သွင်းမှုမှားနေသည်',
-'Invalid Query': 'Invalid Query',
-'invalid request': 'invalid request',
-'Is Active': 'Is Active',
-'Key': 'Key',
-'Language': 'ဘာသာစကား',
-'languages': 'ဘာသာစကားများ',
-'Languages': 'ဘာသာစကားများ',
-'Last name': 'မျိုးနွယ်အမည်',
-'Layout': 'အပြင်အဆင်',
-'Layout Plugins': 'Layout Plugins',
-'Layouts': 'အပြင်အဆင်များ',
-'Live Chat': 'တိုက်ရိုက် ဆက်သွယ် ပြောကြားရန်',
-'Login': 'ဝင်ရောက်အသုံးပြုရန်',
-'Login to the Administrative Interface': 'Login to the Administrative Interface',
-'Logout': 'ထွက်ရန်',
-'Lost Password': 'စကားဝှက် မသိတော့ပါ',
-'Lost password?': 'စကားဝှက် မသိတော့ဘူးလား။',
-'Manage': 'စီမံခန့်ခွဲရန်',
-'Manage %(action)s': '%(action)s ကို စီမံရန်',
-'Manage Access Control': 'အသုံးပြုခြင်းဆိုင်ရာ ထိန်းချုပ်မှု စီမံခန့်ခွဲရန်',
-'Manage Cache': 'Manage Cache',
-'Memberships': 'အသင်းဝင်များ',
-'Menu Model': 'Menu Model',
-'models': 'models',
-'Models': 'Models',
-'Modified By': 'ပြင်ဆင်မွမ်းမံသူ',
-'Modified On': 'ပြင်ဆင်မွမ်းမံသည့် အချိန်',
-'Modules': 'Modules',
-'modules': 'modules',
-'My Sites': 'ကျွန်ုပ်၏ Site များ',
-'Name': 'အမည်',
-'New application wizard': 'New application wizard',
-'New Record': 'မှတ်တမ်း အသစ်',
-'new record inserted': 'မှတ်တမ်း အသစ် ဖြည့်သွင်းပြီးပြီ',
-'New simple application': 'ရိုးရိုး application အသစ်',
-'next %s rows': 'နောက်အတန်း %s တန်း',
-'No databases in this application': 'ဒီ application တွင် မည်သည့် ဒေတာဘေစ့်မှ မရှိပါ',
-'no package selected': 'no package selected',
-'Object or table name': 'Object or table name',
-'Online examples': 'အွန်လိုင်း နမူနာများ',
-'or alternatively': 'or alternatively',
-'Or Get from URL:': 'Or Get from URL:',
-'or import from csv file': 'or import from csv file',
-'Origin': 'မူလ အစ',
-'Other Plugins': 'အခြား Plugins',
-'Other Recipes': 'အခြား Recipes',
-'Overview': 'အပေါ်ယံရှုမြင်ခြင်း',
-'Overwrite installed app': 'Overwrite installed app',
-'Pack all': 'အားလုံးကို ထုပ်ပိုးရန်',
-'Pack custom': 'ရွေးချယ်ထုပ်ပိုးရန်',
-'Password': 'စကားဝှက်',
-"Password fields don't match": 'စကားဝှက်များ ကိုက်ညီမှု မရှိပါ',
-'Permission': 'ခွင့်ပြုချက်',
-'Permissions': 'ခွင့်ပြုချက်များ',
-'please input your password again': 'ကျေးဇူးပြု၍ စကားဝှက်ကို ထပ်မံ ဖြည့်သွင်းပေးပါ',
-'Plugins': 'Plugins',
-'plugins': 'plugins',
-'Plural-Forms:': 'Plural-Forms:',
-'Powered by': 'အားဖြည့်စွမ်းအားပေးသူ',
-'Preface': 'နိဒါန်း',
-'previous %s rows': 'previous %s rows',
-'Private files': 'Private files',
-'private files': 'private files',
-'pygraphviz library not found': 'pygraphviz library ကို မတွေ့ပါ',
-'Python': 'Python',
-'Query:': 'Query:',
-'Quick Examples': 'အမြန် အသုံးပြုနိုင်သော နမူနာများ',
-'RAM': 'RAM',
-'RAM Cache Keys': 'RAM Cache Keys',
-'Ram Cleared': 'Ram ရှင်းလင်းပြီးပြီ',
-'Recipes': 'Recipes',
-'Record': 'မှတ်တမ်း',
-'record does not exist': 'မှတ်တမ်း မရှိပါ',
-'Record ID': 'Record ID',
-'Record id': 'Record id',
-'Register': 'မှတ်ပုံတင်ရန်',
-'Registration identifier': 'Registration identifier',
-'Registration key': 'Registration key',
-'Reload routes': 'Reload routes',
-'Remember me (for 30 days)': 'Remember me (for 30 days)',
-'Request reset password': 'စကားဝှက် အသစ် တောင်းဆိုရန်',
-'Reset Password key': 'Reset Password key',
-'Role': 'Role',
-'Roles': 'Roles',
-'Rows in Table': 'Rows in Table',
-'Rows selected': 'ရွေးထားသော အတန်းများ',
-"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
-'Running on %s': 'Running on %s',
-'Save model as...': 'Save model as...',
-'Semantic': 'Semantic',
-'Services': 'Services',
-'shell': 'shell',
-'Site': 'Site',
-'Size of cache:': 'Size of cache:',
-'Start wizard': 'Start wizard',
-'state': 'state',
-'static': 'static',
-'Static': 'Static',
-'Statistics': 'ကိန်းဂဏန်း အချက်အလက်များ',
-'Stylesheet': 'Stylesheet',
-'submit': 'ပြုလုပ်ပါ',
-'Submit': 'Submit',
-'Support': 'အထောက်အပံ့',
-'Table': 'ဇယား',
-'test': 'test',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
-'The Core': 'The Core',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
-'The output of the file is a dictionary that was rendered by the view %s': 'The output of the file is a dictionary that was rendered by the view %s',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'The Views': 'The Views',
-'There are no plugins': 'There are no plugins',
-'There are no private files': 'There are no private files',
-'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
-'This App': 'ဒီ App',
-'This email already has an account': 'ဒီအီးမေးလ်တွင် အကောင့် ရှိပြီး ဖြစ်ပါသည်',
-'Time in Cache (h:m:s)': 'Time in Cache (h:m:s)',
-'Timestamp': 'Timestamp',
-'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
-'Traceback': 'Traceback',
-'Translation strings for the application': 'Translation strings for the application',
-'Try the mobile interface': 'Try the mobile interface',
-'Twitter': 'Twitter',
-'unable to parse csv file': 'unable to parse csv file',
-'Uninstall': 'Uninstall',
-'update all languages': 'update all languages',
-'Update:': 'Update:',
-'Upload': 'Upload',
-'Upload a package:': 'Upload a package:',
-'Upload and install packed application': 'Upload and install packed application',
-'upload file:': 'upload file:',
-'upload plugin file:': 'upload plugin file:',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.',
-'User': 'အသုံးပြုသူ',
-'User ID': 'User ID',
-'Users': 'အသုံးပြုသူများ',
-'Verify Password': 'စကားဝှက်ကို အတည်ပြုပါ',
-'Version': 'Version',
-'Versioning': 'Versioning',
-'Videos': 'ဗွီဒီယိုများ',
-'View': 'ဗျူး',
-'views': 'views',
-'Views': 'ဗျူးများ',
-'Web Framework': 'Web Framework',
-'Welcome': 'ကြိုဆိုပါ၏',
-'Welcome to web2py!': 'web2py မှ ကြိုဆိုပါသည်။',
-'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
-'Working...': 'ဆောင်ရွက်နေပါသည် ။ ။ ။',
-'You are successfully running web2py': 'သင်သည် web2py ကို အောင်မြင်စွာ လည်ပတ်မောင်းနှင်စေပါသည်။',
-'You can modify this application and adapt it to your needs': 'သင် ဒီ application ကို ပြုပြင်မွမ်းမံနိုင်ပါသည်။ ထို့အပြင် သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီစေရန် ပြုလုပ်နိုင်ပါသည်။',
-'You visited the url %s': 'သင် လည်ပတ်ခဲ့သော URL %s',
-'စကားဝှက် အသစ် တောင်းဆိုရန်': 'စကားဝှက် အသစ် တောင်းဆိုရန်',
-'မှတ်ပုံတင်ရန်': 'မှတ်ပုံတင်ရန်',
-'ဝင်ရောက်အသုံးပြုရန်': 'ဝင်ရောက်အသုံးပြုရန်',
-}

applications/welcome/languages/my.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'my',
 '!langname!': 'Malay',

applications/welcome/languages/nl.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'nl',
 '!langname!': 'Nederlands',

applications/welcome/languages/pl.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'pl',
 '!langname!': 'Polska',

applications/welcome/languages/pt.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'pt',
 '!langname!': 'Português',

applications/welcome/languages/ro.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!=': '!=',
 '!langcode!': 'ro',

applications/welcome/languages/ru.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'ru',
 '!langname!': 'Русский',

applications/welcome/languages/sk.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'sk',
 '!langname!': 'Slovenský',

applications/welcome/languages/uk.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'uk',
 '!langname!': 'Українська',

applications/welcome/languages/zh-cn.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'zh-cn',
 '!langname!': '中文',

applications/welcome/languages/zh-tw.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'zh-cn',
 '!langname!': '中文',

applications/welcome/languages/zh.py

@@ -1,4 +1,4 @@
-# coding: utf8
+# -*- coding: utf-8 -*-
 {
 '!langcode!': 'zh-tw',
 '!langname!': '中文',

applications/welcome/models/db.py

@@ -25,6 +25,8 @@ else:
 ## by default give a view/generic.extension to all actions from localhost
 ## none otherwise. a pattern can be 'controller/function.extension'
 response.generic_patterns = ['*'] if request.is_local else []
+## choose a style for forms
+response.formstyle = 'bootstrap3_inline' # or 'bootstrap3_stacked' or 'bootstrap2' or other
 
 ## (optional) optimize handling of static files
 # response.optimize_css = 'concat,minify,inline'
@@ -84,5 +86,4 @@ use_janrain(auth, filename='private/janrain.key')
 #########################################################################
 
 ## after defining tables, uncomment below to enable auditing
-# auth.enable_record_versioning(db)
-
+auth.enable_record_versioning(db)

applications/welcome/models/menu.py

@@ -6,12 +6,14 @@
 #########################################################################
 
 response.logo = A(B('web',SPAN(2),'py'),XML('™ '),
-                  _class="brand",_href="http://www.web2py.com/")
+                  _class="navbar-brand",_href="http://www.web2py.com/",
+                  _id="web2py-logo")
 response.title = request.application.replace('_',' ').title()
 response.subtitle = ''
 
 ## read more at http://dev.w3.org/html5/markup/meta.name.html
 response.meta.author = 'Your Name <you@example.com>'
+response.meta.description = 'a cool new app'
 response.meta.keywords = 'web2py, python, framework'
 response.meta.generator = 'Web2py Web Framework'
 
@@ -124,15 +126,7 @@ def _():
                         (T('Live Chat'), False,
                          'http://webchat.freenode.net/?channels=web2py'),
                         ]),
-                (T('Plugins'), False, None, [
-                        ('plugin_wiki', False,
-                         'http://web2py.com/examples/default/download'),
-                        (T('Other Plugins'), False,
-                         'http://web2py.com/plugins'),
-                        (T('Layout Plugins'),
-                         False, 'http://web2py.com/layouts'),
-                        ])
-                ]
+             (T('Plugins'), False, 'http://web2py.com/plugins')]        
          )]
 if DEVELOPMENT_MENU: _()
 

applications/welcome/static/css/web2py.css

@@ -63,7 +63,7 @@ audio {width:200px}
     border-top:1px #DEDEDE solid;
 }
 .header {
-	/* background:<fill here for header image>; */
+        /* background:<fill here for header image>; */
 }
 
 
@@ -125,17 +125,9 @@ div.flash:hover { opacity:0.25; }
 
 div.error_wrapper {display:block}
 div.error {
-    width: 298px;
-    background:red;
-    border: 2px solid #d00;
-    color:white;
+    color:red;
     padding:5px;
     display:inline-block;
-    background-image: -webkit-linear-gradient(left,#f00,#fdd);
-    background-image: -o-linear-gradient(left,#f00,#fdd);
-    background-image: -moz-linear-gradient(0deg, #f00, #fdd);
-    background-image: linear-gradient(left,#f00,#fdd);
-    background-repeat: repeat-y;
 }
 
 .topbar {
@@ -302,11 +294,6 @@ li.w2p_grid_breadcrumb_elem {
 .web2py_console input, .web2py_console select,
 .web2py_console a { margin: 2px; }
 
-.web2py_htmltable {
-   width: 100%;
-   overflow-x: auto;
-   -ms-overflow-x:scroll;
-}
 
 #wiki_page_body {
    width: 600px;
@@ -320,3 +307,7 @@ li.w2p_grid_breadcrumb_elem {
 .ie-lte8 div.flash{ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#222222', endColorstr='#000000', GradientType=0 ); }
 .ie-lte8 div.flash:hover {filter:alpha(opacity=25);}
 .ie9 #w2p_query_panel {padding-bottom:2px}
+
+.web2py_console .form-control {width: 20%; display: inline;}
+.web2py_console #w2p_keywords {width: 50%;}
+.web2py_search_actions a, .web2py_console input[type=submit], .web2py_console input[type=button], .web2py_console button { padding: 6px 12px; }

applications/welcome/static/css/web2py_bootstrap.css

@@ -1,264 +0,0 @@
-/*=============================================================
-                       CUSTOM RULES
-==============================================================*/
-
-body{height:auto;} /* to avoid vertical scroll bar */
-
-a{}
-a:visited{}
-a:hover{}
-a:focus{}
-a:active{}
-
-h1{}
-h2{}
-h3{}
-h4{}
-h5{}
-h6{}
-
-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;}
-.navbar-inner {-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
-.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 {margin-bottom:0}
-.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;}
-
-/* web2py radio widget adjustment */
-.generic-widget input[type='radio'] {margin:-1px 0 0 0; vertical-align: middle;}
-.generic-widget input[type='radio'] + label {display:inline-block; margin:0 0 0 6px; vertical-align: middle;}
-
-/*=============================================================
-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;}
-
-div.controls .error {
-    width: auto;
-}
-
-/*=============================================================
-                       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%;
-  }
-}
-
-@media (max-width: 767px) {
-    .navbar {
-        margin-right: -20px;
-        margin-left: -20px;
-    }
-}

applications/welcome/static/css/web2py_bootstrap_nojs.css

@@ -1,122 +0,0 @@
-/*=============================================================
-                 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/welcome/static/js/web2py_bootstrap.js

@@ -1,40 +0,0 @@
-// 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 adjust_height_of_collapsed_nav() {
-        var cn = jQuery('div.collapse');
-        if (cn.get(0)) {
-            var cnh = cn.get(0).style.height;
-            if (cnh>'0px'){
-                cn.css('height','auto');
-            }
-        }
-  }
-  function hoverMenu(){
-    jQuery('ul.nav a.dropdown-toggle').parent().hover(function(){
-        adjust_height_of_collapsed_nav();
-        var mi = jQuery(this).addClass('open');
-        mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
-    }, function(){
-        var 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(event){
-      event.stopProgpagation();
-      if(event.originalEvent.ctrlKey){
-          window.open(jQuery(this).attr('href'), "_blank");
-      } else {
-          window.location.href=jQuery(this).attr('href');
-          }
-      });
-});

applications/welcome/views/appadmin.html

@@ -12,45 +12,35 @@
 {{if request.function=='index':}}
 <h2>{{=T("Available Databases and Tables")}}</h2>
   {{if not databases:}}{{=T("No databases in this application")}}{{pass}}
-  <ul class="nav nav-tabs" id="myTab">
-  <li class="active" ><a href="#alltables" data-toggle="tab">Tables</a></li>
-  <li><a href="#hooks" data-toggle="tab">Hooks</a></li>
-  </ul>
-  <div class="tab-content">
-      <div class="tab-pane active" id="alltables">
-        <table>
-          {{for db in sorted(databases):}}
-            {{for table in databases[db].tables:}}
-              {{qry='%s.%s.id>0'%(db,table)}}
-              {{tbl=databases[db][table]}}
-              {{if hasattr(tbl,'_primarykey'):}}
-                {{if tbl._primarykey:}}
-                    {{firstkey=tbl[tbl._primarykey[0]]}}
-                    {{if firstkey.type in ['string','text']:}}
-                      {{qry='%s.%s.%s!=""'%(db,table,firstkey.name)}}
-                    {{else:}}
-                      {{qry='%s.%s.%s>0'%(db,table,firstkey.name)}}
-                    {{pass}}
-                {{else:}}
-                     {{qry=''}}
-                {{pass}}
-              {{pass}}
-          <tr>
-            <th style="font-size: 1.75em;">
-              {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
-            </th>
-            <td>
-              {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}}
-            </td>
-          </tr>
-          {{pass}}
-          {{pass}}
-        </table>
-      </div>
-      <div class="tab-pane" id="hooks">
-      {{=LOAD('appadmin', 'hooks', ajax=True)}}
-      </div>
-  </div>
+<table>
+  {{for db in sorted(databases):}}
+    {{for table in databases[db].tables:}}
+      {{qry='%s.%s.id>0'%(db,table)}}
+      {{tbl=databases[db][table]}}
+      {{if hasattr(tbl,'_primarykey'):}}
+        {{if tbl._primarykey:}}
+            {{firstkey=tbl[tbl._primarykey[0]]}}
+            {{if firstkey.type in ['string','text']:}}
+              {{qry='%s.%s.%s!=""'%(db,table,firstkey.name)}}
+            {{else:}}
+              {{qry='%s.%s.%s>0'%(db,table,firstkey.name)}}
+            {{pass}}
+        {{else:}}
+             {{qry=''}}
+        {{pass}}
+      {{pass}}
+  <tr>
+    <th style="font-size: 1.75em;">
+      {{=A("%s.%s" % (db,table),_href=URL('select',args=[db],vars=dict(query=qry)))}}
+    </th>
+    <td>
+      {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}}
+    </td>
+  </tr>
+  {{pass}}
+  {{pass}}
+</table>
+
 {{elif request.function=='select':}}
   <h2>{{=XML(str(T("Database %s select"))%A(request.args[0],_href=URL('index'))) }}
   </h2>
@@ -75,7 +65,7 @@
     {{if start>0:}}{{=A(T('previous %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start-step)),_class="btn")}}{{pass}}
     {{if stop<nrows:}}{{=A(T('next %s rows') % step,_href=URL('select',args=request.args[0],vars=dict(start=start+step)),_class="btn")}}{{pass}}
     {{if rows:}}
-       <div style="overflow:auto; width:80%;">
+       <div style="overflow: auto;" width="80%">
        {{linkto = lambda f, t, r: URL('update', args=[request.args[0], r, f]) if f else "#"}}
        {{upload=URL('download',args=request.args[0])}}
        {{=SQLTABLE(rows,linkto,upload,orderby=True,_class='sortable')}}

applications/welcome/views/default/index.html

@@ -1,20 +1,30 @@
 {{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
 {{extend 'layout.html'}}
 
-{{if 'message' in globals():}}
-<h3>{{=message}}</h3>
+{{block header}}
+    <header class="container-fluid background">
+      <div class="jumbotron text-center">
+        {{if response.title:}}
+        <h1>{{=response.title}}
+          <small>{{=response.subtitle or ''}}</small></h1>
+        {{pass}}
+      </div>
+    </header>
+{{end}}
 
-<h4>{{=T('How did you get here?')}}</h4>
+{{if 'message' in globals():}}
+<h2>{{=message}}</h2>
+<p class="lead">{{=T('How did you get here?')}}</p>
 <ol>
   <li>{{=T('You are successfully running web2py')}}</li>
   <li>{{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}</li>
   <li>{{=XML(T('Which called the function %s located in the file %s',
-             (A(request.function+'()',_href='#'),
-              A('web2py/applications/%(application)s/controllers/%(controller)s.py'%request,
-               _href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}</li>
+    (A(request.function+'()',_href='#'),
+    A('web2py/applications/%(application)s/controllers/%(controller)s.py' % request,
+    _href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}</li>
   <li>{{=XML(T('The output of the file is a dictionary that was rendered by the view %s',
-           A('web2py/applications/%(application)s/views/%(controller)s/index.html'%request,
-           _href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}</li>
+    A('web2py/applications/%(application)s/views/%(controller)s/index.html' % request,
+    _href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}</li>
   <li>{{=T('You can modify this application and adapt it to your needs')}}</li>
 </ol>
 {{elif 'content' in globals():}}
@@ -24,12 +34,17 @@
 {{pass}}
 
 {{block right_sidebar}}
-{{=A(T("Administrative Interface"), _href=URL('admin','default','index'), _class='btn',
-     _style='margin-top: 1em;')}}
-<h6>{{=T("Don't know what to do?")}}</h6>
-<ul>
-  <li>{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
-  <li><a href="http://web2py.com">web2py.com</a></li>
-  <li><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
-</ul>
+<a id="w2padmin-btn" class="btn btn-primary btn-lg btn-block"
+   href="{{=URL('admin','default','index')}}">
+  <i class="glyphicon glyphicon-cog"></i>
+  {{=T("admin")}}
+</a>
+<div class="panel panel-info">
+  <div class="panel-heading">{{=T("Don't know what to do?")}}</div>
+  <ul class="list-group">
+    <li class="list-group-item">{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
+    <li class="list-group-item"><a href="http://web2py.com">web2py.com</a></li>
+    <li class="list-group-item"><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
+  </ul>
+</div>
 {{end}}

applications/welcome/views/default/user.html

@@ -1,25 +1,35 @@
 {{extend 'layout.html'}}
 
-<h2>{{=T( request.args(0).replace('_',' ').capitalize() )}}</h2>
-<div id="web2py_user_form">
-{{
-if request.args(0)=='login' and not session.auth_2_factor_user:
-    if not 'register' in auth.settings.actions_disabled:
-        form.add_button(T('Register'),URL(args='register', vars={'_next': request.vars._next} if request.vars._next else None),_class='btn')
-    pass
-    if not 'request_reset_password' in auth.settings.actions_disabled:
-        form.add_button(T('Lost Password'),URL(args='request_reset_password'),_class='btn')
-    pass
-pass
-=form
-}}
+<h2>
+{{=T('Sign Up') if request.args(0) == 'register' else T('Log In') if request.args(0) == 'login' else T(request.args(0).replace('_',' ').title())}}
+</h2>
+
+<div class="container">
+    <div class="row">
+        <div id="web2py_user_form" class="col-lg-6">
+        {{
+        if request.args(0)=='login':
+            if not 'register' in auth.settings.actions_disabled:
+                form.add_button(T('Sign Up'),URL(args='register', vars={'_next': request.vars._next} if request.vars._next else None),_class='btn btn-default')
+            pass
+            if not 'request_reset_password' in auth.settings.actions_disabled:
+                form.add_button(T('Lost Password'),URL(args='request_reset_password'),_class='btn btn-default')
+            pass
+        pass
+        =form
+        }}
+        </div>
+    </div>
 </div>
-<script language="javascript"><!--
-jQuery("#web2py_user_form input:visible:enabled:first").focus();
+
+
+{{block page_js}}
+<script>
+    jQuery("#web2py_user_form input:visible:enabled:first").focus();
 {{if request.args(0)=='register':}}
     web2py_validate_entropy(jQuery('#auth_user_password'),100);
-{{elif request.args(0) in ('change_password','reset_password'):}}
+{{elif request.args(0)=='change_password':}}
     web2py_validate_entropy(jQuery('#no_table_new_password'),100);
 {{pass}}
-//--></script>
-
+</script>
+{{end page_js}}

applications/welcome/views/layout.html

@@ -1,174 +1,132 @@
-<!--[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]-->
-<!--[if IE 7]><html class="ie ie7 ie-lte9 ie-lte8 ie-lte7 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
-<!--[if IE 8]><html class="ie ie8 ie-lte9 ie-lte8 no-js" lang="{{=T.accepted_language or 'en'}}"> <![endif]-->
-<!--[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>
-<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
-       Remove this if you use the .htaccess -->
-	   
-  <meta charset="utf-8" />
-
-  <!-- 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 -->
-  <meta name="google-site-verification" content="" />
-
-  <!--  Mobile Viewport Fix
-        j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
-        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
-        user-scalable = yes allows the user to zoom in -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-  <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
-  <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
-
-  <!-- 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.insert(0,URL('static','css/web2py.css'))
-  response.files.insert(1,URL('static','css/bootstrap.min.css'))
-  response.files.insert(2,URL('static','css/bootstrap-responsive.min.css'))
-  response.files.insert(3,URL('static','css/web2py_bootstrap.css'))
-  }}
-
-  {{include 'web2py_ajax.html'}}
-
-  {{
-  # 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'}[
+  <head>
+    <meta charset="utf-8">
+    <!-- www.phpied.com/conditional-comments-block-downloads/ -->
+    <!-- Always force latest IE rendering engine
+         (even in intranet) & Chrome Frame
+         Remove this if you use the .htaccess -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge{{=not request.is_local and ',chrome=1' or ''}}">
+    <!--  Mobile Viewport Fix
+          j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
+          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
+          user-scalable = yes allows the user to zoom in -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <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 -->
+    <meta name="google-site-verification" content="">
+    <!-- include stylesheets -->
+    <link rel="stylesheet" href="{{=URL('static','css/bootstrap.min.css')}}"/>
+    <link rel="stylesheet" href="{{=URL('static','css/bootstrap-theme.min.css')}}"/>
+    <link rel="stylesheet" href="{{=URL('static','css/web2py-bootstrap3.css')}}"/>
+    <link rel="shortcut icon" href="{{=URL('static','images/favicon.ico')}}" type="image/x-icon">
+    <link rel="apple-touch-icon" href="{{=URL('static','images/favicon.png')}}">
+    <!-- All JavaScript at the bottom, except for Modernizr which enables
+         HTML5 elements & feature detects -->
+    <script src="{{=URL('static','js/modernizr-2.8.3.min.js')}}"><script>
+    <!--[if lt IE 9]>
+        <script src="{{=URL('static','js/respond-1.4.2.min.js')}}"></script>
+        <![endif]-->
+    <!-- Favicons -->
+    {{include 'web2py_ajax.html'}} <!-- this includes jquery.js, calendar.js/.css and web2py.js -->
+    {{block head}}{{end}}
+    {{
+    # using sidebars need to know what sidebar you want to use
+    mc0 = 'col-md-12'
+    mc1 = 'col-md-9'
+    mc2 = 'col-md-6'
+    left_sidebar_enabled = globals().get('left_sidebar_enabled', False)
+    right_sidebar_enabled = globals().get('right_sidebar_enabled', False)
+    middle_column = {0: mc0, 1: mc1, 2: mc2}[
     (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.10.3/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" />
-       <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js" type="text/javascript"></script>
-       uncomment to load jquery-ui //-->
-  <noscript><link href="{{=URL('static', 'css/web2py_bootstrap_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
-  {{block head}}{{end}}
-</head>
-
-<body>
-  <!-- Navbar ================================================== -->
-  <div class="navbar navbar-inverse">
-    <div class="flash">{{=response.flash or ''}}</div>
-    <div class="navbar-inner">
+    }}
+  </head>
+  <body>
+    <!--[if lt IE 8]><p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p><![endif]-->
+    <div class="flash alert alert-dismissable">{{=response.flash or ''}}</div>
+    <!-- Navbar ======================================= -->
+    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container">
-        {{is_mobile=request.user_agent().is_mobile}}
-        <!-- the next tag is necessary for bootstrap menus, do not remove -->
-        <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse" style="{{='display:none;' if not is_mobile else ''}}">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        {{=response.logo or ''}}
-        <ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul>
-        <div class="{{='nav-collapse' if is_mobile else 'nav'}}">
-          {{if response.menu:}}
-          {{=MENU(response.menu, _class='mobile-menu nav' if is_mobile else 'nav',mobile=is_mobile,li_class='dropdown',ul_class='dropdown-menu')}}
-          {{pass}}
-        </div><!--/.nav-collapse -->
-      </div>
-    </div>
-  </div><!--/top navbar -->
-
-  <div class="container">
-    <!-- Masthead ================================================== -->
-    <header class="mastheader row" id="header">
-      {{if response.title:}}
-        <div class="span12">
-            <div class="page-header">
-                <h1>
-                    {{=response.title}}
-                    <small>{{=response.subtitle or ''}}</small>
-                </h1>
-            </div>
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          {{=response.logo or ''}}
         </div>
-	{{pass}}
-    </header>
-
-    <section id="main" class="main row">
-        {{if left_sidebar_enabled:}}
-        <div class="span3 left-sidebar">
+        <div class="collapse navbar-collapse navbar-ex1-collapse">
+          <ul class="nav navbar-nav navbar-right">
+            {{='auth' in globals() and auth.navbar('Welcome',mode='dropdown') or ''}}
+          </ul>
+          {{if response.menu:}}
+          {{=MENU(response.menu, _class='nav navbar-nav',li_class='dropdown',ul_class='dropdown-menu')}}
+          {{pass}}
+        </div>
+      </div>
+    </nav>
+    <!-- Masthead ===================================== -->    
+    {{block header}}
+    {{end}}
+    <!-- Main ========================================= -->
+    <!-- Begin page content -->
+    <div class="container-fluid">
+      {{if left_sidebar_enabled:}}
+        <div class="col-md-3 left-sidebar">
             {{block left_sidebar}}
             <h3>Left Sidebar</h3>
             <p></p>
             {{end}}
         </div>
-        {{pass}}
+      {{pass}}
 
-        <div class="{{=middle_columns}}">
-            {{block center}}
-            {{include}}
-            {{end}}
-        </div>
+      <div class="{{=middle_column}}">
+        {{block center}}
+        {{include}}
+        {{end}}
+      </div>
 
-        {{if right_sidebar_enabled:}}
-        <div class="span3">
+      {{if right_sidebar_enabled:}}
+        <div class="col-md-3">
             {{block right_sidebar}}
             <h3>Right Sidebar</h3>
             <p></p>
             {{end}}
         </div>
-        {{pass}}
-    </section><!--/main-->
+      {{pass}}
 
-    <!-- Footer ================================================== -->
-    <div class="row">
-        <footer class="footer span12" id="footer">
-            <div class="footer-content">
-                {{block footer}} <!-- this is default footer -->
-                <div class="copyright pull-left">{{=T('Copyright')}} &#169; {{=request.now.year}}</div>
-                <div id="poweredBy" class="pull-right">
-                    {{=T('Powered by')}}
-                    <a href="http://www.web2py.com/">web2py</a>
-                </div>
-                {{end}}
-            </div>
-        </footer>
     </div>
 
-  </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> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
-      <![endif]-->
-  
-  {{if response.google_analytics_id:}}
-  <!-- Google Analytics -->
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', '{{=response.google_analytics_id}}', 'auto');
-    ga('send', 'pageview');
-  </script>
-  <!-- End Google Analytics -->
-  {{pass}}
-  <script src="{{=URL('static','js/share.js',vars=dict(static=URL('static','images')))}}"></script>
-</body>
+    {{block footer}} <!-- this is default footer -->      
+    <footer class="footer">
+      <div class="container-fluid">
+        <div class="copyright pull-left">{{=T('Copyright')}} &#169; {{=request.now.year}}</div>
+          <div id="poweredBy" class="pull-right">
+            {{=T('Powered by')}}
+            <a href="http://www.web2py.com/">web2py</a>
+          </div>
+      </div>
+    </footer>
+    {{end}}
+    <!-- The javascript =============================== -->
+    <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
+    <script src="{{=URL('static','js/web2py-bootstrap3.js')}}"></script>
+    {{block page_js}}{{end page_js}}
+    {{if response.google_analytics_id:}}
+    <!-- Analytics ==================================== -->
+    <script src="{{=URL('static','js/analytics.min.js')}}"></script>
+    <script type="text/javascript">
+      analytics.initialize({
+      'Google Analytics':{trackingId:'{{=response.google_analytics_id}}'}
+      });
+    </script>
+    {{pass}}
+    <!-- Share ============================y============ -->
+    <script src="{{=URL('static','js/share.js',vars=dict(static=URL('static','images')))}}"></script>
+  </body>
 </html>
-