reverted to bs2 for an early release

applications/welcome/models/db.py

@@ -25,8 +25,6 @@ else:
 ## by default give a view/generic.extension to all actions from localhost
 ## none otherwise. a pattern can be 'controller/function.extension'
 response.generic_patterns = ['*'] if request.is_local else []
-## choose a style for forms
-response.formstyle = 'bootstrap3_inline' # or 'bootstrap3_stacked' or 'bootstrap2' or other
 
 ## (optional) optimize handling of static files
 # response.optimize_css = 'concat,minify,inline'

applications/welcome/models/menu.py

@@ -6,14 +6,12 @@
 #########################################################################
 
 response.logo = A(B('web',SPAN(2),'py'),XML('™ '),
-                  _class="navbar-brand",_href="http://www.web2py.com/",
-                  _id="web2py-logo")
+                  _class="brand",_href="http://www.web2py.com/")
 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'
 
@@ -126,7 +124,15 @@ def _():
                         (T('Live Chat'), False,
                          'http://webchat.freenode.net/?channels=web2py'),
                         ]),
-             (T('Plugins'), False, 'http://web2py.com/plugins')]        
+                (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'),
+                        ])
+                ]
          )]
 if DEVELOPMENT_MENU: _()