From 90883e59266f86349c820bd37d9b11692fc26f64 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 17 Jun 2012 23:35:03 -0500
Subject: [PATCH] improved layout, thanks Paolo

---
 VERSION                                        |  2 +-
 applications/welcome/static/css/bootswatch.css | 11 +++++++++++
 applications/welcome/static/css/web2py.css     |  1 -
 applications/welcome/views/layout.html         |  5 +----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index dd6bb228..a8f1928d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-17 23:16:11) dev
+Version 2.00.0 (2012-06-17 23:35:00) dev
diff --git a/applications/welcome/static/css/bootswatch.css b/applications/welcome/static/css/bootswatch.css
index 961896c1..5a56a675 100644
--- a/applications/welcome/static/css/bootswatch.css
+++ b/applications/welcome/static/css/bootswatch.css
@@ -83,3 +83,14 @@ li {margin-bottom: 0;} /*bootswatch*/
   margin-top: 7px;
   float:right;
 }
+
+.open > .dropdown-menu  ul { /* fix menu issue when BS2.0.4 is applied */ 
+	display: block; 
+}
+
+#navbar{padding-top:9px;}
+#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
+.ie-lte7 #navbar .auth_navbar, #navbar .auth_navbar a {color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
+
+#navbar .auth_navbar a:hover {color:white;text-decoration:none;} /* this overwrites bootswatch theme */
+
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index 2bfead1d..9d41654e 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/applications/welcome/static/css/web2py.css
@@ -300,4 +300,3 @@ div.error {
 }
 
 .ie9 #query_panel {padding-bottom:2px;}
-
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index d8e5bf97..f4eff90f 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -70,9 +70,6 @@
         if(jQuery(this).find('ul').length)
           jQuery(this).children('a').contents().before('<i class="icon-chevron-right"></i>'); 
       });
-      jQuery('.auth_navbar').each(function(){	        
-        jQuery(this).addClass('btn-group').children('a').addClass('btn')
-      });
     });
   </script>
   <noscript><link href="{{=URL('static', 'css/bootswatch_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
@@ -90,12 +87,12 @@
 	  <span class="icon-bar"></span>
 	</a>
 	<a class="brand" href="#">web2py&trade;&nbsp;</a>
-	<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' ','')) or ''}}</div>
 	<div class="nav-collapse">
 	  {{is_mobile=request.user_agent().is_mobile}}
 	  {{if response.menu:}}
 	  {{=MENU(response.menu, _class='mobile-menu nav' if is_mobile else 'nav',mobile=is_mobile,li_class='dropdown',ul_class='dropdown-menu')}}
 	  {{pass}}
+	  <div class="nav pull-right" id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div>
 	</div><!--/.nav-collapse -->
       </div>
     </div>