fixing a mess

applications/welcome/models/db.py

@@ -40,16 +40,19 @@ response.generic_patterns = ['*'] if request.is_local else []
 ## (more options discussed in gluon/tools.py)
 #########################################################################
 
-from gluon.tools import Auth, Crud, Service, PluginManager, prettydate
+from gluon.tools import Auth, Service, PluginManager
+
 auth = Auth(db)
-crud, service, plugins = Crud(db), Service(), PluginManager()
+service = Service()
+plugins = PluginManager()
 
 ## create all tables needed by auth if not custom tables
 auth.define_tables(username=False, signature=False)
+auth.settings.formstyle = SQLFORM.formstyles.bootstrap3
 
 ## configure email
 mail = auth.settings.mailer
-mail.settings.server = 'logging' or 'smtp.gmail.com:587'
+mail.settings.server = 'logging' if request.is_local else 'smtp.gmail.com:587'
 mail.settings.sender = 'you@gmail.com'
 mail.settings.login = 'username:password'
 

applications/welcome/models/menu.py

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