bootstrap 2.1.1, thanks Paolo

VERSION

@@ -1 +1 @@
-Version 2.0.9 (2012-09-17 21:25:01) stable
+Version 2.0.9 (2012-09-17 21:32:45) stable

applications/welcome/static/css/web2py_bootstrap.css

@@ -112,7 +112,6 @@ td.w2p_fl,td.w2p_fc {padding:0;}
 }
 /* bootstrap has a label as input's wrapper while web2py has a div */
 div>input[type="radio"],div>input[type="checkbox"]{margin:0;}
-.ie-lte9 #auth_user_remember__row input[type="checkbox"]{margin-top:-2px;}
 /* bootstrap has button instead of input */
 input[type="button"], input[type="submit"]{margin-right:8px;}
 
@@ -187,53 +186,6 @@ td.w2p_fw ul{margin-left:0px;}
 }
 .web2py_grid form table{width:auto;}
 
-/*=============================================================
- BOOTSTRAP DROPDOWN to be deleted if BS 2.1.1 submenu is used
-==============================================================*/
-
-.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;
-}
-.navbar .dropdown-menu ul:after{
-  border-top:6px solid transparent;
-  border-left:none;
-  border-right:6px solid #fff;
-  border-bottom:6px solid transparent;
-  left:10px;
-  top:6px;
-  left:-6px;
-}
-.dropdown-menu span{display:inline-block;}
-.chevron-right{
-  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-right:-13px;
-  margin-top:7px;
-  float:right;
-}
-.open >.dropdown-menu  ul{display:block;} /* fix menu issue when BS2.0.4 is applied */
-
 /*=============================================================
                        MEDIA QUERIES
 ==============================================================*/

applications/welcome/views/layout.html

@@ -66,7 +66,7 @@
 
 <body>
   <!-- Navbar ================================================== -->
-  <div class="navbar navbar-fixed-top">
+  <div class="navbar navbar-inverse navbar-fixed-top">
     <div class="flash">{{=response.flash or ''}}</div>
     <div class="navbar-inner">
       <div class="container">
@@ -76,7 +76,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </a>
-        <a class="brand" href="#">web2py&trade;&nbsp;</a>
+        <a class="brand" href="http://www.web2py.com/">web2py&trade;&nbsp;</a>
         <ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul>
         <div class="nav-collapse">
           {{is_mobile=request.user_agent().is_mobile}}
@@ -155,13 +155,15 @@
       });
       jQuery('.nav li li').each(function(){
         if(jQuery(this).find('ul').length)
-          jQuery(this).children('a').contents().before('<i class="chevron-right"></i>');
+          jQuery(this).addClass('dropdown-submenu');
       });
       if(jQuery(document).width()>=980) {
-        jQuery('ul.nav li.dropdown').hover(function() {
+       jQuery('ul.nav a.dropdown-toggle').parent().hover(function() {
-          jQuery(this).find('.dropdown-menu').stop(true, true).delay(200).fadeIn();
+          mi = jQuery(this);
+          mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400,function(){mi.addClass('open')});
         }, function() {
-          jQuery(this).find('.dropdown-menu').stop(true, true).delay(200).fadeOut();
+         mi = jQuery(this);
+          mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
         });
       }
       jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});