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
VERSION
+1 -1
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
applications/welcome/static/css/web2py.css
+2 -1
View File
@@ -127,7 +127,7 @@ div.error {
} }
.topbar { .topbar {
padding: 10px 10px; padding: 10px 0;
width:100%; width:100%;
color: #959595; color: #959595;
vertical-align: middle; vertical-align: middle;
@@ -171,6 +171,7 @@ div.error {
.breadcrumbs { float: left; } .breadcrumbs { float: left; }
.copyright {float: left;} .copyright {float: left;}
#poweredBy {float: right;}
/* #MEDIA QUERIES SECTION */ /* #MEDIA QUERIES SECTION */
applications/welcome/views/layout.html
+61 -53
View File
@@ -74,15 +74,17 @@
</head> </head>
<body> <body>
<div class="topbar"> <div class="topbar">
<div class="container-fluid"> <div class="container">
<div class="span12"> <div class="row">
<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ',''))}}</div> <div class="span12">
{{is_mobile=request.user_agent().is_mobile}} <div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ',''))}}</div>
{{if response.menu:}} {{is_mobile=request.user_agent().is_mobile}}
<div id="menu"> {{if response.menu:}}
{{=MENU(response.menu, _class='mobile-menu' if is_mobile else 'sf-menu',mobile=is_mobile)}} <div id="menu">
{{=MENU(response.menu, _class='mobile-menu' if is_mobile else 'sf-menu',mobile=is_mobile)}}
</div>
{{pass}}
</div> </div>
{{pass}}
</div> </div>
</div> </div>
</div><!-- topbar --> </div><!-- topbar -->
@@ -90,63 +92,69 @@
<div class="flash">{{=response.flash or ''}}</div> <div class="flash">{{=response.flash or ''}}</div>
<div class="header"> <div class="header">
<div class="container-fluid"> <div class="container>
<div class="span12"> <div class="row">
<!-- AddToAny BEGIN --> <div class="span12">
<div style="float:right; padding-top: .25em;" class="a2a_kit a2a_default_style"> <!-- AddToAny BEGIN -->
<a class="a2a_dd" href="http://www.addtoany.com/share_save">Share</a></div> <div style="float:right; padding-top: .25em;" class="a2a_kit a2a_default_style">
<script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script> <a class="a2a_dd" href="http://www.addtoany.com/share_save">Share</a>
<div class="page-header"> <script type="text/javascript" src="http://static.addtoany.com/menu/page.js"></script>
<h1> </div> <!-- AddToAny END -->
{{=response.title or request.application}} <div class="page-header">
<small>{{=response.subtitle or ''}}</small> <h1>
</h1> {{=response.title or request.application}}
<small>{{=response.subtitle or ''}}</small>
</h1>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="main"> <div class="main">
<div class="container-fluid"> <div class="container">
{{if left_sidebar_enabled:}} <div class="row">
<div class="span3 left-sidebar"> {{if left_sidebar_enabled:}}
{{block left_sidebar}} <div class="span3 left-sidebar">
<h3>Left Sidebar</h3> {{block left_sidebar}}
<p></p> <h3>Left Sidebar</h3>
{{end}} <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> </div>
{{pass}} </div><!-- container -->
<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><!-- main --> </div><!-- main -->
<div class="footer"> <div class="footer">
<div class="container-fluid"> <div class="container">
<div class="span12"> <div class="row">
{{block footer}} <!-- this is default footer --> <div class="span12">
<div class="footer-content"> {{block footer}} <!-- this is default footer -->
<div class="copyright">{{=T('Copyright')}} &#169; 2011</div> <div class="footer-content">
<div style="float: right;"> <div class="copyright">{{=T('Copyright')}} &#169; 2011</div>
Powered by <div id="poweredBy">
<a href="http://www.web2py.com/">web2py</a> Powered by
<a href="http://www.web2py.com/">web2py</a>
</div>
</div> </div>
{{end}}
</div> </div>
{{end}}
</div> </div>
</div><!-- container-fluid --> </div><!-- container-fluid -->
</div><!-- footer --> </div><!-- footer -->