dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better and centered welcome layout, thanks Chris May

Browse Source
This commit is contained in:
Massimo DiPierro
2012-05-22 09:05:39 -05:00
parent 0ae599a94d
commit 7447071cc4
3 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
Version 2.00.0 (2012-05-21 16:49:59) dev
Version 2.00.0 (2012-05-22 09:05:35) dev

3
applications/welcome/static/css/web2py.css
View File

@@ -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 */

114
applications/welcome/views/layout.html
View File

@@ -74,15 +74,17 @@
</head>
<body>
<div class="topbar">
<div class="container-fluid">
<div class="span12">
<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ',''))}}</div>
{{is_mobile=request.user_agent().is_mobile}}
{{if response.menu:}}
<div id="menu">
{{=MENU(response.menu, _class='mobile-menu' if is_mobile else 'sf-menu',mobile=is_mobile)}}
<div class="container">
<div class="row">
<div class="span12">
<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ',''))}}</div>
{{is_mobile=request.user_agent().is_mobile}}
{{if response.menu:}}
<div id="menu">
{{=MENU(response.menu, _class='mobile-menu' if is_mobile else 'sf-menu',mobile=is_mobile)}}
</div>
{{pass}}
</div>
{{pass}}
</div>
</div>
</div><!-- topbar -->
@@ -90,63 +92,69 @@
<div class="flash">{{=response.flash or ''}}</div>
<div class="header">
<div class="container-fluid">
<div class="span12">
<!-- AddToAny BEGIN -->
<div style="float:right; padding-top: .25em;" class="a2a_kit a2a_default_style">
<a class="a2a_dd" href="http://www.addtoany.com/share_save">Share</a></div>
<script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
<div class="page-header">
<h1>
{{=response.title or request.application}}
<small>{{=response.subtitle or ''}}</small>
</h1>
<div class="container>
<div class="row">
<div class="span12">
<!-- AddToAny BEGIN -->
<div style="float:right; padding-top: .25em;" class="a2a_kit a2a_default_style">
<a class="a2a_dd" href="http://www.addtoany.com/share_save">Share</a>
<script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
</div> <!-- AddToAny END -->
<div class="page-header">
<h1>
{{=response.title or request.application}}
<small>{{=response.subtitle or ''}}</small>
</h1>
</div>
</div>
</div>
</div>
</div>
<div class="main">
<div class="container-fluid">
{{if left_sidebar_enabled:}}
<div class="span3 left-sidebar">
{{block left_sidebar}}
<h3>Left Sidebar</h3>
<p></p>
{{end}}
<div class="container">
<div class="row">
{{if left_sidebar_enabled:}}
<div class="span3 left-sidebar">
{{block left_sidebar}}
<h3>Left Sidebar</h3>
<p></p>
{{end}}
</div>
{{pass}}
<div class="{{=middle_columns}}">
{{block center}}
{{include}}
{{end}}
</div>
{{if right_sidebar_enabled:}}
<div class="span3">
{{block right_sidebar}}
<h3>Right Sidebar</h3>
<p></p>
{{end}}
</div>
{{pass}}
</div>
{{pass}}
<div class="{{=middle_columns}} center">
{{block center}}
{{include}}
{{end}}
</div>
{{if right_sidebar_enabled:}}
<div class="span3">
{{block right_sidebar}}
<h3>Right Sidebar</h3>
<p></p>
{{end}}
</div>
{{pass}}
</div><!-- container-fluid -->
</div><!-- container -->
</div><!-- main -->
<div class="footer">
<div class="container-fluid">
<div class="span12">
{{block footer}} <!-- this is default footer -->
<div class="footer-content">
<div class="copyright">{{=T('Copyright')}} &#169; 2011</div>
<div style="float: right;">
Powered by
<a href="http://www.web2py.com/">web2py</a>
<div class="container">
<div class="row">
<div class="span12">
{{block footer}} <!-- this is default footer -->
<div class="footer-content">
<div class="copyright">{{=T('Copyright')}} &#169; 2011</div>
<div id="poweredBy">
Powered by
<a href="http://www.web2py.com/">web2py</a>
</div>
</div>
{{end}}
</div>
{{end}}
</div>
</div><!-- container-fluid -->
</div><!-- footer -->