diff --git a/VERSION b/VERSION index ec33540d..cbbf73de 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-05-21 16:49:59) dev +Version 2.00.0 (2012-05-22 09:05:35) dev diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index b8c18dfe..359c86d8 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -127,7 +127,7 @@ div.error { } .topbar { - padding: 10px 10px; + padding: 10px 0; width:100%; color: #959595; vertical-align: middle; @@ -171,6 +171,7 @@ div.error { .breadcrumbs { float: left; } .copyright {float: left;} +#poweredBy {float: right;} /* #MEDIA QUERIES SECTION */ diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index 04125069..ea507d60 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -74,15 +74,17 @@
-
-
- - {{is_mobile=request.user_agent().is_mobile}} - {{if response.menu:}} - @@ -90,63 +92,69 @@
{{=response.flash or ''}}
-
-
- -
- Share
- -
-

- {{=response.title or request.application}} - {{=response.subtitle or ''}} -

+
+
+ +
+ Share + +
+
+

+ {{=response.title or request.application}} + {{=response.subtitle or ''}} +

+
-
- {{if left_sidebar_enabled:}} -
- {{block left_sidebar}} -

Left Sidebar

-

- {{end}} +
+
+ {{if left_sidebar_enabled:}} +
+ {{block left_sidebar}} +

Left Sidebar

+

+ {{end}} +
+ {{pass}} + +
+ {{block center}} + {{include}} + {{end}} +
+ + {{if right_sidebar_enabled:}} +
+ {{block right_sidebar}} +

Right Sidebar

+

+ {{end}} +
+ {{pass}}
- {{pass}} - -
- {{block center}} - {{include}} - {{end}} -
- - {{if right_sidebar_enabled:}} -
- {{block right_sidebar}} -

Right Sidebar

-

- {{end}} -
- {{pass}} - -
+
-
-
- {{block footer}} -
-
{{=T('Copyright')}} © 2011
-
- Powered by - web2py +
+
+
+ {{block footer}} +
+
{{=T('Copyright')}} © 2011
+
+ Powered by + web2py +
+ {{end}}
- {{end}}