fixed type in dal with simplejson, thanks Mart

Use T operator fot title attribute of grid buttons

.gitignore

@@ -52,5 +52,4 @@ applications/*/*.py[oc]
 applications/examples/static/epydoc
 applications/examples/static/sphinx
 applications/admin/cron/cron.master
-
+HOWTO-web2py-devel
-

.travis.yml

@@ -0,0 +1,38 @@
+language: python
+
+python:
+  - '2.5'
+  - '2.6'
+  - '2.7'
+  - 'pypy'
+install:
+  - pip install -e . --use-mirrors
+env:
+  - DB=sqlite:memory
+  - DB=mysql://root:@localhost/test_w2p
+  - DB=postgres://postgres:@localhost/test_w2p
+before_script:
+  - if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then pip install --use-mirrors unittest2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors coverage; fi;
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install --use-mirrors python-coveralls; fi
+  - 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
+matrix:
+  exclude:
+    - python: 'pypy'
+      env: DB=postgres://postgres:@localhost/test_w2p
+    - python: 'pypy'
+      env: DB=mysql://root:@localhost/test_w2p
+
+script: export COVERAGE_PROCESS_START=gluon/tests/coverage.ini; ./web2py.py --run_system_tests --with_coverage
+after_success:
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coverage combine; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --config_file=gluon/tests/coverage.ini; fi
+  
+notifications:
+  email: true

ABOUT

@@ -0,0 +1,6 @@
+web2py is an open source full-stack framework for agile development 
+of secure database-driven web-based applications, written and programmable in 
+Python. 
+
+Created by Massimo Di Pierro <mdipierro@cs.depaul.edu>
+

CHANGELOG

@@ -1,3 +1,91 @@
+## 2.4.7
+
+- pypy support, thanks Niphlod
+- more bug fixes
+- ...
+
+## 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
+- schema export with db.as_json/as_xml, thanks Alan
+- graph representation of models
+- admin based on bootstrap, thanks Paolo
+- support for semantic versioning
+- new bootstrap based admin, thanks Paolo
+- improved scheduler (and change in scheduler field names), thanks Niphlod
+- graphiz support added to adm, thanks Jose
+- on_failure in grid
+- db.table.field.abs()
+- better wiki
+- geoPoint, getLine, geoPolygon
+- better reporting of 500 ajax errors
+- better grid
+- improved/fixed mongodb support
+- improved parse_as_rest(patterns=...), thanks Denes
+- improved IMAP DAL support, thanks Alan
+- improved security when cookies in sessions
+- Row.as_xml, as_json, as_dict, as_yaml thanks Alan
+- smarted custom_import
+- setup-ubuntu-12-04-redmine-unicorn-web2py-uwsgi-nginx.sh
+- added support for motor and pulsar servers, thanks Niphlod
+- added json-rpc2 support
+- added pypyodbc.py driver
+- allow auth.settings.ondelete='CASCADE'
+- new syntax IS_EXPR(lambda value: ...
+- using google for QR codes (although Graph API will be deprecated in 2015)
+- upgraded fpdf to 1.7.1
+- bug fixes (including issues with calendar.js and archive tables)
+
+## 2.3.1 - 2.3.2
+
+- new virtual fields syntax: 
+  ``db.define_table('person',Field('name'),Field.Virtual('namey',lambda row: row.person.name+'y'))``
+- db.thing(name='Cohen',_orderby=db.thing.name), thanks Yair
+- made many modules Python 3.3 friendly (compile but not tested)
+- better welcome css, thanks Paolo
+- jQuery 1.8.3
+- Bootstrap 2.2.2
+- Modernizr 2.6.2 (custom full options)
+- integration with analyitics.js (0.2.0)
+- better scheduler, thanks Niphlod
+- page and media preview in wiki, thanks Niphlod
+- create new auth.wiki page from slug model, thanks Nico
+- conditional menus with auth.wiki(menugroups=['wiki_editor'])
+- better security in grid/smartgrid
+- allow LOADing multiple grids, thanks Niphlod
+- auth.settings.login_onfail, thanks Yair
+- better handling of session files for speed
+- added heroku support (experimental)
+- added rocket support for IPV6, thanks Chirs Winebrinner
+- more customizable menus with MENU(li_first, li_last..)
+- added support for paymentech (gluon/contrib/paymentech.py)
+- fixed broken cron
+- fixed possible xss with share.js
+- many bug fixes. Closed more than 50 tickets since 2.2.1
+
+## 2.2.1
+
+- session.connect(cookie_key='secret', compression_level=9) stores sessions in cookies
+- T.is_writable = False prevents T from dynamically updating langauge files
+- all code is more PEP8 compliant
+- better custom_importer behaviour (now works per app, is smalled and faster)
+- fixed some bugs
+- upgraded feedparser.py and rss2.py
+- codemirror has autoresize
+
 ## 2.1.0
 
 - overall faster web2py

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

@@ -29,7 +29,8 @@ update:
 	wget -O gluon/contrib/simplejsonrpc.py http://rad2py.googlecode.com/hg/ide2py/simplejsonrpc.py
 	echo "remember that pymysql was tweaked"
 src:
-	echo 'Version 2.1.1 ('`date +%Y-%m-%d\ %H:%M:%S`') stable' > VERSION
+	### Use semantic versioning
+	echo 'Version 2.4.7-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
@@ -43,6 +44,8 @@ src:
 	rm -f applications/admin/uploads/*                 
 	rm -f applications/welcome/uploads/*               
 	rm -f applications/examples/uploads/* 
+	### make epydoc
+	make epydoc
 	### make welcome layout and appadmin the default
 	cp applications/welcome/views/appadmin.html applications/admin/views
 	cp applications/welcome/views/appadmin.html applications/examples/views
@@ -51,21 +54,19 @@ src:
 	### build web2py_src.zip
 	echo '' > NEWINSTALL
 	mv web2py_src.zip web2py_src_old.zip | echo 'no old'
-	cd ..; zip -r web2py/web2py_src.zip web2py/gluon/*.py web2py/gluon/contrib/* web2py/splashlogo.gif web2py/*.py web2py/README.markdown  web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/Makefile web2py/epydoc.css web2py/epydoc.conf web2py/app.example.yaml web2py/logging.example.conf web2py_exe.conf web2py/queue.example.yaml MANIFEST.in w2p_apps w2p_clone w2p_run startweb2py web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py
+	cd ..; zip -r web2py/web2py_src.zip web2py/gluon/*.py web2py/gluon/contrib/* web2py/splashlogo.gif web2py/*.py web2py/README.markdown  web2py/LICENSE web2py/CHANGELOG web2py/NEWINSTALL web2py/VERSION web2py/Makefile web2py/epydoc.css web2py/epydoc.conf web2py/app.example.yaml web2py/logging.example.conf web2py/queue.example.yaml web2py/MANIFEST.in web2py/w2p_apps web2py/w2p_clone web2py/w2p_run web2py/web2py.cio web2py/web2py.gif web2py/scripts/*.sh web2py/scripts/*.py web2py/applications/admin web2py/applications/examples/ web2py/applications/welcome web2py/applications/__init__.py web2py/site-packages/__init__.py web2py/gluon/tests/*.sh web2py/gluon/tests/*.py
 
 mdp:
-	make epydoc
 	make src
 	make app
 	make win
 app:
-	echo 'did you uncomment import_all in gluon/main.py?'
+	python2.7 -c 'import compileall; compileall.compile_dir("gluon/")'
-	python2.5 -c 'import compileall; compileall.compile_dir("gluon/")'
 	#python web2py.py -S welcome -R __exit__.py
 	#cd ../web2py_osx/site-packages/; unzip ../site-packages.zip
 	find gluon -path '*.pyc' -exec cp {} ../web2py_osx/site-packages/{} \;
 	cd ../web2py_osx/site-packages/; zip -r ../site-packages.zip *
-	mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.5
+	mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7
 	cp README.markdown ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp NEWINSTALL ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp LICENSE ../web2py_osx/web2py/web2py.app/Contents/Resources
@@ -84,7 +85,6 @@ app:
 	cd ../web2py_osx; zip -r web2py_osx.zip web2py
 	mv ../web2py_osx/web2py_osx.zip .
 win:
-	echo 'did you uncomment import_all in gluon/main.py?'
 	python2.7 -c 'import compileall; compileall.compile_dir("gluon/")'
 	#cd ../web2py_win/library/; unzip ../library.zip
 	find gluon -path '*.pyc' -exec cp {} ../web2py_win/library/{} \;
@@ -108,18 +108,17 @@ win:
 	cd ../web2py_win; zip -r web2py_win.zip web2py
 	mv ../web2py_win/web2py_win.zip .
 run:
-	python2.5 web2py.py -a hello
+	python2.7 web2py.py -a hello
 commit:
 	python web2py.py --run_system_tests
 	make src
 	echo '' > NEWINSTALL
 	hg commit -m "$(S)"
-	#bzr commit -m "$(S)"
 	git commit -a -m "$(S)"
 push:
 	hg push
 	git push
-	git push mdipierro
+	git push --tags
 tag:
 	git tag -l '$(S)'
 	hg tag -l '$(S)'
@@ -130,5 +129,5 @@ pip:
 	# after upload clean Web2py sources with rm -R ./dist
 	# http://guide.python-distribute.org/creation.html
 	python setup.py sdist
-	python setup.py register
+	sudo python setup.py register
-	python setup.py sdist upload
+	sudo python setup.py sdist upload

README.markdown

@@ -6,6 +6,13 @@ 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)
+
+[![Coverage Status](https://coveralls.io/repos/web2py/web2py/badge.png)](https://coveralls.io/r/web2py/web2py)
+
 ## Installation Instructions
 
 To start web2py there is NO NEED to install it. Just unzip and do:

VERSION

@@ -1 +1 @@
-Version 2.1.1 (2012-10-15 06:40:52) stable
+Version 2.4.7-stable+timestamp.2013.05.25.10.38.02

__init__.py

@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-

anyserver.py

@@ -9,12 +9,15 @@ License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
 This file is based, although a rewrite, on MIT-licensed code from the Bottle web framework.
 """
 
-import os, sys, optparse, urllib
+import os
+import sys
+import optparse
+import urllib
+
 path = os.path.dirname(os.path.abspath(__file__))
 os.chdir(path)
 sys.path = [path] + [p for p in sys.path if not p == path]
-import gluon.main
+
-from gluon.fileutils import read_file, write_file
 
 class Servers:
     @staticmethod
@@ -30,8 +33,10 @@ class Servers:
     @staticmethod
     def wsgiref(app, address, **options):  # pragma: no cover
         from wsgiref.simple_server import make_server, WSGIRequestHandler
+
         class QuietHandler(WSGIRequestHandler):
-            def log_request(*args, **kw): pass
+            def log_request(*args, **kw):
+                pass
         options['handler_class'] = QuietHandler
         srv = make_server(address[0], address[1], app, **options)
         srv.serve_forever()
@@ -76,19 +81,19 @@ class Servers:
         from fapws import base
         evwsgi.start(address[0], str(address[1]))
         evwsgi.set_base_module(base)
+
         def app(environ, start_response):
             environ['wsgi.multiprocess'] = False
             return app(environ, start_response)
         evwsgi.wsgi_cb(('', app))
         evwsgi.run()
 
-
     @staticmethod
     def gevent(app, address, **options):
-        from gevent import monkey; monkey.patch_all()
         from gevent import pywsgi
         from gevent.pool import Pool
-        pywsgi.WSGIServer(address, app, spawn = 'workers' in options and Pool(int(options.workers)) or 'default').serve_forever()
+        pywsgi.WSGIServer(address, app, spawn='workers' in options and Pool(
+            int(options.workers)) or 'default').serve_forever()
 
     @staticmethod
     def bjoern(app, address, **options):
@@ -129,9 +134,11 @@ class Servers:
         config = {'bind': "%s:%d" % address}
         config.update(options)
         sys.argv = ['anyserver.py']
+
         class GunicornApplication(Application):
             def init(self, parser, opts, args):
                 return config
+
             def load(self):
                 return app
         g = GunicornApplication()
@@ -152,8 +159,30 @@ class Servers:
                                   "tcp://127.0.0.1:9996")
         mongrel2_handler(app, conn, debug=False)
 
+    @staticmethod
+    def motor(app, address, **options):
+        #https://github.com/rpedroso/motor
+        import motor
+        app = motor.WSGIContainer(app)
+        http_server = motor.HTTPServer(app)
+        http_server.listen(address=address[0], port=address[1])
+        #http_server.start(2)
+        motor.IOLoop.instance().start()
+
+    @staticmethod
+    def pulsar(app, address, **options):
+        from pulsar.apps import wsgi
+        sys.argv = ['anyserver.py']
+        s = wsgi.WSGIServer(callable=app, bind="%s:%d" % address)
+        s.start()
 
 def run(servername, ip, port, softcron=True, logging=False, profiler=None):
+    if servername == 'gevent':
+        from gevent import monkey
+        monkey.patch_all()
+
+    import gluon.main
+
     if logging:
         application = gluon.main.appfactory(wsgiapp=gluon.main.wsgibase,
                                             logfilename='httpserver.log',
@@ -165,6 +194,7 @@ def run(servername,ip,port,softcron=True,logging=False,profiler=None):
         global_settings.web2py_crontype = 'soft'
     getattr(Servers, servername)(application, (ip, int(port)))
 
+
 def mongrel2_handler(application, conn, debug=False):
     """
     Based on :
@@ -190,14 +220,17 @@ def mongrel2_handler(application,conn,debug=False):
     # and responses. Unless I have missed something.
 
     while True:
-        if debug: print "WAITING FOR REQUEST"
+        if debug:
+            print "WAITING FOR REQUEST"
 
         # receive a request
         req = conn.recv()
-        if debug: print "REQUEST BODY: %r\n" % req.body
+        if debug:
+            print "REQUEST BODY: %r\n" % req.body
 
         if req.is_disconnect():
-            if debug: print "DISCONNECT"
+            if debug:
+                print "DISCONNECT"
             continue  # effectively ignore the disconnect from the client
 
         # Set a couple of environment attributes a.k.a. header attributes
@@ -217,11 +250,13 @@ def mongrel2_handler(application,conn,debug=False):
             environ['QUERY_STRING'] = environ['URI'].split('?')[1]
         else:
             environ['QUERY_STRING'] = ''
-        if environ.has_key('Content-Length'):
+        if 'Content-Length' in environ:
-            environ['CONTENT_LENGTH'] = environ['Content-Length'] # necessary for POST to work with Django
+            environ['CONTENT_LENGTH'] = environ[
+                'Content-Length']  # necessary for POST to work with Django
         environ['wsgi.input'] = req.body
 
-        if debug: print "ENVIRON: %r\n" % environ
+        if debug:
+            print "ENVIRON: %r\n" % environ
 
         # SimpleHandler needs file-like stream objects for
         # requests, errors and responses
@@ -230,7 +265,8 @@ def mongrel2_handler(application,conn,debug=False):
         respIO = StringIO.StringIO()
 
         # execute the application
-        handler = SimpleHandler(reqIO, respIO, errIO, environ, multithread = False, multiprocess = False)
+        handler = SimpleHandler(reqIO, respIO, errIO, environ,
+                                multithread=False, multiprocess=False)
         handler.run(application)
 
         # Get the response and filter out the response (=data) itself,
@@ -254,16 +290,20 @@ def mongrel2_handler(application,conn,debug=False):
         errors = errIO.getvalue()
 
         # return the response
-        if debug: print "RESPONSE: %r\n" % response
+        if debug:
+            print "RESPONSE: %r\n" % response
         if errors:
-            if debug: print "ERRORS: %r" % errors
+            if debug:
+                print "ERRORS: %r" % errors
             data = "%s\r\n\r\n%s" % (data, errors)
-        conn.reply_http(req, data, code = code, status = status, headers = headers)
+        conn.reply_http(
+            req, data, code=code, status=status, headers=headers)
+
 
 def main():
     usage = "python anyserver.py -s tornado -i 127.0.0.1 -p 8000 -l -P"
     try:
-        version = read_file('VERSION')
+        version = open('VERSION','r')
     except IOError:
         version = ''
     parser = optparse.OptionParser(usage, None, optparse.Option, version)
@@ -300,13 +340,10 @@ def main():
                       dest='workers',
                       help='number of workers number')
     (options, args) = parser.parse_args()
-    print 'starting %s on %s:%s...' % (options.server,options.ip,options.port)
+    print 'starting %s on %s:%s...' % (
-    run(options.server,options.ip,options.port,logging=options.logging,profiler=options.profiler)
+        options.server, options.ip, options.port)
+    run(options.server, options.ip, options.port,
+        logging=options.logging, profiler=options.profiler)
 
 if __name__ == '__main__':
     main()
-
-
-
-
-

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/(.+)

appengine_config.example.py

@@ -2,8 +2,3 @@ def webapp_add_wsgi_middleware(app):
     from google.appengine.ext.appstats import recording
     app = recording.appstats_wsgi_middleware(app)
     return app
-
-
-
-
-

applications/__init__.py

@@ -0,0 +1 @@
+

applications/admin/__init__.py

@@ -0,0 +1 @@
+

applications/admin/controllers/appadmin.py

@@ -11,6 +11,11 @@ import copy
 import gluon.contenttype
 import gluon.fileutils
 
+try:
+    import pygraphviz as pgv
+except ImportError:
+    pgv = None
+
 response.subtitle = 'Database Administration (appadmin)'
 
 # ## critical --- make a copy of the environment
@@ -49,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 = {}
@@ -102,17 +111,16 @@ def query_by_table_type(tablename,db,request=request):
         cond = '>0'
         if firstkey.type in ['string', 'text']:
             cond = '!=""'
-        qry = '%s.%s.%s%s' % (request.args[0], request.args[1], firstkey.name, cond)
+        qry = '%s.%s.%s%s' % (
+            request.args[0], request.args[1], firstkey.name, cond)
     else:
         qry = '%s.%s.id>0' % tuple(request.args[:2])
     return qry
 
 
-
 # ##########################################################
 # ## list all databases and tables
 # ###########################################################
-
 def index():
     return dict(databases=databases)
 
@@ -140,6 +148,7 @@ def download():
     db = get_database(request)
     return response.download(request, db)
 
+
 def csv():
     import gluon.contenttype
     response.headers['Content-Type'] = \
@@ -156,6 +165,7 @@ def csv():
 def import_csv(table, file):
     table.import_from_csv_file(file)
 
+
 def select():
     import re
     db = get_database(request)
@@ -192,7 +202,8 @@ def select():
     session.last_query = request.vars.query
     form = FORM(TABLE(TR(T('Query:'), '', INPUT(_style='width:400px',
                 _name='query', _value=request.vars.query or '',
-                requires=IS_NOT_EMPTY(error_message=T("Cannot be empty")))), TR(T('Update:'),
+                requires=IS_NOT_EMPTY(
+                    error_message=T("Cannot be empty")))), TR(T('Update:'),
                 INPUT(_name='update_check', _type='checkbox',
                 value=False), INPUT(_style='width:400px',
                 _name='update_fields', _value=request.vars.update_fields
@@ -200,13 +211,14 @@ def select():
                 _class='delete', _type='checkbox', value=False), ''),
                 TR('', '', INPUT(_type='submit', _value=T('submit')))),
                 _action=URL(r=request, args=request.args))
+
+    tb = None
     if form.accepts(request.vars, formname=None):
         regex = re.compile(request.args[0] + '\.(?P<table>\w+)\..+')
         match = regex.match(form.vars.query.strip())
         if match:
             table = match.group('table')
         try:
-            tb = None
             nrows = db(query).count()
             if form.vars.update_check and form.vars.update_fields:
                 db(query).update(**eval_in_global_env('dict(%s)'
@@ -217,9 +229,11 @@ def select():
                 response.flash = T('%s %%{row} deleted', nrows)
             nrows = db(query).count()
             if orderby:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop), orderby=eval_in_global_env(orderby))
+                rows = db(query, ignore_common_filters=True).select(limitby=(
+                    start, stop), orderby=eval_in_global_env(orderby))
             else:
-                rows = db(query,ignore_common_filters=True).select(limitby=(start, stop))
+                rows = db(query, ignore_common_filters=True).select(
+                    limitby=(start, stop))
         except Exception, e:
             import traceback
             tb = traceback.format_exc()
@@ -265,12 +279,15 @@ def update():
     (db, table) = get_table(request)
     keyed = hasattr(db[table], '_primarykey')
     record = None
+    db[table]._common_filter = None
     if keyed:
         key = [f for f in request.vars if f in db[table]._primarykey]
         if key:
-            record = db(db[table][key[0]] == request.vars[key[0]], ignore_common_filters=True).select().first()
+            record = db(db[table][key[0]] == request.vars[key[
+                        0]]).select().first()
     else:
-        record = db(db[table].id == request.args(2),ignore_common_filters=True).select().first()
+        record = db(db[table].id == request.args(
+            2)).select().first()
 
     if not record:
         qry = query_by_table_type(table, db)
@@ -282,7 +299,8 @@ def update():
         for k in db[table]._primarykey:
             db[table][k].writable = False
 
-    form = SQLFORM(db[table], record, deletable=True, delete_label=T('Check to delete'),
+    form = SQLFORM(
+        db[table], record, deletable=True, delete_label=T('Check to delete'),
         ignore_rw=ignore_rw and not keyed,
         linkto=URL('select',
                    args=request.args[:1]), upload=URL(r=request,
@@ -304,11 +322,18 @@ def update():
 def state():
     return dict()
 
+
 def ccache():
+    cache.ram.initialize()
+    cache.disk.initialize()
+
     form = FORM(
-        P(TAG.BUTTON(T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
+        P(TAG.BUTTON(
-        P(TAG.BUTTON(T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+            T("Clear CACHE?"), _type="submit", _name="yes", _value="yes")),
-        P(TAG.BUTTON(T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
+        P(TAG.BUTTON(
+            T("Clear RAM"), _type="submit", _name="ram", _value="ram")),
+        P(TAG.BUTTON(
+            T("Clear DISK"), _type="submit", _name="disk", _value="disk")),
     )
 
     if form.accepts(request.vars, session):
@@ -332,11 +357,16 @@ def ccache():
         redirect(URL(r=request))
 
     try:
-        from guppy import hpy; hp=hpy()
+        from guppy import hpy
+        hp = hpy()
     except ImportError:
         hp = False
 
-    import shelve, os, copy, time, math
+    import shelve
+    import os
+    import copy
+    import time
+    import math
     from gluon import portalocker
 
     ram = {
@@ -363,7 +393,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']
@@ -379,11 +409,13 @@ def ccache():
             if value[0] < ram['oldest']:
                 ram['oldest'] = value[0]
             ram['keys'].append((key, GetInHMS(time.time() - value[0])))
-
+    folder = os.path.join(request.folder,'cache')
-    locker = open(os.path.join(request.folder,
+    if not os.path.exists(folder):
-                                        'cache/cache.lock'), 'a')
+        os.mkdir(folder)
+    locker = open(os.path.join(folder, 'cache.lock'), 'a')
     portalocker.lock(locker, portalocker.LOCK_EX)
-    disk_storage = shelve.open(os.path.join(request.folder, 'cache/cache.shelve'))
+    disk_storage = shelve.open(
+        os.path.join(folder, 'cache.shelve'))
     try:
         for key, value in disk_storage.items():
             if isinstance(value, dict):
@@ -414,7 +446,8 @@ def ccache():
     total['misses'] = ram['misses'] + disk['misses']
     total['keys'] = ram['keys'] + disk['keys']
     try:
-        total['ratio'] = total['hits'] * 100 / (total['hits'] + total['misses'])
+        total['ratio'] = total['hits'] * 100 / (total['hits'] +
+                                                total['misses'])
     except (KeyError, ZeroDivisionError):
         total['ratio'] = 0
 
@@ -442,4 +475,101 @@ def ccache():
                 ram=ram, disk=disk, object_stats=hp != False)
 
 
+def table_template(table):
+    from gluon.html import TR, TD, TABLE, TAG
 
+    def FONT(*args, **kwargs):
+        return TAG.font(*args, **kwargs)
+
+    def types(field):
+        f_type = field.type
+        if not isinstance(f_type,str):
+            return ' '
+        elif f_type == 'string':
+            return field.length
+        elif f_type == 'id':
+            return B('pk')
+        elif f_type.startswith('reference') or \
+                f_type.startswith('list:reference'):
+            return B('fk')
+        else:
+            return ' '
+
+    # This is horribe HTML but the only one graphiz understands
+    rows = []
+    cellpadding = 4
+    color = "#000000"
+    bgcolor = "#FFFFFF"
+    face = "Helvetica"
+    face_bold = "Helvetica Bold"
+    border = 0
+
+    rows.append(TR(TD(FONT(table, _face=face_bold, _color=bgcolor),
+                           _colspan=3, _cellpadding=cellpadding,
+                           _align="center", _bgcolor=color)))
+    for row in db[table]:
+        rows.append(TR(TD(FONT(row.name, _color=color, _face=face_bold),
+                              _align="left", _cellpadding=cellpadding,
+                              _border=border),
+                       TD(FONT(row.type, _color=color, _face=face),
+                               _align="left", _cellpadding=cellpadding,
+                               _border=border),
+                       TD(FONT(types(row), _color=color, _face=face),
+                               _align="center", _cellpadding=cellpadding,
+                               _border=border)))
+    return "< %s >" % TABLE(*rows, **dict(_bgcolor=bgcolor, _border=1,
+                                          _cellborder=0, _cellspacing=0)
+                             ).xml()
+
+
+def bg_graph_model():
+    graph = pgv.AGraph(layout='dot',  directed=True,  strict=False,  rankdir='LR')
+    
+    subgraphs = dict()    
+    for tablename in db.tables:
+        if hasattr(db[tablename],'_meta_graphmodel'):
+            meta_graphmodel = db[tablename]._meta_graphmodel
+        else:
+            meta_graphmodel = dict(group='Undefined', color='#ECECEC')
+        
+        group = meta_graphmodel['group'].replace(' ', '') 
+        if not subgraphs.has_key(group):
+            subgraphs[group] = dict(meta=meta_graphmodel, tables=[])
+            subgraphs[group]['tables'].append(tablename)
+        else:
+            subgraphs[group]['tables'].append(tablename)        
+      
+        graph.add_node(tablename, name=tablename, shape='plaintext',
+                       label=table_template(tablename))
+    
+    for n, key in enumerate(subgraphs.iterkeys()):        
+        graph.subgraph(nbunch=subgraphs[key]['tables'],
+                    name='cluster%d' % n,
+                    style='filled',
+                    color=subgraphs[key]['meta']['color'],
+                    label=subgraphs[key]['meta']['group'])   
+
+    for tablename in db.tables:
+        for field in db[tablename]:
+            f_type = field.type
+            if isinstance(f_type,str) and (
+                f_type.startswith('reference') or
+                f_type.startswith('list:reference')):
+                referenced_table = f_type.split()[1].split('.')[0]
+                n1 = graph.get_node(tablename)
+                n2 = graph.get_node(referenced_table)
+                graph.add_edge(n1, n2, color="#4C4C4C", label='')
+
+    graph.layout()
+    #return graph.draw(format='png', prog='dot')
+    if not request.args:
+        return graph.draw(format='png', prog='dot')
+    else:       
+        response.headers['Content-Disposition']='attachment;filename=graph.%s'%request.args(0)
+        if request.args(0) == 'dot':        
+            return graph.string()
+        else:
+            return graph.draw(format=request.args(0), prog='dot')
+
+def graph_model():    
+    return dict(databases=databases, pgv=pgv)

applications/admin/controllers/debug.py

@@ -5,7 +5,8 @@ import gluon.contrib.shell
 import gluon.dal
 import gluon.html
 import gluon.validators
-import code, thread
+import code
+import thread
 from gluon.debug import communicate, web_debugger, qdb_debugger
 import pydoc
 
@@ -16,6 +17,7 @@ if DEMO_MODE or MULTI_USER_MODE:
 
 FE = 10 ** 9
 
+
 def index():
     app = request.args(0) or 'admin'
     reset()
@@ -23,6 +25,7 @@ def index():
     data = communicate()
     return dict(app=app, data=data)
 
+
 def callback():
     app = request.args[0]
     command = request.vars.statement
@@ -31,6 +34,7 @@ def callback():
     k = len(session['debug_commands:' + app]) - 1
     return '[%i] %s%s\n' % (k + 1, command, output)
 
+
 def reset():
     app = request.args(0) or 'admin'
     session['debug_commands:' + app] = []
@@ -81,26 +85,32 @@ def interact():
                 f_globals=f_globals, f_locals=f_locals,
                 exception=web_debugger.exception_info)
 
+
 def step():
     web_debugger.do_step()
     redirect(URL("interact"))
 
+
 def next():
     web_debugger.do_next()
     redirect(URL("interact"))
 
+
 def cont():
     web_debugger.do_continue()
     redirect(URL("interact"))
 
+
 def ret():
     web_debugger.do_return()
     redirect(URL("interact"))
 
+
 def stop():
     web_debugger.do_quit()
     redirect(URL("interact"))
 
+
 def execute():
     app = request.args[0]
     command = request.vars.statement
@@ -166,6 +176,8 @@ def toggle_breakpoint():
     try:
         filename = os.path.join(request.env['applications_parent'],
                                 'applications', request.vars.filename)
+        # normalize path name: replace slashes, references, etc...
+        filename = os.path.normpath(os.path.normcase(filename))
         if not request.vars.data:
             # ace send us the line number!
             lineno = int(request.vars.sel_start) + 1
@@ -182,6 +194,8 @@ def toggle_breakpoint():
         if lineno is not None:
             for bp in qdb_debugger.do_list_breakpoint():
                 no, bp_filename, bp_lineno, temporary, enabled, hits, cond = bp
+                # normalize path name: replace slashes, references, etc...
+                bp_filename = os.path.normpath(os.path.normcase(bp_filename))
                 if filename == bp_filename and lineno == bp_lineno:
                     err = qdb_debugger.do_clear_breakpoint(filename, lineno)
                     response.flash = T("Removed Breakpoint on %s at line %s", (
@@ -199,3 +213,25 @@ def toggle_breakpoint():
         session.flash = str(e)
     return response.json({'ok': ok, 'lineno': lineno})
     
+def list_breakpoints():
+    "Return a list of linenumbers for current breakpoints"
+
+    breakpoints = []
+    ok = None
+    try:
+        filename = os.path.join(request.env['applications_parent'],
+                                'applications', request.vars.filename)
+        # normalize path name: replace slashes, references, etc...
+        filename = os.path.normpath(os.path.normcase(filename))
+        for bp in qdb_debugger.do_list_breakpoint():
+            no, bp_filename, bp_lineno, temporary, enabled, hits, cond = bp
+            # normalize path name: replace slashes, references, etc...
+            bp_filename = os.path.normpath(os.path.normcase(bp_filename))
+            if filename == bp_filename:
+                breakpoints.append(bp_lineno)
+        ok = True
+    except Exception, e:
+        session.flash = str(e)
+        ok = False
+    return response.json({'ok': ok, 'breakpoints': breakpoints})
+

applications/admin/controllers/default.py

@@ -15,17 +15,19 @@ from glob import glob
 import shutil
 import platform
 try:
-    from git import *
+    import git
+    if git.__version__ < '0.3.1':
+        raise ImportError("Your version of git is %s. Upgrade to 0.3.1 or better." % git.__version__)
     have_git = True
-except ImportError:
+except ImportError, e:
     have_git = False
-    GIT_MISSING = 'requires gitpython module, but not installed or incompatible version'
+    GIT_MISSING = 'Requires gitpython module, but not installed or incompatible version: %s' % e
 
 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'))
 
@@ -39,26 +41,33 @@ if FILTER_APPS and request.args(0) and not request.args(0) in FILTER_APPS:
     redirect(URL('site'))
 
 
-if not session.token: session.token = web2py_uuid()
+if not session.token:
+    session.token = web2py_uuid()
+
 
 def count_lines(data):
     return len([line for line in data.split('\n') if line.strip() and not line.startswith('#')])
 
+
 def log_progress(app, mode='EDIT', filename=None, progress=0):
     progress_file = os.path.join(apath(app, r=request), 'progress.log')
     now = str(request.now)[:19]
     if not os.path.exists(progress_file):
         safe_open(progress_file, 'w').write('[%s] START\n' % now)
     if filename:
-        safe_open(progress_file,'a').write('[%s] %s %s: %s\n' % (now,mode,filename,progress))
+        safe_open(progress_file, 'a').write(
+            '[%s] %s %s: %s\n' % (now, mode, filename, progress))
+
 
 def safe_open(a, b):
     if DEMO_MODE and ('w' in b or 'a' in b):
         class tmp:
-            def write(self,data): pass
+            def write(self, data):
+                pass
         return tmp()
     return open(a, b)
 
+
 def safe_read(a, b='r'):
     safe_file = safe_open(a, b)
     try:
@@ -66,6 +75,7 @@ def safe_read(a, b='r'):
     finally:
         safe_file.close()
 
+
 def safe_write(a, value, b='w'):
     safe_file = safe_open(a, b)
     try:
@@ -73,14 +83,16 @@ def safe_write(a, value, b='w'):
     finally:
         safe_file.close()
 
+
 def get_app(name=None):
     app = name or request.args(0)
-    if app and (not MULTI_USER_MODE or is_manager() or \
+    if app and (not MULTI_USER_MODE or is_manager() or
                 db(db.app.name == app)(db.app.owner == auth.user.id).count()):
         return app
     session.flash = T('App does not exist or your are not authorized')
     redirect(URL('site'))
 
+
 def index():
     """ Index handler """
 
@@ -126,7 +138,7 @@ def check_version():
     session.forget()
     session._unlock(response)
 
-    new_version, version_number = check_new_version(request.env.web2py_version,
+    new_version, version = check_new_version(request.env.web2py_version,
                                              WEB2PY_VERSION_URL)
 
     if new_version == -1:
@@ -134,11 +146,10 @@ 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 %s' % version.split('(')[0])
     else:
-        return sp_button(URL('upgrade_web2py'), T('upgrade now')) \
+        return sp_button(URL('upgrade_web2py'), T('upgrade now to %s') % version.split('(')[0])
-            + XML(' <strong class="upgrade_version">%s.%s.%s</strong>' \
+
-                      % version_number[:3])
 
 def logout():
     """ Logout handler """
@@ -151,11 +162,14 @@ def logout():
 def change_password():
 
     if session.pam_user:
-        session.flash = T('PAM authenticated user, cannot change password here')
+        session.flash = T(
+            'PAM authenticated user, cannot change password here')
         redirect(URL('site'))
     form = SQLFORM.factory(Field('current_admin_password', 'password'),
-                         Field('new_admin_password','password',requires=IS_STRONG()),
+                           Field('new_admin_password',
-                         Field('new_admin_password_again','password'))
+                                 'password', requires=IS_STRONG()),
+                           Field('new_admin_password_again', 'password'),
+                           _class="span4 well")
     if form.accepts(request.vars):
         if not verify_password(request.vars.current_admin_password):
             form.errors.current_admin_password = T('invalid password')
@@ -163,7 +177,8 @@ def change_password():
             form.errors.new_admin_password_again = T('no match')
         else:
             path = abspath('parameters_%s.py' % request.env.server_port)
-            safe_write(path, 'password="%s"' % CRYPT()(request.vars.new_admin_password)[0])
+            safe_write(path, 'password="%s"' % CRYPT()(
+                request.vars.new_admin_password)[0])
             session.flash = T('password changed')
             redirect(URL('site'))
     return dict(form=form)
@@ -223,10 +238,10 @@ def site():
                 redirect(URL(r=request))
             target = os.path.join(apath(r=request), form_update.vars.name)
             try:
-                new_repo = Repo.clone_from(form_update.vars.url,target)
+                new_repo = git.Repo.clone_from(form_update.vars.url, target)
                 session.flash = T('new application "%s" imported',
                                   form_update.vars.name)
-            except GitCommandError, err:
+            except git.GitCommandError, err:
                 session.flash = T('Invalid git repository specified.')
             redirect(URL(r=request))
 
@@ -295,8 +310,10 @@ def report_progress(app):
     matches = regex.findall(open(progress_file, 'r').read())
     events, counter = [], 0
     for m in matches:
-        if not m: continue
+        if not m:
-        days = -(request.now - datetime.datetime.strptime(m[0],'%Y-%m-%d %H:%M:%S')).days
+            continue
+        days = -(request.now - datetime.datetime.strptime(m[0],
+                 '%Y-%m-%d %H:%M:%S')).days
         counter += int(m[1])
         events.append([days, counter])
     return events
@@ -338,6 +355,34 @@ 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'),
                           {T('Cancel'): URL('site')})
@@ -350,11 +395,16 @@ def upgrade_web2py():
         redirect(URL('site'))
     return dict(dialog=dialog)
 
+
 def uninstall():
     app = get_app()
 
     dialog = FORM.confirm(T('Uninstall'),
                           {T('Cancel'): URL('site')})
+    dialog['_id'] = 'confirm_form'
+    dialog['_class'] = 'well'
+    for component in dialog.components:
+        component['_class'] = 'btn'
 
     if dialog.accepted:
         if MULTI_USER_MODE:
@@ -407,6 +457,7 @@ def remove_compiled_app():
     session.flash = T('compiled application removed')
     redirect(URL('site'))
 
+
 def delete():
     """ Object delete handler """
     app = get_app()
@@ -432,6 +483,7 @@ def delete():
         redirect(URL(sender, anchor=request.vars.id2))
     return dict(filename=filename, sender=sender)
 
+
 def delete():
     """ Object delete handler """
     app = get_app()
@@ -458,6 +510,7 @@ def delete():
         redirect(URL(sender, anchor=request.vars.id2))
     return dict(dialog=dialog, filename=filename)
 
+
 def enable():
     app = get_app()
     filename = os.path.join(apath(app, r=request), 'DISABLED')
@@ -470,6 +523,7 @@ def enable():
         safe_open(filename, 'wb').write(time.ctime())
         return SPAN(T('Enable'), _style='color:red')
 
+
 def peek():
     """ Visualize object code """
     app = get_app(request.vars.app)
@@ -491,6 +545,7 @@ def peek():
                 data=data,
                 extension=extension)
 
+
 def test():
     """ Execute controller tests """
     app = get_app()
@@ -499,16 +554,20 @@ def test():
     else:
         file = '.*\.py'
 
-    controllers = listdir(apath('%s/controllers/' % app, r=request), file + '$')
+    controllers = listdir(
+        apath('%s/controllers/' % app, r=request), file + '$')
 
     return dict(app=app, controllers=controllers)
 
+
 def keepalive():
     return ''
 
+
 def search():
     keywords = request.vars.keywords or ''
     app = get_app()
+
     def match(filename, keywords):
         filename = os.path.join(apath(app, r=request), filename)
         if keywords in read_file(filename, 'rb'):
@@ -518,14 +577,17 @@ def search():
     files1 = glob(os.path.join(path, '*/*.py'))
     files2 = glob(os.path.join(path, '*/*.html'))
     files3 = glob(os.path.join(path, '*/*/*.html'))
-    files=[x[len(path)+1:].replace('\\','/') for x in files1+files2+files3 if match(x,keywords)]
+    files = [x[len(path) + 1:].replace(
+        '\\', '/') for x in files1 + files2 + files3 if match(x, keywords)]
     return response.json(dict(files=files, message=T.M('Searching: **%s** %%{file}', len(files))))
 
+
 def edit():
     """ File edit handler """
     # Load json only if it is ajax edited...
     app = get_app(request.vars.app)
     filename = '/'.join(request.args)
+    response.title = request.args[-1]
     if request.vars.app:
         path = abspath(filename)
     else:
@@ -590,7 +652,8 @@ def edit():
             data = request.vars.data.replace('\r\n', '\n').strip() + '\n'
             safe_write(path, data)
             lineno_new = count_lines(data)
-            log_progress(app,'EDIT',filename,progress=lineno_new-lineno_old)
+            log_progress(
+                app, 'EDIT', filename, progress=lineno_new - lineno_old)
             file_hash = md5_hash(data)
             saved_on = time.ctime(os.stat(path)[stat.ST_MTIME])
             response.flash = T('file saved on %s', saved_on)
@@ -605,32 +668,38 @@ def edit():
             code = request.vars.data.rstrip().replace('\r\n', '\n') + '\n'
             compile(code, path, "exec", _ast.PyCF_ONLY_AST)
         except Exception, e:
+            # offset calculation is only used for textarea (start/stop)
             start = sum([len(line) + 1 for l, line
                          in enumerate(request.vars.data.split("\n"))
                          if l < e.lineno - 1])
             if e.text and e.offset:
-                offset = e.offset - (len(e.text) - len(e.text.splitlines()[-1]))
+                offset = e.offset - (len(e.text) - len(
+                    e.text.splitlines()[-1]))
             else:
                 offset = 0
-            highlight = {'start': start, 'end': start + offset + 1, 'lineno': e.lineno}
+            highlight = {'start': start, 'end': start +
+                         offset + 1, 'lineno': e.lineno, 'offset': offset}
             try:
                 ex_name = e.__class__.__name__
             except:
                 ex_name = 'unknown exception!'
             response.flash = DIV(T('failed to compile file because:'), BR(),
                                  B(ex_name), ' ' + T('at line %s', e.lineno),
-                                 offset and ' '+T('at char %s', offset) or '',
+                                 offset and ' ' +
+                                 T('at char %s', offset) or '',
                                  PRE(str(e)))
 
     if data_or_revert and request.args[1] == 'modules':
         # Lets try to reload the modules
         try:
             mopath = '.'.join(request.args[2:])[:-3]
-            exec 'import applications.%s.modules.%s' % (request.args[0], mopath)
+            exec 'import applications.%s.modules.%s' % (
+                request.args[0], mopath)
             reload(sys.modules['applications.%s.modules.%s'
                                % (request.args[0], mopath)])
         except Exception, e:
-            response.flash = DIV(T('failed to reload module because:'),PRE(str(e)))
+            response.flash = DIV(
+                T('failed to reload module because:'), PRE(str(e)))
 
     edit_controller = None
     editviewlinks = None
@@ -639,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':
@@ -660,7 +729,7 @@ def edit():
             for v in viewlist:
                 vf = os.path.split(v)[-1]
                 vargs = "/".join([viewpath.replace(os.sep, "/"), vf])
-                editviewlinks.append(A(vf.split(".")[0],\
+                editviewlinks.append(A(vf.split(".")[0],
                                        _href=URL('edit', args=[vargs])))
 
     if len(request.args) > 2 and request.args[1] == 'controllers':
@@ -680,7 +749,7 @@ def edit():
         editarea_preferences['REPLACE_TAB_BY_SPACES'] = '4'
         editarea_preferences['DISPLAY'] = 'onload'
         for key in editarea_preferences:
-            if globals().has_key(key):
+            if key in globals():
                 editarea_preferences[key] = globals()[key]
         return dict(app=request.args[0],
                     filename=filename,
@@ -695,6 +764,7 @@ def edit():
                     editarea_preferences=editarea_preferences,
                     editviewlinks=editviewlinks)
 
+
 def resolve():
     """
     """
@@ -739,7 +809,7 @@ def resolve():
             return 'minus'
 
     if request.vars:
-        c = '\n'.join([item[2:].rstrip() for (i, item) in enumerate(d) if item[0] \
+        c = '\n'.join([item[2:].rstrip() for (i, item) in enumerate(d) if item[0]
                        == ' ' or 'line%i' % i in request.vars])
         safe_write(path, c)
         session.flash = 'files merged'
@@ -754,7 +824,8 @@ def resolve():
         diff = TABLE(*[TR(TD(gen_data(i, item)),
                           TD(item[0]),
                           TD(leading(item[2:]),
-                          TT(item[2:].rstrip())), _class=getclass(item))
+                          TT(item[2:].rstrip())),
+                          _class=getclass(item))
                        for (i, item) in enumerate(d) if item[0] != '?'])
 
     return dict(diff=diff, filename=filename)
@@ -764,13 +835,15 @@ def edit_language():
     """ Edit language file """
     app = get_app()
     filename = '/'.join(request.args)
+    response.title = request.args[-1]
     strings = read_dict(apath(filename, r=request))
 
     if '__corrupted__' in strings:
         form = SPAN(strings['__corrupted__'], _class='error')
         return dict(filename=filename, form=form)
 
-    keys = sorted(strings.keys(),lambda x,y: cmp(unicode(x,'utf-8').lower(), unicode(y,'utf-8').lower()))
+    keys = sorted(strings.keys(), lambda x, y: cmp(
+        unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower()))
     rows = []
     rows.append(H2(T('Original/Translation')))
 
@@ -796,27 +869,34 @@ def edit_language():
         # Making the short circuit compatible with <= python2.4
         k = (s != k) and k or B(k)
 
-        rows.append(P(prefix, k, BR(), elem, TAG.BUTTON(T('delete'),
+        new_row = DIV(LABEL(prefix, k, _style="font-weight:normal;"),
-                            _onclick='return delkey("%s")' % name), _id=name))
+                      CAT(elem, '\n', TAG.BUTTON(
+                    T('delete'),
+                    _onclick='return delkey("%s")' % name,
+                    _class='btn')), _id=name, _class='span6 well well-small')
 
-    rows.append(INPUT(_type='submit', _value=T('update')))
+        rows.append(DIV(new_row,_class="row-fluid"))
+    rows.append(DIV(INPUT(_type='submit', _value=T('update'), _class="btn btn-primary"), _class='controls'))
     form = FORM(*rows)
     if form.accepts(request.vars, keepvalues=True):
         strs = dict()
         for key in keys:
             name = md5_hash(key)
-            if form.vars[name]==chr(127): continue
+            if form.vars[name] == chr(127):
+                continue
             strs[key] = form.vars[name]
         write_dict(apath(filename, r=request), strs)
         session.flash = T('file saved on %(time)s', dict(time=time.ctime()))
         redirect(URL(r=request, args=request.args))
     return dict(app=request.args[0], filename=filename, form=form)
 
+
 def edit_plurals():
     """ Edit plurals file """
     app = get_app()
     filename = '/'.join(request.args)
-    plurals = read_plural_dict(apath(filename, r=request)) # plural forms dictionary
+    plurals = read_plural_dict(
+        apath(filename, r=request))  # plural forms dictionary
     nplurals = int(request.vars.nplurals) - 1  # plural forms quantity
     xnplurals = xrange(nplurals)
 
@@ -825,37 +905,41 @@ def edit_plurals():
         form = SPAN(plurals['__corrupted__'], _class='error')
         return dict(filename=filename, form=form)
 
-    keys = sorted(plurals.keys(),lambda x,y: cmp(unicode(x,'utf-8').lower(), unicode(y,'utf-8').lower()))
+    keys = sorted(plurals.keys(), lambda x, y: cmp(
-    rows = []
+        unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower()))
-
+    tab_rows = []
-    row=[T("Singular Form")]
-    row.extend([T("Plural Form #%s", n+1) for n in xnplurals])
-    table=TABLE(THEAD(TR(row)))
-
     for key in keys:
         name = md5_hash(key)
         forms = plurals[key]
 
         if len(forms) < nplurals:
             forms.extend(None for i in xrange(nplurals - len(forms)))
+        tab_col1 = DIV(CAT(LABEL(T("Singular Form")), B(key,
+                                                        _class='fake-input')))
+        tab_inputs = [SPAN(LABEL(T("Plural Form #%s", n + 1)), INPUT(_type='text', _name=name + '_' + str(n), value=forms[n], _size=20), _class='span6') for n in xnplurals]
+        tab_col2 = DIV(CAT(*tab_inputs))
+        tab_col3 = DIV(CAT(LABEL(XML('&nbsp;')), TAG.BUTTON(T('delete'), _onclick='return delkey("%s")' % name, _class='btn'), _class='span6'))
+        tab_row = DIV(DIV(tab_col1, '\n', tab_col2, '\n', tab_col3, _class='well well-small'), _id=name, _class='row-fluid tab_row')
+        tab_rows.append(tab_row)
 
-        row = [B(key)]
+    tab_rows.append(DIV(TAG['button'](T('update'), _type='submit',
-        row.extend([INPUT(_type='text', _name=name+'_'+str(n), value=forms[n], _size=20) for n in xnplurals])
+                                      _class='btn btn-primary'),
-        row.append(TD(TAG.BUTTON(T('delete'), _onclick='return delkey("%s")' % name)))
+                        _class='controls'))
-        rows.append(TR(row, _id=name))
+    tab_container = DIV(*tab_rows, **dict(_class="row-fluid"))
-    if rows:
+
-        table.append(TBODY(rows))
+    form = FORM(tab_container)
-    rows=[table, INPUT(_type='submit', _value=T('update'))]
-    form = FORM(*rows)
     if form.accepts(request.vars, keepvalues=True):
         new_plurals = dict()
         for key in keys:
             name = md5_hash(key)
-            if form.vars[name+'_0']==chr(127): continue
+            if form.vars[name + '_0'] == chr(127):
-            new_plurals[key] = [form.vars[name+'_'+str(n)] for n in xnplurals]
+                continue
+            new_plurals[key] = [form.vars[name + '_' + str(n)]
+                                for n in xnplurals]
         write_plural_dict(apath(filename, r=request), new_plurals)
         session.flash = T('file saved on %(time)s', dict(time=time.ctime()))
-        redirect(URL(r=request, args=request.args, vars=dict(nplurals=request.vars.nplurals)))
+        redirect(URL(r=request, args=request.args, vars=dict(
+            nplurals=request.vars.nplurals)))
     return dict(app=request.args[0], filename=filename, form=form)
 
 
@@ -879,7 +963,7 @@ def design():
     if request.vars and not request.vars.token == session.token:
         redirect(URL('logout'))
 
-    if request.vars.pluginfile!=None and not isinstance(request.vars.pluginfile,str):
+    if request.vars.pluginfile is not None and not isinstance(request.vars.pluginfile, str):
         filename = os.path.basename(request.vars.pluginfile.filename)
         if plugin_install(app, request.vars.pluginfile.file,
                           request, filename):
@@ -893,7 +977,6 @@ def design():
         session.flash = T('plugin not specified')
         redirect(URL(r=request))
 
-
     # If we have only pyc files it means that
     # we cannot design
     if os.path.exists(apath('%s/compiled' % app, r=request)):
@@ -911,7 +994,8 @@ def design():
         defines[m].sort()
 
     # Get all controllers
-    controllers = sorted(listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
+    controllers = sorted(
+        listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
     controllers = [x.replace('\\', '/') for x in controllers]
     functions = {}
     for c in controllers:
@@ -920,7 +1004,8 @@ def design():
         functions[c] = items
 
     # Get all views
-    views = sorted(listdir(apath('%s/views/' % app, r=request), '[\w/\-]+(\.\w+)+$'))
+    views = sorted(
+        listdir(apath('%s/views/' % app, r=request), '[\w/\-]+(\.\w+)+$'))
     views = [x.replace('\\', '/') for x in views if not x.endswith('.bak')]
     extend = {}
     include = {}
@@ -950,22 +1035,25 @@ def design():
     statics.sort()
 
     # Get all languages
+    langpath = os.path.join(apath(app, r=request),'languages')
     languages = dict([(lang, info) for lang, info
-                   in read_possible_languages(
+                      in read_possible_languages(langpath).iteritems()
-                       apath(app, r=request)).iteritems()
                       if info[2] != 0])  # info[2] is langfile_mtime:
                                          # get only existed files
 
     #Get crontab
     cronfolder = apath('%s/cron' % app, r=request)
-    if not os.path.exists(cronfolder): os.mkdir(cronfolder)
+    if not os.path.exists(cronfolder):
+        os.mkdir(cronfolder)
     crontab = apath('%s/cron/crontab' % app, r=request)
     if not os.path.exists(crontab):
         safe_write(crontab, '#crontab')
 
     plugins = []
+
     def filter_plugins(items, plugins):
-        plugins+=[item[7:].split('/')[0].split('.')[0] for item in items if item.startswith('plugin_')]
+        plugins += [item[7:].split('/')[0].split(
+            '.')[0] for item in items if item.startswith('plugin_')]
         plugins[:] = list(set(plugins))
         plugins.sort()
         return [item for item in items if not item.startswith('plugin_')]
@@ -985,6 +1073,7 @@ def design():
                 crontab=crontab,
                 plugins=plugins)
 
+
 def delete_plugin():
     """ Object delete handler """
     app = request.args(0)
@@ -1014,6 +1103,7 @@ def delete_plugin():
         redirect(URL('design', args=request.args(0), anchor=request.vars.id2))
     return dict(dialog=dialog, plugin=plugin)
 
+
 def plugin():
     """ Application design handler """
     app = get_app()
@@ -1040,7 +1130,8 @@ def plugin():
         defines[m].sort()
 
     # Get all controllers
-    controllers = sorted(listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
+    controllers = sorted(
+        listdir(apath('%s/controllers/' % app, r=request), '.*\.py$'))
     controllers = [x.replace('\\', '/') for x in controllers]
     functions = {}
     for c in controllers:
@@ -1049,7 +1140,8 @@ def plugin():
         functions[c] = items
 
     # Get all views
-    views = sorted(listdir(apath('%s/views/' % app, r=request), '[\w/\-]+\.\w+$'))
+    views = sorted(
+        listdir(apath('%s/views/' % app, r=request), '[\w/\-]+\.\w+$'))
     views = [x.replace('\\', '/') for x in views]
     extend = {}
     include = {}
@@ -1195,7 +1287,8 @@ def create_file():
             if len(filename) == 5:
                 raise SyntaxError
 
-            msg = T('This is the %(filename)s template', dict(filename=filename))
+            msg = T(
+                'This is the %(filename)s template', dict(filename=filename))
             if extension == 'html':
                 text = dedent("""
                    {{extend 'layout.html'}}
@@ -1245,8 +1338,10 @@ def create_file():
         session.flash = T('file "%(filename)s" created',
                           dict(filename=full_filename[len(path):]))
         vars = {}
-        if request.vars.id: vars['id']=request.vars.id
+        if request.vars.id:
-        if request.vars.app: vars['app']=request.vars.app
+            vars['id'] = request.vars.id
+        if request.vars.app:
+            vars['app'] = request.vars.app
         redirect(URL('edit',
                  args=[os.path.join(request.vars.location, filename)], vars=vars))
     except Exception, e:
@@ -1319,7 +1414,8 @@ def errors():
     method = request.args(1) or 'new'
     db_ready = {}
     db_ready['status'] = get_ticket_storage(app)
-    db_ready['errmessage'] = T("No ticket_storage.txt found under /private folder")
+    db_ready['errmessage'] = T(
+        "No ticket_storage.txt found under /private folder")
     db_ready['errlink'] = "http://web2py.com/books/default/chapter/29/13#Collecting-tickets"
 
     if method == 'new':
@@ -1334,7 +1430,8 @@ def errors():
 
         for fn in listdir(errors_path, '^[a-fA-F0-9.\-]+$'):
             fullpath = os.path.join(errors_path, fn)
-            if not os.path.isfile(fullpath): continue
+            if not os.path.isfile(fullpath):
+                continue
             try:
                 fullpath_file = open(fullpath, 'r')
                 try:
@@ -1355,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,
@@ -1367,7 +1464,6 @@ def errors():
 
         return dict(errors=[x[1] for x in decorated], app=app, method=method, db_ready=db_ready)
 
-
     elif method == 'dbnew':
         errors_path = apath('%s/errors' % app, r=request)
         tk_db, tk_table = get_ticket_storage(app)
@@ -1417,22 +1513,27 @@ def errors():
                 tk_db.commit()
         tickets_ = tk_db(tk_table.id > 0).select(tk_table.ticket_id, tk_table.created_datetime, orderby=~tk_table.created_datetime)
         tickets = [row.ticket_id for row in tickets_]
-        times = dict([(row.ticket_id, row.created_datetime) for row in tickets_])
+        times = dict(
+            [(row.ticket_id, row.created_datetime) for row in tickets_])
 
         return dict(app=app, tickets=tickets, method=method, times=times)
 
     else:
         for item in request.vars:
-            if item[:7] == 'delete_':
+            # delete_all} rows doesn't contain any ticket
+            # Remove anything else as requested
+            if item[:7] == 'delete_' and (not item == "delete_all}"):
                 os.unlink(apath('%s/errors/%s' % (app, item[7:]), r=request))
-        func = lambda p: os.stat(apath('%s/errors/%s' % \
+        func = lambda p: os.stat(apath('%s/errors/%s' %
                                        (app, p), r=request)).st_mtime
-        tickets = sorted(listdir(apath('%s/errors/' % app, r=request), '^\w.*'),
+        tickets = sorted(
+            listdir(apath('%s/errors/' % app, r=request), '^\w.*'),
             key=func,
             reverse=True)
 
         return dict(app=app, tickets=tickets, method=method, db_ready=db_ready)
 
+
 def get_ticket_storage(app):
     private_folder = apath('%s/private' % app, r=request)
     ticket_file = os.path.join(private_folder, 'ticket_storage.txt')
@@ -1454,6 +1555,7 @@ def get_ticket_storage(app):
         )
     return ticketsdb, ticketsdb.get(tablename)
 
+
 def make_link(path):
     """ Create a link from a path """
     tryFile = path.replace('\\', '/')
@@ -1536,6 +1638,7 @@ def ticket():
                 layer=e.layer,
                 myversion=myversion)
 
+
 def ticketdb():
     """ Ticket handler """
 
@@ -1559,10 +1662,12 @@ def ticketdb():
                 layer=e.layer,
                 myversion=myversion)
 
+
 def error():
     """ Generate a ticket (for testing) """
     raise RuntimeError('admin ticket generator at your service')
 
+
 def update_languages():
     """ Update available languages """
 
@@ -1600,12 +1705,14 @@ def user():
     else:
         return dict(form=T("Disabled"))
 
+
 def reload_routes():
     """ Reload routes.py """
     import gluon.rewrite
     gluon.rewrite.load()
     redirect(URL('site'))
 
+
 def manage_students():
     if not (MULTI_USER_MODE and is_manager()):
         session.flash = T('Not Authorized')
@@ -1614,6 +1721,7 @@ def manage_students():
     grid = SQLFORM.grid(db.auth_user)
     return locals()
 
+
 def bulk_register():
     if not (MULTI_USER_MODE and is_manager()):
         session.flash = T('Not Authorized')
@@ -1634,6 +1742,7 @@ def bulk_register():
 # 2) should not prompt user at console
 # 3) should give option to force commit and not reuqire manual merge
 
+
 def git_pull():
     """ Git Pull handler """
     app = get_app()
@@ -1644,27 +1753,26 @@ def git_pull():
                           {T('Cancel'): URL('site')})
     if dialog.accepted:
         try:
-            repo = Repo(os.path.join(apath(r=request),app))
+            repo = git.Repo(os.path.join(apath(r=request), app))
             origin = repo.remotes.origin
             origin.fetch()
             origin.pull()
             session.flash = T("Application updated via git pull")
             redirect(URL('site'))
-        except CheckoutError, message:
+
+        except git.CheckoutError:
             session.flash = T("Pull failed, certain files could not be checked out. Check logs for details.")
             redirect(URL('site'))
-        except UnmergedEntriesError:
+        except git.UnmergedEntriesError:
             session.flash = T("Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.")
             redirect(URL('site'))
+        except git.GitCommandError:
+            session.flash = T(
+                "Pull failed, git exited abnormally. See logs for details.")
+            redirect(URL('site'))
         except AssertionError:
             session.flash = T("Pull is not possible because you have unmerged files. Fix them up in the work tree, and then try again.")
             redirect(URL('site'))
-        except GitCommandError, status:
-            session.flash = T("Pull failed, git exited abnormally. See logs for details.")
-            redirect(URL('site'))
-        except Exception,e:
-            session.flash = T("Pull failed, git exited abnormally. See logs for details.")
-            redirect(URL('site'))
     elif 'cancel' in request.vars:
         redirect(URL('site'))
     return dict(app=app, dialog=dialog)
@@ -1682,19 +1790,17 @@ def git_push():
     form.process()
     if form.accepted:
         try:
-            repo = Repo(os.path.join(apath(r=request),app))
+            repo = git.Repo(os.path.join(apath(r=request), app))
             index = repo.index
             index.add([apath(r=request) + app + '/*'])
             new_commit = index.commit(form.vars.changelog)
             origin = repo.remotes.origin
             origin.push()
-            session.flash = T("Git repo updated with latest application changes.")
+            session.flash = T(
+                "Git repo updated with latest application changes.")
             redirect(URL('site'))
-        except UnmergedEntriesError:
+        except git.UnmergedEntriesError:
             session.flash = T("Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.")
             redirect(URL('site'))
-        except Exception, e:
-            session.flash = T("Push failed, git exited abnormally. See logs for details.")
-            redirect(URL('site'))
     return dict(app=app, form=form)
 

applications/admin/controllers/gae.py

@@ -18,28 +18,34 @@ if MULTI_USER_MODE and not is_manager():
 
 forever = 10 ** 8
 
+
 def kill():
     p = cache.ram('gae_upload', lambda: None, forever)
-    if not p or p.poll()!=None:
+    if not p or p.poll() is not None:
         return 'oops'
     os.kill(p.pid, signal.SIGKILL)
     cache.ram('gae_upload', lambda: None, -1)
 
+
 class EXISTS(object):
     def __init__(self, error_message='file not found'):
         self.error_message = error_message
+
     def __call__(self, value):
         if os.path.exists(value):
             return (value, None)
         return (value, self.error_message)
 
+
 def deploy():
     regex = re.compile('^\w+$')
-    apps = sorted(file for file in os.listdir(apath(r=request)) if regex.match(file))
+    apps = sorted(
+        file for file in os.listdir(apath(r=request)) if regex.match(file))
     form = SQLFORM.factory(
         Field('appcfg', default=GAE_APPCFG, label=T('Path to appcfg.py'),
               requires=EXISTS(error_message=T('file not found'))),
-        Field('google_application_id',requires=IS_MATCH('[\w\-]+'),label=T('Google Application Id')),
+        Field('google_application_id', requires=IS_MATCH(
+            '[\w\-]+'), label=T('Google Application Id')),
         Field('applications', 'list:string',
               requires=IS_IN_SET(apps, multiple=True),
               label=T('web2py apps to deploy')),
@@ -51,7 +57,7 @@ def deploy():
             kill()
         except:
             pass
-        ignore_apps = [item for item in apps \
+        ignore_apps = [item for item in apps
                        if not item in form.vars.applications]
         regex = re.compile('\(applications/\(.*')
         yaml = apath('../app.yaml', r=request)
@@ -59,8 +65,10 @@ def deploy():
             example = apath('../app.example.yaml', r=request)
             shutil.copyfile(example, yaml)
         data = read_file(yaml)
-        data = re.sub('application:.*','application: %s' % form.vars.google_application_id,data)
+        data = re.sub('application:.*', 'application: %s' %
-        data = regex.sub('(applications/(%s)/.*)|' % '|'.join(ignore_apps),data)
+                      form.vars.google_application_id, data)
+        data = regex.sub(
+            '(applications/(%s)/.*)|' % '|'.join(ignore_apps), data)
         write_file(yaml, data)
 
         path = request.env.applications_parent
@@ -76,9 +84,10 @@ def deploy():
         fcntl.fcntl(p.stderr.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
     return dict(form=form, command=cmd)
 
+
 def callback():
     p = cache.ram('gae_upload', lambda: None, forever)
-    if not p or p.poll()!=None:
+    if not p or p.poll() is not None:
         return '<done/>'
     try:
         output = p.stdout.read()
@@ -89,5 +98,3 @@ def callback():
     except:
         errors = ''
     return (output + errors).replace('\n', '<br/>')
-
-

applications/admin/controllers/mercurial.py

@@ -22,6 +22,7 @@ sessions/*
 errors/*
 """
 
+
 def hg_repo(path):
     import os
     uio = ui.ui()
@@ -37,6 +38,7 @@ def hg_repo(path):
         write_file(hgignore, _hgignore_content)
     return repo
 
+
 def commit():
     app = request.args(0)
     path = apath(app, r=request)
@@ -63,6 +65,7 @@ def commit():
         changes = []
     return dict(form=form, files=files, changes=changes, repo=repo)
 
+
 def revision():
     app = request.args(0)
     path = apath(app, r=request)
@@ -80,5 +83,3 @@ def revision():
         desc=ctx.description(),
         form=form
     )
-
-

applications/admin/controllers/openshift.py

@@ -1,15 +1,21 @@
 import os
+try:
     from distutils import dir_util
+except ImportError:
+    session.flash = T('requires distutils, but not installed')
+    redirect(URL('default', 'site'))
 try:
     from git import *
 except ImportError:
     session.flash = T('requires python-git, but not installed')
     redirect(URL('default', 'site'))
 
+
 def deploy():
     apps = sorted(file for file in os.listdir(apath(r=request)))
     form = SQLFORM.factory(
-        Field('osrepo',default='/tmp',label=T('Path to local openshift repo root.'),
+        Field(
+            'osrepo', default='/tmp', label=T('Path to local openshift repo root.'),
             requires=EXISTS(error_message=T('directory not found'))),
         Field('osname', default='web2py', label=T('WSGI reference name')),
         Field('applications', 'list:string',
@@ -23,7 +29,8 @@ def deploy():
         except:
             pass
 
-        ignore_apps = [item for item in apps if not item in form.vars.applications]
+        ignore_apps = [
+            item for item in apps if not item in form.vars.applications]
         regex = re.compile('\(applications/\(.*')
         w2p_origin = os.getcwd()
         osrepo = form.vars.osrepo
@@ -47,9 +54,11 @@ def deploy():
         #Git code ends here
     return dict(form=form, command=cmd)
 
+
 class EXISTS(object):
     def __init__(self, error_message='file not found'):
         self.error_message = error_message
+
     def __call__(self, value):
         if os.path.exists(value):
             return (value, None)

applications/admin/controllers/plugin_jqmobile.py

@@ -1,10 +1,10 @@
 response.files = response.files[:3]
 response.menu = []
 
+
 def index():
     return locals()
 
+
 def about():
     return locals()
-
-

applications/admin/controllers/shell.py

@@ -1,7 +1,8 @@
 import sys
 import cStringIO
 import gluon.contrib.shell
-import code, thread
+import code
+import thread
 from gluon.shell import env
 
 if DEMO_MODE or MULTI_USER_MODE:
@@ -10,16 +11,19 @@ if DEMO_MODE or MULTI_USER_MODE:
 
 FE = 10 ** 9
 
+
 def index():
     app = request.args(0) or 'admin'
     reset()
     return dict(app=app)
 
+
 def callback():
     app = request.args[0]
     command = request.vars.statement
     escape = command[:1] != '!'
-    history = session['history:'+app] = session.get('history:'+app,gluon.contrib.shell.History())
+    history = session['history:' + app] = session.get(
+        'history:' + app, gluon.contrib.shell.History())
     if not escape:
         command = command[1:]
     if command == '%reset':
@@ -31,17 +35,16 @@ def callback():
         except ValueError:
             return ''
     session['commands:' + app].append(command)
-    environ=env(app,True)
+    environ = env(app, True, extra_request=dict(is_https=request.is_https))
     output = gluon.contrib.shell.run(history, command, environ)
     k = len(session['commands:' + app]) - 1
     #output = PRE(output)
     #return TABLE(TR('In[%i]:'%k,PRE(command)),TR('Out[%i]:'%k,output))
     return 'In [%i] : %s%s\n' % (k + 1, command, output)
 
+
 def reset():
     app = request.args(0) or 'admin'
     session['commands:' + app] = []
     session['history:' + app] = gluon.contrib.shell.History()
     return 'done'
-
-

applications/admin/controllers/toolbar.py

@@ -2,10 +2,12 @@ import os
 from gluon.settings import global_settings, read_file
 #
 
+
 def index():
     app = request.args(0)
     return dict(app=app)
 
+
 def profiler():
     """
     to use the profiler start web2py with -F profiler.log
@@ -27,5 +29,3 @@ def profiler():
             size += len(data)
             response.cookies[KEY] = size
     return data
-
-

applications/admin/controllers/webservices.py

@@ -82,6 +82,7 @@ def install(app_name, filename, data, overwrite=True):
 
     return installed
 
+
 @service.jsonrpc
 def attach_debugger(host='localhost', port=6000, authkey='secret password'):
     import gluon.contrib.qdb as qdb
@@ -124,7 +125,7 @@ def detach_debugger():
     gluon.debug.qdb_debugger = None
     return True
 
+
 def call():
     session.forget()
     return service()
-

applications/admin/controllers/wizard.py

@@ -1,9 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import os, uuid, re, pickle, urllib, glob
+import os
+import uuid
+import re
+import pickle
+import urllib
+import glob
 from gluon.admin import app_create, plugin_install
 from gluon.fileutils import abspath, read_file, write_file
 
+
 def reset(session):
     session.app = {
         'name': '',
@@ -30,30 +36,33 @@ def reset(session):
         'page_error': '# Error: the document does not exist',
     }
 
-if not session.app: reset(session)
+if not session.app:
+    reset(session)
+
 
 def listify(x):
     if not isinstance(x, (list, tuple)):
         return x and [x] or []
     return x
 
+
 def clean(name):
     return re.sub('\W+', '_', name.strip().lower())
 
+
 def index():
     response.view = 'wizard/step.html'
     reset(session)
     apps = os.listdir(os.path.join(request.folder, '..'))
     form = SQLFORM.factory(Field('name', requires=[IS_NOT_EMPTY(),
-                                                IS_ALPHANUMERIC()]))
+                                                   IS_ALPHANUMERIC()]), _class='span5 well well-small')
     if form.accepts(request.vars):
         app = form.vars.name
         session.app['name'] = app
-        if MULTI_USER_MODE and db(db.app.name==app)\
+        if MULTI_USER_MODE and db(db.app.name == app)(db.app.owner != auth.user.id).count():
-                (db.app.owner!=auth.user.id).count():
             session.flash = 'App belongs already to other user'
         elif app in apps:
-            meta = os.path.normpath(\
+            meta = os.path.normpath(
                 os.path.join(os.path.normpath(request.folder),
                              '..', app, 'wizard.metadata'))
             if os.path.exists(meta):
@@ -96,36 +105,44 @@ def step1():
               requires=IS_NOT_EMPTY()),
         Field('subtitle', default=params.get('subtitle', None)),
         Field('author', default=params.get('author', None)),
-                Field('author_email',default=params.get('author_email',None)),
+        Field(
+            'author_email', default=params.get('author_email', None)),
         Field('keywords', default=params.get('keywords', None)),
         Field('description', 'text',
               default=params.get('description', None)),
         Field('layout_theme', requires=IS_IN_SET(themes),
               default=params.get('layout_theme', themes[0])),
-                Field('database_uri',default=params.get('database_uri',None)),
+        Field(
-                Field('security_key',default=params.get('security_key',None)),
+            'database_uri', default=params.get('database_uri', None)),
-                Field('email_server',default=params.get('email_server',None)),
+        Field(
-                Field('email_sender',default=params.get('email_sender',None)),
+            'security_key', default=params.get('security_key', None)),
+        Field(
+            'email_server', default=params.get('email_server', None)),
+        Field(
+            'email_sender', default=params.get('email_sender', None)),
         Field('email_login', default=params.get('email_login', None)),
         Field('login_method', requires=IS_IN_SET(('local', 'janrain')),
               default=params.get('login_method', 'local')),
-                Field('login_config',default=params.get('login_config',None)),
+        Field(
-                Field('plugins','list:string',requires=IS_IN_SET(plugins,multiple=True)))
+            'login_config', default=params.get('login_config', None)),
+        Field('plugins', 'list:string', requires=IS_IN_SET(plugins, multiple=True)),
+        _class='span7 well well-small')
 
     if form.accepts(request.vars):
         session.app['params'] = [(key, form.vars.get(key, None))
                                  for key, value in session.app['params']]
-        redirect(URL('step2'))
+        redirect(URL('step2')  + '/#xwizard_form')
     return dict(step='1: Setting Parameters', form=form)
 
+
 def step2():
     response.view = 'wizard/step.html'
     form = SQLFORM.factory(Field('table_names', 'list:string',
-                               default=session.app['tables']))
+                                 default=session.app['tables']), _class="span7 well well-small")
     if form.accepts(request.vars):
-        table_names = [clean(t) for t in listify(form.vars.table_names) \
+        table_names = [clean(t) for t in listify(form.vars.table_names)
                        if t.strip()]
-        if [t for t in table_names if t.startswith('auth_') and \
+        if [t for t in table_names if t.startswith('auth_') and
                 not t == 'auth_user']:
             form.error.table_names = \
                 T('invalid table names (auth_* tables already defined)')
@@ -141,19 +158,21 @@ def step2():
                         session.app['page_' + name] = \
                             '## Manage %s\n\n{{=form}}' % (table)
             if session.app['tables']:
-                redirect(URL('step3',args=0))
+                redirect(URL('step3', args=0) + '/#xwizard_form')
             else:
-                redirect(URL('step4'))
+                redirect(URL('step4') + '/#xwizard_form')
     return dict(step='2: Tables', form=form)
 
+
 def step3():
     response.view = 'wizard/step.html'
-    n=int(request.args(0) or 0)
+    n = int(request.args(-1) or 0)
     m = len(session.app['tables'])
-    if n>=m: redirect(URL('step2'))
+    if n >= m:
+        redirect(URL('step2'))
     table = session.app['tables'][n]
     form = SQLFORM.factory(Field('field_names', 'list:string',
-                               default=session.app.get('table_'+table,[])))
+                                 default=session.app.get('table_' + table, [])), _class="span7 well well-small")
     if form.accepts(request.vars) and form.vars.field_names:
         fields = listify(form.vars.field_names)
         if table == 'auth_user':
@@ -169,46 +188,50 @@ def step3():
             response.flash = T('invalid circular reference')
         else:
             if n < m - 1:
-                redirect(URL('step3',args=n+1))
+                redirect(URL('step3', args=n + 1) + '/#xwizard_form')
             else:
-                redirect(URL('step4'))
+                redirect(URL('step4') + '/#xwizard_form')
-    return dict(step='3: Fields for table "%s" (%s of %s)' \
+    return dict(step='3: Fields for table "%s" (%s of %s)'
                 % (table, n + 1, m), table=table, form=form)
 
+
 def step4():
     response.view = 'wizard/step.html'
     form = SQLFORM.factory(Field('pages', 'list:string',
-                               default=session.app['pages']))
+                                 default=session.app['pages']), _class="span7 well well-small")
     if form.accepts(request.vars):
         session.app['pages'] = [clean(t)
                                 for t in listify(form.vars.pages)
                                 if t.strip()]
         if session.app['pages']:
-            redirect(URL('step5',args=0))
+            redirect(URL('step5', args=0) + '/#xwizard_form')
         else:
-            redirect(URL('step6'))
+            redirect(URL('step6') + '/#xwizard_form')
     return dict(step='4: Pages', form=form)
 
+
 def step5():
     response.view = 'wizard/step.html'
-    n=int(request.args(0) or 0)
+    n = int(request.args(-1) or 0)
     m = len(session.app['pages'])
-    if n>=m: redirect(URL('step4'))
+    if n >= m:
+        redirect(URL('step4'))
     page = session.app['pages'][n]
     markmin_url = 'http://web2py.com/examples/static/markmin.html'
     form = SQLFORM.factory(Field('content', 'text',
                                  default=session.app.get('page_' + page, []),
                                  comment=A('use markmin',
                                            _href=markmin_url, _target='_blank')),
-                         formstyle='table2cols')
+                           formstyle='table2cols', _class="span7 well well-small")
     if form.accepts(request.vars):
         session.app['page_' + page] = form.vars.content
         if n < m - 1:
-            redirect(URL('step5',args=n+1))
+            redirect(URL('step5', args=n + 1) + '/#xwizard_form')
         else:
-            redirect(URL('step6'))
+            redirect(URL('step6') + '/#xwizard_form')
     return dict(step='5: View for page "%s" (%s of %s)' % (page, n + 1, m), form=form)
 
+
 def step6():
     response.view = 'wizard/step.html'
     params = dict(session.app['params'])
@@ -220,7 +243,8 @@ def step6():
         Field('generate_menu', 'boolean', default=True),
         Field('apply_layout', 'boolean', default=True),
         Field('erase_database', 'boolean', default=True),
-        Field('populate_database','boolean',default=True))
+        Field('populate_database', 'boolean', default=True),
+        _id="generate_form", _class="form-horizontal span7 well well-small")
     if form.accepts(request.vars):
         if DEMO_MODE:
             session.flash = T('Application cannot be generated in demo mode')
@@ -230,9 +254,11 @@ def step6():
         redirect(URL('generated'))
     return dict(step='6: Generate app "%s"' % app, form=form)
 
+
 def generated():
     return dict(app=session.app['name'])
 
+
 def sort_tables(tables):
     import re
     regex = re.compile('(%s)' % '|'.join(tables))
@@ -245,6 +271,7 @@ def sort_tables(tables):
     tables = []
     if is_auth_user:
         tables.append('auth_user')
+
     def append(table, trail=[]):
         if table in trail:
             raise RuntimeError
@@ -253,12 +280,15 @@ def sort_tables(tables):
             append(t, trail=trail + [table])
         if not table in tables:
             tables.append(table)
-    for table in d: append(table)
+    for table in d:
+        append(table)
     return tables
 
+
 def make_table(table, fields):
     rawtable = table
-    if table!='auth_user': table='t_'+table
+    if table != 'auth_user':
+        table = 't_' + table
     s = ''
     s += '\n' + '#' * 40 + '\n'
     s += "db.define_table('%s',\n" % table
@@ -277,11 +307,12 @@ def make_table(table,fields):
                 has[key] = True
         tables = session.app['tables']
         refs = [t for t in tables if t in items]
-        items = items[:1] + [x for x in items[1:] \
+        items = items[:1] + [x for x in items[1:]
                              if not x in keys and not x in tables]
         barename = name = '_'.join(items)
         if table[:2] == 't_': name = 'f_' + name
-        if first_field=='id': first_field=name
+        if first_field == 'id':
+            first_field = name
 
         ### determine field type
         ftype = 'string'
@@ -295,7 +326,8 @@ def make_table(table,fields):
                 ftype = t
         if refs:
             key = refs[0]
-            if not key=='auth_user': key='t_'+key
+            if not key == 'auth_user':
+                key = 't_' + key
             if 'multiple' in has:
                 ftype = 'list:reference %s' % key
             else:
@@ -352,17 +384,22 @@ def make_table(table,fields):
     s += "    migrate=settings.migrate)\n\n"
     if table == 'auth_user':
         s += """
-db.auth_user.first_name.requires = IS_NOT_EMPTY(error_message=auth.messages.is_empty)
+db.auth_user.first_name.requires = IS_NOT_EMPTY(
-db.auth_user.last_name.requires = IS_NOT_EMPTY(error_message=auth.messages.is_empty)
+    error_message=auth.messages.is_empty)
-db.auth_user.password.requires = CRYPT(key=auth.settings.hmac_key, min_length=4)
+db.auth_user.last_name.requires = IS_NOT_EMPTY(
+    error_message=auth.messages.is_empty)
+db.auth_user.password.requires = CRYPT(
+    key=auth.settings.hmac_key, min_length=4)
 db.auth_user.username.requires = IS_NOT_IN_DB(db, db.auth_user.username)
-db.auth_user.email.requires = (IS_EMAIL(error_message=auth.messages.invalid_email),
+db.auth_user.email.requires = (
+    IS_EMAIL(error_message=auth.messages.invalid_email),
                                IS_NOT_IN_DB(db, db.auth_user.email))
 """
     else:
         s += "db.define_table('%s_archive',db.%s,Field('current_record','reference %s',readable=False,writable=False))\n" % (table, table, table)
     return s
 
+
 def fix_db(filename):
     params = dict(session.app['params'])
     content = read_file(filename, 'rb')
@@ -370,7 +407,7 @@ def fix_db(filename):
         auth_user = make_table('auth_user', session.app['table_auth_user'])
         content = content.replace('sqlite://storage.sqlite',
                                   params['database_uri'])
-        content = content.replace('auth.define_tables()',\
+        content = content.replace('auth.define_tables()',
                                   auth_user + 'auth.define_tables(migrate = settings.migrate)')
     content += """
 mail.settings.server = settings.email_server
@@ -380,7 +417,8 @@ mail.settings.login = settings.email_login
     if params['login_method'] == 'janrain':
         content += """
 from gluon.contrib.login_methods.rpx_account import RPXAccount
-auth.settings.actions_disabled=['register','change_password','request_reset_password']
+auth.settings.actions_disabled=['register','change_password',
+    'request_reset_password']
 auth.settings.login_form = RPXAccount(request,
     api_key = settings.login_config.split(':')[-1],
     domain = settings.login_config.split(':')[0],
@@ -388,6 +426,7 @@ auth.settings.login_form = RPXAccount(request,
 """
     write_file(filename, content, 'wb')
 
+
 def make_menu(pages):
     s = ''
     s += 'response.title = settings.title\n'
@@ -408,6 +447,7 @@ def make_menu(pages):
     s += ']'
     return s
 
+
 def make_page(page, contents):
     if 'auth_user' in session.app['tables'] and not page in ('index', 'error'):
         s = "@auth.requires_login()\ndef %s():\n" % page
@@ -421,11 +461,13 @@ def make_page(page,contents):
         s += "    return dict()\n\n"
     return s
 
+
 def make_view(page, contents):
     s = "{{extend 'layout.html'}}\n\n"
     s += str(MARKMIN(contents))
     return s
 
+
 def populate(tables):
     s = 'from gluon.contrib.populate import populate\n'
     s += 'if db(db.auth_user).isempty():\n'
@@ -434,6 +476,7 @@ def populate(tables):
         s += "     populate(db.%s,10)\n" % t
     return s
 
+
 def create(options):
     if DEMO_MODE:
         session.flash = T('disabled in demo mode')
@@ -461,7 +504,8 @@ def create(options):
     if options.apply_layout and params['layout_theme'] != 'Default':
         try:
             fn = 'web2py.plugin.layout_%s.w2p' % params['layout_theme']
-            theme = urllib.urlopen(LAYOUTS_APP+'/static/plugin_layouts/plugins/'+fn)
+            theme = urllib.urlopen(
+                LAYOUTS_APP + '/static/plugin_layouts/plugins/' + fn)
             plugin_install(app, theme, request, fn)
         except:
             session.flash = T("unable to download layout")
@@ -502,20 +546,23 @@ def create(options):
 
     ### create newapp/models/db_wizard.py
     if options.generate_model:
-        model = os.path.join(request.folder,'..',app,'models','db_wizard.py')
+        model = os.path.join(
+            request.folder, '..', app, 'models', 'db_wizard.py')
         file = open(model, 'wb')
         try:
             file.write('### we prepend t_ to tablenames and f_ to fieldnames for disambiguity\n\n')
             tables = sort_tables(session.app['tables'])
             for table in tables:
-                if table=='auth_user': continue
+                if table == 'auth_user':
+                    continue
                 file.write(make_table(table, session.app['table_' + table]))
         finally:
             file.close()
 
     model = os.path.join(request.folder, '..', app,
                          'models', 'db_wizard_populate.py')
-    if os.path.exists(model): os.unlink(model)
+    if os.path.exists(model):
+        os.unlink(model)
     if options.populate_database and session.app['tables']:
         file = open(model, 'wb')
         try:
@@ -525,7 +572,8 @@ def create(options):
 
     ### create newapp/controllers/default.py
     if options.generate_controller:
-        controller = os.path.join(request.folder,'..',app,'controllers','default.py')
+        controller = os.path.join(
+            request.folder, '..', app, 'controllers', 'default.py')
         file = open(controller, 'wb')
         try:
             file.write("""# -*- coding: utf-8 -*-
@@ -536,17 +584,20 @@ def call(): return service()
 ### end requires
 """)
             for page in session.app['pages']:
-                file.write(make_page(page,session.app.get('page_'+page,'')))
+                file.write(
+                    make_page(page, session.app.get('page_' + page, '')))
         finally:
             file.close()
 
     ### create newapp/views/default/*.html
     if options.generate_views:
         for page in session.app['pages']:
-            view = os.path.join(request.folder,'..',app,'views','default',page+'.html')
+            view = os.path.join(
+                request.folder, '..', app, 'views', 'default', page + '.html')
             file = open(view, 'wb')
             try:
-                file.write(make_view(page,session.app.get('page_'+page,'')))
+                file.write(
+                    make_view(page, session.app.get('page_' + page, '')))
             finally:
                 file.close()
 
@@ -554,5 +605,3 @@ def call(): return service()
         path = os.path.join(request.folder, '..', app, 'databases', '*')
         for file in glob.glob(path):
             os.unlink(file)
-
-

applications/admin/cron/expire_sessions.py

@@ -19,5 +19,3 @@ for filename in os.listdir(path):
                 os.unlink(fullpath)
         except:
             logging.exception('failure to check %s' % fullpath)
-
-

applications/admin/languages/cs.py

@@ -0,0 +1,480 @@
+# coding: utf8
+{
+'!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}',
+'%s %%{row} updated': '%s upravených %%{záznam}',
+'%s selected': '%s označených',
+'%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}',
+'About': 'O programu',
+'About application': 'O aplikaci',
+'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:',
+'are not used': 'nepoužita',
+'are not used yet': 'ještě nepoužita',
+'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í',
+'Breakpoints': 'Body přerušení',
+'breakpoints': 'body přerušení',
+'Buy this book': 'Koupit web2py knihu',
+'Cache': 'Cache',
+'cache': 'cache',
+'Cache Keys': 'Klíče cache',
+'cache, errors and sessions cleaned': 'cache, chyby a relace byly pročištěny',
+'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 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',
+'Check to delete': 'Označit ke smazání',
+'Check to delete:': 'Označit ke smazání:',
+'Checking for upgrades...': 'Zjišťuji, zda jsou k dispozici aktualizace...',
+'Clean': 'Pročistit',
+'Clear CACHE?': 'Vymazat CACHE?',
+'Clear DISK': 'Vymazat DISK',
+'Clear RAM': 'Vymazat RAM',
+'Click row to expand traceback': 'Pro rozbalení stopy, klikněte na řádek',
+'Click row to view a ticket': 'Pro zobrazení chyby (ticketu), klikněte na řádku...',
+'Client IP': 'IP adresa klienta',
+'code': 'code',
+'Code listing': 'Code listing',
+'collapse/expand all': 'vše sbalit/rozbalit',
+'Community': 'Komunita',
+'Compile': 'Zkompilovat',
+'compiled application removed': 'zkompilovaná aplikace smazána',
+'Components and Plugins': 'Komponenty a zásuvné moduly',
+'Condition': 'Podmínka',
+'continue': 'continue',
+'Controller': 'Kontrolér (Controller)',
+'Controllers': 'Kontroléry',
+'controllers': 'kontroléry',
+'Copyright': 'Copyright',
+'Count': 'Počet',
+'Create': 'Vytvořit',
+'create file with filename:': 'vytvořit soubor s názvem:',
+'created by': 'vytvořil',
+'Created By': 'Vytvořeno - kým',
+'Created On': 'Vytvořeno - kdy',
+'crontab': 'crontab',
+'Current request': 'Aktuální požadavek',
+'Current response': 'Aktuální odpověď',
+'Current session': 'Aktuální relace',
+'currently running': 'právě běží',
+'currently saved or': 'uloženo nebo',
+'customize me!': 'upravte mě!',
+'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',
+'db': 'db',
+'DB Model': 'Databázový model',
+'Debug': 'Ladění',
+'defines tables': 'defines tables',
+'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í',
+'Demo': 'Demo',
+'Deploy': 'Nahrát',
+'Deploy on Google App Engine': 'Nahrát na Google App Engine',
+'Deploy to OpenShift': 'Nahrát na OpenShift',
+'Deployment Recipes': 'Postupy pro deployment',
+'Description': 'Popis',
+'design': 'návrh',
+'Detailed traceback description': 'Podrobný výpis prostředí',
+'details': 'podrobnosti',
+'direction: ltr': 'směr: ltr',
+'Disable': 'Zablokovat',
+'DISK': 'DISK',
+'Disk Cache Keys': 'Klíče diskové cache',
+'Disk Cleared': 'Disk smazán',
+'docs': 'dokumentace',
+'Documentation': 'Dokumentace',
+"Don't know what to do?": 'Nevíte kudy kam?',
+'done!': 'hotovo!',
+'Download': 'Stáhnout',
+'download layouts': 'stáhnout moduly rozvržení stránky',
+'download plugins': 'stáhnout zásuvné moduly',
+'E-mail': 'E-mail',
+'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': 'Snapshot chyby',
+'Error ticket': 'Ticket chyby',
+'Errors': 'Chyby',
+'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ší',
+'Find Previous': 'Najít předchozí',
+'First name': 'Křestní jméno',
+'Forgot username?': 'Zapomněl jste svoje přihlašovací jméno?',
+'forgot username?': 'zapomněl jste svoje přihlašovací jméno?',
+'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',
+'Hello World': 'Ahoj světe',
+'Help': 'Nápověda',
+'Hide/Show Translated strings': 'Skrýt/Zobrazit přeložené texty',
+'Hits': 'Kolikrát dosaženo',
+'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',
+'Index': 'Index',
+'insert new': 'vložit nový záznam ',
+'insert new %s': 'vložit nový záznam %s',
+'inspect attributes': 'inspect attributes',
+'Install': 'Instalovat',
+'Installed applications': 'Nainstalované aplikace',
+'Interaction at %s line %s': 'Interakce v %s, na řádce %s',
+'Interactive console': 'Interaktivní příkazová řádka',
+'Internal State': 'Vnitřní stav',
+'Introduction': 'Úvod',
+'Invalid email': 'Neplatný email',
+'Invalid password': 'Nesprávné heslo',
+'invalid password.': 'neplatné heslo',
+'Invalid Query': 'Neplatný dotaz',
+'invalid request': 'Neplatný požadavek',
+'Is Active': 'Je aktivní',
+'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í',
+'Last saved on:': 'Naposledy uloženo:',
+'Layout': 'Rozvržení stránky (layout)',
+'Layout Plugins': 'Moduly rozvržení stránky (Layout Plugins)',
+'Layouts': 'Rozvržení stránek',
+'License for': 'Licence pro',
+'Line number': 'Číslo řádku',
+'LineNo': 'Č.řádku',
+'Live Chat': 'Online pokec',
+'loading...': 'nahrávám...',
+'locals': 'locals',
+'Locals##debug': 'Lokální proměnné',
+'Logged in': 'Přihlášení proběhlo úspěšně',
+'Logged out': 'Odhlášení proběhlo úspěšně',
+'Login': 'Přihlásit se',
+'login': 'přihlásit se',
+'Login to the Administrative Interface': 'Přihlásit se do Správce aplikací',
+'logout': 'odhlásit se',
+'Logout': 'Odhlásit se',
+'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',
+'models': 'modely',
+'Modified By': 'Změněno - kým',
+'Modified On': 'Změněno - kdy',
+'Modules': 'Moduly',
+'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',
+'New Record': 'Nový záznam',
+'new record inserted': 'nový záznam byl založen',
+'New simple application': 'Vytvořit primitivní aplikaci',
+'next': 'next',
+'next 100 rows': 'dalších 100 řádků',
+'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',
+'Other Plugins': 'Ostatní moduly',
+'Other Recipes': 'Ostatní zásuvné moduly',
+'Overview': 'Přehled',
+'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',
+'previous 100 rows': 'předchozích 100 řádků',
+'Private files': 'Soukromé soubory',
+'private files': 'soukromé soubory',
+'profile': 'profil',
+'Project Progress': 'Vývoj projektu',
+'Python': 'Python',
+'Query:': 'Dotaz:',
+'Quick Examples': 'Krátké příklady',
+'RAM': 'RAM',
+'RAM Cache Keys': 'Klíče RAM Cache',
+'Ram Cleared': 'RAM smazána',
+'Readme': 'Nápověda',
+'Recipes': 'Postupy jak na to',
+'Record': 'Záznam',
+'record does not exist': 'záznam neexistuje',
+'Record ID': 'ID záznamu',
+'Record id': 'id záznamu',
+'refresh': 'obnovte',
+'register': 'registrovat',
+'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é',
+'Removed Breakpoint on %s at line %s': 'Bod přerušení smazán - soubor %s na řádce %s',
+'Replace': 'Zaměnit',
+'Replace All': 'Zaměnit vše',
+'request': 'request',
+'Reset Password key': 'Reset registračního klíče',
+'response': 'response',
+'restart': 'restart',
+'restore': 'obnovit',
+'Retrieve username': 'Získat přihlašovací jméno',
+'return': 'return',
+'revert': 'vrátit se k původnímu',
+'Role': 'Role',
+'Rows in Table': 'Záznamy v tabulce',
+'Rows selected': 'Záznamů zobrazeno',
+'rules are not defined': 'pravidla nejsou definována',
+"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',
+'Services': 'Služby',
+'session': 'session',
+'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',
+'Sorry, could not find mercurial installed': 'Bohužel mercurial není nainstalován.',
+'Start a new app': 'Vytvořit novou aplikaci',
+'Start searching': 'Začít hledání',
+'Start wizard': 'Spustit průvodce',
+'state': 'stav',
+'Static': 'Static',
+'static': 'statické soubory',
+'Static files': 'Statické soubory',
+'Statistics': 'Statistika',
+'Step': 'Step',
+'step': 'step',
+'stop': 'stop',
+'Stylesheet': 'CSS styly',
+'submit': 'odeslat',
+'Submit': 'Odeslat',
+'successful': 'úspěšně',
+'Support': 'Podpora',
+'Sure you want to delete this object?': 'Opravdu chcete smazat tento objekt?',
+'Table': 'tabulka',
+'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)',
+'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/languages/de.py

@@ -1,119 +1,126 @@
 # coding: utf8
+# Translation by: Klaus Kappel <kkappel@yahoo.de>
 {
 '!langcode!': 'de',
 '!langname!': 'Deutsch',
-'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Update" ist ein optionaler Ausdruck wie "Feld1 = \'newvalue". JOIN Ergebnisse können nicht aktualisiert oder gelöscht werden',
+'"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"Update" ist ein optionaler Ausdruck wie "Feld1 = \'newvalue". JOIN Ergebnisse k?nnen nicht aktualisiert oder gel?scht werden',
-'%s %%{row} deleted': '%s Zeilen gelöscht',
+'%s %%{row} deleted': '%s %%{row} Zeilen gel?scht',
-'%s %%{row} updated': '%s Zeilen aktualisiert',
+'%s %%{row} updated': '%s %%{row} Zeilen aktualisiert',
-'%Y-%m-%d': '%Y-%m-%d',
+'%Y-%m-%d': '%d.%m.%Y',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'%Y-%m-%d %H:%M:%S': '%d.%m.%Y %H:%M:%S',
-'(requires internet access)': '(requires internet access)',
+'(requires internet access)': '(Internet Zugang wir ben?tigt)',
+'(requires internet access, experimental)': '(ben?tigt Internet Zugang)',
 '(something like "it-it")': '(so etwas wie "it-it")',
-'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01Searching: **%s** %%{file}': '@markmin\x01Suche: **%s** Dateien',
-'A new version of web2py is available': 'Eine neue Version von web2py ist verfügbar',
+'A new version of web2py is available': 'Eine neue Version von web2py ist verf?gbar',
-'A new version of web2py is available: %s': 'Eine neue Version von web2py ist verfügbar: %s',
+'A new version of web2py is available: %s': 'Eine neue Version von web2py ist verf?gbar: %s',
 'Abort': 'Abbrechen',
-'About': 'Über',
+'About': '?ber',
-'About application': 'Über die Anwendung',
+'About application': '?ber die Anwendung',
-'Additional code for your application': 'Additional code for your application',
+'Additional code for your application': 'zus?tzlicher Code f?r Ihre Anwendung',
-'additional code for your application': 'zusätzlicher Code für Ihre Anwendung',
 'admin disabled because no admin password': 'admin ist deaktiviert, weil kein Admin-Passwort gesetzt ist',
-'admin disabled because not supported on google apps engine': 'admin ist deaktiviert, es existiert dafür keine Unterstützung auf der google apps engine',
+'admin disabled because not supported on google apps engine': 'admin ist deaktiviert, es existiert daf?r keine Unterst?tzung auf der google apps engine',
 'admin disabled because unable to access password file': 'admin ist deaktiviert, weil kein Zugriff auf die Passwortdatei besteht',
 'Admin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
 'Admin is disabled because unsecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
-'Admin language': 'Admin language',
+'Admin language': 'Admin-Sprache',
-'administrative interface': 'administrative interface',
+'administrative interface': 'Administrative Schnittstelle',
 'Administrator Password:': 'Administrator Passwort:',
+'An error occured, please %s the page': 'Ein Fehler ist aufgetereten, bitte %s die Seite',
 'and rename it (required):': 'und benenne sie um (erforderlich):',
 'and rename it:': ' und benenne sie um:',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'Appadmin ist deaktiviert, wegen der Benutzung eines unsicheren Kanals',
+'Application': 'Anwendung',
 'application "%s" uninstalled': 'Anwendung "%s" deinstalliert',
 'application compiled': 'Anwendung kompiliert',
-'application is compiled and cannot be designed': 'Die Anwendung ist kompiliert kann deswegen nicht mehr geändert werden',
+'application is compiled and cannot be designed': 'Die Anwendung ist kompiliert kann deswegen nicht mehr ge?ndert werden',
-'Application name:': 'Application name:',
+'Application name:': 'Name der Applikation:',
-'Are you sure you want to delete file "%s"?': 'Sind Sie sich sicher, dass Sie diese Datei löschen wollen "%s"?',
+'Are you sure you want to delete file "%s"?': 'Sind Sie sich sicher, dass Sie diese Datei l?schen wollen "%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 uninstall application "%s"': 'Sind Sie sich sicher, dass Sie diese Anwendung deinstallieren wollen "%s"',
 'Are you sure you want to uninstall application "%s"?': 'Sind Sie sich sicher, dass Sie diese Anwendung deinstallieren wollen "%s"?',
-'Are you sure you want to upgrade web2py now?': 'Sind Sie sich sicher, dass Sie web2py jetzt upgraden möchten?',
+'Are you sure you want to upgrade web2py now?': 'Sind Sie sich sicher, dass Sie web2py jetzt upgraden m?chten?',
 'arguments': 'arguments',
-'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ACHTUNG: Die Einwahl benötigt eine sichere (HTTPS) Verbindung. Es sei denn sie läuft Lokal(localhost).',
+'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ACHTUNG: Die Einwahl ben?tigt eine sichere (HTTPS) Verbindung. Es sei denn sie l?uft Lokal(localhost).',
-'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ACHTUNG: Testen ist nicht threadsicher. Führen sie also nicht mehrere Tests gleichzeitig aus.',
+'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ACHTUNG: Testen ist nicht threadsicher. F?hren sie also nicht mehrere Tests gleichzeitig aus.',
-'ATTENTION: This is an experimental feature and it needs more testing.': 'ACHTUNG: Dies ist eine experimentelle Funktion und benötigt noch weitere Tests.',
+'ATTENTION: This is an experimental feature and it needs more testing.': 'ACHTUNG: Dies ist eine experimentelle Funktion und ben?tigt noch weitere Tests.',
 'ATTENTION: you cannot edit the running application!': 'ACHTUNG: Eine laufende Anwendung kann nicht editiert werden!',
 'Authentication': 'Authentifizierung',
-'Available databases and tables': 'Verfügbare Datenbanken und Tabellen',
+'Available databases and tables': 'Verf?gbare Datenbanken und Tabellen',
-'back': 'zurück',
+'back': 'zur?ck',
-'beautify': 'beautify',
+'beautify': 'versch?nern',
-'cache': 'Cache',
+'cache': 'Pufferspeicher',
-'cache, errors and sessions cleaned': 'Zwischenspeicher (cache), Fehler und Sitzungen (sessions) gelöscht',
+'cache, errors and sessions cleaned': 'Zwischenspeicher (cache), Fehler und Sitzungen (sessions) gel?scht',
-'call': 'call',
+'call': 'Aufruf',
-'can be a git repo': 'can be a git repo',
+'can be a git repo': 'kann ein git Repository sein',
 'Cannot be empty': 'Darf nicht leer sein',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Nicht Kompilierbar:Es sind Fehler in der Anwendung. Beseitigen Sie die Fehler und versuchen Sie es erneut.',
 'cannot create file': 'Kann Datei nicht erstellen',
 'cannot upload file "%(filename)s"': 'Kann Datei nicht Hochladen "%(filename)s"',
-'Change admin password': 'Administrator-Passwort ändern',
+'Change admin password': 'Administrator-Passwort ?ndern',
-'Change Password': 'Passwort ändern',
+'Change Password': 'Passwort ?ndern',
-'change password': 'Passwort ändern',
+'change password': 'Passwort ?ndern',
-'check all': 'alles auswählen',
+'check all': 'alles ausw?hlen',
 'Check for upgrades': 'check for upgrades',
-'Check to delete': 'Markiere zum löschen',
+'Check to delete': 'Markiere zum l?schen',
-'Checking for upgrades...': 'Auf Updates überprüfen...',
+'Checking for upgrades...': 'Auf Updates ?berpr?fen...',
-'Clean': 'löschen',
+'Clean': 'leeren',
-'click here for online examples': 'hier klicken für online Beispiele',
+'click here for online examples': 'hier klicken f?r online Beispiele',
-'click here for the administrative interface': 'hier klicken für die Administrationsoberfläche ',
+'click here for the administrative interface': 'hier klicken f?r die Administrationsoberfl?che ',
+'Click row to expand traceback': 'Klicke auf die Zeile f?r Fehlerverfolgung',
 'click to check for upgrades': 'hier klicken um nach Upgrades zu suchen',
 'Client IP': 'Client IP',
 'code': 'code',
-'collapse/expand all': 'collapse/expand all',
+'collapse/expand all': 'alles zu- bzw. aufklappen',
 'Compile': 'kompilieren',
-'compiled application removed': 'kompilierte Anwendung gelöscht',
+'compiled application removed': 'kompilierte Anwendung gel?scht',
 'Controller': 'Controller',
 'Controllers': 'Controller',
 'controllers': 'Controllers',
 'Copyright': 'Urheberrecht',
+'Count': 'Anzahl',
 'Create': 'erstellen',
 'create file with filename:': 'erzeuge Datei mit Dateinamen:',
 'create new application:': 'erzeuge neue Anwendung:',
 'Create new simple application': 'Erzeuge neue Anwendung',
-'created by': 'created by',
+'created by': 'erstellt von',
 'crontab': 'crontab',
 'Current request': 'Aktuelle Anfrage (request)',
 'Current response': 'Aktuelle Antwort (response)',
 'Current session': 'Aktuelle Sitzung (session)',
-'currently running': 'currently running',
+'currently running': 'aktuell in Betrieb',
 'currently saved or': 'des derzeit gespeicherten oder',
 'customize me!': 'pass mich an!',
 'data uploaded': 'Daten hochgeladen',
 'Database': 'Datenbank',
 'database': 'Datenbank',
-'database %s select': 'Datenbank %s ausgewählt',
+'database %s select': 'Datenbank %s ausgew?hlt',
 'database administration': 'Datenbankadministration',
 'Date and Time': 'Datum und Uhrzeit',
 'db': 'db',
 'DB Model': 'DB Modell',
 'Debug': 'Debug',
 'defines tables': 'definiere Tabellen',
-'Delete': 'Löschen',
+'Delete': 'L?schen',
-'delete': 'löschen',
+'delete': 'l?schen',
-'delete all checked': 'lösche alle markierten',
+'delete all checked': 'l?sche alle markierten',
-'delete plugin': 'Plugin löschen',
+'delete plugin': 'Plugin l?schen',
-'Delete:': 'Löschen:',
+'Delete:': 'L?schen:',
-'Deploy': 'deploy',
+'Deploy': 'Installieren',
 'Deploy on Google App Engine': 'Auf Google App Engine installieren',
-'Deploy to OpenShift': 'Deploy to OpenShift',
+'Deploy to OpenShift': 'Auf OpenShift installieren',
 'Description': 'Beschreibung',
 'design': 'design',
 'DESIGN': 'design',
-'Design for': 'Design für',
+'Design for': 'Design f?r',
+'Detailed traceback description': 'Detailed traceback description',
 'direction: ltr': 'direction: ltr',
-'Disable': 'Disable',
+'Disable': 'Deaktivieren',
 'documentation': 'Dokumentation',
 'done!': 'fertig!',
-'download layouts': 'download layouts',
+'Download .w2p': 'Download .w2p',
+'download layouts': 'Layouts herunterladen',
 'download plugins': 'download plugins',
 'E-mail': 'E-mail',
 'EDIT': 'BEARBEITEN',
@@ -129,56 +136,64 @@
 'Editing file "%s"': 'Bearbeite Datei "%s"',
 'Editing Language file': 'Sprachdatei bearbeiten',
 'Enterprise Web Framework': 'Enterprise Web Framework',
-'Error logs for "%(app)s"': 'Fehlerprotokoll für "%(app)s"',
+'Error': 'Fehler',
+'Error logs for "%(app)s"': 'Fehlerprotokoll f?r "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
 'Errors': 'Fehler',
 'escape': 'escape',
 'Exception instance attributes': 'Atribute der Ausnahmeinstanz',
-'Expand Abbreviation': 'Kürzel erweitern',
+'Expand Abbreviation': 'K?rzel erweitern',
 'export as csv file': 'Exportieren als CSV-Datei',
-'exposes': 'stellt zur Verfügung',
+'exposes': 'stellt zur Verf?gung',
 'extends': 'erweitert',
 'failed to reload module': 'neu laden des Moduls fehlgeschlagen',
+'File': 'Datei',
 'file "%(filename)s" created': 'Datei "%(filename)s" erstellt',
-'file "%(filename)s" deleted': 'Datei "%(filename)s" gelöscht',
+'file "%(filename)s" deleted': 'Datei "%(filename)s" gel?scht',
 'file "%(filename)s" uploaded': 'Datei "%(filename)s" hochgeladen',
-'file "%(filename)s" was not deleted': 'Datei "%(filename)s" wurde nicht gelöscht',
+'file "%(filename)s" was not deleted': 'Datei "%(filename)s" wurde nicht gel?scht',
 'file "%s" of %s restored': 'Datei "%s" von %s wiederhergestellt',
-'file changed on disk': 'Datei auf Festplatte geändert',
+'file changed on disk': 'Datei auf Festplatte ge?ndert',
 'file does not exist': 'Datei existiert nicht',
 'file saved on %(time)s': 'Datei gespeichert am %(time)s',
 'file saved on %s': 'Datei gespeichert auf %s',
 'filter': 'filter',
 'First name': 'Vorname',
+'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'Funktionen ohne doctests erzeugen [passed] in Tests',
 'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
-'Go to Matching Pair': 'gehe zum übereinstimmenden Paar',
+'Go to Matching Pair': 'gehe zum ?bereinstimmenden Paar',
+'Goto': 'Goto',
 'Group ID': 'Gruppen ID',
 'Hello World': 'Hallo Welt',
 'Help': 'Hilfe',
+'Home': 'Home',
 'htmledit': 'htmledit',
-'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.': 'Falls der obere Test eine Fehler-Ticketnummer enthält deutet das auf einen Fehler in der Ausführung des Controllers hin, noch bevor der Doctest ausgeführt werden konnte. Gewöhnlich führen fehlerhafte Einrückungen oder fehlerhafter Code ausserhalb der Funktion zu solchen Fehlern. Ein grüner Titel deutet darauf hin, dass alle Test(wenn sie vorhanden sind) erfolgreich durchlaufen wurden. In diesem Fall werden die Testresultate nicht angezeigt.',
+'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.': 'Falls der obere Test eine Fehler-Ticketnummer enth?lt deutet das auf einen Fehler in der Ausf?hrung des Controllers hin, noch bevor der Doctest ausgef?hrt werden konnte. Gew?hnlich f?hren fehlerhafte Einr?ckungen oder fehlerhafter Code ausserhalb der Funktion zu solchen Fehlern. Ein gr?ner Titel deutet darauf hin, dass alle Test(wenn sie vorhanden sind) erfolgreich durchlaufen wurden. In diesem Fall werden die Testresultate nicht angezeigt.',
 'If you answer "yes", be patient, it may take a while to download': '',
 'If you answer yes, be patient, it may take a while to download': 'If you answer yes, be patient, it may take a while to download',
 'Import/Export': 'Importieren/Exportieren',
-'includes': 'Einfügen',
+'includes': 'Einf?gen',
 'Index': 'Index',
 'index': 'index',
-'insert new': 'neu einfügen',
+'insert new': 'neu einf?gen',
-'insert new %s': 'neu einfügen %s',
+'insert new %s': 'neu einf?gen %s',
+'inspect attributes': 'inspect attributes',
 'Install': 'installieren',
 'Installed applications': 'Installierte Anwendungen',
 'internal error': 'interner Fehler',
 'Internal State': 'interner Status',
-'Invalid action': 'Ungültige Aktion',
+'Invalid action': 'Ung?ltige Aktion',
-'Invalid email': 'Ungültige Email',
+'Invalid email': 'Ung?ltige Email',
-'invalid password': 'Ungültiges Passwort',
+'invalid password': 'Ung?ltiges Passwort',
-'Invalid Query': 'Ungültige Abfrage',
+'Invalid Query': 'Ung?ltige Abfrage',
-'invalid request': 'ungültige Anfrage',
+'invalid request': 'ung?ltige Anfrage',
-'invalid ticket': 'ungültiges Ticket',
+'invalid ticket': 'ung?ltiges Ticket',
 'Key bindings': 'Tastenbelegungen',
-'Key bindings for ZenConding Plugin': 'Tastenbelegungen für das ZenConding Plugin',
+'Key bindings for ZenConding Plugin': 'Tastenbelegungen f?r das ZenConding Plugin',
 'language file "%(filename)s" created/updated': 'Sprachdatei "%(filename)s" erstellt/aktualisiert',
 'Language files (static strings) updated': 'Sprachdatei (statisch Strings) aktualisiert',
 'languages': 'Sprachen',
@@ -187,8 +202,9 @@
 'Last name': 'Nachname',
 'Last saved on:': 'Zuletzt gespeichert am:',
 'Layout': 'Layout',
-'License for': 'Lizenz für',
+'License for': 'Lizenz f?r',
 'loading...': 'lade...',
+'locals': 'locals',
 'located in the file': 'located in Datei',
 'Login': 'Anmelden',
 'login': 'anmelden',
@@ -196,33 +212,37 @@
 'Logout': 'abmelden',
 'Lost Password': 'Passwort vergessen',
 'lost password?': 'Passwort vergessen?',
-'Main Menu': 'Menú principal',
+'Main Menu': 'Men? principal',
+'Manage': 'Verwalten',
 'Match Pair': 'Paare finden',
-'Menu Model': 'Menü Modell',
+'Menu Model': 'Men? Modell',
 'merge': 'verbinden',
-'Merge Lines': 'Zeilen zusammenfügen',
+'Merge Lines': 'Zeilen zusammenf?gen',
 'Models': 'Modelle',
 'models': 'Modelle',
 'Modules': 'Module',
 'modules': 'Module',
 'Name': 'Name',
 'new application "%s" created': 'neue Anwendung "%s" erzeugt',
-'New application wizard': 'New application wizard',
+'New application wizard': 'Neue Anwendung per Assistent',
 'New Record': 'Neuer Datensatz',
-'new record inserted': 'neuer Datensatz eingefügt',
+'new record inserted': 'neuer Datensatz eingef?gt',
-'New simple application': 'New simple application',
+'New simple application': 'Neue einfache Anwendung',
-'next 100 rows': 'nächsten 100 Zeilen',
+'next 100 rows': 'n?chsten 100 Zeilen',
-'Next Edit Point': 'nächster Bearbeitungsschritt',
+'Next Edit Point': 'n?chster Bearbeitungsschritt',
 'NO': 'NEIN',
 'No databases in this application': 'Keine Datenbank in dieser Anwendung',
+'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'Or Get from URL:': 'oder hole es von folgender URL:',
 'or import from csv file': 'oder importieren von cvs Datei',
 'or provide app url:': 'oder geben Sie eine Anwendungs-URL an:',
 'or provide application url:': 'oder geben Sie eine Anwendungs-URL an:',
 'Origin': 'Herkunft',
-'Original/Translation': 'Original/Übersetzung',
+'Original/Translation': 'Original/?bersetzung',
-'Overwrite installed app': 'installierte Anwendungen überschreiben',
+'Overwrite installed app': 'installierte Anwendungen ?berschreiben',
 'Pack all': 'verpacke alles',
 'Pack compiled': 'Verpacke kompiliert',
+'Pack custom': 'Verpacke individuell',
 'pack plugin': 'Plugin verpacken',
 'Password': 'Passwort',
 'Peeking at file': 'Dateiansicht',
@@ -230,9 +250,10 @@
 'Plugin "%s" in application': 'Plugin "%s" in Anwendung',
 'plugins': 'plugins',
 'Plugins': 'Plugins',
-'Powered by': 'Unterstützt von',
+'Powered by': 'Unterst?tzt von',
 'previous 100 rows': 'vorherige 100 zeilen',
 'Previous Edit Point': 'vorheriger Bearbeitungsschritt',
+'Project Progress': 'Projekt Fortschritt',
 'Query:': 'Abfrage:',
 'record': 'Datensatz',
 'record does not exist': 'Datensatz existiert nicht',
@@ -240,33 +261,38 @@
 'Record ID': 'Datensatz ID',
 'register': 'Registrierung',
 'Register': 'registrieren',
-'Registration key': 'Registrierungsschlüssel',
+'Registration key': 'Registrierungsschl?ssel',
-'Reload routes': 'Reload routes',
+'reload': 'Neu laden',
-'Remove compiled': 'kompilat gelöscht',
+'Reload routes': 'Routen neu laden',
-'Reset Password key': 'Passwortschlüssel zurücksetzen',
+'Remove compiled': 'Bytecode l?schen',
+'request': 'request',
+'Reset Password key': 'Passwortschl?ssel zur?cksetzen',
 'Resolve Conflict file': 'bereinige Konflikt-Datei',
+'response': 'Antwort',
 'restore': 'wiederherstellen',
-'revert': 'zurückkehren',
+'revert': 'zur?ckkehren',
 'Role': 'Rolle',
 'Rows in table': 'Zeilen in Tabelle',
-'Rows selected': 'Zeilen ausgewählt',
+'Rows selected': 'Zeilen ausgew?hlt',
-'Running on %s': 'Running on %s',
+'Running on %s': 'L?uft auf %s',
 'save': 'sichern',
 'Save via Ajax': 'via Ajax sichern',
 'Saved file hash:': 'Gespeicherter Datei-Hash:',
-'selected': 'ausgewählt(e)',
+'Select Files to Package': 'Dateien zum Paketieren w?hlen',
-'session expired': 'Sitzung Abgelaufen',
+'selected': 'ausgew?hlt(e)',
+'session': 'Sitzung',
+'session expired': 'Sitzung abgelaufen',
 'shell': 'shell',
 'Site': 'Seite',
-'some files could not be removed': 'einige Dateien konnten nicht gelöscht werden',
+'some files could not be removed': 'einige Dateien konnten nicht gel?scht werden',
-'Start wizard': 'start wizard',
+'Start wizard': 'Assistent starten',
 'state': 'Status',
 'static': 'statische Dateien',
 'Static files': 'statische Dateien',
 'Stylesheet': 'Stylesheet',
 'Submit': 'Submit',
 'submit': 'Absenden',
-'Sure you want to delete this object?': 'Wollen Sie das Objekt wirklich löschen?',
+'Sure you want to delete this object?': 'Wollen Sie das Objekt wirklich l?schen?',
 'table': 'Tabelle',
 'Table name': 'Tabellen Name',
 'test': 'Test',
@@ -276,42 +302,45 @@
 'test_try': 'test_try',
 'Testing application': 'Teste die Anwendung',
 'Testing controller': 'teste Controller',
-'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'Die "query" ist eine Bedingung wie "db.table1.field1 == \'Wert\'". Etwas wie "db.table1.field1 db.table2.field2 ==" führt zu einem 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.': 'Die "query" ist eine Bedingung wie "db.table1.field1 == \'Wert\'". Etwas wie "db.table1.field1 db.table2.field2 ==" f?hrt zu einem SQL JOIN.',
-'the application logic, each URL path is mapped in one exposed function in the controller': 'Die Logik der Anwendung, jeder URL-Pfad wird auf eine Funktion abgebildet die der Controller zur Verfügung stellt',
+'the application logic, each URL path is mapped in one exposed function in the controller': 'Die Logik der Anwendung, jeder URL-Pfad wird auf eine Funktion abgebildet die der Controller zur Verf?gung stellt',
 '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 data representation, define database tables and sets': 'Die Datenrepräsentation definiert Mengen von Tabellen und Datenbanken ',
+'the data representation, define database tables and sets': 'Die Datenrepr?sentation definiert Mengen von Tabellen und Datenbanken ',
 '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': 'The output of the file is a dictionary that was rendered by the view',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
-'the presentations layer, views are also known as templates': 'Die Präsentationsschicht, Views sind auch bekannt als Vorlagen/Templates',
+'the presentations layer, views are also known as templates': 'Die Pr?sentationsschicht, Views sind auch bekannt als Vorlagen/Templates',
 'There are no controllers': 'Keine Controller vorhanden',
 'There are no models': 'Keine Modelle vorhanden',
 'There are no modules': 'Keine Module vorhanden',
 'There are no plugins': 'There are no plugins',
 'There are no static files': 'Keine statischen Dateien vorhanden',
-'There are no translators, only default language is supported': 'Keine Übersetzungen vorhanden, nur die voreingestellte Sprache wird unterstützt',
+'There are no translators, only default language is supported': 'Keine ?bersetzungen vorhanden, nur die voreingestellte Sprache wird unterst?tzt',
 'There are no views': 'Keine Views vorhanden',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
 'these files are served without processing, your images go here': 'Diese Dateien werden ohne Verarbeitung ausgeliefert. Beispielsweise Bilder kommen hier hin.',
-'This is a copy of the scaffolding application': 'Dies ist eine Kopie einer Grundgerüst-Anwendung',
+'This is a copy of the scaffolding application': 'Dies ist eine Kopie einer Grundger?st-Anwendung',
 'This is the %(filename)s template': 'Dies ist das Template %(filename)s',
 'Ticket': 'Ticket',
-'Timestamp': 'Timestamp',
+'Ticket ID': 'Ticket ID',
+'Timestamp': 'Zeitstempel',
 'TM': 'TM',
-'to  previous version.': 'zu einer früheren Version.',
+'to  previous version.': 'zu einer fr?heren Version.',
 'To create a plugin, name a file/folder plugin_[name]': 'Um ein Plugin zu erstellen benennen Sie eine(n) Datei/Ordner plugin_[Name]',
-'translation strings for the application': 'Übersetzungs-Strings für die Anwendung',
+'Traceback': 'Traceback',
-'Translation strings for the application': 'Translation strings for the application',
+'translation strings for the application': '?bersetzungs-Strings f?r die Anwendung',
+'Translation strings for the application': '?bersetzungs-Strings f?r die Anwendung',
 'try': 'versuche',
 'try something like': 'versuche so etwas wie',
-'Unable to check for upgrades': 'überprüfen von Upgrades nicht möglich',
+'Try the mobile interface': 'Try the mobile interface',
-'unable to create application "%s"': 'erzeugen von Anwendung "%s" nicht möglich',
+'Unable to check for upgrades': '?berpr?fen von Upgrades nicht m?glich',
-'unable to delete file "%(filename)s"': 'löschen von Datein "%(filename)s" nicht möglich',
+'unable to create application "%s"': 'erzeugen von Anwendung "%s" nicht m?glich',
-'Unable to download': 'herunterladen nicht möglich',
+'unable to delete file "%(filename)s"': 'l?schen von Datein "%(filename)s" nicht m?glich',
-'Unable to download app': 'herunterladen der Anwendung nicht möglich',
+'Unable to download': 'herunterladen nicht m?glich',
-'unable to parse csv file': 'analysieren der cvs Datei nicht möglich',
+'Unable to download app': 'herunterladen der Anwendung nicht m?glich',
-'unable to uninstall "%s"': 'deinstallieren von "%s" nicht möglich',
+'unable to parse csv file': 'analysieren der cvs Datei nicht m?glich',
-'uncheck all': 'alles demarkieren',
+'unable to uninstall "%s"': 'deinstallieren von "%s" nicht m?glich',
+'uncheck all': 'Selektionen entfernen',
 'Uninstall': 'deinstallieren',
 'update': 'aktualisieren',
 'update all languages': 'aktualisiere alle Sprachen',
@@ -319,33 +348,35 @@
 'upgrade web2py now': 'jetzt web2py upgraden',
 'upload': 'upload',
 'Upload & install packed application': 'Verpackte Anwendung hochladen und installieren',
-'Upload a package:': 'Upload a package:',
+'Upload a package:': 'Ein Packet hochladen:',
-'Upload and install packed application': 'Upload and install packed application',
+'Upload and install packed application': 'Verpackte Anwendung hochladen und installieren',
 'upload application:': 'lade Anwendung hoch:',
 'Upload existing application': 'lade existierende Anwendung hoch',
 'upload file:': 'lade Datei hoch:',
 'upload plugin file:': 'Plugin-Datei hochladen:',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Benutze (...)&(...) für AND, (...)|(...) für OR, und ~(...) für NOT, um komplexe Abfragen zu erstellen.',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Benutze (...)&(...) f?r AND, (...)|(...) f?r OR, und ~(...) f?r NOT, um komplexe Abfragen zu erstellen.',
-'Use an url:': 'Use an url:',
+'Use an url:': 'Verwende URL:',
-'user': 'user',
+'user': 'Nutzer',
 'User ID': 'Benutzer ID',
-'variables': 'variables',
+'variables': 'Variablen',
 'Version': 'Version',
 'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
 'versioning': 'Versionierung',
-'View': 'View',
+'Versioning': 'Versionierung',
-'view': 'View',
+'View': 'Ansicht',
-'Views': 'Views',
+'view': 'Ansicht',
-'views': 'Views',
+'Views': 'Ansichten',
+'views': 'Ansichten',
+'Web Framework': 'Web Framework',
 'web2py is up to date': 'web2py ist auf dem neuesten Stand',
 'web2py Recent Tweets': 'neuste Tweets von web2py',
 'Welcome %s': 'Willkommen %s',
 'Welcome to web2py': 'Willkommen zu web2py',
-'Which called the function': 'Which called the function',
+'Which called the function': 'welche die Funktion aufrief',
-'Wrap with Abbreviation': 'mit Kürzel einhüllen',
+'Wrap with Abbreviation': 'mit K?rzel einh?llen',
 'xml': 'xml',
 'YES': 'JA',
-'You are successfully running web2py': 'web2by wird erfolgreich ausgeführt',
+'You are successfully running web2py': 'web2by wird erfolgreich ausgef?hrt',
-'You can modify this application and adapt it to your needs': 'Sie können diese Anwendung verändern und Ihren Bedürfnissen anpassen',
+'You can modify this application and adapt it to your needs': 'Sie k?nnen diese Anwendung ver?ndern und Ihren Bed?rfnissen anpassen',
 'You visited the url': 'Sie besuchten die URL',
 }

applications/admin/languages/es.py

@@ -3,154 +3,28 @@
 '!langcode!': 'es',
 '!langname!': 'Español',
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"actualice" es una expresión opcional como "campo1=\'nuevo_valor\'". No se puede actualizar o eliminar resultados de un JOIN',
-'%Y-%m-%d': '%Y-%m-%d',
-'%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '%s %%{row} deleted': '%s filas eliminadas',
 '%s %%{row} updated': '%s filas actualizadas',
+'%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")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
 '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',
-'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!',
 'About': 'acerca de',
 'About application': 'Acerca de la aplicación',
-'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',
-'Administrator Password:': 'Contraseña del Administrador:',
-'Are you sure you want to delete file "%s"?': '¿Está seguro que desea eliminar el archivo "%s"?',
-'Are you sure you want to delete plugin "%s"?': '¿Está seguro que quiere eliminar el plugin "%s"?',
-'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"?',
-'Are you sure you want to upgrade web2py now?': '¿Está seguro que desea actualizar web2py ahora?',
-'Available databases and tables': 'Bases de datos y tablas disponibles',
-'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 compile: there are errors in your app:': 'No se puede compilar: hay errores en su aplicación:',
-'Change Password': 'Cambie Contraseña',
-'Change admin password': 'cambie contraseña admin',
-'Check to delete': 'Marque para eliminar',
-'Checking for upgrades...': 'Buscando actulizaciones...',
-'Clean': 'limpiar',
-'Click row to expand traceback': 'Click row to expand traceback',
-'Client IP': 'IP del Cliente',
-'Compile': 'compilar',
-'Controllers': 'Controladores',
-'Count': 'Count',
-'Create': 'crear',
-'Create new application using the Wizard': 'Create new application using the Wizard',
-'Create new simple application': 'Cree una nueva aplicación',
-'Current request': 'Solicitud en curso',
-'Current response': 'Respuesta en curso',
-'Current session': 'Sesión en curso',
-'DESIGN': 'DISEÑO',
-'Date and Time': 'Fecha y Hora',
-'Delete': 'Elimine',
-'Delete:': 'Elimine:',
-'Deploy on Google App Engine': 'Instale en Google App Engine',
-'Description': 'Descripción',
-'Design for': 'Diseño para',
-'E-mail': 'Correo electrónico',
-'EDIT': 'EDITAR',
-'Edit': 'editar',
-'Edit Profile': 'Editar Perfil',
-'Edit application': 'Editar aplicación',
-'Edit current record': 'Edite el registro actual',
-'Editing Language file': 'Editando archivo de lenguaje',
-'Editing file': 'Editando archivo',
-'Editing file "%s"': 'Editando archivo "%s"',
-'Enterprise Web Framework': 'Armazón Empresarial para Internet',
-'Error': 'Error',
-'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
-'Errors': 'errores',
-'Exception instance attributes': 'Atributos de la instancia de Excepción',
-'File': 'File',
-'First name': 'Nombre',
-'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
-'Group ID': 'ID de Grupo',
-'Hello World': 'Hola Mundo',
-'Help': 'ayuda',
-'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.': 'Si el reporte anterior contiene un número de tiquete este indica un falla en la ejecución del controlador, antes de cualquier intento de ejecutat doctests. Esto generalmente se debe a un error en la indentación o un error por fuera del código de la función.\r\nUn titulo verde indica que todas las pruebas pasaron (si existen). En dicho caso los resultados no se muestran.',
-'Import/Export': 'Importar/Exportar',
-'Install': 'instalar',
-'Installed applications': 'Aplicaciones instaladas',
-'Internal State': 'Estado Interno',
-'Invalid Query': 'Consulta inválida',
-'Invalid action': 'Acción inválida',
-'Invalid email': 'Correo inválido',
-'Language files (static strings) updated': 'Archivos de lenguaje (cadenas estáticas) actualizados',
-'Languages': 'Lenguajes',
-'Last name': 'Apellido',
-'Last saved on:': 'Guardado en:',
-'License for': 'Licencia para',
-'Login': 'Inicio de sesión',
-'Login to the Administrative Interface': 'Inicio de sesión para la Interfaz Administrativa',
-'Logout': 'fin de sesión',
-'Lost Password': 'Contraseña perdida',
-'Models': 'Modelos',
-'Modules': 'Módulos',
-'NO': 'NO',
-'Name': 'Nombre',
-'New Record': 'Registro nuevo',
-'No databases in this application': 'No hay bases de datos en esta aplicación',
-'Origin': 'Origen',
-'Original/Translation': 'Original/Traducción',
-'Overwrite installed app': 'sobreescriba aplicación instalada',
-'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, no puede cambiar la contraseña aquí',
-'Pack all': 'empaquetar todo',
-'Pack compiled': 'empaquete compiladas',
-'Password': 'Contraseña',
-'Peeking at file': 'Visualizando archivo',
-'Plugin "%s" in application': 'Plugin "%s" en aplicación',
-'Plugins': 'Plugins',
-'Powered by': 'Este sitio usa',
-'Query:': 'Consulta:',
-'Record ID': 'ID de Registro',
-'Register': 'Registrese',
-'Registration key': 'Contraseña de Registro',
-'Remove compiled': 'eliminar compiladas',
-'Resolve Conflict file': 'archivo Resolución de Conflicto',
-'Role': 'Rol',
-'Rows in table': 'Filas en la tabla',
-'Rows selected': 'Filas seleccionadas',
-'Saved file hash:': 'Hash del archivo guardado:',
-'Site': 'sitio',
-'Static files': 'Archivos estáticos',
-'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
-'TM': 'MR',
-'Table name': 'Nombre de la tabla',
-'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.',
-'There are no controllers': 'No hay controladores',
-'There are no models': 'No hay modelos',
-'There are no modules': 'No hay módulos',
-'There are no static files': 'No hay archivos estáticos',
-'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',
-'This is the %(filename)s template': 'Esta es la plantilla %(filename)s',
-'Ticket': 'Tiquete',
-'Timestamp': 'Timestamp',
-'To create a plugin, name a file/folder plugin_[name]': 'Para crear un plugin, nombre un archivo/carpeta plugin_[nombre]',
-'Unable to check for upgrades': 'No es posible verificar la existencia de actualizaciones',
-'Unable to download': 'No es posible la descarga',
-'Unable to download app': 'No es posible descargar la aplicación',
-'Unable to download app because:': 'No es posible descargar la aplicación porque:',
-'Unable to download because': 'No es posible descargar porque',
-'Uninstall': 'desinstalar',
-'Update:': 'Actualice:',
-'Upload & install packed application': 'Suba e instale aplicación empaquetada',
-'Upload existing application': 'Suba esta aplicación',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para crear consultas más complejas.',
-'User ID': 'ID de Usuario',
-'Version': 'Versión',
-'Views': 'Vistas',
-'Welcome to web2py': 'Bienvenido a web2py',
-'YES': 'SI',
 'additional code for your application': 'código adicional para su aplicación',
+'Additional code for your application': 'Additional code for your application',
 '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',
+'Admin language': 'Admin language',
+'administrative interface': 'administrative interface',
+'Administrator Password:': 'Contraseña del Administrador:',
+'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it (required):': 'y renombrela (requerido):',
 'and rename it:': ' y renombrelo:',
 'appadmin': 'appadmin',
@@ -158,47 +32,115 @@
 'application "%s" uninstalled': 'aplicación "%s" desinstalada',
 'application compiled': 'aplicación compilada',
 'application is compiled and cannot be designed': 'la aplicación está compilada y no puede ser modificada',
+'are not used': 'are not used',
+'are not used yet': 'are not used yet',
+'Are you sure you want to delete file "%s"?': '¿Está seguro que desea eliminar el archivo "%s"?',
+'Are you sure you want to delete plugin "%s"?': '¿Está seguro que quiere eliminar el plugin "%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 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"?',
+'Are you sure you want to upgrade web2py now?': '¿Está seguro que desea actualizar web2py ahora?',
 'arguments': 'argumentos',
+'at char %s': 'at char %s',
+'at line %s': 'at line %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!',
+'Autocomplete': 'Autocomplete',
+'Available databases and tables': 'Bases de datos y tablas disponibles',
 'back': 'atrás',
+'breakpoint': 'breakpoint',
+'breakpoints': 'breakpoints',
 'browse': 'buscar',
 'cache': '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 compile: there are errors in your app:': 'No se puede compilar: hay errores en su aplicación:',
 'cannot create file': 'no es posible crear archivo',
 'cannot upload file "%(filename)s"': 'no es posible subir archivo "%(filename)s"',
+'Change admin password': 'cambie contraseña admin',
+'Change Password': 'Cambie Contraseña',
 'check all': 'marcar todos',
+'Check to delete': 'Marque para eliminar',
+'Checking for upgrades...': 'Buscando actulizaciones...',
+'Clean': 'limpiar',
 'click here for online examples': 'haga clic aquí para ver ejemplos en línea',
 'click here for the administrative interface': 'haga clic aquí para usar la interfaz administrativa',
+'Click row to expand traceback': 'Click row to expand traceback',
 'click to check for upgrades': 'haga clic para buscar actualizaciones',
 'click to open': 'click to open',
+'Client IP': 'IP del Cliente',
 'code': 'código',
+'Code listing': 'Code listing',
+'collapse/expand all': 'collapse/expand all',
 'commit (mercurial)': 'commit (mercurial)',
+'Compile': 'compilar',
 'compiled application removed': 'aplicación compilada removida',
+'continue': 'continue',
+'Controllers': 'Controladores',
 'controllers': 'controladores',
+'Count': 'Count',
+'Create': 'crear',
 'create file with filename:': 'cree archivo con nombre:',
+'Create new application using the Wizard': 'Create new application using the Wizard',
 'create new application:': 'nombre de la nueva aplicación:',
+'Create new simple application': 'Cree una nueva aplicación',
 'created by': 'creado por',
 'crontab': 'crontab',
+'Current request': 'Solicitud en curso',
+'Current response': 'Respuesta en curso',
+'Current session': 'Sesión en curso',
 'currently saved or': 'actualmente guardado o',
 'customize me!': 'Adaptame!',
 'data uploaded': 'datos subidos',
 'database': 'base de datos',
 'database %s select': 'selección en base de datos %s',
 'database administration': 'administración base de datos',
+'Date and Time': 'Fecha y Hora',
 'db': 'db',
+'Debug': 'Debug',
 'defines tables': 'define tablas',
+'Delete': 'Elimine',
 'delete': 'eliminar',
 'delete all checked': 'eliminar marcados',
 'delete plugin': 'eliminar plugin',
+'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete:': 'Elimine:',
+'Deploy on Google App Engine': 'Instale en Google App Engine',
+'Description': 'Descripción',
 'design': 'modificar',
+'DESIGN': 'DISEÑO',
+'Design for': 'Diseño para',
 'direction: ltr': 'direction: ltr',
+'docs': 'docs',
 'done!': 'listo!',
+'download layouts': 'download layouts',
+'download plugins': 'download plugins',
+'E-mail': 'Correo electrónico',
+'EDIT': 'EDITAR',
+'Edit': 'editar',
+'Edit application': 'Editar aplicación',
 'edit controller': 'editar controlador',
+'Edit current record': 'Edite el registro actual',
+'Edit Profile': 'Editar Perfil',
 'edit views:': 'editar vistas:',
+'Editing file': 'Editando archivo',
+'Editing file "%s"': 'Editando archivo "%s"',
+'Editing Language file': 'Editando archivo de lenguaje',
+'Enterprise Web Framework': 'Armazón Empresarial para Internet',
+'Error': 'Error',
+'Error logs for "%(app)s"': 'Bitácora de errores en "%(app)s"',
+'Errors': 'errores',
+'Exception instance attributes': 'Atributos de la instancia de Excepción',
 'export as csv file': 'exportar como archivo CSV',
 'exposes': 'expone',
+'exposes:': 'exposes:',
 'extends': 'extiende',
+'failed to compile file because:': 'failed to compile file because:',
 'failed to reload module': 'recarga del módulo ha fallado',
 'failed to reload module because:': 'no es posible recargar el módulo por:',
+'File': 'File',
 'file "%(filename)s" created': 'archivo "%(filename)s" creado',
 'file "%(filename)s" deleted': 'archivo "%(filename)s" eliminado',
 'file "%(filename)s" uploaded': 'archivo "%(filename)s" subido',
@@ -208,76 +150,211 @@
 'file does not exist': 'archivo no existe',
 'file saved on %(time)s': 'archivo guardado %(time)s',
 'file saved on %s': 'archivo guardado %s',
+'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
+'First name': 'Nombre',
+'Functions with no doctests will result in [passed] tests.': 'Funciones sin doctests equivalen a pruebas [aceptadas].',
+'Globals##debug': 'Globals',
+'graph model': 'graph model',
+'Group ID': 'ID de Grupo',
+'Hello World': 'Hola Mundo',
+'Help': 'ayuda',
 'htmledit': 'htmledit',
+'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.': 'Si el reporte anterior contiene un número de tiquete este indica un falla en la ejecución del controlador, antes de cualquier intento de ejecutat doctests. Esto generalmente se debe a un error en la indentación o un error por fuera del código de la función.\r\nUn titulo verde indica que todas las pruebas pasaron (si existen). En dicho caso los resultados no se muestran.',
+'Import/Export': 'Importar/Exportar',
 'includes': 'incluye',
 'insert new': 'inserte nuevo',
 'insert new %s': 'inserte nuevo %s',
+'Install': 'instalar',
+'Installed applications': 'Aplicaciones instaladas',
+'Interaction at %s line %s': 'Interaction at %s line %s',
+'Interactive console': 'Interactive console',
 'internal error': 'error interno',
+'Internal State': 'Estado Interno',
+'Invalid action': 'Acción inválida',
+'Invalid email': 'Correo inválido',
 'invalid password': 'contraseña inválida',
+'Invalid Query': 'Consulta inválida',
 'invalid request': 'solicitud inválida',
 'invalid ticket': 'tiquete inválido',
+'Key bindings': 'Key bindings',
 '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',
+'Languages': 'Lenguajes',
 'languages updated': 'lenguajes actualizados',
+'Last name': 'Apellido',
+'Last saved on:': 'Guardado en:',
+'License for': 'Licencia para',
 'loading...': 'cargando...',
+'Locals##debug': 'Locals',
+'Login': 'Inicio de sesión',
 'login': 'inicio de sesión',
+'Login to the Administrative Interface': 'Inicio de sesión para la Interfaz Administrativa',
+'Logout': 'fin de sesión',
+'Lost Password': 'Contraseña perdida',
 'manage': 'manage',
 'merge': 'combinar',
+'Models': 'Modelos',
 'models': 'modelos',
+'Modules': 'Módulos',
 'modules': 'módulos',
+'Name': 'Nombre',
 'new application "%s" created': 'nueva aplicación "%s" creada',
 'new plugin installed': 'nuevo plugin instalado',
+'New Record': 'Registro nuevo',
 'new record inserted': 'nuevo registro insertado',
+'next': 'next',
 'next 100 rows': '100 filas siguientes',
+'NO': 'NO',
+'No databases in this application': 'No hay bases de datos en esta aplicación',
+'No Interaction yet': 'No Interaction yet',
 'no match': 'no encontrado',
+'or alternatively': 'or alternatively',
 'or import from csv file': 'o importar desde archivo CSV',
 'or provide app url:': 'o provea URL de la aplicación:',
 'or provide application url:': 'o provea URL de la aplicación:',
+'Origin': 'Origen',
+'Original/Translation': 'Original/Traducción',
+'Overwrite installed app': 'sobreescriba aplicación instalada',
+'Pack all': 'empaquetar todo',
+'Pack compiled': 'empaquete compiladas',
 'pack plugin': 'empaquetar plugin',
+'PAM authenticated user, cannot change password here': 'usuario autenticado por PAM, no puede cambiar la contraseña aquí',
+'Password': 'Contraseña',
 'password changed': 'contraseña cambiada',
+'Peeking at file': 'Visualizando archivo',
+'Please': 'Please',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" eliminado',
+'Plugin "%s" in application': 'Plugin "%s" en aplicación',
+'plugins': 'plugins',
+'Plugins': 'Plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Este sitio usa',
 'previous 100 rows': '100 filas anteriores',
+'Private files': 'Private files',
+'private files': 'private files',
+'Query:': 'Consulta:',
 'record': 'registro',
 'record does not exist': 'el registro no existe',
 'record id': 'id de registro',
+'Record ID': 'ID de Registro',
+'refresh': 'refresh',
+'Register': 'Registrese',
+'Registration key': 'Contraseña de Registro',
+'reload': 'reload',
+'Remove compiled': 'eliminar compiladas',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
+'Resolve Conflict file': 'archivo Resolución de Conflicto',
 'restore': 'restaurar',
+'return': 'return',
 'revert': 'revertir',
+'Role': 'Rol',
+'Rows in table': 'Filas en la tabla',
+'Rows selected': 'Filas seleccionadas',
+'rules are not defined': 'rules are not defined',
+"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')",
+'Save': 'Save',
 'save': 'guardar',
+'Save file:': 'Save file:',
+'Save via Ajax': 'Save via Ajax',
+'Saved file hash:': 'Hash del archivo guardado:',
 'selected': 'seleccionado(s)',
 'session expired': 'sesión expirada',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
 'shell': 'shell',
+'Site': 'sitio',
 'some files could not be removed': 'algunos archivos no pudieron ser removidos',
+'Start searching': 'Start searching',
 'state': 'estado',
 'static': 'estáticos',
+'Static': 'Static',
+'Static files': 'Archivos estáticos',
+'step': 'step',
+'stop': 'stop',
 'submit': 'enviar',
+'successful': 'successful',
+'Sure you want to delete this object?': '¿Está seguro que desea eliminar este objeto?',
 'table': 'tabla',
+'Table name': 'Nombre de la tabla',
 'test': 'probar',
+'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 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 data representation, define database tables and sets': 'la representación de datos, define tablas y conjuntos de base de datos',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'la capa de presentación, las vistas también son llamadas plantillas',
+'There are no controllers': 'No hay controladores',
+'There are no models': 'No hay modelos',
+'There are no modules': 'No hay módulos',
+'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
+'There are no static files': 'No hay archivos estáticos',
+'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 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',
 'these files are served without processing, your images go here': 'estos archivos son servidos sin procesar, sus imágenes van aquí',
+'This is the %(filename)s template': 'Esta es la plantilla %(filename)s',
+'this page to see if a breakpoint was hit and debug interaction is required.': 'this page to see if a breakpoint was hit and debug interaction is required.',
+'Ticket': 'Tiquete',
+'Timestamp': 'Timestamp',
+'TM': 'MR',
 'to  previous version.': 'a la versión previa.',
+'To create a plugin, name a file/folder plugin_[name]': 'Para crear un plugin, nombre un archivo/carpeta plugin_[nombre]',
+'To emulate a breakpoint programatically, write:': 'To emulate a breakpoint programatically, write:',
+'to use the debugger!': 'to use the debugger!',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
 'translation strings for the application': 'cadenas de caracteres de traducción para la aplicación',
+'Translation strings for the application': 'Translation strings for the application',
 'try': 'intente',
 'try something like': 'intente algo como',
+'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': 'No es posible verificar la existencia de actualizaciones',
 'unable to create application "%s"': 'no es posible crear la aplicación "%s"',
 'unable to delete file "%(filename)s"': 'no es posible eliminar el archivo "%(filename)s"',
 'unable to delete file plugin "%(plugin)s"': 'no es posible eliminar plugin "%(plugin)s"',
+'Unable to download': 'No es posible la descarga',
+'Unable to download app': 'No es posible descargar la aplicación',
+'Unable to download app because:': 'No es posible descargar la aplicación porque:',
+'Unable to download because': 'No es posible descargar porque',
 'unable to parse csv file': 'no es posible analizar el archivo CSV',
 'unable to uninstall "%s"': 'no es posible instalar "%s"',
 'unable to upgrade because "%s"': 'no es posible actualizar porque "%s"',
 'uncheck all': 'desmarcar todos',
+'Uninstall': 'desinstalar',
 'update': 'actualizar',
 'update all languages': 'actualizar todos los lenguajes',
+'Update:': 'Actualice:',
 'upgrade web2py now': 'actualize web2py ahora',
+'Upload': 'Upload',
+'Upload & install packed application': 'Suba e instale aplicación empaquetada',
 'upload application:': 'subir aplicación:',
+'Upload existing application': 'Suba esta aplicación',
 'upload file:': 'suba archivo:',
 'upload plugin file:': 'suba archivo de plugin:',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Use (...)&(...) para AND, (...)|(...) para OR, y ~(...) para NOT, para crear consultas más complejas.',
+'User ID': 'ID de Usuario',
 'variables': 'variables',
+'Version': 'Versión',
 'versioning': 'versiones',
+'Versioning': 'Versioning',
 'view': 'vista',
+'Views': 'Vistas',
 'views': 'vistas',
-'web2py Recent Tweets': 'Tweets Recientes de web2py',
 'web2py is up to date': 'web2py está actualizado',
+'web2py online debugger': 'web2py online debugger',
+'web2py Recent Tweets': 'Tweets Recientes de web2py',
 'web2py upgraded; please restart it': 'web2py actualizado; favor reiniciar',
+'Welcome to web2py': 'Bienvenido a web2py',
+'YES': 'SI',
+'You need to set up and reach a': 'You need to set up and reach a',
+'Your application will be blocked until you click an action button (next, step, continue, etc.)': 'Your application will be blocked until you click an action button (next, step, continue, etc.)',
+'Your can inspect variables using the console below': 'Your can inspect variables using the console below',
 }

applications/admin/languages/fr.py

@@ -5,11 +5,11 @@
 '"update" is an optional expression like "field1=\'newvalue\'". You cannot update or delete the results of a JOIN': '"update" est une expression en option tels que "field1 = \'newvalue\'". Vous ne pouvez pas mettre à jour ou supprimer les résultats d\'une jointure "a JOIN"',
 '%Y-%m-%d': '%d-%m-%Y',
 '%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
-'%s %%{row} deleted': 'lignes %s supprimé',
+'%s %%{row} deleted': 'lignes %s supprimées',
-'%s %%{row} updated': 'lignes %s mis à jour',
+'%s %%{row} updated': 'lignes %s mises à jour',
-'(requires internet access)': '(requires internet access)',
+'(requires internet access)': '(nécessite un accès Internet)',
 '(something like "it-it")': '(quelque chose comme "it-it") ',
-'@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
+'@markmin\x01Searching: **%s** %%{file}': 'Cherche: **%s** fichiers',
 'A new version of web2py is available: %s': 'Une nouvelle version de web2py est disponible: %s ',
 'A new version of web2py is available: Version 1.68.2 (2009-10-21 09:59:29)\n': 'Une nouvelle version de web2py est disponible: Version 1.68.2 (2009-10-21 09:59:29)\r\n',
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': 'ATTENTION: nécessite une connexion sécurisée (HTTPS) ou être en localhost. ',
@@ -17,59 +17,59 @@
 'ATTENTION: you cannot edit the running application!': "ATTENTION: vous ne pouvez pas modifier l'application qui tourne!",
 'About': 'à propos',
 'About application': "A propos de l'application",
-'Additional code for your application': 'Additional code for your application',
+'Additional code for your application': 'Code additionnel pour votre application',
 'Admin is disabled because insecure channel': 'Admin est désactivé parce que canal non sécurisé',
-'Admin language': 'Admin language',
+'Admin language': "Language de l'admin",
 'Administrator Password:': 'Mot de passe Administrateur:',
-'Application name:': 'Application name:',
+'Application name:': "Nom de l'application:",
-'Are you sure you want to delete file "%s"?': 'Etes-vous sûr de vouloir supprimer le fichier «%s»?',
+'Are you sure you want to delete file "%s"?': 'Êtes-vous sûr de vouloir supprimer le fichier «%s»?',
-'Are you sure you want to delete plugin "%s"?': 'Etes-vous sûr de vouloir effacer le plugin "%s"?',
+'Are you sure you want to delete plugin "%s"?': 'Êtes-vous sûr de vouloir supprimer le plugin "%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?': 'Êtes-vous sûr de vouloir supprimer cet objet?',
 'Are you sure you want to uninstall application "%s"?': "Êtes-vous sûr de vouloir désinstaller l'application «%s»?",
-'Are you sure you want to upgrade web2py now?': 'Are you sure you want to upgrade web2py now?',
+'Are you sure you want to upgrade web2py now?': 'Êtes-vous sûr de vouloir mettre à jour web2py maintenant?',
 'Available databases and tables': 'Bases de données et tables disponible',
 'Cannot be empty': 'Ne peut pas être vide',
 'Cannot compile: there are errors in your app.        Debug it, correct errors and try again.': 'Ne peut pas compiler: il y a des erreurs dans votre application. corriger les erreurs et essayez à nouveau.',
-'Cannot compile: there are errors in your app:': 'Cannot compile: there are errors in your app:',
+'Cannot compile: there are errors in your app:': 'Ne peut pas compiler: il y a des erreurs dans votre application:',
-'Change admin password': 'change admin password',
+'Change admin password': 'Changer le mot de passe admin',
-'Check for upgrades': 'check for upgrades',
+'Check for upgrades': 'Vérifier les mises à jour',
 'Check to delete': 'Cocher pour supprimer',
 'Checking for upgrades...': 'Vérification des mises à jour ... ',
 'Clean': 'nettoyer',
 'Compile': 'compiler',
 'Controllers': 'Contrôleurs',
-'Create': 'create',
+'Create': 'Créer',
 'Create new simple application': 'Créer une nouvelle application',
-'Current request': 'Requête actuel',
+'Current request': 'Requête actuelle',
 'Current response': 'Réponse actuelle',
 'Current session': 'Session en cours',
 'Date and Time': 'Date et heure',
 'Delete': 'Supprimer',
-'Delete this file (you will be asked to confirm deletion)': 'Delete this file (you will be asked to confirm deletion)',
+'Delete this file (you will be asked to confirm deletion)': 'Supprimer ce fichier (on vous demandera de confirmer la suppression)',
 'Delete:': 'Supprimer:',
-'Deploy': 'deploy',
+'Deploy': 'Déployer',
 'Deploy on Google App Engine': 'Déployer sur Google App Engine',
 'EDIT': 'MODIFIER',
 'Edit': 'modifier',
 'Edit application': "Modifier l'application",
-'Edit current record': 'Modifier cet entrée',
+'Edit current record': 'Modifier cette entrée',
 'Editing Language file': 'Modifier le fichier de langue',
 'Editing file': 'Modifier le fichier',
 'Editing file "%s"': 'Modifier le fichier "% s" ',
 'Enterprise Web Framework': 'Enterprise Web Framework',
 'Error logs for "%(app)s"': 'Journal d\'erreurs pour "%(app)s"',
 'Errors': 'erreurs',
-'Exception instance attributes': 'Exception instance attributes',
+'Exception instance attributes': "Attributs d'instance Exception",
-'Functions with no doctests will result in [passed] tests.': 'Des fonctions sans doctests entraînera tests [passed] .',
+'Functions with no doctests will result in [passed] tests.': 'Des fonctions sans doctests entraîneront des tests [passed] .',
 'Help': 'aide',
-'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.': "Si le rapport ci-dessus contient un numéro de ticket, cela indique une défaillance dans l'exécution du contrôleur, avant toute tentative d'exécuter les doctests. Cela est généralement dû à une erreur d'indentation ou une erreur à l'extérieur du code de la fonction.\r\nUn titre verte indique que tous les tests (si définie) passed. Dans ce cas, les résultats des essais ne sont pas affichées.",
+'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.': "Si le rapport ci-dessus contient un numéro de ticket, cela indique une défaillance dans l'exécution du contrôleur, avant toute tentative d'exécuter les doctests. Cela est généralement dû à une erreur d'indentation ou une erreur à l'extérieur du code de la fonction.\r\nUn titre vert indique que tous les tests (si définis) sont passés. Dans ce cas, les résultats des essais ne sont pas affichées.",
 'Import/Export': 'Importer/Exporter',
-'Install': 'install',
+'Install': 'Installer',
-'Installed applications': 'Les applications installées',
+'Installed applications': 'Applications installées',
 'Internal State': 'État Interne',
 'Invalid Query': 'Requête non valide',
 'Invalid action': 'Action non valide',
-'Language files (static strings) updated': 'Fichiers de langue (static strings) Mise à jour ',
+'Language files (static strings) updated': 'Fichiers de langue (chaînes statiques) mis à jour ',
 'Languages': 'Langues',
 'Last saved on:': 'Dernière sauvegarde le:',
 'License for': 'Licence pour',
@@ -79,13 +79,13 @@
 'Models': 'Modèles',
 'Modules': 'Modules',
 'NO': 'NON',
-'New Record': 'Nouvel Entrée',
+'New Record': 'Nouvelle Entrée',
-'New application wizard': 'New application wizard',
+'New application wizard': 'Assistant nouvelle application',
-'New simple application': 'New simple application',
+'New simple application': 'Nouvelle application simple',
 'No databases in this application': 'Aucune base de données dans cette application',
 'Original/Translation': 'Original / Traduction',
-'Overwrite installed app': 'overwrite installed app',
+'Overwrite installed app': "Écraser l'application installée",
-'PAM authenticated user, cannot change password here': 'PAM authenticated user, cannot change password here',
+'PAM authenticated user, cannot change password here': 'Utilisateur authentifié par PAM, vous ne pouvez pas changer le mot de passe ici',
 'Pack all': 'tout empaqueter',
 'Pack compiled': 'paquet compilé',
 'Peeking at file': 'Jeter un oeil au fichier',
@@ -97,101 +97,101 @@
 'Resolve Conflict file': 'Résoudre les conflits de fichiers',
 'Rows in table': 'Lignes de la table',
 'Rows selected': 'Lignes sélectionnées',
-"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')",
+"Run tests in this file (to run all files, you may also use the button labelled 'test')": "Lancer les tests dans ce fichier (pour lancer tous les fichiers, vous pouvez également utiliser le bouton nommé 'test')",
-'Save': 'Save',
+'Save': 'Enregistrer',
 'Saved file hash:': 'Hash du Fichier enregistré:',
-'Site': 'site',
+'Site': 'Site',
-'Start wizard': 'start wizard',
+'Start wizard': "Démarrer l'assistant",
 'Static files': 'Fichiers statiques',
 'Sure you want to delete this object?': 'Vous êtes sûr de vouloir supprimer cet objet? ',
 'TM': 'MD',
 'Testing application': "Test de l'application",
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La "requête" est une condition comme "db.table1.field1==\'value\'". Quelque chose comme "db.table1.field1==db.table2.field2" aboutit à un JOIN SQL.',
-'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 application logic, each URL path is mapped in one exposed function in the controller': "La logique de l'application, chaque chemin d'URL est mappé avec une fonction exposée dans le contrôleur",
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
-'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'The presentations layer, views are also known as templates': "Les couches de présentation, les vues sont également appelées modples",
-'There are no controllers': "Il n'existe pas de contrôleurs",
+'There are no controllers': "Il n'y a pas de contrôleurs",
-'There are no models': "Il n'existe pas de modèles",
+'There are no models': "Il n'y a pas de modèles",
-'There are no modules': "Il n'existe pas de modules",
+'There are no modules': "Il n'y a pas de modules",
-'There are no plugins': 'There are no plugins',
+'There are no plugins': "Il n'y a pas de plugins",
-'There are no static files': "Il n'existe pas de fichiers statiques",
+'There are no static files': "Il n'y a pas de fichiers statiques",
-'There are no translators, only default language is supported': "Il n'y a pas de traducteurs, est prise en charge uniquement la langue par défaut",
+'There are no translators, only default language is supported': "Il n'y a pas de traducteurs, seule la langue par défaut est prise en charge",
-'There are no views': "Il n'existe pas de vues",
+'There are no views': "Il n'y a pas de vues",
-'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'These files are served without processing, your images go here': 'Ces fichiers sont renvoyés sans traitement, vos images viennent ici',
 'This is the %(filename)s template': 'Ceci est le modèle %(filename)s ',
 'Ticket': 'Ticket',
 'To create a plugin, name a file/folder plugin_[name]': 'Pour créer un plugin, créer un fichier /dossier plugin_[nom]',
-'Translation strings for the application': 'Translation strings for the application',
+'Translation strings for the application': "Chaînes de traduction pour l'application",
-'Unable to check for upgrades': 'Impossible de vérifier les mises à niveau',
+'Unable to check for upgrades': 'Impossible de vérifier les mises à jour',
 'Unable to download': 'Impossible de télécharger',
-'Unable to download app': 'Impossible de télécharger app',
+'Unable to download app': "Impossible de télécharger l'app",
-'Unable to download app because:': 'Unable to download app because:',
+'Unable to download app because:': "Impossible de télécharger l'app car:",
-'Unable to download because': 'Unable to download because',
+'Unable to download because': 'Impossible de télécharger car',
 'Uninstall': 'désinstaller',
 'Update:': 'Mise à jour:',
-'Upload & install packed application': 'Upload & install packed application',
+'Upload & install packed application': "Charger & installer l'application empaquetée",
-'Upload a package:': 'Upload a package:',
+'Upload a package:': 'Charger un paquet:',
-'Upload existing application': 'charger une application existante',
+'Upload existing application': 'Charger une application existante',
-'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Utilisez (...)&(...) pour AND, (...)|(...) pour OR, et ~(...) pour NOT et construire des requêtes plus complexes. ',
+'Use (...)&(...) for AND, (...)|(...) for OR, and ~(...)  for NOT to build more complex queries.': 'Utilisez (...)&(...) pour AND, (...)|(...) pour OR, et ~(...) pour NOT afin de construire des requêtes plus complexes. ',
-'Use an url:': 'Use an url:',
+'Use an url:': 'Utiliser une url:',
 'Version': 'Version',
 'Views': 'Vues',
-'Web Framework': 'Web Framework',
+'Web Framework': 'Framework Web',
 'YES': 'OUI',
 'additional code for your application': 'code supplémentaire pour votre application',
-'admin disabled because no admin password': 'admin désactivé car aucun mot de passe admin',
+'admin disabled because no admin password': 'admin désactivée car aucun mot de passe admin',
-'admin disabled because not supported on google app engine': 'admin désactivé car non pris en charge sur Google Apps engine',
+'admin disabled because not supported on google app engine': 'admin désactivée car non prise en charge sur Google Apps engine',
-'admin disabled because unable to access password file': "admin désactivé car incapable d'accéder au fichier mot de passe",
+'admin disabled because unable to access password file': "admin désactivée car incapable d'accéder au fichier mot de passe",
-'administrative interface': 'administrative interface',
+'administrative interface': "interface d'administration",
 'and rename it (required):': 'et renommez-la (obligatoire):',
 'and rename it:': 'et renommez-le:',
 'appadmin': 'appadmin',
 'appadmin is disabled because insecure channel': 'appadmin est désactivé parce que canal non sécurisé',
-'application "%s" uninstalled': 'application "%s" désinstallé',
+'application "%s" uninstalled': 'application "%s" désinstallée',
-'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installed with md5sum: %(digest)s',
+'application %(appname)s installed with md5sum: %(digest)s': 'application %(appname)s installée avec md5sum: %(digest)s',
 'application compiled': 'application compilée',
-'application is compiled and cannot be designed': "l'application est compilée et ne peut être désigné",
+'application is compiled and cannot be designed': "l'application est compilée et ne peut être modifiée",
 'arguments': 'arguments',
 'back': 'retour',
 'cache': 'cache',
-'cache, errors and sessions cleaned': 'cache, erreurs et sessions nettoyé',
+'cache, errors and sessions cleaned': 'cache, erreurs et sessions nettoyés',
-'cannot create file': 'ne peu pas créer de fichier',
+'cannot create file': 'ne peut pas créer de fichier',
-'cannot upload file "%(filename)s"': 'ne peu pas charger le fichier "%(filename)s"',
+'cannot upload file "%(filename)s"': 'ne peut pas charger le fichier "%(filename)s"',
-'check all': 'tous vérifier ',
+'check all': 'tout vérifier ',
-'click to check for upgrades': 'Cliquez pour vérifier les mises à niveau',
+'click to check for upgrades': 'Cliquez pour vérifier les mises jour',
 'code': 'code',
-'collapse/expand all': 'collapse/expand all',
+'collapse/expand all': 'tout réduire/agrandir',
-'compiled application removed': 'application compilée enlevé',
+'compiled application removed': 'application compilée enlevée',
 'controllers': 'contrôleurs',
 'create file with filename:': 'créer un fichier avec nom de fichier:',
 'create new application:': 'créer une nouvelle application:',
 'created by': 'créé par',
 'crontab': 'crontab',
-'currently running': 'currently running',
+'currently running': 'tourne actuellement',
-'currently saved or': 'actuellement enregistrés ou',
+'currently saved or': 'actuellement enregistré ou',
 'data uploaded': 'données chargées',
 'database': 'base de données',
 'database %s select': 'base de données  %s sélectionner',
 'database administration': 'administration base de données',
-'db': 'db',
+'db': 'bdd',
 'defines tables': 'définit les tables',
 'delete': 'supprimer',
-'delete all checked': 'supprimer tout ce qui est cocher',
+'delete all checked': 'supprimer tout ce qui est coché',
-'delete plugin': ' supprimer plugin',
+'delete plugin': ' supprimer le plugin',
 'design': 'conception',
 'direction: ltr': 'direction: ltr',
 'docs': 'docs',
 'done!': 'fait!',
-'download layouts': 'download layouts',
+'download layouts': 'télécharger layouts',
-'download plugins': 'download plugins',
+'download plugins': 'télécharger plugins',
 'edit controller': 'modifier contrôleur',
-'edit views:': 'edit views:',
+'edit views:': 'modifier vues:',
-'export as csv file': 'exportation au format CSV',
+'export as csv file': 'export au format CSV',
 'exposes': 'expose',
-'exposes:': 'exposes:',
+'exposes:': 'expose:',
 'extends': 'étend',
 'failed to reload module': 'impossible de recharger le module',
-'failed to reload module because:': 'failed to reload module because:',
+'failed to reload module because:': 'impossible de recharger le module car:',
 'file "%(filename)s" created': 'fichier "%(filename)s" créé',
 'file "%(filename)s" deleted': 'fichier "%(filename)s" supprimé',
 'file "%(filename)s" uploaded': 'fichier "%(filename)s" chargé',
@@ -200,7 +200,7 @@
 'file does not exist': "fichier n'existe pas",
 'file saved on %(time)s': 'fichier enregistré le %(time)s',
 'file saved on %s': 'fichier enregistré le %s',
-'filter': 'filter',
+'filter': 'filtre',
 'htmledit': 'edition html',
 'includes': 'inclus',
 'index': 'index',
@@ -219,14 +219,14 @@
 'modules': 'modules',
 'new application "%s" created': 'nouvelle application "%s" créée',
 'new plugin installed': 'nouveau plugin installé',
-'new record inserted': 'nouvelle entrée inséré',
+'new record inserted': 'nouvelle entrée insérée',
 'next 100 rows': '100 lignes suivantes',
-'no match': 'no match',
+'no match': 'aucune correspondance',
 'or import from csv file': 'ou importer depuis un fichier CSV ',
-'or provide app url:': 'or provide app url:',
+'or provide app url:': "ou fournir l'URL de l'app:",
 'or provide application url:': "ou fournir l'URL de l'application:",
 'pack plugin': 'paquet plugin',
-'password changed': 'password changed',
+'password changed': 'mot de passe modifié',
 'plugin "%(plugin)s" deleted': 'plugin "%(plugin)s" supprimé',
 'plugins': 'plugins',
 'previous 100 rows': '100 lignes précédentes',
@@ -245,9 +245,9 @@
 'submit': 'envoyer',
 'table': 'table',
 'test': 'tester',
-'the application logic, each URL path is mapped in one exposed function in the controller': "la logique de l'application, chaque route URL est mappé dans une fonction exposée dans le contrôleur",
+'the application logic, each URL path is mapped in one exposed function in the controller': "la logique de l'application, chaque chemin d'URL est mappé dans une fonction exposée dans le contrôleur",
-'the data representation, define database tables and sets': 'la représentation des données, défini les tables de bases de données et sets',
+'the data representation, define database tables and sets': 'La représentation des données, définir les tables et ensembles de la base de données',
-'the presentations layer, views are also known as templates': 'la couche des présentations, les vues sont également connus en tant que modèles',
+'the presentations layer, views are also known as templates': 'la couche de présentation, les vues sont également appelées modèles',
 'these files are served without processing, your images go here': 'ces fichiers sont servis sans transformation, vos images vont ici',
 'to  previous version.': 'à la version précédente.',
 'translation strings for the application': "chaînes de traduction de l'application",
@@ -258,22 +258,22 @@
 'unable to delete file plugin "%(plugin)s"': 'impossible de supprimer le plugin "%(plugin)s"',
 'unable to parse csv file': "impossible d'analyser les fichiers CSV",
 'unable to uninstall "%s"': 'impossible de désinstaller "%s"',
-'unable to upgrade because "%s"': 'unable to upgrade because "%s"',
+'unable to upgrade because "%s"': 'impossible de mettre à jour car "%s"',
 'uncheck all': 'tout décocher',
 'update': 'mettre à jour',
 'update all languages': 'mettre à jour toutes les langues',
-'upgrade now': 'upgrade now',
+'upgrade now': 'mettre à jour maintenant',
-'upgrade web2py now': 'upgrade web2py now',
+'upgrade web2py now': 'mettre à jour web2py maintenant',
-'upload': 'upload',
+'upload': 'charger',
 'upload application:': "charger l'application:",
 'upload file:': 'charger le fichier:',
 'upload plugin file:': 'charger fichier plugin:',
-'user': 'user',
+'user': 'utilisateur',
 'variables': 'variables',
 'versioning': 'versioning',
 'view': 'vue',
 'views': 'vues',
-'web2py Recent Tweets': 'web2py Tweets récentes',
+'web2py Recent Tweets': 'Tweets récents sur web2py ',
 'web2py is up to date': 'web2py est à jour',
-'web2py upgraded; please restart it': 'web2py upgraded; please restart it',
+'web2py upgraded; please restart it': 'web2py mis à jour; veuillez le redémarrer',
 }

applications/admin/languages/it.py

@@ -23,6 +23,7 @@
 'Admin language': 'Admin language',
 'administrative interface': 'administrative interface',
 'Administrator Password:': 'Password Amministratore:',
+'An error occured, please %s the page': 'An error occured, please %s the page',
 'and rename it (required):': 'e rinominala (obbligatorio):',
 'and rename it:': 'e rinominala:',
 'appadmin': 'appadmin ',
@@ -144,8 +145,10 @@
 'Get from URL:': 'Get from URL:',
 'Git Pull': 'Git Pull',
 'Git Push': 'Git Push',
+'graph model': 'graph model',
 'Hello World': 'Salve Mondo',
 'Help': 'aiuto',
+'Hide/Show Translated strings': 'Hide/Show Translated strings',
 'htmledit': 'modifica come html',
 '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/Export': 'Importa/Esporta',
@@ -195,6 +198,8 @@
 'NO': 'NO',
 'No databases in this application': 'Nessun database presente in questa applicazione',
 'no match': 'nessuna corrispondenza',
+'or alternatively': 'or alternatively',
+'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'oppure importa da file CSV',
 'or provide app url:': "oppure fornisci url dell'applicazione:",
 'Original/Translation': 'Originale/Traduzione',
@@ -219,6 +224,7 @@
 'record does not exist': 'il record non esiste',
 'record id': 'ID del record',
 'register': 'registrazione',
+'reload': 'reload',
 'Remove compiled': 'rimozione codice compilato',
 'request': 'request',
 'Resolve Conflict file': 'File di risoluzione conflitto',
@@ -242,6 +248,7 @@
 'Start wizard': 'start wizard',
 'state': 'stato',
 'static': 'statico',
+'Static': 'Static',
 'Static files': 'Files statici',
 'Stylesheet': 'Foglio di stile (stylesheet)',
 'submit': 'invia',
@@ -261,6 +268,7 @@
 'There are no models': 'Non ci sono modelli',
 'There are no modules': 'Non ci sono moduli',
 'There are no plugins': 'There are no plugins',
+'There are no private files': 'There are no private files',
 'There are no static files': 'Non ci sono file statici',
 'There are no translators, only default language is supported': 'Non ci sono traduzioni, viene solo supportato il linguaggio di base',
 'There are no views': 'Non ci sono viste ("view")',
@@ -280,6 +288,7 @@
 'Translation strings for the application': 'Translation strings for the application',
 'try': 'prova',
 'try something like': 'prova qualcosa come',
+'Try the mobile interface': 'Try the mobile interface',
 'try view': 'try view',
 'Unable to check for upgrades': 'Impossibile controllare presenza di aggiornamenti',
 'unable to create application "%s"': 'impossibile creare applicazione "%s"',
@@ -298,6 +307,7 @@
 'Update:': 'Aggiorna:',
 'upgrade web2py now': 'upgrade web2py now',
 'upload': 'upload',
+'Upload': 'Upload',
 'Upload & install packed application': 'Carica ed installa pacchetto con applicazione',
 'Upload a package:': 'Upload a package:',
 'Upload and install packed application': 'Upload and install packed application',
@@ -308,6 +318,7 @@
 'Use an url:': 'Use an url:',
 'variables': 'variables',
 'Version': 'Versione',
+'Version %s.%s.%s %s (%s)': 'Version %s.%s.%s %s (%s)',
 'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
 'versioning': 'sistema di versioni',
 'Versioning': 'Versioning',

applications/admin/languages/ru.py

@@ -92,7 +92,7 @@
 'Database': 'База данных',
 'database': 'база данных',
 'database %s select': 'Выбор базы данных %s ',
-'database administration': 'администраторирование базы данных',
+'database administration': 'администрирование базы данных',
 'Date and Time': 'Дата и время',
 'db': 'бд',
 'DB Model': 'Модель БД',
@@ -134,7 +134,7 @@
 'Editing Language file': 'Правка языкового файла',
 'Editing Plural Forms File': 'Editing Plural Forms File',
 'Enterprise Web Framework': 'Enterprise Web Framework',
-'Error logs for "%(app)s"': 'Журнал ошибок для "%(app)"',
+'Error logs for "%(app)s"': 'Журнал ошибок для "%(app)s"',
 'Error snapshot': 'Error snapshot',
 'Error ticket': 'Error ticket',
 'Errors': 'Ошибка',

applications/admin/languages/sr-cr.py

@@ -0,0 +1,212 @@
+# coding: utf8
+{
+'!langcode!': 'sr-cr',
+'!langname!': 'Српски (Ћирилица)',
+'%Y-%m-%d': '%d-%m-%Y',
+'%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
+'(requires internet access)': '(захтијева приступ интернету)',
+'(something like "it-it")': '(нешто као "it-it")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(датотека **gluon/contrib/plural_rules/%s.py** није пронађена)',
+'About': 'Информације',
+'About application': 'О апликацији',
+'Additional code for your application': 'Додатни код за апликацију',
+'admin disabled because unable to access password file': 'администрација онемогућена јер не могу приступити датотеци са лозинком',
+'Admin language': 'Језик администратора',
+'administrative interface': 'административни интерфејс',
+'Administrator Password:': 'Лозинка администратора:',
+'and rename it:': 'и преименуј у:',
+'Application name:': 'Назив апликације:',
+'are not used': 'није кориштено',
+'are not used yet': 'није још кориштено',
+'Are you sure you want to delete this object?': 'Да ли сте сигурни да желите обрисати?',
+'arguments': 'arguments',
+'at char %s': 'код слова %s',
+'at line %s': 'на линији %s',
+'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.',
+'back': 'назад',
+'Basics': 'Основе',
+'Begin': 'Почетак',
+'cache, errors and sessions cleaned': 'кеш, грешке и сесије су обрисани',
+'can be a git repo': 'може бити git repo',
+'cannot upload file "%(filename)s"': 'не мофу отпремити датотеку "%(filename)s"',
+'Change admin password': 'Промијени лзинку администратора',
+'check all': 'check all',
+'Check for upgrades': 'Провјери могућност надоградње',
+'Checking for upgrades...': 'Провјеравам могућност надоградње...',
+'Clean': 'Прочисти',
+'Click row to expand traceback': 'Click row to expand traceback',
+'code': 'код',
+'collapse/expand all': 'сакрити/приказати све',
+'Compile': 'Компајлирај',
+'Controllers': 'Контролери',
+'controllers': 'контролери',
+'Count': 'Count',
+'Create': 'Креирај',
+'create file with filename:': 'Креирај датотеку под називом:',
+'Create rules': 'Креирај правила',
+'created by': 'израдио',
+'crontab': 'crontab',
+'currently running': 'тренутно покренут',
+'currently saved or': 'тренутно сачувано или',
+'database administration': 'администрација базе података',
+'Debug': 'Debug',
+'defines tables': 'дефинише табеле',
+'delete': 'обриши',
+'Delete': 'Обриши',
+'delete all checked': 'delete all checked',
+'Delete this file (you will be asked to confirm deletion)': 'Обриши ову даатотеку (бићете упитани за потврду брисања)',
+'Deploy': 'Постави',
+'Deploy on Google App Engine': 'Постави на Google App Engine',
+'Deploy to OpenShift': 'Постави на OpenShift',
+'Detailed traceback description': 'Detailed traceback description',
+'direction: ltr': 'direction: ltr',
+'Disable': 'Искључи',
+'docs': 'документација',
+'download layouts': 'преузми layouts',
+'download plugins': 'преузми plugins',
+'Edit': 'Уређивање',
+'edit all': 'уреди све',
+'Edit application': 'Уреди апликацију',
+'edit controller': 'уреди контролер',
+'edit views:': 'уреди views:',
+'Editing file "%s"': 'Уређивање датотеке "%s"',
+'Editing Language file': 'Уређивање језичке датотеке',
+'Error': 'Грешка',
+'Error logs for "%(app)s"': 'Преглед грешака за "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'Грешке',
+'Exception instance attributes': 'Exception instance attributes',
+'Expand Abbreviation': 'Expand Abbreviation',
+'exposes': 'exposes',
+'exposes:': 'exposes:',
+'extends': 'проширује',
+'failed to compile file because:': 'нисам могао да компајлирам због:',
+'File': 'Датотека',
+'file does not exist': 'датотека не постоји',
+'file saved on %s': 'датотека сачувана на %s',
+'filter': 'филтер',
+'Find Next': 'Пронађи сљедећи',
+'Find Previous': 'Пронађи претходни',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'Generate': 'Generate',
+'Get from URL:': 'Преузми са странице:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Go to Matching Pair': 'Go to Matching Pair',
+'go!': 'крени!',
+'Help': 'Помоћ',
+'Hide/Show Translated strings': 'Сакрити/Приказати преведене ријечи',
+'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.',
+'includes': 'укључује',
+'inspect attributes': 'inspect attributes',
+'Install': 'Инсталирај',
+'Installed applications': 'Инсталиране апликације',
+'invalid password.': 'погрешна лозинка.',
+'Key bindings': 'Пречице',
+'Key bindings for ZenCoding Plugin': 'Пречице за ZenCoding Plugin',
+'Language files (static strings) updated': 'Језичке датотеке су ажуриране',
+'languages': 'језици',
+'Languages': 'Језици',
+'Last saved on:': 'Посљедња измјена:',
+'License for': 'Лиценца за',
+'loading...': 'преузимам...',
+'locals': 'locals',
+'Login': 'Пријава',
+'Login to the Administrative Interface': 'Пријава за административни интерфејс',
+'Logout': 'Излаз',
+'Match Pair': 'Match Pair',
+'Merge Lines': 'Споји линије',
+'models': 'models',
+'Models': 'Models',
+'Modules': 'Modules',
+'modules': 'modules',
+'New Application Wizard': 'Чаробњак за нове апликације',
+'New application wizard': 'Чаробњак за нове апликације',
+'New simple application': 'Нова једноставна апликација',
+'Next Edit Point': 'Next Edit Point',
+'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'online designer': 'онлајн дизајнер',
+'Original/Translation': 'Оргинал/Превод',
+'Overwrite installed app': 'Пребриши постојећу апликацију',
+'Pack all': 'Запакуј све',
+'Peeking at file': 'Peeking at file',
+'Plugins': 'Plugins',
+'plugins': 'plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Омогућио',
+'Previous Edit Point': 'Previous Edit Point',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Напредак пројекта',
+'Reload routes': 'Обнови преусмјерења',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Замијени',
+'Replace All': 'Замијени све',
+'request': 'request',
+'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'revert': 'revert',
+'rules are not defined': 'правила нису дефинисана',
+'rules:': 'правила:',
+"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': 'Покренути на %s',
+'Save': 'Сачувај',
+'Save via Ajax': 'сачувај via Ajax',
+'Saved file hash:': 'Сачувано као хаш:',
+'session': 'сесија',
+'session expired': 'сесија истекла',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'shell',
+'Site': 'Сајт',
+'skip to generate': 'skip to generate',
+'Start a new app': 'Покрени нову апликацију',
+'Start searching': 'Покрени претрагу',
+'Start wizard': 'Покрени чаробњака',
+'static': 'static',
+'Static files': 'Static files',
+'Step': 'Корак',
+'Submit': 'Прихвати',
+'successful': 'успјешан',
+'test': 'тест',
+'Testing application': 'Тестирање апликације',
+'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 data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'There are no models': 'There are no models',
+'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',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket nedostaje',
+'to  previous version.': 'на претходну верзију.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Ријечи у апликацији које треба превести',
+'Try the mobile interface': 'Пробај мобилни интерфејс',
+'try view': 'try view',
+'uncheck all': 'uncheck all',
+'Uninstall': 'Деинсталирај',
+'update': 'ажурирај',
+'update all languages': 'ажурирај све језике',
+'upload': 'Отпреми',
+'Upload a package:': 'Преузми пакет:',
+'Upload and install packed application': 'Преузми и инсталирај запаковану апликацију',
+'upload file:': 'преузми датотеку:',
+'upload plugin file:': 'преузми плагин датотеку:',
+'variables': 'variables',
+'Version': 'Верзија',
+'Version %s.%s.%s (%s) %s': 'Верзија %s.%s.%s (%s) %s',
+'Versioning': 'Versioning',
+'views': 'views',
+'Views': 'Views',
+'Web Framework': 'Web Framework',
+'web2py is up to date': 'web2py је ажуран',
+'web2py Recent Tweets': 'web2py Recent Tweets',
+'Wrap with Abbreviation': 'Wrap with Abbreviation',
+}

applications/admin/languages/sr-lt.py

@@ -0,0 +1,212 @@
+# coding: utf8
+{
+'!langcode!': 'sr-lt',
+'!langname!': 'Srpski (Latinica)',
+'%Y-%m-%d': '%d-%m-%Y',
+'%Y-%m-%d %H:%M:%S': '%d-%m-%Y %H:%M:%S',
+'(requires internet access)': '(zahtijeva pristup internetu)',
+'(something like "it-it")': '(nešto kao "it-it")',
+'@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(datoteka **gluon/contrib/plural_rules/%s.py** nije pronađena)',
+'About': 'Informacije',
+'About application': 'O aplikaciji',
+'Additional code for your application': 'Dodatni kod za aplikaciju',
+'admin disabled because unable to access password file': 'administracija onemogućena jer ne mogu pristupiti datoteci sa lozinkom',
+'Admin language': 'Jezik administratora',
+'administrative interface': 'administrativni interfejs',
+'Administrator Password:': 'Lozinka administratora:',
+'and rename it:': 'i preimenuj u:',
+'Application name:': 'Naziv aplikacije:',
+'are not used': 'nije korišteno',
+'are not used yet': 'nije još korišteno',
+'Are you sure you want to delete this object?': 'Da li ste sigurni da želite obrisati?',
+'arguments': 'arguments',
+'at char %s': 'kod slova %s',
+'at line %s': 'na liniji %s',
+'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.',
+'back': 'nazad',
+'Basics': 'Osnove',
+'Begin': 'Početak',
+'cache, errors and sessions cleaned': 'keš, greške i sesije su obrisani',
+'can be a git repo': 'može biti git repo',
+'cannot upload file "%(filename)s"': 'ne mogu otpremiti datoteku "%(filename)s"',
+'Change admin password': 'Promijeni lozinku administratora',
+'check all': 'check all',
+'Check for upgrades': 'Provjeri mogućnost nadogradnje',
+'Checking for upgrades...': 'Provjeravam mogućnost nadogradnje...',
+'Clean': 'Pročisti',
+'Click row to expand traceback': 'Click row to expand traceback',
+'code': 'kod',
+'collapse/expand all': 'sakriti/prikazati sve',
+'Compile': 'Kompajliraj',
+'Controllers': 'Kontroleri',
+'controllers': 'kontroleri',
+'Count': 'Count',
+'Create': 'Kreiraj',
+'create file with filename:': 'Kreiraj datoteku pod nazivom:',
+'Create rules': 'Kreiraj pravila',
+'created by': 'izradio',
+'crontab': 'crontab',
+'currently running': 'trenutno pokrenut',
+'currently saved or': 'trenutno sačuvano ili',
+'database administration': 'administracija baze podataka',
+'Debug': 'Debug',
+'defines tables': 'definiše tabele',
+'delete': 'obriši',
+'Delete': 'Obriši',
+'delete all checked': 'delete all checked',
+'Delete this file (you will be asked to confirm deletion)': 'Obriši ovu datoteku (bićete upitani za potvrdu brisanja)',
+'Deploy': 'Postavi',
+'Deploy on Google App Engine': 'Postavi na Google App Engine',
+'Deploy to OpenShift': 'Postavi na OpenShift',
+'Detailed traceback description': 'Detailed traceback description',
+'direction: ltr': 'direction: ltr',
+'Disable': 'Isključi',
+'docs': 'dokumentacija',
+'download layouts': 'preuzmi layouts',
+'download plugins': 'preuzmi plugins',
+'Edit': 'Uređivanje',
+'edit all': 'uredi sve',
+'Edit application': 'Uredi aplikaciju',
+'edit controller': 'uredi controller',
+'edit views:': 'uredi views:',
+'Editing file "%s"': 'Uređivanje datoteke "%s"',
+'Editing Language file': 'Uređivanje jezičke datoteke',
+'Error': 'Greška',
+'Error logs for "%(app)s"': 'Pregled grešaka za "%(app)s"',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'Greške',
+'Exception instance attributes': 'Exception instance attributes',
+'Expand Abbreviation': 'Expand Abbreviation',
+'exposes': 'exposes',
+'exposes:': 'exposes:',
+'extends': 'proširuje',
+'failed to compile file because:': 'nisam mogao da kompajliram zbog:',
+'File': 'Datoteka',
+'file does not exist': 'datoteka ne postoji',
+'file saved on %s': 'datoteka sačuvana na %s',
+'filter': 'filter',
+'Find Next': 'Pronađi sljedeći',
+'Find Previous': 'Pronađi prethodni',
+'Frames': 'Frames',
+'Functions with no doctests will result in [passed] tests.': 'Functions with no doctests will result in [passed] tests.',
+'Generate': 'Generate',
+'Get from URL:': 'Preuzmi sa stranice:',
+'Git Pull': 'Git Pull',
+'Git Push': 'Git Push',
+'Go to Matching Pair': 'Go to Matching Pair',
+'go!': 'kreni!',
+'Help': 'Pomoć',
+'Hide/Show Translated strings': 'Sakriti/Prikazati prevedene riječi',
+'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.',
+'includes': 'uključuje',
+'inspect attributes': 'inspect attributes',
+'Install': 'Instaliraj',
+'Installed applications': 'Instalirane aplikacije',
+'invalid password.': 'pogrešna lozinka.',
+'Key bindings': 'Prečice',
+'Key bindings for ZenCoding Plugin': 'Prečice za for ZenCoding Plugin',
+'Language files (static strings) updated': 'Jezičke datoteke su ažurirane',
+'languages': 'jezici',
+'Languages': 'Jezici',
+'Last saved on:': 'Posljednja izmjena:',
+'License for': 'Licenca za',
+'loading...': 'preuzimam...',
+'locals': 'locals',
+'Login': 'Prijava',
+'Login to the Administrative Interface': 'Prijava za administrativni interfejs',
+'Logout': 'Izlaz',
+'Match Pair': 'Match Pair',
+'Merge Lines': 'Spoji linije',
+'models': 'models',
+'Models': 'Models',
+'Modules': 'Modules',
+'modules': 'modules',
+'New Application Wizard': 'Čarobnjak za nove aplikacije',
+'New application wizard': 'Čarobnjak za nove aplikacije',
+'New simple application': 'Nova jednostavna aplikacija',
+'Next Edit Point': 'Next Edit Point',
+'No ticket_storage.txt found under /private folder': 'No ticket_storage.txt found under /private folder',
+'online designer': 'onlajn dizajner',
+'Original/Translation': 'Original/Prevod',
+'Overwrite installed app': 'Prebriši postojeću aplikaciju',
+'Pack all': 'Zapakuj sve',
+'Peeking at file': 'Peeking at file',
+'Plugins': 'Plugins',
+'plugins': 'plugins',
+'Plural-Forms:': 'Plural-Forms:',
+'Powered by': 'Omogućio',
+'Previous Edit Point': 'Previous Edit Point',
+'Private files': 'Private files',
+'private files': 'private files',
+'Project Progress': 'Napredak projekta',
+'Reload routes': 'Obnovi preusmjerenja',
+'Removed Breakpoint on %s at line %s': 'Removed Breakpoint on %s at line %s',
+'Replace': 'Zamijeni',
+'Replace All': 'Zamijeni sve',
+'request': 'request',
+'response': 'response',
+'restart': 'restart',
+'restore': 'restore',
+'revert': 'revert',
+'rules are not defined': 'pravila nisu definisana',
+'rules:': 'pravila:',
+"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': 'Pokrenuto na %s',
+'Save': 'Sačuvaj',
+'Save via Ajax': 'Sačuvaj via Ajax',
+'Saved file hash:': 'Sačuvano kao haš:',
+'session': 'sesija',
+'session expired': 'sesija istekla',
+'Set Breakpoint on %s at line %s: %s': 'Set Breakpoint on %s at line %s: %s',
+'shell': 'shell',
+'Site': 'Sajt',
+'skip to generate': 'skip to generate',
+'Start a new app': 'Pokreni novu aplikaciju',
+'Start searching': 'Pokreni pretragu',
+'Start wizard': 'Pokreni čarobnjaka',
+'static': 'static',
+'Static files': 'Static files',
+'Step': 'Korak',
+'Submit': 'Prihvati',
+'successful': 'uspješan',
+'test': 'test',
+'Testing application': 'Testing application',
+'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 data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
+'There are no models': 'There are no models',
+'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',
+'Ticket ID': 'Ticket ID',
+'Ticket Missing': 'Ticket nedostaje',
+'to  previous version.': 'na prethodnu verziju.',
+'To create a plugin, name a file/folder plugin_[name]': 'To create a plugin, name a file/folder plugin_[name]',
+'toggle breakpoint': 'toggle breakpoint',
+'Toggle Fullscreen': 'Toggle Fullscreen',
+'Traceback': 'Traceback',
+'Translation strings for the application': 'Riječi u aplikaciji koje treba prevesti',
+'Try the mobile interface': 'Probaj mobilni interfejs',
+'try view': 'try view',
+'uncheck all': 'uncheck all',
+'Uninstall': 'Deinstaliraj',
+'update': 'ažuriraj',
+'update all languages': 'ažuriraj sve jezike',
+'upload': 'Otpremi',
+'Upload a package:': 'Preuzmi paket:',
+'Upload and install packed application': 'Preuzmi i instaliraj zapakovanu aplikaciju',
+'upload file:': 'preuzmi datoteku:',
+'upload plugin file:': 'preuzmi plugin datoteku:',
+'variables': 'variables',
+'Version': 'Verzija',
+'Version %s.%s.%s (%s) %s': 'Verzija %s.%s.%s (%s) %s',
+'Versioning': 'Versioning',
+'views': 'views',
+'Views': 'Views',
+'Web Framework': 'Web Framework',
+'web2py is up to date': 'web2py je ažuran',
+'web2py Recent Tweets': 'web2py Recent Tweets',
+'Wrap with Abbreviation': 'Wrap with Abbreviation',
+}

applications/admin/languages/uk.py

@@ -34,10 +34,12 @@
 'App does not exist or your are not authorized': 'Додаток не існує, або ви не авторизовані',
 'appadmin': 'Aдм.панель',
 'appadmin is disabled because insecure channel': "адмін.панель відключено через використання ненадійного каналу зв'язку",
+'Application': 'Додаток (Application)',
 'application "%s" uninstalled': 'додаток "%s" вилучено',
 'application %(appname)s installed with md5sum: %(digest)s': 'додаток %(appname)s встановлено з md5sum: %(digest)s',
 'Application cannot be generated in demo mode': 'В демо-режимі генерувати додатки не можна',
 'application compiled': 'додаток скомпільовано',
+'Application exists already': 'Додаток вже існує',
 'application is compiled and cannot be designed': 'додаток скомпільований. налаштування змінювати не можна',
 'Application name:': 'Назва додатку:',
 'are not used': 'не використовуються',
@@ -160,6 +162,7 @@
 'Error snapshot': 'Розгорнутий знімок стану (Error snapshot)',
 'Error ticket': 'Позначка (ticket) про помилку',
 'Errors': 'Помилки',
+'Errors in form, please check it out.': 'Помилка у формі, будь-ласка перевірте її.',
 'Exception %(extype)s: %(exvalue)s': 'Виключення %(extype)s: %(exvalue)s',
 'Exception %s': 'Виключення %s',
 'Exception instance attributes': 'Атрибути примірника класу Exception (виключення)',
@@ -388,6 +391,7 @@
 'There are no models': 'Моделей, наразі, нема',
 'There are no modules': 'Модулів поки що нема',
 'There are no plugins': 'Жодної втулки, наразі, не встановлено',
+'There are no private files': 'Приватних файлів поки що нема',
 'There are no static files': 'Статичних файлів, наразі, нема',
 'There are no translators': 'Перекладів нема',
 'There are no translators, only default language is supported': 'Перекладів нема, підтримується тільки мова оригіналу',
@@ -418,6 +422,7 @@
 'Traceback': 'Стек викликів (Traceback)',
 'Translation strings for the application': 'Пари рядків <оригінал>:<переклад> для вибраної мови',
 'try something like': 'спробуйте щось схоже на',
+'Try the mobile interface': 'Спробуйте мобільний інтерфейс',
 'try view': 'дивитись результат',
 'Type PDB debugger command in here and hit Return (Enter) to execute it.': 'наберіть тут будь-які команди ладнача PDB і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
 'Type python statement in here and hit Return (Enter) to execute it.': 'Наберіть тут будь-які вирази Python і натисніть клавішу [Return] ([Enter]), щоб запустити їх на виконання.',
@@ -463,7 +468,7 @@
 'Views': 'Відображення (Views)',
 'views': 'відображення',
 'WARNING:': 'ПОПЕРЕДЖЕННЯ:',
-'Web Framework': 'Web Framework',
+'Web Framework': 'Веб-каркас (Web Framework)',
 'web2py apps to deploy': 'Готові до розгортання додатки web2py',
 'web2py Debugger': 'Ладнач web2py',
 'web2py downgrade': 'повернення на попередню версію web2py',

applications/admin/models/0.py

@@ -78,5 +78,3 @@ PLUGINS_APP = 'http://web2py.com/plugins'
 # set the language
 if 'adminLanguage' in request.cookies and not (request.cookies['adminLanguage'] is None):
     T.force(request.cookies['adminLanguage'].value)
-
-

applications/admin/models/0_imports.py

@@ -28,5 +28,3 @@ from gluon.languages import findT, update_all_languages
 from gluon.myregex import *
 from gluon.restricted import *
 from gluon.compileapp import compile_application, remove_compiled_application
-
-

applications/admin/models/access.py

@@ -1,4 +1,6 @@
-import base64, os, time
+import base64
+import os
+import time
 from gluon import portalocker
 from gluon.admin import apath
 from gluon.fileutils import read_file
@@ -24,7 +26,8 @@ elif not request.is_local and not DEMO_MODE:
 try:
     _config = {}
     port = int(request.env.server_port or 0)
-    restricted(read_file(apath('../parameters_%i.py' % port, request)), _config)
+    restricted(
+        read_file(apath('../parameters_%i.py' % port, request)), _config)
 
     if not 'password' in _config or not _config['password']:
         raise HTTP(200, T('admin disabled because no admin password'))
@@ -38,7 +41,8 @@ except IOError:
             raise HTTP(200,
                        T('admin disabled because not supported on google app engine'))
     else:
-        raise HTTP(200, T('admin disabled because unable to access password file'))
+        raise HTTP(
+            200, T('admin disabled because unable to access password file'))
 
 
 def verify_password(password):
@@ -63,6 +67,7 @@ deny_file = os.path.join(request.folder, 'private', 'hosts.deny')
 allowed_number_of_attempts = 5
 expiration_failed_logins = 3600
 
+
 def read_hosts_deny():
     import datetime
     hosts = {}
@@ -83,6 +88,7 @@ def read_hosts_deny():
         f.close()
     return hosts
 
+
 def write_hosts_deny(denied_hosts):
     f = open(deny_file, 'w')
     portalocker.lock(f, portalocker.LOCK_EX)
@@ -93,6 +99,7 @@ def write_hosts_deny(denied_hosts):
     portalocker.unlock(f)
     f.close()
 
+
 def login_record(success=True):
     denied_hosts = read_hosts_deny()
     val = (0, 0)
@@ -168,4 +175,3 @@ elif session.authorized and \
 if request.controller == 'appadmin' and DEMO_MODE:
     session.flash = 'Appadmin disabled in demo mode'
     redirect(URL('default', 'sites'))
-

applications/admin/models/buttons.py

@@ -2,6 +2,7 @@
 
 import os
 
+
 def A_button(*a, **b):
     b['_data-role'] = 'button'
     b['_data-inline'] = 'true'
@@ -11,7 +12,7 @@ def button(href, label):
     if is_mobile:
         ret = A_button(SPAN(label), _href=href)
     else:
-        ret = A(SPAN(label),_class='button',_href=href)
+        ret = A(SPAN(label), _class='button btn', _href=href)
     return ret
 
 def button_enable(href, app):
@@ -20,19 +21,20 @@ def button_enable(href, app):
     else:
         label = SPAN(T('Disable'), _style='color:green')
     id = 'enable_' + app
-    return A(label,_class='button',_id=id,callback=href,target=id)
+    return A(label, _class='button btn', _id=id, callback=href, target=id)
 
 def sp_button(href, label):
     if request.user_agent().is_mobile:
         ret = A_button(SPAN(label), _href=href)
     else:
-        ret = A(SPAN(label),_class='button special',_href=href)
+        ret = A(SPAN(label), _class='button special btn btn-inverse', _href=href)
     return ret
 
 def helpicon():
     return IMG(_src=URL('static', 'images/help.png'), _alt='help')
 
 def searchbox(elementid):
-    return TAG[''](LABEL(IMG(_id="search_start",_src=URL('static', 'images/search.png'), _alt=T('filter')), _class='icon', _for=elementid), ' ', INPUT(_id=elementid, _type='text', _size=12))
+    return SPAN(LABEL(IMG(_id="search_start", _src=URL('static', 'images/search.png'), _alt=T('filter')),
-
+                    _class='icon', _for=elementid), ' ',
-
+                INPUT(_id=elementid, _type='text', _size=12, _class="input-medium"),
+            _class="searchbox")

applications/admin/models/db.py

@@ -4,9 +4,12 @@
 if MULTI_USER_MODE:
     db = DAL('sqlite://storage.sqlite')       # if not, use SQLite or other DB
     from gluon.tools import *
-    auth = Auth(globals(),db)                      # authentication/authorization
+    auth = Auth(
-    crud = Crud(globals(),db)                      # for CRUD helpers using auth
+        globals(), db)                      # authentication/authorization
-    service = Service(globals())                   # for json, xml, jsonrpc, xmlrpc, amfrpc
+    crud = Crud(
+        globals(), db)                      # for CRUD helpers using auth
+    service = Service(
+        globals())                   # for json, xml, jsonrpc, xmlrpc, amfrpc
     plugins = PluginManager()
 
     mail = auth.settings.mailer
@@ -29,6 +32,7 @@ if not session.authorized and MULTI_USER_MODE:
     elif not request.function == 'user':
         redirect(URL('default', 'user/login'))
 
+
 def is_manager():
     if not MULTI_USER_MODE:
         return True
@@ -36,5 +40,3 @@ def is_manager():
         return True
     else:
         return False
-
-

applications/admin/models/menu.py

@@ -21,6 +21,12 @@ if request.vars.app or request.args:
                           _c == 'mercurial' and _f == 'commit',
                           URL(_a, 'mercurial', 'commit', args=_t)))
 
+if os.path.exists('applications/examples'):
+    response.menu.append(
+        (T('Help'), False, URL('examples', 'default', 'documentation')))
+else:
+    response.menu.append((T('Help'), False, 'http://web2py.com/examples/default/documentation'))
+
 if not session.authorized:
     response.menu = [(T('Login'), True, URL('site'))]
 else:
@@ -29,9 +35,3 @@ else:
     response.menu.append((T('Debug'), False,
                           URL(_a, 'debug', 'interact')))
 
-if os.path.exists('applications/examples'):
-    response.menu.append((T('Help'), False, URL('examples','default','index')))
-else:
-    response.menu.append((T('Help'), False, 'http://web2py.com/examples'))
-
-

applications/admin/models/plugin_multiselect.py

@@ -1,5 +1,4 @@
-response.files.append(URL('static','plugin_multiselect/jquery.multi-select.js'))
+response.files.append(
+    URL('static', 'plugin_multiselect/jquery.multi-select.js'))
 response.files.append(URL('static', 'plugin_multiselect/multi-select.css'))
 response.files.append(URL('static', 'plugin_multiselect/start.js'))
-
-

applications/admin/modules/__init__.py

@@ -1,2 +1 @@
 
-

applications/admin/static/css/bootstrap_adapters.css

@@ -0,0 +1,579 @@
+/*=============================================================
+                         GENERAL 
+==============================================================*/
+html,body{height:auto;background:transparent;}
+/*=============================================================
+                         CONTROLS 
+==============================================================*/
+label,
+input,
+button,
+select,
+textarea,
+button.btn
+{
+font-size:13px;
+font-weight:normal;
+line-height:18px;
+}
+textarea,
+select
+{
+margin-bottom:9px;
+}
+select,
+/*textarea,*/
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input,
+a.btn-lnk
+{
+height:18px;
+padding:4px;
+font-size:13px;
+line-height:18px;
+}
+.design h3,
+.plugin h3
+{
+background-position:0 2px;
+}
+
+select,
+input[type="file"]
+{
+height:28px;
+line-height:28px;
+}
+input[type="submit"],
+input[type="button"]
+{
+font-size:13px;
+height:28px;
+line-height:18px;
+padding:4px 10px;
+}
+input[type="radio"],
+input[type="checkbox"]
+{
+margin-top:2px;
+}
+.button.btn
+{
+line-height:1.25em;
+font-size:inherit;
+border:none;
+text-shadow:none;
+margin-bottom:0px;
+-webkit-border-radius:0px;
+   -moz-border-radius:0px;
+        border-radius:0px;
+-webkit-box-shadow:none;
+   -moz-box-shadow:none;
+        box-shadow:none);
+}
+.button.btn:hover
+{
+background-color:transparent;
+-webkit-transition: background-position 0s linear;
+   -moz-transition: background-position 0s linear;
+     -o-transition: background-position 0s linear;
+        transition: background-position 0s linear;
+}
+form label
+{
+font-weight:bold;
+}
+.help
+{
+border-color:transparent;
+}
+/* tree menu */
+.folder
+{
+border:none;
+}
+.folder>i
+{
+display:none;
+}
+.celled
+{
+padding-top: 2px;
+}
+.celled-one
+{
+padding-top: 1px;
+}
+
+.test h3
+{
+border:0;
+padding-left:18px;
+}
+/*=============================================================
+                      FLASH MESSAGEBOX 
+==============================================================*/
+.flash
+{
+position:fixed;
+width:50%;
+top:49px;
+left:25%;
+right:25%;
+cursor:default;
+text-align:center;
+padding:8px 35px 8px 14px;
+z-index:5620;
+}
+.flash>.close
+{
+color:inherit;
+opacity:0.7;
+}
+.flash>.close:hover
+{
+opacity:0.9;
+}
+/*=============================================================
+                         NAVBAR 
+==============================================================*/
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner
+{
+/* in place of shadow image */
+-webkit-box-shadow:0px 10px 20px rgba(195,195,195,1.0);
+-moz-box-shadow:   0px 10px 20px rgba(195,195,195,1.0);
+box-shadow:        0px 10px 20px rgba(195,195,195,1.0);
+//zoom:1; /* IE6-9 */
+filter:progid:DXImageTransform.Microsoft.DropShadow(OffX=0, OffY=10, Color=#000000); /* IE6-9 */
+padding:0;
+}
+.navbar-inverse .navbar-inner
+{
+min-height:33px; /* required - override */
+height:33px;
+filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
+background:#292929 url(../images/header_bg.png) repeat-x;
+border:none;
+}
+#header
+{
+background:transparent;
+}
+#header.navbar
+{
+overflow:visible;
+}
+.navbar-inverse .nav > li > a
+{
+padding:0;
+line-height:1.25;
+text-shadow:none;
+}
+.navbar .btn-navbar
+{
+padding:4px;
+margin:5px 5px 0 5px;
+}
+#menu{margin-right:-7px;}
+/*=============================================================
+                         FOOTER 
+==============================================================*/
+#footer
+{
+padding-bottom:0;
+}
+/*=============================================================
+                         MAIN 
+==============================================================*/
+#main
+{
+position:static;
+padding-top:0;
+padding-bottom:0;
+}
+/*=============================================================
+                        SIDEBAR 
+==============================================================*/
+.sidebar_inner
+{
+background:transparent;
+padding:0;
+min-width:auto;
+}
+.sidebar .box {
+border-top:1px solid #EEE;
+}
+/*=============================================================
+                       WIZARD 
+==============================================================*/
+.step div.help li
+{
+line-height:inherit;
+}
+.ms-container .ms-selectable li.ms-elem-selectable,
+.ms-container .ms-selection li.ms-elem-selected
+{
+font-size:13px;
+}
+.input-append a.btn
+{
+padding:4px;
+height:18px;
+font-size:13px;
+line-height:18px;
+}
+/*=============================================================
+                       ERRORS TABLE 
+==============================================================*/
+.errors .table th
+{
+filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
+}
+
+.tablebar span.help
+{
+font-weight:normal;
+line-height:1.25em;
+text-shadow:none;
+width:auto;
+}
+/*=============================================================
+                      TOOLTIP
+==============================================================*/
+.tooltip.in
+{
+opacity:1;
+filter:alpha(opacity=100);
+}
+.tooltip-inner
+{
+opacity:1;
+text-align:left;
+background:#9fb364;
+color:#eef1d9;
+border:1px solid #eef1d9;
+font-style:italic;
+padding:0.3em;
+-moz-border-radius:0.5em;
+border-radius:0.5em;
+font-size:13px;
+text-transform:none;
+}
+.tooltip.right .tooltip-arrow,
+.tooltip.left .tooltip-arrow
+{
+border-color:transparent;
+}
+
+/*=============================================================
+                        THE GRID 
+==============================================================*/
+.w2p_grid_bottom_bar .w2p_export_menu
+{
+line-height:18px;
+margin-left:0;
+}
+.w2p_export_menu .dropdown-toggle
+{
+cursor:pointer;
+margin:0;
+padding:0;
+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);
+}
+.w2p_export_menu ul 
+{
+margin-top:2px;
+display:none;
+}
+.w2p_export_menu li
+{ 
+display:list-item;
+margin:0;
+}
+div.web2py_grid 
+{
+font-size:13px;
+line-height:18px;
+}
+.web2py_grid a.btn
+{
+font-size:13px;
+line-height:18px;
+padding:4px 10px;
+margin-left:0;
+margin-right:4px;
+
+background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+}
+.web2py_grid .input-append .btn
+{
+padding:4px 10px;
+margin-right:0;
+font-family:inherit;
+color:#333;
+text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);
+border:1px solid #c5c5c5;
+}
+.web2py_grid select:focus
+{
+border-color:rgba(232,149,60,0.8);
+outline:0;
+-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(232, 149, 60, 0.6);
+-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(232,149,60,0.6);
+box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(232, 149, 60, 0.6);
+}
+.web2py_console input[type="button"],
+.web2py_grid .row_buttons a.btn
+{
+color:#333;
+line-height:18px;
+padding:4px 10px;
+text-shadow:rgba(255, 255, 255, 0.74902) 0px 1px 1px;
+border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+-webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+        border-radius: 4px;
+}
+.web2py_console input[type="button"]:hover,
+.web2py_grid .row_buttons a.btn:hover
+{
+color:#333;
+border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+background:#E6E6E6;
+background-position: 0 -15px !important;
+-webkit-transition: background-position .1s linear;
+-moz-transition: background-position .1s linear;
+-o-transition: background-position .1s linear;
+transition: background-position .1s linear;
+}
+.web2py_table 
+{
+border:none;
+}
+.web2py_table table
+{
+/*table-layout:fixed;*/
+margin-bottom:4px;
+}
+.web2py_table table td
+{
+/*word-wrap:break-word;*/ /*uncomment when "table-layout:fixed" is applied */
+}
+
+.web2py_grid thead th 
+{
+background-color:transparent;
+padding:4px 5px;
+line-height:18px;
+vertical-align:bottom;
+border-right:0;
+border-bottom:0;
+word-wrap:break-word;
+}
+.web2py_grid .btn-group > .dropdown-menu
+{
+font-size:13px;
+}
+.web2py_grid .dropdown-menu li > a:hover,
+.web2py_grid .dropdown-menu li > a:focus 
+{
+filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
+background-image:none;
+background-color:#E8953C;
+}
+.pagination
+{
+margin:0;
+height:30px;
+}
+.pagination ul > li > a
+{
+line-height:28px;
+}
+
+#w2p_grid_addbtn:focus,
+#w2p_search-form :focus,
+.btn:focus
+{
+outline:none;
+}
+.web2py_console input[type="button"]:focus,
+.web2py_grid .row_buttons a.btn:focus
+ {
+box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+div.web2py_counter.span6
+{
+min-height:20px;
+}
+.web2py_paginator 
+{
+border:0;
+margin:0;
+padding:0;
+background-color:transparent;
+}
+.web2py_paginator ul li a
+{
+margin-right:0;
+padding:0 14px;
+border:1px solid #DDD;
+border-left-width:0;
+color:#E8953C;
+}
+.web2py_paginator ul li a:hover
+{
+background: whiteSmoke;
+border: 1px solid #DDD;
+border-left-width:0;
+color:#e2821b;
+}
+.web2py_paginator ul li:first-child a,
+.web2py_paginator ul li:first-child a:hover
+{
+border-left-width:1px;
+}
+.web2py_paginator .current
+{
+font-weight:normal;
+}
+.web2py_paginator ul li.current a:hover
+{
+color:#999;
+}
+
+
+
+
+
+.editor-bar-column a[name="save"]
+{
+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;
+padding:2px 6px;
+font-size:11px;
+line-height:17px;
+margin:0;
+}
+.editor-bar-column a[name="save"]:hover
+{
+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;
+}
+.keybindings
+{
+padding:0 18px 10px;
+} 
+.keybindings li 
+{
+margin-bottom:0;
+}
+
+/*-----  translate page  ---*/
+
+.languageform input
+{
+margin-bottom:0;
+}
+.languageform div
+{
+margin-bottom:9px;
+}
+.languageform input.untranslated
+{
+background-color:#FC0;
+}
+
+.step #wizard_nav .first-box
+{
+padding-top:0;
+}
+
+/*=============================================================
+                         MEDIA QUERIES 
+==============================================================*/
+@media (max-width: 979px)
+{
+/*-----------------------------------
+                  Navbar
+-------------------------------------*/
+	#header .navbar-inner
+	{
+	padding:0;
+	}
+	/*collapsed menu*/
+	.navbar .nav-collapse .nav
+	{
+	background:#222;
+	padding:8px 2px 8px 8px;
+	-webkit-border-bottom-right-radius:8px;
+	-webkit-border-bottom-left-radius:8px;
+	-moz-border-radius-bottomright:8px;
+	-moz-border-radius-bottomleft:8px;
+	border-bottom-right-radius:8px;
+	border-bottom-left-radius:8px;
+	}
+	#menu
+	{
+	margin-right:0;
+	}
+	#menu li
+	{
+	float:none;
+	}
+	#menu a.button,
+	#menu a.button span
+	{
+	background-image:url(../images/menu_responsive.png);
+	}
+	#menu a.button
+	{
+	padding:0 1em 0 0;
+	}
+}
+@media(max-width:632px)
+{
+/*-----------------------------------
+                  footer
+-------------------------------------*/
+	#footer
+	{
+	height:auto;
+	}
+
+	#footer select
+	{
+	margin-top:8px;
+	}
+}

applications/admin/static/css/bootstrap_essentials.css

@@ -0,0 +1,351 @@
+
+/*=============================================================
+ GENERAL
+==============================================================*/
+ body { /*remember to account for the hidden area underneath
+fixed navbar by adding at least 40px padding to the <body>.
+Be sure to add this after the core Bootstrap CSS
+and before the optional responsive CSS.
+An alternative solution is to set top-margin to div#main padding-top:60px; comment this for alternative solution*/ height:auto; /*uncomment this for alternative solution*/ }
+
+/*=============================================================
+ BOOTSTRAP ICONS FOLDER FIX
+==============================================================*/
+ [class^="icon-"], [class*=" icon-"] { /* right folder for bootstrap black images/icons*/ background-image:url("../images/glyphicons-halflings.png") }
+
+.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-"] { /* right folder for bootstrap white images/icons*/ background-image:url("../images/glyphicons-halflings-white.png"); }
+
+/*=============================================================
+ INPUT BORDER HIGHLIGHT WHEN INPUT IS FOCUSED
+==============================================================*/
+ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, input[type="file"]:focus, select:focus, .uneditable-input:focus { /* outline color*/ border-color:rgba(232, 149, 60, 0.8); outline:0; /*outline:thin dotted \9;*/ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); }
+
+.web2py_grid .dropdown-menu li > a:hover, .web2py_grid .dropdown-menu li > a:focus { filter:progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9*/ background-image:none; background-color:#E8953C; }
+
+/*=============================================================
+ COLOR OF LINKS
+==============================================================*/
+ a, a:hover { color:#E8953C; text-decoration:none; }
+
+a:hover { color:#e2821b; }
+
+/*=============================================================
+ CONTROLS and CONTAINERS
+==============================================================*/
+ .row-buttons .btn { margin-bottom:7px; }
+
+.sidebar .box { clear:right; margin-top:2em; border-top:1px solid #d1d1d1; padding:0 1em; }
+
+.pwdchange>.button { margin-bottom:10px; }
+
+input[type="file"] { margin-bottom:9px; }
+
+.form-inline input[type="file"] { margin-bottom:0px; }
+
+input + .help-block { margin-top:-5px; margin-bottom:4px; }
+
+#confirm_form input.btn, .generatedbyw2p input { margin-right:4px; }
+
+a[rel='tooltip'] span, div[rel='tooltip'] span { display:none; margin-left:-9999px; }
+
+/*in-page browsing*/
+ [rel="pagebookmark"] { position:relative; }
+
+[rel="pagebookmark"]>.component { cursor:pointer; }
+
+[rel="pagebookmark"]>.hashstick { position:absolute; top:-54px; left:-9999px; visibility:visible; }
+
+/* following 2 rules set the style of a small button for going to top of page*/
+ .tophashlink.btn { padding:2px 3px; visibility:hidden; }
+
+.hashstick:target+.tophashlink.btn { visibility:visible; }
+
+ul.act_edit { margin-top:4px; margin-left:20px; }
+
+ul.act_edit .btn { margin-top:4px; margin-bottom:4px; }
+
+ul.act_edit .file>a { white-space:pre; }
+
+.right-full { text-align:right; }
+
+.searchbox, .searchbox label, .searchbox input { display:inline-block; }
+
+.buttons-row .btn { margin-bottom:9px; }
+
+.li-controls { display:inline-block; width:180px; vertical-align:middle; }
+
+.celled { display:inline-block; padding: 0 0 0 4px; vertical-align:top; margin-top:4px; width:700px; }
+
+.folder { list-style-type:none; #border-left: 1px dotted #AAA; }
+
+.folder li { list-style-type:none; }
+
+.folder>i { display:inline-block; width:5px; height:5px; border:1px solid; background-color:#FAA732; margin-left:-4px; margin-top:-2px; border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-radius:1px; }
+
+.folder>i+a { padding-left:0.5em; }
+
+.folder ul { margin-top:0.5em; margin-bottom:0.5em; }
+
+.controls-inline .btn { margin-right:5px; }
+
+div.web2py_counter.span6 { min-height:24px; text-align:right; }
+
+.pagination { margin:0; }
+
+.table { margin-bottom:10px; }
+
+.row_buttons .btn { margin-right:4px; }
+
+.editor-bar-column { display:inline-block; vertical-align:top; margin-right:4px; }
+
+.editor-bar-column .input-long { width:270px; }
+
+.editor-bar-column .input-normal { width:206px; }
+
+.keybindings li { margin-bottom:0.5em; }
+
+.keybindings span { padding:0.3em; border:1px solid transparent; vertical-align:middle; }
+
+.teletype-text { font-family:monospace; font-weight:bold; font-style:normal; border-color:#999; background:#333; color:#DDD; -moz-border-radius:0.3em; border-radius:0.3em; }
+
+.edit_language .tab_row div { display:inline-block; vertical-align:top; margin-right:4px; }
+
+.edit_language .fake-input { height:18px; padding:4px; font-size:13px; line-height:18px; overflow:hidden; white-space:nowrap; display:inline-block; margin-bottom:9px; }
+
+.test h3 { padding-left:9px; margin:0; font-size:16px; line-height:1; border-left:9px solid transparent; }
+
+.test h3.passed { border-color:#009900; }
+
+.test h3.failed { border-color:#CC0000; }
+
+.test h3.nodoctests { border-color:#CCCC99; }
+
+.test .test_report { width:100%; overflow:auto; }
+
+.test_report pre { white-space:pre; }
+
+.test div[id^="output_"]>h2 { font-size:18px; line-height:1; color:grey; }
+
+div.center { text-align:center; }
+
+.delete h2 { word-wrap:break-word; }
+
+/*=============================================================
+ SHELL
+==============================================================*/
+ .shell .output-wrapper { width:100%; height:30em; border:1px solid #333; }
+
+.shell .prompt-wrapper { float:left; width:100%; overflow:hidden; height:auto; border:1px solid #333; }
+
+.shell .prompt-container { margin-left:2.5em; }
+
+.shell #caret { width:2.5em; float:left; margin-left:-100%; }
+
+.shell #shellwrapper { background:white; color:#E8953C; width:100%; margin:1em 0; border:0; }
+
+.shell #output, .shell .prompt { color:#E8953C; background:white; resize:none; border:none; width:100%; height:100%; cursor:default; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; }
+
+.shell #output:focus, .shell .prompt:focus { border-color:transparent; outline:0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; }
+
+.shell #output pre { color: #E8953C; }
+
+.shell #autoscroll { cursor:pointer; float:right; }
+
+.shell .prompt, .shell #output, .shell #caret { font-size: 11pt; padding: 6px; padding-right: 0em; }
+
+.shell #caret { padding-top:9px; }
+
+.shell .prompt, .shell #output, .shell pre, .shell #caret { font-family: monospace; }
+
+.shell a[rel="tooltip"] { margin-left:8px; }
+
+/*=============================================================
+ PEEK
+==============================================================*/
+ .peek .code-wrapper { width:100%; overflow:auto; white-space:pre; }
+
+.peek table td pre { word-break:normal; white-space:pre; }
+
+/*=============================================================
+ FOOTER
+==============================================================*/
+ #footer { border-top:1px solid; text-align:center; padding:1em 0; }
+
+#footer span, #footer select { display:inline-block; margin-bottom:0; vertical-align:middle; }
+
+#footer select { width:auto; }
+
+/*=============================================================
+ MAIN
+==============================================================*/
+ #main { margin-top:60px; /*uncomment this for alternative solution to hidden area underneath fixed navbar issue*/ margin-bottom:60px; }
+
+/*=============================================================
+ WIZARD
+==============================================================*/
+ #wizard_nav .box { border-bottom:1px dotted; }
+
+#wizard_nav li { margin-left:1em; margin-top:0.5em; }
+
+.step textarea { width:auto; }
+
+select[name='layout_theme'] { vertical-align:top; }
+
+img#preview { margin-bottom:9px; }
+
+/* multiselect customization*/
+ .ms-container { margin-bottom:5px; }
+
+.ms-selectable, .step .ms-selection { text-align:center; }
+
+.ms-list { text-align:left; background:white; }
+
+.ms-container li.ms-elem-selectable:not(.disabled).ms-hover, .ms-container .ms-selection li:not(.disabled).ms-hover { background-color:#E8953C; }
+
+.ms-container .ms-selectable { margin-right:25px; }
+
+.ms-container .ms-selectable, .ms-container .ms-selection { background:transparent; }
+
+.ms-container .ms-list.ms-focus { border-color:rgba(232, 149, 60, 0.8); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(232, 149, 60, 0.6); }
+
+/* grow_input*/
+ ul[id$="_grow_input"] { margin-left:0; }
+
+/* generate_form*/
+ #generate_form .control-group { margin-bottom:0; }
+
+#generate_form .control-label { text-align:left; }
+
+#generate_form .controls { padding-left:18px; margin-left:0; }
+
+#generate_form .control-label.empty { width:142px; }
+
+.step [rel="pagebookmark"]>.hashstick { display:none; }
+
+/*generated page*/
+ .generated iframe { border:1px inset #e3e3e3; }
+
+/*=============================================================
+ ERRORS TABLE / TICKET PAGE
+==============================================================*/
+ .tablebar { margin:7px 0 7px 0; }
+
+.tablebar input { margin-right:27px; }
+
+.tablebar span { vertical-align:bottom; }
+
+.table th { background: #e9e9e9; background: -moz-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #FAFAFA), color-stop(100%, #E9E9E9)); background: -webkit-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: -o-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: -ms-linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); background: linear-gradient(top, #FAFAFA 0%, #E9E9E9 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9'); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')"; /*font-size:10px; color:#444; text-transform:uppercase;*/ }
+
+td.cbcentered, th.cbcentered { text-align:center; }
+
+td.cbcentered>input, th.cbcentered>input { margin-top:-1px; }
+
+.traceback div { }
+
+.ticket_code>table td:first-child { border-left:0; }
+
+#trck_errors table td pre { word-break:normal; white-space:pre; }
+
+.inspect pre, .errorsource pre { word-break:normal; white-space:pre; }
+
+.ticket_code { background-color:lightyellow; }
+
+.ticket_code table, .ticket_code td { border-width:0px; border-collapse:collapse; width:100%; }
+
+.ticket_code tbody tr:hover td { background-color:transparent; }
+
+/*=============================================================
+ FLOT GRAPHS
+==============================================================*/
+ .about #placeholder { width:auto; max-width:600px; height:300px; position:relative; margin:0 auto; /* for centering*/ }
+
+/*=============================================================
+ THE GRID
+==============================================================*/
+ #w2p_query_panel { min-width:20px; min-height:20px; padding:10px; margin-top:1em; background-color:#f5f5f5; border: 1px solid #e3e3e3; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); }
+
+#w2p_query_panel select, #w2p_query_panel input { margin-bottom:0; margin-right:4px; }
+
+.web2py_grid .hidden { visibility:visible; }
+
+.qry_pnl_btns { display:inline-block; }
+
+#w2p_grid_addbtn, #w2p_search-form { margin-top:9px; margin-bottom:9px; }
+
+#w2p_search-form { margin-bottom:0; }
+
+#w2p_search-form form { margin-bottom:0; }
+
+/*----- translate page ---*/
+ .languageform input { margin-bottom:0; }
+
+.languageform input.untranslated { background-color:#FC0; }
+
+/*=============================================================
+ MEDIA QUERIES
+==============================================================*/
+ @media (max-width: 800px) { .step [rel="pagebookmark"]>.hashstick { /*top:-54px;*/ display:block; }
+
+ }
+
+@media (max-width: 767px) { [rel="pagebookmark"]>.hashstick { top:0; }
+
+/*-----------------------------------
+ main
+-------------------------------------*/
+ #main { margin-top:0; }
+
+/*-----------------------------------
+ footer
+-------------------------------------*/
+ #footer { margin-left: -20px; margin-right: -20px; padding-left: 20px; padding-right: 20px; }
+
+/*-----------------------------------
+ errors page
+-------------------------------------*/
+ #trck_errors { table-layout:fixed; }
+
+#trck_errors .column1 { width:20px; }
+
+#trck_errors .column2 { width:45px; }
+
+#trck_errors .column3 { width:150px; }
+
+#trck_errors .columnN { width:55px; }
+
+#trck_errors .columnN1 { width:138px; }
+
+.ticket_code, .inspect.resp1, .inspect.controls pre, .errorsource { width:100%; overflow:auto; }
+
+.ticket_code>table { width:100%; }
+
+.celled { width:320px; }
+
+ }
+
+@media (max-width: 480px) { .qry_pnl_btns { display:block; margin-top:4px; }
+
+/*-----------------------------------
+ wizard
+-------------------------------------*/
+ #generate_form .control-label { float:left; width:160px; padding-top:5px; }
+
+.inspect>code { display:block; white-space:normal; }
+
+.li-controls { }
+
+.celled { width:165px; }
+
+ }
+
+h4.editableapp, h4.currentapp { padding: 5px 0 5px 54px; display: inline; }
+
+h4.editableapp { background: #fff url(../images/folder.png) no-repeat; }
+
+h4.currentapp { background: #fff url(../images/folder_locked.png) no-repeat; }
+
+.flash { position:fixed; width:50%; top:49px; left:25%; right:25%; cursor:default; text-align:center; z-index:5620; }
+
+table.twitter{ background-color: transparent; }
+table.twitter tr td {vertical-align: top; padding: 5px; }
+table.twitter tr { border-bottom: 1px solid #a0a0a0; }

applications/admin/static/css/styles.css

@@ -1166,7 +1166,7 @@ ul#snapshot > li {
     font-size: 1em;
     color: #3C3C3D;
     text-shadow: 1px 1px 0 #FFFFFF;
-    background:#ECECEC;
+    //background:#ECECEC;
     white-space: nowrap; overflow: visible;
     cursor: pointer; text-decoration: none;
     border: 1px solid #CACACA;
@@ -1244,8 +1244,64 @@ color: #222;
 	border-radius:2px;
 }
 .ie9 #query_panel {padding-bottom:2px;}
-
 .error, .error a {color:red}
 .pluralsform thead td {font-weight:bold; font-size:1.2em; padding-bottom:5px}
 .pluralsform td {padding-left:5px}
 .tm_ftag {color:blue}
+
+/*-----------------------------------*/
+/*       due to bootstrap layout
+/*-----------------------------------*/
+.navbar .btn-navbar{display:none;}
+label{display:block;}
+input{margin-bottom:5px;}
+.login input{width:210px;}
+.change_password input{width:210px;}
+div.flash .close{color:inherit;float:right;}
+label.checkbox{margin-bottom:5px;}
+.control-group{margin-bottom:5px;}
+.step #menu li{margin-left:0;margin-top:0;}
+.step #wizard_nav{padding-top:0.5em;}
+.hashstick{visibility:hidden;}
+#generate_form .control-label{float:left;width:160px;padding-top:5px;text-align:left;}
+#generate_form .controls > .checkbox:first-child{padding-top:7px;}
+/* from default/errors.html */
+table.sortable{border-spacing:0px;}
+table.sortable td, table.sortable th{padding:2px 5px 2px 5px;}
+table.sortable thead{background-color:#eee;color:#666666;font-weight:bold;cursor:default;}
+tr.error_ticket:hover{background-color:#eee;}
+.controls a.button.unavailable{color:#ff0000;}
+/* end from default/errors.html */
+/* new errors table */
+.tablebar{margin:7px 0 7px 0;}
+.cbcentered{text-align:center;}
+/* new tooltip */
+a[rel='tooltip']:hover{background:transparent;text-decoration:none;}
+a[rel='tooltip'] span{display:none;padding:5px;margin-left:10px;width:150px;}
+a[rel='tooltip']:hover span{cursor:default;display:inline;position:absolute;}
+a[rel='tooltip'] span{background:#9fb364;color:#eef1d9;border:1px solid #eef1d9;font-style:italic;width:20%;padding:0.3em;-moz-border-radius:0.5em;border-radius:0.5em;font-size:13px;text-transform:none;}
+/* flot graph */
+.about #placeholder{width:600px;height:300px;margin:0 auto;}
+.tophashlink.btn{visibility:hidden;}
+.help-block{display:block;}
+.w2p_grid_bottom_bar .w2p_export_menu{float:left;line-height:39px;margin-left:10px;}
+.w2p_export_menu .dropdown-toggle{cursor:default;color:#333;margin:0;padding:0;background-image:none;}
+.w2p_export_menu ul{display:inline-block;margin:0;vertical-align:middle;}
+.w2p_export_menu li{list-style:none;display:inline-block;margin-right:4px;margin-left:2px;}
+.edit_language .tab_row div{display:inline-block;vertical-align:top;margin-right:4px;}
+.edit_language .tab_row>div{border:1px solid #e3e3e3;margin-bottom:20px;background-color:#f5f5f5;}
+/* shell*/
+.shell .output-wrapper{width:75%;height:30em;border:1px solid #333;}
+.shell .prompt-wrapper{float:left;width:100%;overflow:hidden;height:auto;border:1px solid #333;}
+.shell .prompt-container{margin-left:2.5em;}
+.shell #caret{width:2.5em;float:left;margin-left:-100%;}
+.shell #shellwrapper{background:white;color:#E8953C;width:75%;margin:1em 0;border:0;}
+.shell #output,.shell .prompt{color:#E8953C;background:white;resize:none;border:none;width:100%;height:100%;cursor:default;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
+.shell #output:focus,.shell .prompt:focus{border-color:transparent;outline:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.shell #output pre{color:#E8953C;}
+.shell #autoscroll{cursor:pointer;float:right;}
+.shell .prompt,.shell #output,.shell #caret{font-size:11pt;padding:6px;padding-right:0em;}
+.shell .prompt,.shell #output,.shell pre,.shell #caret{font-family:monospace;}
+.shell a[rel="tooltip"]{margin-left:8px;}
+.shell .clearfix{clear:both;}
+.shell #caret{padding-top:9px;}

applications/admin/static/css/web2py.css

@@ -61,7 +61,7 @@ input[type=text],input[type=password],select{width:300px; margin-right:5px}
     border-top:1px #DEDEDE solid;
 }
 .header {
-	// background:<fill here for header image>;
+	/* background:<fill here for header image>; */
 }
 
 
@@ -92,7 +92,7 @@ div.flash {
     position:fixed;
     padding:10px;
     top:48px;
-    right:50px;
+    right:250px;
     min-width:280px;
     opacity:0.95;
     margin:0px 0px 10px 10px;
@@ -115,6 +115,10 @@ div.flash {
     z-index:2000;
 }
 
+div.flash #closeflash{color:inherit; float:right; margin-left:15px;}
+.ie-lte7  div.flash #closeflash
+{color:expression(this.parentNode.currentStyle['color']);float:none;position:absolute;right:4px;}
+
 div.flash:hover { opacity:0.25; }
 
 div.error_wrapper {display:block}
@@ -182,11 +186,12 @@ div.error {
 * will look better with the declarations below
 * if needed to remove base.css consider keeping these following lines in some css file.
 */
-// .web2py_table {border:1px solid #ccc}
+/* .web2py_table {border:1px solid #ccc} */
 .web2py_paginator {}
 .web2py_grid {width:100%}
 .web2py_grid table {width:100%}
 .web2py_grid tbody td {padding:2px 5px 2px 5px; vertical-align: middle;}
+.web2py_grid .web2py_form td {vertical-align: top;}
 
 .web2py_grid thead th,.web2py_grid tfoot td {
     background-color:#EAEAEA;

applications/admin/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/admin/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/admin/static/js/ajax_editor.js

@@ -43,8 +43,9 @@ function doHighlight(highlight) {
     if (window.ace_editor) {
 	window.ace_editor.gotoLine(highlight.lineno);
     } else if (window.mirror) {
-	window.mirror.setSelection({line:highlight.lineno,ch:0},
+        // Put the cursor at the offending line:
-				   {line:highlight.end,ch:0});
+        window.mirror.setCursor({line:highlight.lineno-1,
+                                 ch:highlight.offset+1});
     } else if (window.eamy) {
 	// not implemented
     } else if (window.textarea) {
@@ -105,7 +106,7 @@ function doClickSave() {
 			doHighlight(json.highlight);
 		    } else {
 			jQuery("input[name='saved_on']").attr('style','background-color:#99FF99');
-			jQuery(".flash").delay(1000).fadeOut('slow');
+			//jQuery(".flash").delay(1000).fadeOut('slow');
 		    }
 		    // console.info(jQuery("input[name='file_hash']").val());
 		    var output = '<b>exposes:</b> ';
@@ -148,8 +149,12 @@ function getSelectionRange() {
     return sel;
 }
 
-function doToggleBreakpoint(filename, url) {
+function doToggleBreakpoint(filename, url, sel) {
-    var sel = getSelectionRange();
+    if (sel==null) {
+        // use cursor position to determine the breakpoint line
+        // (gutter already tell us the selected line)
+        sel = getSelectionRange();
+    }
     var dataForPost = prepareMultiPartPOST(new Array(
 	prepareDataForSave('filename', filename),
 	prepareDataForSave('sel_start', sel["start"]),
@@ -170,15 +175,26 @@ function doToggleBreakpoint(filename, url) {
 	  success: function(json,text,xhr){
 	     // show flash message (if any)
 	     var flash=xhr.getResponseHeader('web2py-component-flash');
-	     if (flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
+	     if (flash) {
+				jQuery('.flash').html(decodeURIComponent(flash))
+				.append('<a href="#" class="close">&times;</a>')
+				.slideDown();
+		}
 	     else jQuery('.flash').hide();
 	     try {
 		 if (json.error) {
 		     window.location.href=json.redirect;
 		 } else {
+             if (json.ok==true && window.mirror) {
     		     // mark the breakpoint if ok=True
+ 		         editor.setMarker(json.lineno-1,
+ 		                         "<span style='color: red'>●</span> %N%")
+ 		     } else if (json.ok==false && window.mirror) {
     		     // remove mark if ok=False
+ 		         editor.setMarker(json.lineno-1, "%N%")
+ 		     } else {
     		     // do nothing if ok = null
+    		 }
 		     // alert(json.ok + json.lineno);
 		 }
 	     } catch(e) { on_error(); }
@@ -188,6 +204,43 @@ function doToggleBreakpoint(filename, url) {
 	return false;
 }
 
+// on load, update all breakpoints markers:
+function doListBreakpoints(filename, url) {
+    var dataForPost = prepareMultiPartPOST(new Array(
+	    prepareDataForSave('filename', filename)
+        ));
+     jQuery.ajax({
+	  type: "POST",
+	  contentType: 'multipart/form-data;boundary="'+dataForPost[1]+'"',
+	  url: url,
+	  dataType: "json",
+	  data: dataForPost[0],
+	  timeout: 5000,
+      beforeSend: function(xhr) {
+	  xhr.setRequestHeader('web2py-component-location',
+			       document.location);
+	  xhr.setRequestHeader('web2py-component-element',
+			       'doListBreakpoints');},
+	  success: function(json,text,xhr){
+	     try {
+		     if (json.error) {
+		         window.location.href=json.redirect;
+		     } else {
+                 if (window.mirror) {
+                     for (i in json.breakpoints) {
+                         lineno = json.breakpoints[i];
+            		     // mark the breakpoint if ok=True
+         		         editor.setMarker(lineno-1,
+         		                         "<span style='color: red'>●</span> %N%");
+         		     }
+        		 }
+		     }
+	     } catch(e) { on_error(); }
+      },
+      error: function(json) { on_error(); }
+	});
+	return false;
+}
 
 function keepalive(url) {
 	jQuery.ajax({
@@ -197,4 +250,3 @@ function keepalive(url) {
 	  success: function(){},
 	  error: function(x) { on_error(); } });
 }
-

applications/admin/static/js/jquery.flot.resize.js

@@ -0,0 +1,60 @@
+/*
+Flot plugin for automatically redrawing plots when the placeholder
+size changes, e.g. on window resizes.
+
+It works by listening for changes on the placeholder div (through the
+jQuery resize event plugin) - if the size changes, it will redraw the
+plot.
+
+There are no options. If you need to disable the plugin for some
+plots, you can just fix the size of their placeholders.
+*/
+
+
+/* Inline dependency: 
+ * jQuery resize event - v1.1 - 3/14/2010
+ * http://benalman.com/projects/jquery-resize-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,h,c){var a=$([]),e=$.resize=$.extend($.resize,{}),i,k="setTimeout",j="resize",d=j+"-special-event",b="delay",f="throttleWindow";e[b]=250;e[f]=true;$.event.special[j]={setup:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.add(l);$.data(this,d,{w:l.width(),h:l.height()});if(a.length===1){g()}},teardown:function(){if(!e[f]&&this[k]){return false}var l=$(this);a=a.not(l);l.removeData(d);if(!a.length){clearTimeout(i)}},add:function(l){if(!e[f]&&this[k]){return false}var n;function m(s,o,p){var q=$(this),r=$.data(this,d);r.w=o!==c?o:q.width();r.h=p!==c?p:q.height();n.apply(this,arguments)}if($.isFunction(l)){n=l;return m}else{n=l.handler;l.handler=m}}};function g(){i=h[k](function(){a.each(function(){var n=$(this),m=n.width(),l=n.height(),o=$.data(this,d);if(m!==o.w||l!==o.h){n.trigger(j,[o.w=m,o.h=l])}});g()},e[b])}})(jQuery,this);
+
+
+(function ($) {
+    var options = { }; // no options
+
+    function init(plot) {
+        function onResize() {
+            var placeholder = plot.getPlaceholder();
+
+            // somebody might have hidden us and we can't plot
+            // when we don't have the dimensions
+            if (placeholder.width() == 0 || placeholder.height() == 0)
+                return;
+
+            plot.resize();
+            plot.setupGrid();
+            plot.draw();
+        }
+        
+        function bindEvents(plot, eventHolder) {
+            plot.getPlaceholder().resize(onResize);
+        }
+
+        function shutdown(plot, eventHolder) {
+            plot.getPlaceholder().unbind("resize", onResize);
+        }
+        
+        plot.hooks.bindEvents.push(bindEvents);
+        plot.hooks.shutdown.push(shutdown);
+    }
+    
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'resize',
+        version: '1.0'
+    });
+})(jQuery);

applications/admin/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/admin/static/js/web2py.js

@@ -44,18 +44,38 @@ function web2py_event_handlers() {
   doc.on('keyup', 'input.double, input.decimal', function(){this.value=this.value.reverse().replace(/[^0-9\-\.,]|[\-](?=.)|[\.,](?=[0-9]*[\.,])/g,'').reverse();});
   var confirm_message = (typeof w2p_ajax_confirm_message != 'undefined') ? w2p_ajax_confirm_message : "Are you sure you want to delete this object?";
   doc.on('click', "input[type='checkbox'].delete", function(){if(this.checked) if(!confirm(confirm_message)) this.checked=false;});
+
   doc.ajaxSuccess(function(e, xhr) {
     var redirect=xhr.getResponseHeader('web2py-redirect-location');
-    if (redirect != null) {
+    var command=xhr.getResponseHeader('web2py-component-command');
+    var flash=xhr.getResponseHeader('web2py-component-flash');
+    if (redirect !== null) {
       window.location = redirect;
     };
+    if(command !== null){
+      eval(decodeURIComponent(command));
+    }
+    if(flash) {
+      jQuery('.flash')
+            .html(decodeURIComponent(flash))
+            .append('<span id="closeflash">&times;</span>')
+            .slideDown();
+    }
+  });
+
+  doc.ajaxError(function(e, xhr, settings, exception) {
+    doc.off('click', '.flash')
+      switch(xhr.status){
+        case 500:
+          $('.flash').html(ajax_error_500).slideDown(); 
+      }
   });
 };
 
 jQuery(function() {
    var flash = jQuery('.flash');
    flash.hide();
-   if(flash.html()) flash.append('<span style="float:right;">&times;</span>').slideDown();
+   if(flash.html()) flash.append('<span id="closeflash">&times;</span>').slideDown();
    web2py_ajax_init(document);
    web2py_event_handlers();
 });
@@ -91,8 +111,6 @@ function web2py_ajax_page(method, action, data, target) {
     'complete':function(xhr,text){
       var html=xhr.responseText;
       var content=xhr.getResponseHeader('web2py-component-content');
-      var command=xhr.getResponseHeader('web2py-component-command');
-      var flash=xhr.getResponseHeader('web2py-component-flash');
       var t = jQuery('#'+target);
       if(content=='prepend') t.prepend(html);
       else if(content=='append') t.append(html);
@@ -100,17 +118,14 @@ function web2py_ajax_page(method, action, data, target) {
       web2py_trap_form(action,target);
       web2py_trap_link(target);
       web2py_ajax_init('#'+target);
-      if(command)
-          eval(decodeURIComponent(command));
-      if(flash)
-          jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
     }
   });
 }
 
 function web2py_component(action, target, timeout, times){
   jQuery(function(){
-    var element = jQuery("#" + target).get(0);
+    var jelement = jQuery("#" + target);
+    var element = jelement.get(0);
     var statement = "jQuery('#" + target + "').get(0).reload();";
     element.reload = function (){
         // Continue if times is Infinity or
@@ -119,6 +134,7 @@ function web2py_component(action, target, timeout, times){
             web2py_ajax_page('get', action, null, target);} }; // reload
     // Method to check timing limit
     element.reload_check = function (){
+        if (jelement.hasClass('w2p_component_stop')) {clearInterval(this.timing);return false;}
         if (this.reload_counter == Infinity){return true;}
         else {
             if (!isNaN(this.reload_counter)){

applications/admin/static/js/web2py_bootstrap.js

@@ -0,0 +1,35 @@
+// 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();
+        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/admin/views/appadmin.html

@@ -222,3 +222,28 @@
 </div>
 <div class="clear"></div>
 {{pass}}
+
+{{if request.function=='graph_model':}}
+<h2>{{=T("Graph Model")}}</h2>
+  {{if not pgv:}}
+    {{=T('pygraphviz library not found')}}
+  {{elif not databases:}}
+    {{=T("No databases in this application")}}
+  {{else:}}	   
+    <div class="btn-group">
+      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+        <i class="icon-download"></i> {{=T('Save model as...')}}
+        <span class="caret"></span>
+      </a>
+      <ul class="dropdown-menu">
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['png'])}}">png</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['svg'])}}">svg</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['pdf'])}}">pdf</a></li>
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['ps'])}}">ps</a></li>          
+          <li><a href="{{=URL('appadmin', 'bg_graph_model', args=['dot'])}}">dot</a></li>                                   
+      </ul>
+    </div>
+    <br />
+    {{=IMG(_src=URL('appadmin', 'bg_graph_model'))}}
+  {{pass}}
+{{pass}}

applications/admin/views/debug/breakpoints.html

@@ -0,0 +1,137 @@
+{{extend 'layout.html'}}
+{{block sectionclass}}debug{{end}}
+{{
+frm_trs = form.elements('tr')
+    tbl_rows = []
+    for frm_tr in frm_trs:
+        if frm_tr['_id'] != 'submit_record__row':
+            fld_label = frm_tr.element('td.w2p_fl')
+            fld_widget = frm_tr.element('td.w2p_fw')[0]
+            fld_comment = frm_tr.element('td.w2p_fc')[0]
+            lbls = fld_label.elements('label')
+            lbl = ''
+            if len(lbls) > 0:
+                lbl = fld_label.elements('label')[0]
+                lbl['_class'] = 'control-label'
+            pass
+            if fld_widget['_type'] == 'checkbox':
+                fld_widget = LABEL(fld_widget, _class='checkbox')
+            else:
+                fld_widget = CAT(fld_widget, SPAN('', _class='help-inline'))
+            pass
+            if isinstance(fld_widget, SPAN):
+                fld_widget['_role'] = 'asinput'
+            pass
+            tbl_row = DIV(lbl, DIV(fld_widget,
+                                   TAG['SMALL'](fld_comment, 
+                                                _class='help-block'),
+                                   _class='controls'), _class='control-group')
+            tbl_rows.append(tbl_row)
+        else:
+            smt_btn = frm_tr.element('td.w2p_fw')
+            btn = smt_btn.elements('input')[0]
+            btn['_class'] = 'btn btn-primary'
+            tbl_rows.append(DIV(btn, _class='controls'))
+        pass
+    pass
+    form.element('table', replace=CAT(*tbl_rows))
+    form['_class'] = 'form-horizontal well well-small'
+    import re
+    if form.errors:
+        for key, value in form.errors.iteritems():
+            inpt = form.element(_name=key)
+            inpt_wrapper = inpt.parent
+            if inpt_wrapper['_class'] == None or \
+                                      not "controls" in inpt_wrapper['_class']:
+                inpt_wrapper = inpt_wrapper.parent
+            pass
+            inpt_wrapper.parent['_class'] += ' error'
+            inpt_wrapper.element(_class=re.compile('help-inline'),
+                            replace=lambda me:SPAN(value, _class=me['_class']))
+        pass
+        form.errors.clear()
+    pass
+}}
+<!-- begin "debug" block -->
+<div class="row-fluid">
+    <div class="applist f60 span7" style="padding-bottom:20px;">
+        <div class="applist_inner">
+            <h2>{{=T("Breakpoints")}}</h2>
+            <div class="errorform">
+                <form name="myform" method="post">
+                    <div class="tablebar">
+                        <input value="{{=T('delete all checked')}}" type="submit" class="btn"/>
+                    </div>
+                    <div class="row-fluid">
+                        <div class="span12 errors">
+                            <table id="trck_breakpoints" class="sortable table table-hover table-condensed">
+                                <thead>
+                                    <tr>
+                                        <th class="column1 cbcentered"><input type="checkbox" name="delete_all}" /></th>
+                                        <th class="column2">{{=T("Filename")}}</th>
+                                        <th class="column3">{{=T("Line Nr")}}</th>
+                                        <th>{{=T("Temporary")}}</th>
+                                        <th>{{=T("Condition")}}</th>
+                                        <th class="columnN">{{=T("Hits")}}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {{for bp in breakpoints:}}
+                                    <tr class="breakpoint">
+                                        <td class="cbcentered"><input type="checkbox" name="delete_{{=bp['number']}}" /></td>
+                                        <td>{{=bp['filename']}}</td>
+                                        <td>{{=A(bp['lineno'],_href="#",_onclick="collapse('%s');" % bp['number'])}}</td>
+                                        <td>{{=bp['temporary']}}</td>
+                                        <td>{{=bp['condition']}}</td>
+                                        <td>{{=bp['hits']}}</td>
+                                    </tr>
+                                    <tr id="{{=bp['number']}}" class="sourcecode traceback">
+                                        <td colspan="6">
+                                            <div class="ticket_code">
+                                            {{=CODE(open(bp['path']).read(), language='python', 
+                                                link=None, highlight_line=bp['lineno'], context_lines=10)}}
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    {{pass}}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </form><!-- /errorform -->
+            </div>
+        </div>
+    </div><!-- /applist -->
+    <div class="sidebar fl60 span5">
+        <div class="sidebar_inner controls" style="margin:0;">
+            <div class="box">
+                <h3>{{=T("Add breakpoint")}}</h3>
+                {{=form}}
+                <div class="row-fluid">
+                    <div class="help span12 alert alert-block alert-info">
+                        <ul class="unstyled">
+                            <li>{{=T("You can also set and remove breakpoint in the edit window, using the Toggle Breakpoint button")}}</li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+  
+<script type="text/javascript">
+    jQuery(document).ready(function() {
+        jQuery('.sourcecode').hide();
+        jQuery("#trck_breakpoints thead tr th:first input[type=checkbox]").click(function() {
+            var checkedStatus = this.checked;
+            jQuery("#trck_breakpoints tbody tr td:first-child input[type=checkbox]").each(function() {
+                this.checked = checkedStatus;
+            });
+        });
+        jQuery("#trck_breakpoints tbody tr td:first-child input[type=checkbox]").change(function() {
+            var allchecked = jQuery("#trck_breakpoints tbody tr td:first-child input[type=checkbox]:checked").length == jQuery("#trck_breakpoints tbody tr td:first-child input[type=checkbox]").length;
+            jQuery("#trck_breakpoints thead tr th:first input[type=checkbox]").prop('checked', allchecked);
+        });
+    });
+</script>
+<!-- end "debug" block -->

applications/admin/views/debug/interact.html

@@ -0,0 +1,191 @@
+{{extend 'layout.html'}}
+{{block sectionclass}}debug{{end}}
+<!-- begin "debug" block -->
+<div class="row-fluid">
+    <div class="applist f60 span7" style="padding-bottom:20px;">
+      <div class="applist_inner">
+        <h2>{{=T("web2py online debugger")}}</h2>
+        {{if filename:}}
+            <h3 style="word-wrap:break-word;">{{=T("Interaction at %s line %s") % (filename, lineno)}}</h3>
+            {{if exception:}}
+                  <h3 class="exception">{{=T("Exception %s", exception['title'])}}</h3>
+            {{pass}}
+                <h5>{{=T("Code listing")}}</h5>
+                {{if lines:}}<div class="inspect" style="width:100%;overflow:auto;background-color:whiteSmoke;margin-bottom:20px;">
+                <pre>{{=CODE('\n'.join([x[1] for x in sorted(lines.items(),key=lambda x: x[0])]),
+                        language='python', link=None, counter=min(lines.keys()), 
+                        highlight_line=lineno, context_lines=10)}}</pre></div>
+                {{pass}}
+            <div class="row-fluid">
+                <div class="help span7 alert alert-block alert-info">
+                  <ul class="unstyled">
+                    <li>{{=T("Your application will be blocked until you click an action button (next, step, continue, etc.)")}}</li>
+                    <li>{{=T("Your can inspect variables using the console below")}}</li>
+                  </ul>
+                </div>
+            </div>
+            <h3>{{=T("Interactive console")}}</h3>
+            <div class="shell"><div id="wrapper">
+                <div class="row-fluid">
+                    <div class="output-wrapper span11">
+                        <textarea id="output" readonly="readonly">{{=data}}</textarea>
+                    </div>
+                </div>
+                <div class="row-fluid">
+                    <form id="form" action="{{=URL(r=request, f='callback', args=app)}}" method="get" class="span11">
+                        <div id="shellwrapper">
+                            <div class="prompt-wrapper">
+                                <div class="prompt-container">
+                                    <textarea class="prompt" name="statement" id="statement"></textarea>
+                                </div>
+                                <a href="#" rel="tooltip" data-placement="right" data-original-title="{{=T('Type some Python code in here and hit Return (Enter) to execute it.')}}">
+                                    {{=helpicon()}}
+                                    <span>Type some Python code in here and hit Return (Enter) to execute it.</span>
+                                </a>
+                            </div>
+                            <div id="caret"><span>&gt;&gt;&gt;</span></div>
+                            <div id="autoscroll">autoscroll</div>
+                        </div>
+                    </form>
+                </div>
+            </div></div>
+        {{elif request.env.get('wsgi_multiprocess') or not request.env.get('wsgi_multithread'):}}
+              <h3 class="not_paused">{{=T("Unsupported webserver working mode: %s", request.env.get('server_software', ''))}}</h3>
+                <div class="help span7 alert alert-block alert-info">
+                  <ul class="unstyled">
+                    <li><b>{{=T("WARNING:")}} </b>{{=T("This debugger may not work properly if you don't have a threaded webserver or you're using multiple daemon processes.")}}</li>
+                    <li>{{=T("In development, use the default Rocket webserver that is currently supported by this debugger.")}}</li>
+                    <li>{{=T("On production, you'll have to configure your webserver to use one process and multiple threads to use this debugger.")}}</li>
+                  </ul>
+                </div>
+                {{#=BEAUTIFY(request.env)}}
+        {{else:}}
+              <h3 class="not_paused">{{=T("No Interaction yet")}}</h3>
+                <div class="help span7 alert alert-block alert-info">
+                  <ul class="unstyled">
+                    <li>{{=T("You need to set up and reach a")}} {{=A(T("breakpoint"), _href=URL('breakpoints'))}} {{=T('to use the debugger!')}}</li>
+                    <li>{{=T('To emulate a breakpoint programatically, write:')}}
+                    {{=CODE("from gluon.debug import dbg\n"
+                            "dbg.set_trace() # stop here!\n",
+                            counter=None)}}</li>
+                    <li>{{=T('Please')}} {{=A(T("refresh"), _href=URL('interact'))}} {{=T('this page to see if a breakpoint was hit and debug interaction is required.')}}</li>
+                  </ul>
+                </div>
+        {{pass}}
+      </div>
+    </div> <!-- /applist -->
+    <div class="sidebar fl60 span5">
+      <div class="sidebar_inner controls" style="margin:0;">
+        <span class="pwdchange pull-right">
+            {{if filename:}}
+                {{=sp_button(URL('step'), T("step"))}}
+                {{=sp_button(URL('next'), T("next"))}}
+                {{=sp_button(URL('ret'), T("return"))}}
+                {{=sp_button(URL('cont'), T("continue"))}}
+                {{=sp_button(URL('stop'), T("stop"))}}
+            {{pass}}
+                {{=button(URL('breakpoints'), T("breakpoints"))}}
+        </span>
+
+        {{if exception:}}
+            <div class="box">
+              <h3>{{=T('Exception %(extype)s: %(exvalue)s', dict(extype=exception['extype'], exvalue=exception['exvalue']))}}</h3>
+              <div class="formfield">
+                   {{=CODE((exception['request']), counter=None)}}
+              </div>
+            </div>
+        {{pass}}
+
+        <div class="box">
+          <h3>{{=T('Locals##debug')}}</h3>
+          <div class="formfield">
+        {{=BEAUTIFY(f_locals)}}
+          </div>
+        </div>
+        <div class="box">
+          <h3>{{=T('Globals##debug')}}</h3>
+          <div class="formfield">
+        {{=BEAUTIFY(f_globals)}}
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <script src="{{=URL('static', 'js/autoscroll.js')}}"></script>
+
+    <script type="text/javascript">
+    var bShellScrolling=0
+    jQuery(document).ready(function(){
+      // jQuery('#statement').focus();  // not usefull most times... 
+
+      jQuery('#statement').keyup(function(event){
+        var t=jQuery(this),
+        s=t.val(),
+        o=jQuery('#output'),
+        RETURN = 38;
+        if(s=='\n') t.val('');
+        if(s.length>1 && s.substr(s.length-1,1)=='\n' && s.substr(s.length-2,1)!=':' &&
+        (s.indexOf(':\n ')<0 || s.substr(s.length-2,1)=='\n')) {
+          t.val('');
+          jQuery.post("{{=URL(r=request,f='execute',args=app)}}",
+          {statement:s},function(data){o.html(o.html()+data).attr('scrollTop',o.attr('scrollHeight'));});
+        } else { };
+        if(event.keyCode==RETURN){
+          var i=s.length
+          if(i==0){
+            var s=o.find('table:last pre:first').text();
+            bShellScrolling=o.find('table').length;
+          }else if(bShellScrolling){
+            var i=bShellScrolling
+            if(i<1){
+              return
+            }else{
+              i--
+              var s=o.find('table:nth-child('+(i)+') pre:first').text();
+              bShellScrolling=i
+            }
+          }else if(s.indexOf('\n')<0){
+            var oo=o.find('tr:first-child pre:contains("'+s+'")')
+            if(oo.length==0){
+              return
+            }else if(oo.length==1){
+              s=oo.text();
+            }else{
+              sVar=oo.text();
+              o.html(o.html()+'<dd>'+s+' ?</dd><dt>'+sVar+'</dt>').attr('scrollTop',o.attr('scrollHeight'))
+              return
+            }
+          }else{
+            //multistring expr
+            return;
+          }
+          //  if(s.slice(s.length-1)=='\n'){
+          s=s.slice(0,s.length-1)
+          //	}
+          t.val(s);
+        }
+        if(bShellScrolling && event.keyCode==40){
+          var i=bShellScrolling
+          i++
+          var s=o.find('table:nth-child('+i+') tr:first-child pre').text();
+          if(s){
+            s=s.slice(0,s.length-1)
+            t.val(s);
+            bShellScrolling=i
+          }else{
+            bShellScrolling=0
+            t.val('')
+          }
+        };
+        if(bShellScrolling && (event.keyCode==37 || event.keyCode==39)){
+          bShellScrolling=0;
+        };
+        if(event.keyCode==27){
+          bShellScrolling=0;
+          t.val('');
+        };
+      });
+    });
+    </script>
+</div>
+<!-- end "debug" block -->

applications/admin/views/default/about.html

@@ -1,24 +1,26 @@
 {{extend 'layout.html'}}
-
 {{block sectionclass}}about{{end}}
-
+<!-- begin "about" block -->
 <h2>{{=T("About application")}} "{{=app}}"</h2>
 <h3>{{=T("About")}} {{=app}}</h3>
 <p class="controls">{{=button(URL('edit/%s/ABOUT' % (app)), T('Edit'))}}</p>
-<div class="about_text legalese">{{=about}}</div>
+<div class="about_text legalese well well-small">{{=about}}</div>
 <h3>{{=T('License for')}} {{=app}}</h3>
 <p class="controls">{{=button(URL('edit/%s/LICENSE' % (app)), T('Edit'))}}</p>
-<div class="license_text legalese">{{=license}}</div>
+<div class="license_text legalese well well-small">{{=license}}</div>
-</ul>
-
-<script language="javascript" type="text/javascript" src="{{=URL('static','js/jquery.flot.js')}}"></script>
-
 <h3>{{=T('Project Progress')}}</h3>
-<p>
+<script language="javascript" type="text/javascript" src="{{=URL('static','js/jquery.flot.js')}}"></script>
-<center>
+<script language="javascript" type="text/javascript" src="{{=URL('static','js/jquery.flot.resize.js')}}"></script>
-<div id="placeholder" style="width:600px;height:300px;"></div>
+<div class="row-fluid">
-</center>
+	<div class="span2"> </div>
+	<div class="span8 center"> 
+		<div id="placeholder"></div>
+	</div>
+	<div class="span2"> </div>
+</div>
 <script type="text/javascript">
-jQuery(function () { jQuery.plot(jQuery("#placeholder"), [ {{=progress}} ]); });
+jQuery(document).ready(function() {
+	jQuery.plot(jQuery("#placeholder"), [ {{=progress}} ]);
+})
 </script>
-</p>
+<!-- end "about" block -->

applications/admin/views/default/bulk_register.html

@@ -1,5 +1,20 @@
 {{extend 'layout.html'}}
-
+{{
-<h1>{{=T('Bulk Student Registration')}}</h1>
+# add bootstrap class to form
-
+form['_class']='span4 well well-small'
-{{=form}}
+# change form.custom.begin
+form.custom.begin=XML("<%s %s>" % (form.tag,form._xml()[0]))
+# new form buttons
+smt = form.element('input',_type='submit')
+smt['_class']='btn'
+form.element('input[type=submit]',replace=lambda button: DIV(button,_class="controls-inline"))
+}}
+<h2>{{=T('Bulk Student Registration').capitalize()}}</h2>
+<div id="web2py_user_form">
+{{=form.custom.begin}}
+{{for e in form.components[0]:}}
+  {{= e[0][0]}}
+  {{= e[1][0]}}
+{{pass}}
+{{=form.custom.end}}
+</div>

applications/admin/views/default/change_password.html

@@ -1,10 +1,22 @@
 {{extend 'layout.html'}}
-
 {{block sectionclass}}change_password{{end}}
-
+<!-- begin "change_password" block  -->
-<h2>Change Admin Password</h2>
+<h2>web2py&trade; {{=T('Web Framework')}}</h2>
-
+<h3>{{=T('Change Admin Password')}}</h3>
 <div class="pwform">
-  {{=form}}
+{{=form.custom.begin}}
+	{{ for fieldname in form.table.fields: }} 
+		{{if fieldname is not 'id':}}
+			<label>{{=form.custom.label[fieldname]}}</label> 
+			{{=form.custom.widget[fieldname]}} 
+		{{pass}}
+	{{pass}} 
+	<div class="controls"><button type="submit" class="btn">{{=T('Submit')}}</button></div>
+{{=form.custom.end}}
 </div>
-
+<script type="text/javascript">
+	jQuery(document).ready(function() {
+		jQuery(":input:visible:enabled:first").focus();
+	});
+</script>
+<!-- end "change_password" block -->

applications/admin/views/default/delete.html

@@ -1,9 +1,16 @@
 {{extend 'layout.html'}}
-
+{{
+dlg = dialog
+smt_button = dlg.element(_type="submit")
+smt_button['_class'] = 'btn'
+smt_button['_style'] = 'margin-right:4px;'
+ccl_button = dlg.element(_type="button")
+ccl_button['_class'] = 'btn'
+}}
 {{block sectionclass}}delete{{end}}
-
+<!-- begin "delete" block -->
 <h2>{{=T('Are you sure you want to delete file "%s"?', filename)}}</h2>
 <div class="center">
 {{=dialog}}
 </div>
-
+<!-- end "delete" block -->

applications/admin/views/default/delete_plugin.html

@@ -1,9 +1,16 @@
 {{extend 'layout.html'}}
-
+{{
+dlg = dialog
+smt_button = dlg.element(_type="submit")
+smt_button['_class'] = 'btn'
+smt_button['_style'] = 'margin-right:4px;'
+ccl_button = dlg.element(_type="button")
+ccl_button['_class'] = 'btn'
+}}
 {{block sectionclass}}delete_plugin{{end}}
-
+<!-- begin "delete_plugin" block -->
 <h2>{{=T('Are you sure you want to delete plugin "%s"?', plugin)}}</h2>
 <div class="center">
 {{=dialog}}
 </div>
-
+<!-- end "delete_plugin" block -->

applications/admin/views/default/design.html

@@ -7,52 +7,75 @@ def peekfile(path,file,vars={},title=None):
     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)
-    return A(SPAN(T('Edit')),_class='button editbutton',_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')), SPAN(T("Run tests in this file (to run all files, you may also use the button labelled 'test')"))), _class='icon test tooltip',_href=URL('test', args=(app, file)))
+    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')"))), 
+                        _class='icon test',
+                        _href=URL('test', args=(app, file)),
+                        _rel="tooltip",
+                        **{'_data-placement':'right',
+                            '_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',_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',_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(T("upload file:")," ",
+    form=FORM(
-              INPUT(_type="file",_name="file")," ",T("and rename it:")," ",
+            LABEL(T("upload file:")),
-              INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY),
+            INPUT(_type="file",_name="file"),
+            LABEL(T("and rename it:")),
+            INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY,_class=""),
+            DIV(TAG['BUTTON'](T("Upload"),_type="submit",_class="btn"),_class="controls"),
             INPUT(_type="hidden",_name="location",_value=location),
             INPUT(_type="hidden",_name="token",_value=session.token),
             INPUT(_type="hidden",_name="sender",_value=URL('design',args=app, anchor=anchor)),
-              INPUT(_type="submit",_value=T("upload")),_action=URL('upload_file'))
+            _action=URL('upload_file'),
+            _class="generatedbyw2p well well-small")
     return form
-def file_create_form(location, anchor=None):
+def file_create_form(location, anchor=None, helptext=""):
-    form=FORM(T("create file with filename:")," ",
+    form=FORM(
-              INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY),
+            LABEL(T("create file with filename:")),
+            INPUT(_type="text",_name="filename",requires=IS_NOT_EMPTY,_class=''),
+            TAG['SMALL'](helptext,_class="help-block"),
+            DIV(TAG['BUTTON'](T("Create"),_type="submit",_class="btn"),_class="controls"),
             INPUT(_type="hidden",_name="location",_value=location),
             INPUT(_type="hidden",_name="sender",_value=URL('design',args=app)),
             INPUT(_type="hidden",_name="token",_value=session.token),
             INPUT(_type="hidden",_name="id",_value=anchor),
-              INPUT(_type="submit",_value=T("Create")),_action=URL('create_file'))
+            _action=URL('create_file'),
+            _class="generatedbyw2p well well-small")
     return form
 def upload_plugin_form(app, anchor=None):
-    form=FORM(T("upload plugin file:")," ",
+    form=FORM(
+            LABEL(T("upload plugin file:")),
             INPUT(_type="file",_name="pluginfile"),
             INPUT(_type="hidden",_name="id",_value=anchor),
             INPUT(_type="hidden",_name="token",_value=session.token),
-              INPUT(_type="submit",_value=T("upload")))
+            DIV(TAG['BUTTON'](T("Upload"),_type="submit",_class="btn"),_class="controls"),
+            _class="generatedbyw2p well well-small")
     return form
 def deletefile(arglist, vars={}):
     vars.update({'sender':request.function+'/'+app})
-  return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), SPAN(T('Delete this file (you will be asked to confirm deletion)'))), _class='icon delete tooltip', _href=URL('delete',args=arglist,vars=vars))
+    return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), 
+                        SPAN(T('Delete this file (you will be asked to confirm deletion)'))),
+                        _href=URL('delete',args=arglist,vars=vars),
+                        _class='icon delete',
+                        _rel="tooltip",
+                        **{'_data-placement':'right',
+                            '_data-original-title':T('Delete this file (you will be asked to confirm deletion)')})
 }}
 
 {{block sectionclass}}design{{end}}
+<!-- begin "design" block -->
 
 <h2>{{=T("Edit application")}} "{{=A(app,_href=URL(app,'default','index'),_target="_blank")}}"</h2>
 
 <!-- COLLAPSE/JUMP-TO BUTTONS -->
 <div class="right-full controls">
-  <p>
+    <p class="buttons-row">
     {{=searchbox('search')}}
-    <a class="button special" href="#" onclick="jQuery('h3').click();return false"><span>{{=T("collapse/expand all")}}</span></a>
+    <a class="button special btn btn-inverse" href="#" onclick="jQuery('h3>span').click();return false"><span>{{=T("collapse/expand all")}}</span></a>
     <span class="buttongroup">
     {{=button('#models', T("models"))}}
     {{=button('#controllers', T("controllers"))}}
@@ -67,10 +90,12 @@ def deletefile(arglist, vars={}):
 </div>
 
 <!-- MODELS -->
-
+<h3 id="_models" rel="pagebookmark">
-<h3 id="models" onclick="collapse('models_inner');" class="component">
+    <span class="component" onclick="collapse('models_inner');">{{=T("Models")}}</span>
-  {{=T("Models")}}
+    <a href="#models" rel="tooltip" data-placement="right" data-original-title="{{=T('The data representation, define database tables and sets')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("The data representation, define database tables and sets")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </h3>
 <div id="models_inner" class="component_contents">
     {{if not models:}}<p><strong>{{=T("There are no models")}}</strong></p>{{else:}}
@@ -79,13 +104,12 @@ def deletefile(arglist, vars={}):
         {{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')}}
         {{pass}}
+                {{=button(URL(a=app, c='appadmin',f='graph_model'), T('graph model'))}}
     </div>
-  {{pass}}
+    <ul class="unstyled act_edit">
-
-  <ul>
         {{for m in models:}}
             {{id="models__"+m.replace('.','__')}}
-    <li id="{{=id}}">
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
             <span class="filetools controls">
                 {{=editfile('models',m, dict(id=id))}}
                 {{=deletefile([app, 'models', m], dict(id=id, id2='models'))}}
@@ -99,7 +123,13 @@ def deletefile(arglist, vars={}):
         </li>
         {{pass}}
     </ul>
-  <div class="controls formfield">{{=file_create_form('%s/models/' % app, 'models')}}</div>
+    {{pass}}
+    <div class="controls formfield">
+      <button onclick="jQuery('#form1').slideToggle()" class="btn btn-mini">Create</button>
+      <div id="form1" class="row-fluid" style="display:none">
+        <div class="span3">{{=file_create_form('%s/models/' % app, 'models')}}</div>
+      </div>
+    </div>
 </div>
 
 <!-- FIND CONTROLLER FUNCTIONS -->
@@ -109,10 +139,12 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 }}
 
 <!-- CONTROLLERS -->
-
+<h3 id="_controllers" rel="pagebookmark">
-<h3 id="controllers" onclick="collapse('controllers_inner');" class="component">
+    <span class="component" onclick="collapse('controllers_inner');">{{=T("Controllers")}}</span>
-  {{=T("Controllers")}}
+    <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')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("The application logic, each URL path is mapped in one exposed function in the controller")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </h3>
 <div id="controllers_inner" class="component_contents">
     {{if not controllers:}}<p><strong>{{=T("There are no controllers")}}</strong></p>{{else:}}
@@ -121,11 +153,10 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
         {{=button(URL('test',args=app), T("test"))}}
         {{=button(URL('edit',args=[app,'cron','crontab']), T("crontab"))}}
     </div>
-  {{pass}}
+    <ul class="unstyled act_edit">
-  <ul>
         {{for c in controllers:}}
         {{id="controllers__"+c.replace('.','__')}}
-    <li id="{{=id}}">
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
         <span class="filetools controls">
         {{=editfile('controllers',c, dict(id=id))}}
         {{=deletefile([app, 'controllers', c], dict(id=id, id2='controllers'))}}
@@ -134,30 +165,38 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
         <span class="file">
         {{=peekfile('controllers',c, dict(id=id))}}
         </span>
-    <span class="extras">
+        <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]]))}}
         </span>
         </li>
         {{pass}}
     </ul>
-  <div class="controls formfield">{{=file_create_form('%s/controllers/' % app, 'controllers')}}</div>
+    {{pass}}
+    <div class="controls formfield">
+      <button onclick="jQuery('#form2').slideToggle()" class="btn btn-mini">Create</button>
+      <div id="form2" class="row-fluid" style="display:none">
+        <div class="span3">{{=file_create_form('%s/controllers/' % app, 'controllers')}}</div>
+      </div>
+    </div>
 </div>
 
 <!-- VIEWS -->
-
+<h3 id="_views" rel="pagebookmark">
-<h3 id="views" onclick="collapse('views_inner');" class="component">
+    <span class="component" onclick="collapse('views_inner');">{{=T("Views")}}</span>
-  {{=T("Views")}}
+    <a href="#views" rel="tooltip" data-placement="right" data-original-title="{{=T('The presentations layer, views are also known as templates')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("The presentations layer, views are also known as templates")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </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">
         {{=button(LAYOUTS_APP, T("download layouts"))}}
     </div>
-  {{if not views:}}<p><strong>{{=T("There are no views")}}</strong></p>{{pass}}
+    <ul class="unstyled act_edit">
-  <ul>
         {{for c in views:}}
             {{id="views__"+c.replace('/','__').replace('.','__')}}
-    <li id="{{=id}}">
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
             <span class="filetools controls">
                 {{=editfile('views',c, dict(id=id))}}
                 {{=deletefile([app, 'views', c], dict(id=id, id2='views'))}}
@@ -165,85 +204,97 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
             <span class="file">
                 {{=peekfile('views',c, dict(id=id))}}
             </span>
-    <span class="extras">
+            <span class="extras celled celled-one">
                 {{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]]))}}
             </span>
         </li>
         {{pass}}
     </ul>
-  <div class="controls formfield">{{=file_create_form('%s/views/' % app, 'views')}}</div>
+    {{pass}}
+    <div class="controls formfield">
+      <button onclick="jQuery('#form3').slideToggle()" class="btn btn-mini">Create</button>
+      <div id="form3" class="row-fluid" style="display:none">
+        <div class="span3">{{=file_create_form('%s/views/' % app, 'views')}}</div>
+      </div>
+    </div>
 </div>
 
 <!-- LANGUAGES -->
-
+<h3 id="_languages" rel="pagebookmark">
-<h3 id="languages" onclick="collapse('languages_inner');" class="component">
+    <span class="component" onclick="collapse('languages_inner');">{{=T("Languages")}}</span>
-  {{=T("Languages")}}
+    <a href="#languages" rel="tooltip" data-placement="right" data-original-title="{{=T('Translation strings for the application')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("Translation strings for the application")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </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:}}
     <div class="controls comptools">
         {{=button(URL('update_languages/'+app), T('update all languages'))}}
     </div>
-  {{if not languages:}}<p><strong>{{=T("There are no translators, only default language is supported")}}</strong></p>{{pass}}
+    <ul class="unstyled act_edit">
-  <table>
         {{for lang in sorted(languages):
             file = lang+'.py'
             id = "languages__"+file.replace('.','__')}}
-    <tr id="{{=id}}">
+        <li id="{{='_'+id}}" rel="pagebookmark" class="li-row"><span id="{{=id}}" class="hashstick">&nbsp;</span>
-    <td>
+            <span class="li-controls">
                 <span class="filetools controls">
                  {{=editlanguagefile('languages',file)}}
                  {{=deletefile([app, 'languages', file], dict(id=id, id2='languages'))}}
                 </span>
-    <span class="file">
+                <span class="">
                   {{=peekfile('languages',file, dict(id=id))}}
                 </span>
-    </td>
+            </span> <!-- /li-row -->
-    <td>
+            <span class="extras celled">
-    &nbsp;
                 (
                 {{=T("Plural-Forms:")}}
                 {{p=languages[lang][3:7]}}
                 {{if p[2] == 'default':}}
-       <span class='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:}}
                  {{if p[3] == 1:}}
                    {{=B(T("are not used"))}}
                  {{else:}}
                    {{pfile=p[0]}}
-        {{if p[1]!=0:}}
+                    {{if p[1]!=0:}}<span style="display:inline-block;margin-top:-10px;">
                      <span class="filetools controls">
                        {{=editpluralsfile('languages',pfile,dict(nplurals=p[3]))}}
                      </span>
                      <span class="file">
                         {{=peekfile('languages',pfile,dict(id=id))}}
-          </span>
+                     </span></span>
                    {{else:}}
                       <b>{{=T("are not used yet")}}</b>
                     {{pass}}
                   {{pass}}
                 {{pass}}
                 )
-    </td>
+            </span>
-    </tr>
+        </li>
         {{pass}}
-  </table>
+    </ul>
     {{pass}}
-  <div class="controls formfield">{{=file_create_form('%s/languages/' % app, 'languages')}}{{=T('(something like "it-it")')}}</div>
+    <div class="controls formfield">
+      <button onclick="jQuery('#form4').slideToggle()" class="btn btn-mini">Create</button>
+      <div id="form4" class="row-fluid" style="display:none">
+        <div class="span3">{{=file_create_form('%s/languages/' % app, 'languages', T('(something like "it-it")'))}}</div>
+      </div>
+    </div>
 </div>
 
 <!-- STATIC -->
-
+<h3 id="_static" rel="pagebookmark">
-<h3 id="static" onclick="collapse('static_inner');" class="component">
+    <span class="component" onclick="collapse('static_inner');">{{=T("Static")}}</span>
-  {{=T("Static files")}}
+    <a href="#static" rel="tooltip" data-placement="right" data-original-title="{{=T('These files are served without processing, your images go here')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("These files are served without processing, your images go here")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </h3>
 <div id="static_inner" class="component_contents">
-  <div class="controls comptools">
+    {{if not statics:}}<p><strong>{{=T("There are no static files")}}</strong></p>{{else:}}
-  </div>
+    <ul class="unstyled act_edit">
-  {{if not statics:}}<p><strong>{{=T("There are no static files")}}</strong></p>{{pass}}
-  <ul>
     {{
         path=[]
         for file in statics+['']:
@@ -255,7 +306,7 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
                     path.append(file_path[len(path)])
                     thispath='static__'+'__'.join(path)
     }}
-    <li class="folder">
+        <li class="folder"><i>&nbsp;</i>
             <a href="javascript:collapse('{{=thispath}}');" class="file">{{=path[-1]}}/</a>
             <ul id="{{=thispath}}" style="display: none;" class="sublist">{{
                 else:
@@ -266,7 +317,8 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
                 pass
             pass
         if filename:
-      }}<li>
+    }}
+        <li>
             <span class="filetools controls">
                 {{=editfile('static',file, dict(id="static"))}} {{=deletefile([app,'static',file], dict(id="static",id2="static"))}}
             </span>
@@ -277,26 +329,31 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
         pass
     pass
     }}
-    {{pass}}
     </ul>
-  <div class="controls formfield">{{=file_create_form('%s/static/' % app, 'static')}}
+    {{pass}}
-  {{=file_upload_form('%s/static/' % app, 'static')}}</div>
+    <div class="controls formfield">
+      <button onclick="jQuery('#form5').slideToggle()" class="btn btn-mini">Create/Upload</button>
+      <div id="form5" class="row-fluid" style="display:none">
+        <div class="span3">{{=file_create_form('%s/static/' % app, 'static')}}<em>{{=T('or alternatively')}}</em></div>
+        <div class="span3">{{=file_upload_form('%s/static/' % app, 'static')}}</div>
+      </div>
+    </div>
 </div>
 
 <!-- MODULES -->
-
+<h3 id="_modules" rel="pagebookmark">
-<h3 id="modules" onclick="collapse('modules_inner');" class="component">
+    <span class="component" onclick="collapse('modules_inner');">{{=T("Modules")}}</span>
-  {{=T("Modules")}}
+    <a href="#modules" rel="tooltip" data-placement="right" data-original-title="{{=T('Additional code for your application')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("Additional code for your application")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </h3>
 <div id="modules_inner" class="component_contents">
-  <div class="controls comptools">
+    {{if not modules:}}<p><strong>{{=T("There are no modules")}}</strong></p>{{else:}}
-  </div>
+    <ul class="unstyled act_edit">
-  {{if not modules:}}<p><strong>{{=T("There are no modules")}}</strong></p>{{pass}}
-  <ul>
         {{for m in modules:}}
             {{id="modules__"+m.replace('/','__').replace('.','__')}}
-    <li id="{{=id}}">
+        <li id="{{='_'+id}}" rel="pagebookmark"><span id="{{=id}}" class="hashstick">&nbsp;</span>
             <span class="filetols controls">
                 {{=editfile('modules',m,dict(id=id))}}
                 {{if m!='__init__.py':}}
@@ -309,21 +366,27 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
         </li>
         {{pass}}
     </ul>
-  <div class="controls formfield">{{=file_create_form('%s/modules/' % app, 'modules')}}
+    {{pass}}
-  {{=file_upload_form('%s/modules/' % app, 'modules')}}</div>
+    <div class="controls formfield">
+      <button onclick="jQuery('#form6').slideToggle()" class="btn btn-mini">Create/Upload</button>
+      <div id="form6" class="row-fluid" style="display:none">
+        <div class="span3">{{=file_create_form('%s/modules/' % app, 'modules')}}<em>{{=T('or alternatively')}}</em></div>
+        <div class="span3">{{=file_upload_form('%s/modules/' % app, 'modules')}}</div>
+      </div>
+    </div>
 </div>
 
 <!-- PRIVATE -->
-
+<h3 id="_private" rel="pagebookmark">
-<h3 id="private" onclick="collapse('private_inner');" class="component">
+    <span class="component" onclick="collapse('private_inner');">{{=T("Private files")}}</span>
-  {{=T("Private files")}}
+    <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')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("These files are not served, they are only available from within your app")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </h3>
 <div id="private_inner" class="component_contents">
-  <div class="controls comptools">
+    {{if not privates:}}<p><strong>{{=T("There are no private files")}}</strong></p>{{else:}}
-  </div>
+    <ul class="unstyled act_edit">
-  {{if not privates:}}<p><strong>{{=T("There are no private files")}}</strong></p>{{pass}}
-  <ul>
         {{
         path=[]
         for file in privates+['']:
@@ -341,12 +404,14 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
                 else:
                     path = path[:-1]
             }}
-    </ul></li>
+            </ul>
+        </li>
         {{
                 pass
             pass
             if filename:
-      }}<li>
+        }}
+        <li>
             <span class="filetools controls">
                 {{=editfile('private',file, dict(id="private"))}} {{=deletefile([app,'private',file], dict(id="private",id2="private"))}}
             </span>
@@ -359,25 +424,29 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
         }}
     {{pass}}
     </ul>
-  <div class="controls formfield">{{=file_create_form('%s/private/' % app, 'private')}}
+    <div class="controls formfield">
-  {{=file_upload_form('%s/private/' % app, 'private')}}</div>
+      <button onclick="jQuery('#form7').slideToggle()" class="btn btn-mini">Create/Upload</button>
+      <div id="form7" class="row-fluid" style="display:none">
+        <div class="span3">{{=file_create_form('%s/private/' % app, 'private')}}<em>{{=T('or alternatively')}}</em></div>
+        <div class="span3">{{=file_upload_form('%s/private/' % app, 'private')}}</div>
+      </div>
+    </div>
 </div>
 
-
 <!-- PLUGINS -->
-
+<h3 id="_plugins" rel="pagebookmark">
-<h3 id="plugins" onclick="collapse('plugins_inner');" class="component">
+    <span class="component" onclick="collapse('plugins_inner');">{{=T("Plugins")}}</span>
-  {{=T("Plugins")}}
+    <a href="#plugins" rel="tooltip" data-placement="right" data-original-title="{{=T('To create a plugin, name a file/folder plugin_[name]')}}">
-  <span class="tooltip">{{=helpicon()}} <span>{{=T("To create a plugin, name a file/folder plugin_[name]")}}</span></span>
+    {{=helpicon()}}
+    <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>
 </h3>
 <div id="plugins_inner" class="component_contents">
     <div class="controls comptools">
         {{=button(PLUGINS_APP, T('download plugins'))}}
     </div>
-  <div class="controls">
-  </div>
     {{if plugins:}}
-  <ul>
+    <ul class="unstyled act_edit">
         {{for plugin in plugins:}}
             {{id="plugins__"+plugin.replace('/','__').replace('.','__')}}
         <li id="{{=id}}">
@@ -388,9 +457,14 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
     {{else:}}
     <p><strong>{{=T('There are no plugins')}}</strong></p>
     {{pass}}
-  <div class="controls formfield">{{=upload_plugin_form(app, 'plugins')}}</div>
+    <div class="controls formfield">
+      <button onclick="jQuery('#form8').slideToggle()" class="btn btn-mini">Upload</button>
+      <div id="form8" class="row-fluid" style="display:none">
+        <div class="row-fluid">
+          <div class="span3">{{=upload_plugin_form(app, 'plugins')}}</div>
+        </div>
+      </div>
 </div>
-
 
 <script>
 function filter_files() {
@@ -400,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 {
@@ -416,4 +490,4 @@ jQuery(document).ready(function(){
    jQuery('#search_start').click(function(e){ filter_files(); });
 });
 </script>
-
+<!-- end "design" block -->

applications/admin/views/default/edit.html

@@ -1,8 +1,18 @@
 {{extend 'layout.html'}}
-
+<!-- begin "edit" block -->
 {{
   def shortcut(combo, description):
-    return XML('<li><tt>%s</tt> %s</li>' % (combo, description))
+    return XML('<li><span class="teletype-text">%s</span><span>%s</span></li>' % (combo, description))
+  def listfiles(app, dir, regexp='.*\.py$'):
+      files = sorted(
+         listdir(apath('%(app)s/%(dir)s/' % {'app':app, 'dir':dir}, r=request), regexp))
+      files = [x.replace('\\', '/') for x in files if not x.endswith('.bak')]
+      return files
+
+  def editfile(path,file,vars={}):
+    args=(path,file) if 'app' in vars else (app,path,file)
+    return A(file, _class='', _href=URL('edit', args=args, vars=vars), _style='word-wrap: break-word;')
+
 }}
 {{if TEXT_EDITOR == 'amy':}}
 {{include 'default/amy_ajax.html'}}
@@ -25,6 +35,13 @@
 <link rel="stylesheet" href="{{=cm}}/lib/util/dialog.css">
 <script src="{{=cm}}/emmet.min.js"></script>
 <script language="Javascript" type="text/javascript" src="{{=URL('static','js/ajax_editor.js')}}"></script>
+<script language="Javascript" type="text/javascript">
+jQuery(document).ready(function(){
+     doListBreakpoints({{=XML("'%s','%s://%s%s'" % (filename, 
+                request.env['wsgi_url_scheme'], request.env['http_host'],
+                URL(c='debug', f='list_breakpoints')))}});
+});
+</script>
 {{elif TEXT_EDITOR == 'ace':}}
 <script src="{{=URL(r=request,c='static',f='ace/src/ace.js')}}" type="text/javascript" charset="utf-8"></script>
 <script src="{{=URL(r=request,c='static',f='ace/src/theme-%s.js' % TEXT_EDITOR_THEME)}}" type="text/javascript" charset="utf-8"></script>
@@ -88,7 +105,7 @@ jQuery(document).ready(function(){
 <h2>{{=T('Editing file "%s"',filename)}}</h2>
 
 {{if functions:}}
-  <p class="formfield">
+  <p class="formfield well well-small">
 <span style="text-align:left;" id="exposed">
   {{=B(T('exposes:'))}} {{=XML(', '.join([A(f,_href=URL(a=app,c=controller,f=f)).xml() for f in functions]))}}
 </span>
@@ -98,15 +115,15 @@ jQuery(document).ready(function(){
   {{pass}}
   </p>
 {{pass}}
-
+<div class='row-fluid'>
-<p class="right controls">
+<p class="right controls pull-right">
   {{if filetype=='python':}}
       {{=A(SPAN(T('toggle breakpoint')),
            _value="breakpoint", _name="breakpoint",
-           _onclick="return doToggleBreakpoint('%s','%s://%s%s');" % (filename, 
+           _onclick="return doToggleBreakpoint('%s','%s://%s%s',null);" % (filename, 
                 request.env['wsgi_url_scheme'], request.env['http_host'],
                 URL(c='debug', f='toggle_breakpoint')),
-           _class="button special")}}
+           _class="button special btn btn-inverse")}}
   {{pass}}  
   {{=button(URL('design',args=request.vars.app if request.vars.app else request.args[0], anchor=request.vars.id), T('back'))}}
   {{if edit_controller:}}
@@ -116,25 +133,59 @@ jQuery(document).ready(function(){
   {{=button(view_link, T('try view'))}}
   {{pass}}
   {{if request.args[1]=='models':}}
-  <a class="button" href="http://www.web2py.com/sqldesigner" target="_blank"><span>{{=T('online designer')}}</span></a>
+  <a class="button btn" href="http://www.web2py.com/sqldesigner" target="_blank"><span>{{=T('online designer')}}</span></a>
   {{pass}}
-  <a class="button" href="http://www.web2py.com/examples/static/epydoc/index.html" target="_blank"><span>{{=T('docs')}}</span></a>
+  <a class="button btn" href="http://www.web2py.com/examples/static/epydoc/index.html" target="_blank"><span>{{=T('docs')}}</span></a>
 </p>
+</div>
+<div id="editor_area" class="row-fluid">
 
-<div id="editor_area">
+<ul class="nav nav-list span2 well" rel="pagebookmark">
-  <form action="{{=URL('edit',args=filename)}}" method="post" name="editform" id="editform">
+{{dirs=[{'name':'models', 'reg':'.*\.py$'}, 
-    <a value="save" name="save" onclick="return doClickSave();" class="icon saveicon">
+	{'name':'controllers', 'reg':'.*\.py$'},
+	{'name':'views', 'reg':'[\w/\-]+(\.\w+)+$'},
+	{'name':'modules', 'reg':'.*\.py$'},
+	{'name':'private', 'reg': '[^\.#].*'}]}}
+{{for dir in dirs:}}
+<li class="nav-header component" onclick="collapse('{{="%s_files" % dir['name']}}');">{{=dir['name']}}</li>
+<li id="{{="%s_files" % dir['name']}}">
+	<ul class="nav nav-list">	
+	{{for f in listfiles(app, dir['name'], regexp=dir['reg'] ):}}
+	{{id="%s__" % dir['name'] + f.replace('.','__')}}
+	{{current_file = request.args(len(request.args) - 1)}} 
+	<li class="{{='active' if current_file==f else ''}}">
+	{{=editfile(dir['name'], f, dict(id=id))}}	
+	</li>
+	{{pass}}
+	</ul>
+</li>
+{{pass}}	
+</ul>
+
+  <form action="{{=URL('edit',args=filename)}}" method="post" name="editform" id="editform" class="span10">
+	<div class="editor-bar-column">
+		<label>{{=T('Save file:')}}</label>
+		<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>
-    {{=T('Saved file hash:')}}
+	</div>
-    <input type="input" name="file_hash" value="{{=file_hash}}" readonly="readonly"/>
+	<div class="editor-bar-column">
-    {{=T('Last saved on:')}} <input type="input" name="saved_on" value="{{=saved_on}}" readonly="readonly"/>
+		<div class="row-fluid">
-    <br><hr>
+			<div class="span7">
+				<label>{{=T('Saved file hash:')}}</label>
+				<input type="input" name="file_hash" value="{{=file_hash}}" class="input-long uneditable-input" readonly="readonly"/>
+			</div>
+			<div class="span5">
+				<label>{{=T('Last saved on:')}}</label>
+				<input type="input" name="saved_on" value="{{=saved_on}}" class="input-normal uneditable-input" readonly="readonly"/>
+			</div>
+		</div>
+	</div>
     {{if TEXT_EDITOR == 'amy':}}
     <textarea style="width: auto; height:400px;direction:ltr;" rows="58" cols="100" -amy-enabled="true" id="body" name="data">{{=data}}</textarea>
     <script>window.eamy = eamy;</script>
     {{elif TEXT_EDITOR == 'codemirror':}}
-    <textarea style="width: auto; height:400px;direction:ltr;" id="body" name="data">{{=data}}</textarea>
+    <textarea style="width: auto; height:auto; direction:ltr;" id="body" name="data">{{=data}}</textarea>
     <script>
       function isFullScreen(instance) {
           return /\bCodeMirror-fullscreen\b/.test(instance.getWrapperElement().className);
@@ -191,12 +242,19 @@ jQuery(document).ready(function(){
         autofocus: true,
         onCursorActivity: function() {
             editor.setLineClass(hlLine, null, null);
-            hlLine = editor.setLineClass(editor.getCursor().line, null, "activeline");}
+            hlLine = editor.setLineClass(editor.getCursor().line, null, "activeline");},
+        onGutterClick: function(cm, n) {
+            sel = {start: n, end: n, data: ''};
+            doToggleBreakpoint({{=XML("'%s','%s://%s%s',sel" % (filename, 
+                request.env['wsgi_url_scheme'], request.env['http_host'],
+                URL(c='debug', f='toggle_breakpoint')))}});
+          }
       };
       var editor = CodeMirror.fromTextArea(
          document.getElementById("body"),cm_opts);
       var hlLine = editor.setLineClass(0, "activeline");
       window.mirror = editor;
+      jQuery(function(){jQuery('.CodeMirror-scroll').css("height","auto").css("overflow-x","auto");});
     </script>
     {{elif TEXT_EDITOR == 'ace':}}
     <div id="editor" style="height: 500px; width: auto; position: relative">{{=data}}</div>
@@ -226,16 +284,21 @@ window.onload = function() {
     <textarea cols="80" rows="25" id="body" style="direction:ltr;" name="data">{{=data}}</textarea>
     <script>window.textarea = area.textarea;</script>
     {{pass}}
-    <button class="editbutton" onclick="window.location.reload(); return false">{{=T('restore')}}</button> {{=T('currently saved or')}} <button class="editbutton" type="submit" name="revert">{{=T('revert')}}</button>
+	<div class="editor-bar-bottom" style="margin-top:9px;">
+		<button class="editbutton btn" onclick="window.location.reload(); return false">{{=T('restore')}}</button>
+		{{=T('currently saved or')}}
+		<button class="editbutton btn" type="submit" name="revert">{{=T('revert')}}</button>
 		{{=T('to  previous version.')}}
+	</div>
     <br/>
   </form>
 </div>
 
-<div class="help">
+<div class="row-fluid">
+	<div class="help span4 alert alert-block alert-info">
 		{{if TEXT_EDITOR=='edit_area' and filetype=='html':}}
 		<h3>{{=T('Key bindings for ZenCoding Plugin')}}</h3>
-  <ul>
+		<ul class="keybindings unstyled">
 			{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
 			{{=shortcut('Ctrl+,', T('Expand Abbreviation'))}}
 			{{=shortcut('Ctrl+M', T('Match Pair'))}}
@@ -247,7 +310,7 @@ window.onload = function() {
 		</ul>
 		{{elif TEXT_EDITOR == 'codemirror' and filetype=='html':}}
 		<h3>{{=T('Key bindings for ZenCoding Plugin')}}</h3>
-  <ul>
+		<ul class="keybindings unstyled">
 			{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
 			{{=shortcut('Ctrl+F11', T('Toggle Fullscreen'))}}
 			{{=shortcut('Ctrl-F / Cmd-F', T('Start searching'))}}
@@ -259,7 +322,7 @@ window.onload = function() {
 		</ul>
 		{{elif TEXT_EDITOR == 'codemirror':}}
 		<h3>{{=T("Key bindings")}}</h3>
-  <ul>
+		<ul class="keybindings unstyled">
 			{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
 			{{=shortcut('Ctrl+F11', T('Toggle Fullscreen'))}}
 			{{=shortcut('Ctrl-F / Cmd-F', T('Start searching'))}}
@@ -270,8 +333,10 @@ window.onload = function() {
 		</ul>
 		{{else:}}
 		<h3>{{=T("Key bindings")}}</h3>
-  <ul>
+		<ul class="keybindings unstyled">
 			{{=shortcut('Ctrl+S', T('Save via Ajax'))}}
 		</ul>
 		{{pass}}
 	</div>
+</div>
+<!-- end "edit" block -->

applications/admin/views/default/edit_language.html

@@ -7,18 +7,20 @@ function delkey(id) {
   return false;
 }
 function hideShowTranslated(){
-	jQuery(".translated").closest("p").toggle();
+	jQuery(".translated").closest("div.row-fluid").toggle();
 }
 </script>
 
 {{block sectionclass}}edit_language{{end}}
-
+<!-- begin "edit_language" block -->
 <h2>{{=T('Editing Language file')}} "{{=filename}}"</h2>
-<a class="button" href="#" onclick="hideShowTranslated(this);">
+<div class="controls">
+<a class="button btn" href="#" onclick="hideShowTranslated(this);">
 <span>{{=T('Hide/Show Translated strings')}}</span>
 </a>
+</div>
 <div class="languageform">
   {{=form}}
 </div>
-
+<button class="btn" style="position:fixed; right:10px; bottom: 10px;" onclick="jQuery('form input[type=submit]').click()">Save Changes</button>
-
+<!-- end "edit_language" block -->

applications/admin/views/default/edit_plurals.html

@@ -6,11 +6,10 @@ function delkey(id) {
   return false;
 }
 </script>
-
 {{block sectionclass}}edit_language{{end}}
-
+<!-- begin "edit_language(plurals)" block -->
 <h2>{{=T("Editing Plural Forms File")}} "{{=filename}}"</h2>
 <div class="pluralsform">
   {{=form}}
 </div>
-
+<!-- end "edit_language(plurals)" block -->

applications/admin/views/default/errors.html

@@ -1,98 +1,58 @@
 {{extend 'layout.html'}}
 {{import os, stat, time}}
-
 {{block sectionclass}}errors{{end}}
-
+<!-- begin "errors" block -->
-<style>
-table.sortable {
-  border-spacing:0px;
-}
-table.sortable td, table.sortable th {
-  padding: 2px 5px 2px 5px;
-}
-table.sortable thead {
-  background-color:#eee;
-  color:#666666;
-  font-weight: bold;
-  cursor: default;
-}
-tr.error_ticket:hover {
-  background-color: #eee;
-}
-.controls a.button.unavailable {
-  color: #ff0000;
-}
-</style>
-
-<script language="JavaScript">
-  function check(){
-    for (var i = 0; i < document.myform.elements.length; i++) {
-        var e = document.myform.elements[i];
-        if (e.type == 'checkbox') e.checked = true;
-    }
-  }
-  function uncheck(){
-    for (var i = 0; i < document.myform.elements.length; i++) {
-      var e = document.myform.elements[i];
-      if (e.type == 'checkbox') e.checked = false;
-    }
-  }
-  jQuery(document).ready(function() { jQuery('.traceback').hide(); });
-</script>
 {{if db_ready['status'] == False:
-    switchbutton = A(SPAN("switch to : db"), _href=db_ready['errlink'], _class="button unavailable", _title="%s" % (db_ready['errmessage']))
+	switchbutton = A(SPAN("switch to : db"), _href=db_ready['errlink'], _class="button unavailable btn btn-danger", _title="%s" % (db_ready['errmessage']))
 else:
-    switchbutton = A(SPAN("switch to : db"), _href=URL(args=[app, 'dbnew']), _class="button")
+	switchbutton = A(SPAN("switch to : db"), _href=URL(args=[app, 'dbnew']), _class="button btn")
 pass}}
-
 <h2>{{=T('Error logs for "%(app)s"',dict(app=app))}}</h2>
-
 <div class="errorform">
 	<form name="myform" method="post">
-    <input name="CheckAll" value="{{=T('check all')}}"
-     onclick="check()" type="button">
-    <input name="CheckAll" value="{{=T('uncheck all')}}"
-     onclick="uncheck()" type="button">
-    <input value="{{=T('delete all checked')}}" type="submit"><br><br>
-
 		{{ if 'new' in method: }}
 		{{base_url = 'db' in method and 'ticketdb' or 'ticket' }}
-    <h3>{{=T('Click row to expand traceback')}}</h3>
+		<p class="controls row-fluid">
-    <p class="controls">
+			<div class="controls controls-row">
 				{{if 'db' in method:}}
-        source : db
+				<span class="uneditable-input">source : db</span>
-        <a class="button" href="{{=URL(args=[app, 'new'])}}"><span>switch to : filesystem</span></a>
+				<a class="button btn" href="{{=URL(args=[app, 'new'])}}"><span>switch to : filesystem</span></a>
-        <a class="button" href="{{=URL(args=[app, 'dbold'])}}"><span>lists by ticket</span></a>
+				<a class="button btn" href="{{=URL(args=[app, 'dbold'])}}"><span>lists by ticket</span></a>
 				{{else:}}
-        source : filesystem
+				<span class="uneditable-input">source : filesystem</span>
 				{{=switchbutton}}
-        <a class="button" href="{{=URL(args=[app, 'old'])}}"><span>lists by ticket</span></a>
+				<a class="button btn" href="{{=URL(args=[app, 'old'])}}"><span>lists by ticket</span></a>
 				{{pass}}
+			</div>
 		</p>
-    <table id="trck_errors" class="sortable">
+		<div class="tablebar">
+			<input value="{{=T('delete all checked')}}" type="submit" class="btn"/>
+			<span class="help label label-info">{{=T('Click row to expand traceback')}}</span>
+		</div>
+		<div class="row-fluid">
+			<div class="span6">
+				<table id="trck_errors" class="sortable table table-hover table-condensed">
 					<thead>
 						<tr>
-          <th>{{=T("Delete")}}</th>
+							<th class="column1 cbcentered"><input type="checkbox" name="delete_all}" /></th>
-          <th>{{=T("Count")}}</th>
+							<th class="column2">{{=T("Count")}}</th>
-          <th>{{=T("File")}}</th>
+							<th class="column3">{{=T("File")}}</th>
 							<th>{{=T("Error")}}</th>
-          <th></th>
+							<th class="columnN"></th>
-          <th></th>
 						</tr>
 					</thead>
 					<tbody>
 						{{for e in errors:}}
 						<tr class="error_ticket">
-          <td><input type="checkbox" name="delete_{{=e['hash']}}" /></td>
+							<td class="cbcentered"><input type="checkbox" name="delete_{{=e['hash']}}" /></td>
 							<td>{{=e['count']}}</td>
 							<td>{{=e['causer']}}</td>
-          <td>{{=A(e['last_line'],_href="#",_onclick="collapse('%s');"%e['hash'])}}</td>
+							<td>{{=A(e['last_line'],_href="#",_onclick="collapse('%s');return false;"%e['hash'])}}</td>
-          <td>+</td>
+							<td>+&nbsp;{{=A(T('details'),_href=URL(base_url,args=[app,e['ticket']]))}}</td>
-          <td>{{=A(T('details'),_href=URL(base_url,args=[app,e['ticket']]))}}</td>
 						</tr>
 						<tr id="{{=e['hash']}}" class="traceback">
-          <td colspan="6">
+							<td colspan="5">
-            <div>
+								<div class="ticket_code">
 									{{=CODE(e['pickel']['traceback'])}}
 								</div>
 							</td>
@@ -100,31 +60,40 @@ pass}}
 						{{pass}}
 					</tbody>
 				</table>
+			</div>
+		</div>
 		{{ else: }}
-    <h3>{{=T('Click row to view a ticket')}}</h3>
+		<p class="controls row-fluid">
-    <p class="controls">
+			<div class="controls controls-row">
 				{{if 'db' in method:}}
-        source : db
+				<span class="uneditable-input">source : db</span>
-        <a class="button" href="{{=URL(args=[app, 'old'])}}"><span>switch to : filesystem</span></a>
+				<a class="button btn" href="{{=URL(args=[app, 'old'])}}"><span>switch to : filesystem</span></a>
-        <a class="button" href="{{=URL(args=[app, 'dbnew'])}}"><span>lists by exception</span></a>
+				<a class="button btn" href="{{=URL(args=[app, 'dbnew'])}}"><span>lists by exception</span></a>
 				{{else:}}
-        source : filesystem
+				<span class="uneditable-input">source : filesystem</span>
 				{{=switchbutton}}
-        <a class="button" href="{{=URL(args=[app, 'new'])}}"><span>lists by exception</span></a>
+				<a class="button btn" href="{{=URL(args=[app, 'new'])}}"><span>lists by exception</span></a>
 				{{pass}}
+			</div>
 		</p>
-    <table class="sortable">
+		<div class="tablebar">
+			<input value="{{=T('delete all checked')}}" type="submit" class="btn"/>
+			<span class="help label label-info">{{=T('Click row to expand traceback')}}</span>
+		</div>
+		<div class="row-fluid">
+			<div class="span6">
+				<table id="trck_errors" class="sortable table table-hover table-condensed">
 					<thead>
 						<tr>
-    <th>{{=T("Delete")}}</th>
+							<th class="column1 cbcentered"><input type="checkbox" name="delete_all}" /></th>
 							<th>{{=T("Ticket")}}</th>
-    <th>{{=T("Date and Time")}}</th>
+							<th class="columnN1">{{=T("Date and Time")}}</th>
 						</tr>
 					</thead>
 					<tbody>
 						{{for ticket in tickets:}}
 						<tr>
-    <td><input type="checkbox" name="delete_{{=ticket}}"/></td>
+							<td class="cbcentered"><input type="checkbox" name="delete_{{=ticket}}"/></td>
 							{{if 'db' in method:}}
 							<td><a href="{{=URL('ticketdb',args=[app,ticket])}}">{{=ticket}}</a></td>
 							<td>{{=time.strftime('%Y-%m-%d %H:%M:%S',times[ticket].timetuple())}}</td>
@@ -136,7 +105,20 @@ pass}}
 						{{pass}}
 					</tbody>
 				</table>
-    {{ pass }}
-  </form>
 			</div>
-
+		</div>
+		{{ pass }}
+	</form><!-- /errorform -->
+</div>
+<script type="text/javascript">
+	jQuery(document).ready(function() {
+		jQuery('.traceback').hide();
+		jQuery("#trck_errors thead tr th:first input[type=checkbox]").click(function() {
+			var checkedStatus = this.checked;
+			jQuery("#trck_errors tbody tr td:first-child input[type=checkbox]").each(function() {
+				this.checked = checkedStatus;
+			});
+		});
+	});
+</script>
+<!-- end "errors" block -->

applications/admin/views/default/git_pull.html

@@ -1,5 +1,15 @@
 {{extend 'layout.html'}}
-
+{{
+dlg = dialog
+smt_button = dlg.element(_type="submit")
+smt_button['_class'] = 'btn'
+smt_button['_style'] = 'margin-right:4px;'
+ccl_button = dlg.element(_type="button")
+ccl_button['_class'] = 'btn'
+}}
+<!-- begin "git_pull" block -->
 <div class="center">
 <h2>{{=T('This will pull changes from the remote repo for application "%s"?', app)}}</h2>
 {{=dialog}}
+</div>
+<!-- end "git_pull" block -->

applications/admin/views/default/git_push.html

@@ -1,6 +1,15 @@
 {{extend 'layout.html'}}
-
+{{
+frm = form
+smt_button = frm.element(_type="submit")
+smt_button['_class'] = 'btn'
+smt_button['_style'] = 'margin-right:4px;'
+ccl_button = frm.element(_type="button")
+ccl_button['_class'] = 'btn'
+}}
+<!-- begin "git_push" block -->
 <h2>{{=T('This will push changes to the remote repo for application "%s".', app)}}</h2>
 <center>
 {{=form}}
 </center>
+<!-- end "git_push" block -->

applications/admin/views/default/index.html

@@ -1,26 +1,23 @@
 {{extend 'layout.html'}}
+{{block sectionclass}}login{{end}}
+<!-- begin "index" block -->
+<h2>web2py&trade; {{=T('Web Framework')}}</h2>
+<h3>{{=T('Login to the Administrative Interface')}}</h3>
+<div class="form row-fluid">
+{{if request.is_https or request.is_local:}}
+	<form action="{{=URL(r=request)}}" method="post" class="span4 well">
+		<label for="password">{{=T('Administrator Password:')}}</label>
+		<input type="password" name="password" id="password"/>
+		<input type="hidden" name="send" value="{{=send}}"/>
+		<div class="controls"><button type="submit" name="login" class="btn">{{=T('Login')}}</button></div>
+	</form>
+{{else:}}
+<p class="help span7 alert alert-block alert-warning">{{=T('ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.')}}</p>
+{{pass}}
+</div>
 <script type="text/javascript">
-  jQuery(function() {
+	jQuery(document).ready(function(){
 		jQuery("#password").focus();
 	});
 </script>
-
+<!-- end "index" block -->
-{{block sectionclass}}login{{end}}
-
-<h2>web2py&trade; {{=T('Web Framework')}}</h2>
-<h3>{{=T('Login to the Administrative Interface')}}</h3>
-{{if request.is_https or request.is_local:}}
-<div class="form">
-  <form action="{{=URL(r=request)}}" method="post">
-    <div><input type="hidden" name="send" value="{{=send}}"/></div>
-    <table>
-      <tr><td>{{=T('Administrator Password:')}}</td><td><input type="password" name="password" id="password"/></td></tr>
-      <tr><td></td><td><input type="submit" name="login" value="{{=T('Login')}}"/></td></tr>
-    </table>
-  </form>
-</div>
-{{else:}}
-<p class="help">{{=T('ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.')}}</p>
-{{pass}}
-
-

applications/admin/views/default/manage_students.html

@@ -1,5 +1,163 @@
 {{extend 'layout.html'}}
+{{
+#grid['_class'] = 'web2py_grid'
+if not request.args:
+	add_btn = grid.elements('div.web2py_console a.w2p_trap',replace=None)[0]
+	add_btn['_id'] = 'w2p_grid_addbtn'
+	add_btn['_class'] = 'w2p_trap btn'
+	qry_pnl_rows = grid.elements('div',_class="w2p_query_row hidden")
+	for qry_pnl_row in qry_pnl_rows:
+		qry_pnl_btn1 = qry_pnl_row.elements('input',_value="New",replace=None)[0]
+		qry_pnl_btn2 = qry_pnl_row.elements('input',_value="And",replace=None)[0]
+		qry_pnl_btn3 = qry_pnl_row.elements('input',_value="Or",replace=None)[0]
+		qry_pnl_btngrp = qry_pnl_row.elements('input',_value="Close",replace=lambda me:DIV(qry_pnl_btn1,qry_pnl_btn2,qry_pnl_btn3,me,_class="qry_pnl_btns"))
+	pass
+	qry_pnl = grid.elements('div#w2p_query_panel',replace=None)
+	csl_frm = grid.elements('div.web2py_console form')[0]
+	csl_frm['_class'] = 'form-inline'
+	csl_frm_search = grid.elements('#web2py_keywords',replace=lambda me:DIV(me,TAG['button'](T('Search'),_class='btn',_type='submit'),TAG['button'](T('Clear'),_class='btn',_type='button',_onclick='jQuery("#web2py_keywords").val("");'),_class="input-append"))
+	csl_frm_search_btn1 = grid.elements('input',_value="Search",replace=None)
+	csl_frm_search_btn2 = grid.elements('input',_value="Clear",replace=None)
+	new_console = grid.elements('div.web2py_console form',replace=lambda frm_csl:DIV(SPAN(add_btn,_class='span1'),SPAN(DIV(frm_csl,qry_pnl[0],_id='w2p_search-form'),_class='span5'),_class='row-fluid'))
+	w2p_grid_tbl = grid.element('table')
+	if w2p_grid_tbl:
+		w2p_grid_tbl['_class'] = 'table table-condensed table-hover table-bordered'
+		tbl_button_rows = grid.elements('td',_class="row_buttons")
+		for tbl_button_row in tbl_button_rows:
+			buttons = tbl_button_row.elements('a.w2p_trap')
+			for button in buttons:
+				button['_class'] = 'w2p_trap btn'
+			pass
+		pass
+		export_menu = grid.element('div.w2p_export_menu')
+		export_menu_links = export_menu.elements('a')
+		export_menu_items = []
+		for link in export_menu_links:
+			item = LI(link)
+			export_menu_items.append(item)
+		pass
+		new_export_menu = DIV(A(T('Exports:'),SPAN(_class='caret'),_href='#',_class='btn dropdown-toggle',**{'_data-toggle':"dropdown"}),UL(*export_menu_items,_class='dropdown-menu'),_class='w2p_export_menu btn-group pull-left')
+		grid_pagination = grid.element('div.web2py_paginator')
+		if grid_pagination:
+			export_menu = grid.element('div.w2p_export_menu',replace=None)
+			new_grid_pagination = grid.element('div.web2py_paginator',replace=lambda me:DIV(new_export_menu,me,_class='w2p_grid_bottom_bar'))
+			grid_pagination['_class'] = 'web2py_paginator pagination pagination-right'
+			grid_page_active = grid.element('li.current')
+			grid_page_active['_class'] = 'current active'
+		else:
+			new_grid_pagination = grid.element('div.w2p_export_menu',replace=DIV(new_export_menu))
+		pass
+		records_counter = grid.element('div.web2py_counter')
+		records_found = int(records_counter[0].partition('records')[0].strip())
+		paginate = 5 # TODO: get it from the controller 
+		pages = records_found/paginate
+		tot_pages = pages if records_found%paginate == 0 else pages+1
+		current_page = int(request.vars.page) if request.vars.page else 1
+		end_record = paginate*current_page if current_page < tot_pages else records_found
+		begin_record = 1 if current_page == 1 else (paginate*(current_page-1))+1
+		rec = "records" if records_found>1 else "record"
+		record_shown_in_the_page = T("Showing %s to %s of %s %s found")%(begin_record,end_record,records_found,rec)
+		new_record_counter = grid.element('div.web2py_counter',replace=DIV(record_shown_in_the_page,_class="web2py_counter span6 pull-right"))
+	pass
+elif request.args(0)=='new':
+	bck_btn = grid.element('div.web2py_grid span.leftarrow').parent
+	bck_btn['_id'] = 'w2p_grid_bckbtn'
+	bck_btn['_class'] = 'w2p_trap btn'
+	frm = grid.element('div.web2py_grid form')
+	frm['_class'] = 'web2py_form span4 well well-small'
 	
-<h1>{{=T('Manage Admin Users/Students')}}</h1>
+	checkbox_lbl = frm.element('label',_for='auth_user_is_manager')
+	checkbox_inp = frm.element(_name='is_manager',replace=CAT())
+	checkbox_lbl[0] = checkbox_inp
+	checkbox_lbl[1] = 'Is Manager'
+	checkbox_lbl['_class'] = "checkbox"
 	
+	inp_smt = frm.element('input',_type='submit',replace=TAG['button'](T('Submit'),_type='submit',_class='btn'))
+	
+	new_form_flds = []
+	frm_trs = frm.elements('tr')
+	for tr in frm_trs:
+		label = tr[0][0]
+		input = tr[1][0]
+		help  = tr[2][0]
+		new_form_flds.append(label)
+		new_form_flds.append(input)
+		new_form_flds.append(help)
+	pass
+	new_frm_content = frm.element('table',replace=CAT(*new_form_flds))
+	new_frm = grid.element('div.web2py_grid form',replace=lambda me:DIV(me,_class='row-fluid'))
+elif request.args(0)=='view':
+	bck_btn = grid.element('div.web2py_grid span.leftarrow').parent
+	bck_btn['_id'] = 'w2p_grid_bckbtn'
+	bck_btn['_class'] = 'w2p_trap btn'
+	pen_btn = grid.element('div.web2py_grid span.pen').parent
+	pen_btn['_id'] = 'w2p_grid_penbtn'
+	pen_btn['_class'] = 'w2p_trap btn'
+	frm = grid.element('div.web2py_grid form')
+	frm['_class'] = 'web2py_form span4 well well-small'
+	
+	checkbox_lbl = frm.element('label',_for='auth_user_is_manager')
+	checkbox_inp = frm.element(_name='is_manager',replace=CAT())
+	checkbox_lbl[0] = checkbox_inp
+	checkbox_lbl[1] = 'Is Manager'
+	checkbox_lbl['_class'] = "checkbox"
+	
+	new_form_flds = []
+	frm_trs = frm.elements('tr')
+	for tr in frm_trs:
+		label = tr[0][0]
+		input = tr[1][0]
+		help  = tr[2][0]
+		new_form_flds.append(label)
+		if len(input) > 0 :
+			new_form_flds.append(SPAN(input,_class='uneditable-input'))
+		pass
+		new_form_flds.append(help)
+	pass
+	new_frm_content = frm.element('table',replace=CAT(*new_form_flds))
+	new_frm = grid.element('div.web2py_grid form',replace=lambda me:DIV(me,_class='row-fluid'))
+elif request.args(0)=='edit':
+	bck_btn = grid.element('div.web2py_grid span.leftarrow').parent
+	bck_btn['_id'] = 'w2p_grid_bckbtn'
+	bck_btn['_class'] = 'w2p_trap btn'
+	viw_btn = grid.element('div.web2py_grid span.magnifier').parent
+	viw_btn['_id'] = 'w2p_grid_viwbtn'
+	viw_btn['_class'] = 'w2p_trap btn'
+	frm = grid.element('div.web2py_grid form')
+	frm['_class'] = 'web2py_form span4 well well-small'
+	
+	checkbox_lbl = frm.element('label',_for='auth_user_is_manager')
+	checkbox_inp = frm.element(_name='is_manager',replace=CAT())
+	checkbox_lbl[0] = checkbox_inp
+	checkbox_lbl[1] = 'Is Manager'
+	checkbox_lbl['_class'] = "checkbox"
+	
+	checkbox1_lbl = frm.element('label',_for='delete_record')
+	checkbox1_inp = frm.element(_id='delete_record',replace=CAT())
+	checkbox1_lbl[0] = checkbox1_inp
+	checkbox1_lbl[1] = T('Check to delete')
+	checkbox1_lbl['_class'] = "checkbox"
+	
+	inp_smt = frm.element('input',_type='submit',replace=TAG['button'](T('Submit'),_type='submit',_class='btn'))
+	
+	id_input = frm.element(_id='auth_user_id')
+	id_input['_class'] = 'uneditable-input'
+	
+	new_form_flds = []
+	frm_trs = frm.elements('tr')
+	for tr in frm_trs:
+		label = tr[0][0]
+		input = tr[1][0]
+		help  = tr[2][0]
+		new_form_flds.append(label)
+		print label
+		new_form_flds.append(input)
+		new_form_flds.append(help)
+	pass
+	new_frm_content = frm.element('table',replace=CAT(*new_form_flds))
+	new_frm = grid.element('div.web2py_grid form',replace=lambda me:DIV(me,_class='row-fluid'))
+pass
+}}
+
+<h2>{{=T('Manage Admin Users/Students')}}</h2>
 {{=grid}}

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/peek.html

@@ -1,17 +1,16 @@
 {{extend 'layout.html'}}
-
 {{block sectionclass}}peek{{end}}
-
+<!-- begin "peek" block -->
 <h2>{{=T("Peeking at file")}} "{{=filename}}"</h2>
-
 <p class="controls">
 {{=button(URL('design',args=request.vars.app if request.vars.app else request.args[0], anchor=request.vars.id), T('back'))}}
 {{=button(URL('edit',args=request.args, vars=request.vars), T('Edit'))}}
 </p>
-
+<div class="code-wrapper">
 {{
 if filename[-3:]=='.py': language='python'
 else: language='html'
 }}
 {{=CODE(data,language=language,link='/examples/global/vars/')}}
-
+</div>
+<!-- end "peek" block -->

applications/admin/views/default/plugin.html

@@ -6,11 +6,17 @@ 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',_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"))), _class='icon test tooltip',_href=URL('test', args=(app, file)))
+	return A(TAG[''](IMG(_src=URL('static', 'images/test_icon.png'), _alt=T('test')), 
+						SPAN(T("Run tests in this file"))), 
+						_class='icon test',
+						_href=URL('test', args=(app, file)),
+						_rel="tooltip",
+						**{'_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:")," ",
@@ -29,42 +35,46 @@ def file_create_form(location):
               INPUT(_type="submit",_value=T("submit")),_action=URL('create_file'))
     return form
 def deletefile(arglist):
-  return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), SPAN(T('Delete this file (you will be asked to confirm deletion)'))), _class='icon delete tooltip', _href=URL('delete',args=arglist,vars=dict(sender=request.function+'/'+app+'/'+request.args[1])))
+	return A(TAG[''](IMG(_src=URL('static', 'images/delete_icon.png')), 
+						SPAN(T('Delete this file (you will be asked to confirm deletion)'))),
+						_href=URL('delete',args=arglist,vars=dict(sender=request.function+'/'+app+'/'+request.args[1])),
+						_class='icon delete',
+						_rel="tooltip",
+						**{'_data-placement':'right',
+							'_data-original-title':T('Delete this file (you will be asked to confirm deletion)')})
 }}
 
 {{block sectionclass}}plugin{{end}}
+<!-- begin "plugin" block -->
+<h2>{{=T('Plugin "%s" in application', request.args(1))}} "{{=app}}"</h2>
 
-<h2>
+<!-- COLLAPSE/JUMP-TO BUTTONS -->
-  {{=T('Plugin "%s" in application', request.args(1))}} "{{=app}}"
-</h2>
 <div class="right-full controls">
-  <a class="button special" href="#" onclick="jQuery('h3').click();return false"><span>{{=T("collapse/expand all")}}</span></a>
+	<p class="buttons-row">
+	<a class="button special btn btn-inverse" href="#" onclick="jQuery('h3>span').click();return false"><span>{{=T("collapse/expand all")}}</span></a>
 	<span class="buttongroup">
-  {{=button("#models", T("models"))}}
+	{{=button('#models', T("models"))}}
-  {{=button("#controllers", T("controllers"))}}
+	{{=button('#controllers', T("controllers"))}}
-  {{=button("#views", T("views"))}}
+	{{=button('#views', T("views"))}}
-  {{=button("#static", T("static"))}}
+	{{=button('#static', T("static"))}}
-  {{=button("#modules", T("modules"))}}
+	{{=button('#modules', T("modules"))}}
 	</span>
 	<span class="buttongroup">
 	{{=sp_button(URL('design',args=request.args, anchor=request.vars.id), T("back"))}}
 	{{=sp_button(URL('delete_plugin',args=request.args, vars=request.vars), T("delete plugin"))}}
 	{{=sp_button(URL('pack_plugin',args=request.args), T("pack plugin"))}}
 	</span>
+	</p>
 </div>
 
 <!-- MODELS -->
-
+<h3 id="_models" rel="pagebookmark">
-<h3 id="models" onclick="collapse('models_inner');" class="component">
+	<span class="component" onclick="collapse('models_inner');">{{=T("Models")}}</span>
-  {{=T("Models")}}
+	<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:}}
+	{{if not models:}}<p><strong>{{=T("There are no models")}}</strong></p>{{else:}}
-  <p><strong>{{=T("There are no models")}}</strong></p>
+	<ul class="unstyled act-edit">
-  {{pass}}
-  <div class="controls comptools">
-  </div>
-  <ul>
 		{{for m in models:}}
 		<li>
 			<span class="filetools controls">
@@ -80,6 +90,7 @@ def deletefile(arglist):
 		</li>
 		{{pass}}
 	</ul>
+	{{pass}}
 </div>
 
 <!-- FIND CONTROLLER FUNCTIONS -->
@@ -89,17 +100,13 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 }}
 
 <!-- CONTROLLERS -->
-
+<h3 id="_controllers" rel="pagebookmark">
-<h3 id="controllers" onclick="collapse('controllers_inner');" class="component">
+	<span class="component" onclick="collapse('controllers_inner');">{{=T("Controllers")}}</span>
-  {{=T("Controllers")}}
+	<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:}}
+	{{if not controllers:}}<p><strong>{{=T("There are no controllers")}}</strong></p>{{else:}}
-  <p><strong>{{=T("There are no controllers")}}</strong></p>
+	<ul class="unstyled act_edit">
-  {{pass}}
-  <div class="controls comptools">
-  </div>
-  <ul>
 		{{for c in controllers:}}
 		<li>
 			<span class="filetools controls">
@@ -110,26 +117,23 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 			<span class="file">
 				{{=peekfile('controllers',c)}}
 			</span>
-    <span class="extras">
+			<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]]))}}
 			</span>
 		</li>
 		{{pass}}
 	</ul>
+	{{pass}}
 </div>
 
 <!-- VIEWS -->
-
+<h3 id="_views" rel="pagebookmark">
-<h3 id="views" onclick="collapse('views_inner');" class="component">
+	<span class="component" onclick="collapse('views_inner');">{{=T("Views")}}</span>
-  {{=T("Views")}}
+	<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:}}
+	{{if not views:}}<p><strong>{{=T("There are no views")}}</strong></p>{{else:}}
-  <p><strong>{{=T("There are no views")}}</strong></p>
+	<ul class="unstyled act_edit">
-  {{pass}}
-  <div class="controls comptools">
-  </div>
-  <ul>
 		{{for c in views:}}
 		<li>
 			<span class="filetools controls">
@@ -139,23 +143,24 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 			<span class="file">
 				{{=peekfile('views',c)}}
 			</span>
-      <span class="extras">
+			<span class="extras celled">
 				{{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]]))}}
 			</span>
 		</li>
 		{{pass}}
 	</ul>
+	{{pass}}
 </div>
 
 <!-- STATIC -->
-
+<h3 id="_static" rel="pagebookmark">
-<h3 id="static" onclick="collapse('static_inner');" class="component">
+	<span class="component" onclick="collapse('static_inner');">{{=T("Static files")}}</span>
-  {{=T("Static files")}}
+	<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>{{pass}}
+	{{if not statics:}}<p><strong>{{=T("There are no static files")}}</strong></p>{{else:}}
-  <ul>
+	<ul class="unstyled act_edit">
 		{{
 		path=[]
 		for file in statics+['']:
@@ -167,53 +172,52 @@ for c in controllers: controller_functions+=[c[:-3]+'/%s.html'%x for x in functi
 					path.append(file_path[len(path)])
 					thispath='static__'+'__'.join(path)
 		}}
-    <li class="folder">
+		<li class="folder"><i>&nbsp;</i>
 			<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:
 					path = path[:-1]
 		}}
-    </ul></li>
+			</ul>
+		</li>
 		{{
 				pass
 			pass
 			if filename:
-      }}<li>
+		}}
+		<li>
 			<span class="filetools controls">
 				{{=editfile('static',file)}} {{=deletefile([app,'static',file])}}
 			</span>
 			<span class="file">
 				<a href="{{=URL(a=app,c='static',f=file)}}">{{=filename}}</a>
 			</span>
-    </li>{{
+		</li>
+		{{
 			pass
 		pass
 		}}
-    {{pass}}
 	</ul>
+	{{pass}}
 </div>
 
 <!-- MODULES -->
-
+<h3 id="_modules" rel="pagebookmark">
-<h3 id="modules" onclick="collapse('modules_inner');" class="component">
+	<span class="component" onclick="collapse('modules_inner');">{{=T("Modules")}}</span>
-  {{=T("Modules")}}
+	<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:}}
+	{{if not modules:}}<p><strong>{{=T("There are no modules")}}</strong></p>{{else:}}
-  <p><strong>{{=T("There are no modules")}}</strong></p>
+	<ul class="unstyled act_edit">
-  {{pass}}
-  <div class="controls comptools">
-  </div>
-  <ul>
 		{{for m in modules:}}
 		<li>
 			{{=editfile('modules',m)}}
-    {{if m!='__init__.py':}}<a class="button" href="{{=URL('delete',args=[app,'modules',m],vars=dict(sender=request.function+'/'+app))}}">{{=T("delete")}}</a>{{pass}}
+			{{if m!='__init__.py':}}<a class="button btn" href="{{=URL('delete',args=[app,'modules',m],vars=dict(sender=request.function+'/'+app))}}">{{=T("delete")}}</a>{{pass}}
 			{{=peekfile('modules',m)}}
 		</li>
 		{{pass}}
 	</ul>
+	{{pass}}
 </div>
-
+<!-- end "plugin" block -->
-
-

applications/admin/views/default/resolve.html

@@ -1,25 +1,21 @@
 {{extend 'layout.html'}}
-
 {{block sectionclass}}resolve{{end}}
-
+<!-- begin "resolve" block -->
 <h2>{{=T('Resolve Conflict file')}} "{{=filename}}"</h2>
-
 <script>
 function plus() {jQuery('.plus').show(); jQuery('.minus').hide(); }
 function minus() {jQuery('.plus').hide(); jQuery('.minus').show(); }
 function all() {jQuery('.plus').show(); jQuery('.minus').show(); }
 </script>
-
 <div class="controls">
-<button onclick="plus()">new</button>
+<button class="btn" onclick="plus()">new</button>
-<button onclick="minus()">old</button>
+<button class="btn" onclick="minus()">old</button>
-<button onclick="all()">all</button>
+<button class="btn" onclick="all()">all</button>
 </div>
-
 <div class="form">
   <form action="{{=URL(r=request,args=request.args)}}" method="post">
     {{=diff}}
-    <input type="submit" name="merge" value="{{=T('merge')}}" /><br/>
+    <input class="btn" type="submit" name="merge" value="{{=T('merge')}}" /><br/>
   </form>
 </div>
-
+<!-- end "resolve" block -->

applications/admin/views/default/site.html

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

applications/admin/views/default/test.html

@@ -1,7 +1,7 @@
 {{extend 'layout.html'}}
 
 {{block sectionclass}}test{{end}}
-
+<!-- begin "test" block -->
 <h2>{{=T('Testing application')}} "{{=app}}"</h2>
 
 {{for controller in sorted(controllers):}}
@@ -14,8 +14,14 @@ ajax('{{=URL(a=app,c=controller[:-3],f='_TEST')}}',[],'output_{{=controller[:-3]
 //--></script>
 {{pass}}
 
-<p class="help">{{=T("""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.
+<div class="row-fluid">
+	<p class="help alert alert-info span6">{{=T("""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.
 		A green title indicates that all tests (if defined) passed. In this case test results are not shown.""")}}</p>
-<p class="help">{{=T('Functions with no doctests will result in [passed] tests.')}}</p>
+</div>
-<p class="help">{{=T('ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.')}}</p>
+<div class="row-fluid">
-
+	<p class="help alert alert-info span6">{{=T('Functions with no doctests will result in [passed] tests.')}}</p>
+</div>
+<div class="row-fluid">
+	<p class="help alert alert-info span6">{{=T('ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.')}}</p>
+</div>
+<!--end "test" block -->

applications/admin/views/default/ticket.html

@@ -1,7 +1,6 @@
 {{extend 'layout.html'}}
-
 {{block sectionclass}}ticket{{end}}
-
+<!-- begin "ticket" block -->
 <h2>{{=T('Error ticket')}} for "{{=app}}"</h2>
 <h3>{{=T('Ticket ID')}}</h3>
 <p>{{=ticket}}</p>
@@ -11,7 +10,7 @@
   <tbody>
     <tr>
       <th>web2py&trade;</th>
-      <td>{{=myversion}}</td>
+      <td>Version {{=myversion}}</td>
     </tr>
     {{if snapshot:}}
     <tr>
@@ -21,36 +20,30 @@
     {{pass}}
   </tbody>
 </table>
-
 {{if traceback or code or layer:}}
 <h3>{{=T('Traceback')}}</h3>
-<div class="inspect">
+<div class="inspect resp1">{{=traceback}}</div>
-{{=traceback}}
-</div>
-
 {{if snapshot:}}
 {{try:}}
-
 <!-- ERROR SNAPSHOT -->
-
+<h3>{{=T('Error snapshot')}}
-    <h3>
+  <a href="#" rel="tooltip" data-placement="right" data-original-title="{{=T('Detailed traceback description')}}">
-    {{=T('Error snapshot')}}
+    {{=helpicon()}}
-    <span class="tooltip">{{=helpicon()}} <span>{{=T('Detailed traceback description')}}</span></span>
+    <span>{{=T("Detailed traceback description")}}</span>
+  </a>
 </h3>
-
 <!-- SNAPSHOT LIST -->
-
 <div id="snapshot">
   <!-- Exception details -->
   <p class="exception_object inspect">
     <code>{{=snapshot['etype']}}({{=snapshot['evalue']}})</code>
   </p>
   <p class="controls">
-      <a class="button" onclick="collapse('exception_inner');"><span>{{=T('inspect attributes')}}</span></a>
+    <a class="button btn" onclick="collapse('exception_inner');"><span>{{=T('inspect attributes')}}</span></a>
   </p>
   <div id="exception_inner" class="hide">
     <div class="inspect">
-          <h5>{{=T("Exception instance attributes")}}</h5>
+      <h4>{{=T("Exception instance attributes")}}</h4>
       <table>
 	<tbody>
 	  {{for k,v in snapshot['exception'].items():}}
@@ -64,33 +57,32 @@
     </div>
   </div>
 </div>
-
 <!-- FRAMES -->
 <div id="frames">
   <h4>{{=T('Frames')}}</h4>
-    <ul>
+  <ul class="unstyled">
     {{for i, frame in enumerate(snapshot['frames']):}}
     <li>
       {{is_hidden = (i != len(snapshot['frames'])-1 and 'hide' or 'inspect')}}
       <div class="framefile inspect controls">
 	<p>
 	  <strong>File {{="%s in %s at line %s" % (frame['file'], frame['func'], frame['lnum'])}}</strong>
-            <a class="button tbbutton" onclick="collapse('{{="%s_code_inner" % i}}');"><span>{{=T("code")}}</span></a>
+	  <a class="button tbbutton btn" onclick="collapse('{{='%s_code_inner' % i}}');"><span>{{=T("code")}}</span></a>
-            <a class="button tbbutton" onclick="collapse('{{="%s_args_inner" % i}}');"><span>{{=T("arguments")}}</span></a>
+	  <a class="button tbbutton btn" onclick="collapse('{{='%s_args_inner' % i}}');"><span>{{=T("arguments")}}</span></a>
-            <a class="button tbbutton" onclick="collapse('{{="%s_vars_inner" % i}}');"><span>{{=T("variables")}}</span></a>
+	  <a class="button tbbutton btn" onclick="collapse('{{='%s_vars_inner' % i}}');"><span>{{=T("variables")}}</span></a>
 	</p>
-          <div id="{{="%s_args_inner" % i}}" class="{{=is_hidden}}">
+	<div id="{{='%s_args_inner' % i}}" class="{{=is_hidden}}" style="width:100%;overflow:auto">
 	  <h5>Function argument list</h5>
 	  <p>{{=frame['call']}}</p>
 	</div>
-          <div id="{{="%s_code_inner" % i}}" class="{{=is_hidden}}">
+	<div id="{{='%s_code_inner' % i}}" class="{{=is_hidden}}" style="width:100%;overflow:auto">
 	  <h5>Code listing</h5>
 	  {{if frame['lines']:}}
 	  <pre>{{=CODE('\n'.join([x[1] for x in sorted(frame['lines'].items(),key=lambda x: x[0])]),
 	    language='python', link=None, counter=min(frame['lines'].keys()), highlight_line=frame['lnum'])}}</pre>
 	  {{pass}}
 	</div>
-          <div id="{{="%s_vars_inner" % i}}" class="{{=is_hidden}}">
+	<div id="{{='%s_vars_inner' % i}}" class="{{=is_hidden}}" style="width:100%;overflow:auto">
 	  <h5>Variables</h5>
 	  <table>
 	    <tbody>
@@ -108,20 +100,27 @@
     {{pass}}
   </ul>
 </div>
-
 <!-- VIEW ENVIRONMENT -->
 <div class="viewenv">
-      <h4>Context</h4>
+  <h4><span>Context</span></h4>
   <p class="controls">
-        <a class="button" onclick="jQuery('#locals').slideToggle()"><span>{{=T('locals')}}</span></a>
+    <a class="button btn" onclick="jQuery('#locals').slideToggle()"><span>{{=T('locals')}}</span></a>
-        <a class="button" onclick="jQuery('#request').slideToggle()"><span>{{=T('request')}}</span></a>
+    <a class="button btn" onclick="jQuery('#request').slideToggle()"><span>{{=T('request')}}</span></a>
-        <a class="button" onclick="jQuery('#session').slideToggle()"><span>{{=T('session')}}</span></a>
+    <a class="button btn" onclick="jQuery('#session').slideToggle()"><span>{{=T('session')}}</span></a>
-        <a class="button" onclick="jQuery('#response').slideToggle()"><span>{{=T('response')}}</span></a>
+    <a class="button btn" onclick="jQuery('#response').slideToggle()"><span>{{=T('response')}}</span></a>
   </p>
-        <div class="hide inspect" id="locals"><h6>locals</h6>{{=BEAUTIFY(snapshot['locals'])}}</div>
+  <div class="hide inspect resp1" id="locals"><h4>locals</h4>
-        <div class="hide inspect" id="request"><h6>request</h6>{{=BEAUTIFY(snapshot['request'])}}</div>
+    {{=BEAUTIFY(snapshot.get('locals','no locals available in snapshot'))}}
-        <div class="hide inspect" id="session"><h6>session</h6>{{=BEAUTIFY(snapshot['session'])}}</div>
+  </div>
-        <div class="hide inspect" id="response"><h6>response</h6>{{=BEAUTIFY(snapshot['response'])}}</div>
+  <div class="hide inspect" id="request"><h4>request</h4>
+    {{=XML(snapshot.get('request','no request available in snapshot'))}}
+  </div>
+  <div class="hide inspect" id="session"><h4>session</h4>
+    {{=XML(snapshot.get('session','no session available in snapshot'))}}
+  </div>
+  <div class="hide inspect" id="response"><h4>response</h4>
+    {{=XML(snapshot.get('response','no response available in snapshot'))}}
+  </div>
 </div>
 {{except Exception, e:}}
 <!-- this should not happen, just in case... (cannot output normal hmtl as we don't know current open tags) -->
@@ -137,3 +136,4 @@
 {{else:}}
 <h3>{{=T('Ticket Missing')}}</h3>
 {{pass}}
+<!-- end "ticket" block -->

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/default/uninstall.html

@@ -1,7 +1,7 @@
 {{extend 'layout.html'}}
-
+<!-- begin "uninstall" block -->
 <h2>{{=T('Are you sure you want to uninstall application "%s"?', app)}}</h2>
 <div class="center">
 {{=dialog}}
 </div>
-
+<!-- end "uninstall" block -->

applications/admin/views/default/upgrade_web2py.html

@@ -1,13 +1,17 @@
 {{extend 'layout.html'}}
-
+{{
+dlg = dialog
+smt_button = dlg.element(_type="submit")
+smt_button['_class'] = 'btn'
+smt_button['_style'] = 'margin-right:4px;'
+ccl_button = dlg.element(_type="button")
+ccl_button['_class'] = 'btn'
+}}
 {{block sectionclass}}upgrade{{end}}
-
+<!-- begin "shell" block -->
 <h2>{{=T('web2py upgrade')}}</h2>
-
+<p class="center"><div class="alert"><strong class="att">{{=T('ATTENTION:')}}</strong> {{=T('This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk')}}<br />
-<p class="center"><strong class="att">{{=T('ATTENTION:')}}</strong> {{=T('This is an experimental feature and it needs more testing. If you decide to upgrade you do it at your own risk')}}<br />
+{{=T('If start the upgrade, be patient, it may take a while to download')}}</p></div>
-{{=T('If start the upgrade, be patient, it may take a while to download')}}</p>
-
 <div class="center">
 {{=dialog}}
 </div>
-

applications/admin/views/default/user.html

@@ -1,20 +1,67 @@
 {{extend 'layout.html'}}
+<!-- begin "user" block -->
 <h2>{{=T( request.args(0).replace('_',' ').capitalize() )}}</h2>
 <div id="web2py_user_form">
+{{if 'auth' in globals():}}
+{{
+# add bootstrap class to form
+form['_class']='span4 well well-small'
+# change form.custom.begin
+form.custom.begin=XML("<%s %s>" % (form.tag,form._xml()[0]))
+if request.args(0)=='login':
+# delete empty label
+d = form.elements("tr#auth_user_remember__row")
+d[0][0] = " "
+# remake remember checkbox
+cbx_inp=form.element(_name='remember')
+cbx_inp['_class']=""
+cbx_lbl=form.element(_for='auth_user_remember')[0]
+form.element('div',replace=LABEL(cbx_inp,cbx_lbl,_class="checkbox"))
+# new form buttons
+smt = form.element('input',_type='submit')
+smt['_class']='btn'
+btns = [smt]
+if not 'register' in auth.settings.actions_disabled:
+btns.append(A(T('register'),_href=URL(r=request,args='register'),_class='btn btn-lnk'))
+pass
+if not 'request_reset_password' in auth.settings.actions_disabled:
+btns.append(A(T('lost password'),_href=URL(r=request,args='request_reset_password'),_class='btn btn-lnk'))
+pass
+form.element('input[type=submit]',replace=DIV(*btns,_class="controls-inline"))
+pass
+if request.args(0)in['register','profile']:
+# remake is_manager checkbox
+cbx_inp=form.element(_name='is_manager')
+cbx_lbl=form.element(_for='auth_user_is_manager')[0]
+form.element(_name='is_manager',replace=lambda cbx_inp : LABEL(cbx_inp,cbx_lbl,_class="checkbox"))
+# delete is manager label
+d = form.elements("tr#auth_user_is_manager__row")
+d[0][0][0] = " "
+# new form buttons
+smt = form.element('input',_type='submit')
+smt['_class']='btn'
+form.element('input[type=submit]',replace=lambda button: DIV(button,_class="controls-inline"))
+pass
+if request.args(0)in ['request_reset_password','change_password']:
+# new form buttons
+smt = form.element('input',_type='submit')
+smt['_class']='btn'
+form.element('input[type=submit]',replace=lambda button: DIV(button,_class="controls-inline"))
+pass
+}}
+{{=form.custom.begin}}
+{{for e in form.components[0]:}}
+  {{= e[0][0]}}
+  {{= e[1][0]}}
+{{pass}}
+{{=form.custom.end}}
+{{else:}}
 {{=form}}
-{{if request.args(0)=='login':}}
-{{if not 'register' in auth.settings.actions_disabled:}}
-<br/><a href="{{=URL(r=request,args='register')}}">register</a>
-{{pass}}
-{{if not 'request_reset_password' in auth.settings.actions_disabled:}}
-<br/><a href="{{=URL(r=request,args='request_reset_password')}}">lost password</a>
-{{pass}}
 {{pass}}
 </div>
-
 <script language="javascript">
-<!--
+//<!--
  jQuery("#web2py_user_form input:visible:enabled:first").focus();
 //-->
 </script>
-
+<!-- end "user" block -->

applications/admin/views/layout.html

@@ -1,44 +1,88 @@
-<!doctype html>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
         <meta http-equiv="P3P" content="CP=\"IDC DSP COR CURa ADMa OUR IND PHY ONL COM STA\"" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>{{=response.title or URL()}}</title>
-        {{response.files.append(URL('static','css/styles.css'))}}
+        {{
+        response.files.append(URL('static','css/bootstrap.min.css'))
+        response.files.append(URL('static','css/bootstrap_essentials.css'))
+        response.files.append(URL('static','css/bootstrap-responsive.min.css'))
+        }}
         {{include 'web2py_ajax.html'}}
         <script>jQuery.noConflict();</script>
     </head>
+
     <body class="{{=T('direction: ltr') == 'direction: rtl' and 'RTLbody' or ''}} {{block sectionclass}}home{{end}}">
-        <div id="header">
+
-          <h1 id="start">
+        <!-- NAVBAR 
-            <a href="{{=URL('default', 'index')}}" class="button"><span>web2py&trade; {{=T('administrative interface')}}</span></a>
+        ============== -->
-          </h1>
+        <div id="header" class="navbar navbar-inverse navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container-fluid">
+                    <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <div id="start" class="brand_wrapper">
+                        <a href="{{=URL('default', 'index')}}" class="button brand" ><span>web2py&trade; {{=T('administrative interface')}}</span></a>
+                    </div>
+                    <div class="nav-collapse">
                         {{if response.menu is not None:}}
-          <ul id="menu">
+                        <ul id="menu" class="nav pull-right">
                             {{for _name,_active,_link in response.menu:}}
                             <li>{{=A(SPAN(_name), _href=_link, _class=_active and 'button select' or 'button')}}</li>
                             {{pass}}
                         </ul>
                         {{pass}}
-        </div>
+                    </div><!--/.nav-collapse -->
-        <div id="main">
+                </div><!-- /container-fluid -->
-            <div id="main_inner">
+            </div><!-- /navbar-inner -->
-                <div class="flash">{{=response.flash or ''}}</div>
+        </div><!-- /#header -->
+
+        <!-- MAIN 
+        =========== -->
+            <div id="main" class="container-fluid">
+                <div id="main_inner" class="row-fluid">
+                    <div class="span12">
+                        <div class="flash alert">{{=response.flash or ''}}</div>
                         {{include}}
-            </div>
+                    </div><!-- /main span12 -->
-        </div>
+                </div><!-- /main row-fluid -->
-        <div id="footer" class="fixed">
+            </div><!-- /#main -->
-            {{=T('Powered by')}} {{=A('web2py', _href='http://www.web2py.com')}}&trade; {{=T('created by')}} Massimo Di Pierro &copy;2007-{{=request.now.year}} -
+
+        <!-- FOOTER 
+        ============== -->
+        <footer id="footer" class="fixed">
+            <p><span>{{=T('Powered by')}} {{=A('web2py', _href='http://www.web2py.com')}}&trade; {{=T('created by')}} Massimo Di Pierro &copy;2007-{{=request.now.year}}
                 {{if hasattr(T,'get_possible_languages_info'):}}
-        <span>
+                - {{=T('Admin language')}}</span>
-          {{=T('Admin language')}}
                 <select name="adminlanguage" onchange="var date = new Date();cookieDate=date.setTime(date.getTime()+(100*24*60*60*1000));document.cookie='adminLanguage='+this.options[this.selectedIndex].id+'; expires='+cookieDate+'; path=/';window.location.reload()">
                     {{for langinfo in sorted([(code,info[1]) for code,info in T.get_possible_languages_info().iteritems() if code != 'default']):}}
                     <option {{=T.accepted_language==langinfo[0] and 'selected' or ''}} {{='id='+langinfo[0]}} >{{=langinfo[1]}}</option>
                     {{pass}}
                 </select>
-        </span>
+                {{else:}}
+                </span>{{pass}}
+            </p>
+        </footer><!-- /#footer -->
+
+        <!-- BS JAVASCRIPT 
+        ====================== -->
+        <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
+        <script type="text/javascript">  
+            jQuery(document).ready(function(){  
+                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}}
-        </div>
     </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/admin/views/plugin_jqmobile/about.html

@@ -9,6 +9,13 @@
       body {
       background: url('{{=URL('static','plugin_jqmobile/images/iphone.jpg')}}') no-repeat white;
       }
+      #back {
+      z-index: 1000;
+      padding: 10px;
+      position: absolute;
+      top: 0;
+      right: 0;
+      }
       iframe {
       position: absolute;
       margin-left: 320px;
@@ -35,6 +42,7 @@
   </head>
   <body>
     <iframe src="{{=URL('default','index',vars=dict(is_mobile='true'))}}"></iframe>
+    <div id="back"><a href="{{=URL('default','index',vars=dict(is_mobile='false'))}}">Back</a></div>
     <div id="about">
       <h1><a href="http://web2py.com">web2py</a> plugin</h1>
       <h2>for <a href="http://jquerymobile.com/">jQuery Mobile</a></h2>