fixed whitespaces in welcome3

This commit is contained in:
mdipierro
2015-03-11 00:35:24 -05:00
parent ae48f471d0
commit 71aac68c20
6 changed files with 412 additions and 362 deletions
@@ -1,309 +1,361 @@
/*! /*!
* part of the package to convert web2py elements to bootstrap3 theme * part of the package to convert web2py elements to bootstrap3 theme
* Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com ) * Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com )
* Released under MIT license * Released under MIT license
* version 1 rev.201402261600 * version 1 rev.201402261600
* *
* Supported version of bootstrap framework: 3.0.2+ * Supported version of bootstrap framework: 3.0.2+
* The full package includes: * The full package includes:
* - bootstrap3.py python module * - bootstrap3.py python module
* - this css file * - this css file
* - web2py-bootstrap3.js * - web2py-bootstrap3.js
* - example of layout.html * - example of layout.html
* - rules overriding web2py.css
*/ */
div.flash.alert{
/*! background-image: none;
* rules overriding web2py.css border-radius: 4px;
* remove if web2py.css is not used -o-border-radius: 4px;
-moz-border-radius: 4px;
*/ -webkit-border-radius: 4px;
border-width: 1px;
div.flash.alert{ color: rgb(51, 51, 51);
background-image: none; font-weight: normal;
border-radius: 4px; margin: 0 0 20px 0;
-o-border-radius: 4px; min-width: 28px;
-moz-border-radius: 4px; opacity: 1;
-webkit-border-radius: 4px; padding: 15px 35px 15px 15px;
border-width: 1px; vertical-align: baseline;
color: rgb(51, 51, 51); right: auto;
font-weight: normal; }
margin: 0 0 20px 0; div.flash.alert:hover {
min-width: 28px; opacity: 1;
opacity: 1; }
padding: 15px 35px 15px 15px; .ie-lte8 div.flash {
vertical-align: baseline; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
right: auto; } }
div.flash.alert:hover { .ie-lte8 div.flash:hover {
opacity: 1; } filter:alpha(opacity=100);
.ie-lte8 div.flash { }
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } ul.navbar-nav li {
.ie-lte8 div.flash:hover { margin-bottom: 0;
filter:alpha(opacity=100); } }
ul.navbar-nav li { ul.list-group, .bs3-form ul , ul.nav-tabs, ul.nav-pills {
margin-bottom: 0; } margin-left: 0;
ul.list-group, .bs3-form ul , ul.nav-tabs, ul.nav-pills { }
margin-left: 0; } p.lead {
p.lead { text-align: inherit;
text-align: inherit; } }
.bs3-form label { .bs3-form label {
white-space: normal; } white-space: normal;
.bs3-form.form-inline [type="text"], [type="password"], select { }
margin-right: 0; } .bs3-form.form-inline [type="text"], [type="password"], select {
.bs3-form div.error { margin-right: 0;
display: none; }
width: auto; .bs3-form div.error {
background: transparent; display: none;
border: none; width: auto;
color: #a94442; background: transparent;
padding: 0; border: none;
background-image: none; } color: #a94442;
padding: 0;
background-image: none;
/*! }
* bootstrap3 adapters
* essential rules /*
* bootstrap3 adapters
*/ * essential rules
*/
/* flash messages */
div.flash.alert { /* flash messages */
display: none; div.flash.alert {
position: fixed; display: none;
top: 70px; position: fixed;
right: 75px; top: 70px;
cursor: pointer; right: 75px;
z-index: 1000; cursor: pointer;
background-color: #f9edbe; z-index: 1000;
border-color: #f0c36d; } background-color: #f9edbe;
div.flash.alert.centered { border-color: #f0c36d; }
right: auto; } div.flash.alert.centered {
div.flash.alert.leftside { right: auto; }
right: auto; div.flash.alert.leftside {
left: 75px; } right: auto;
div.flash.alert #closeflash { left: 75px; }
display: inline-block; div.flash.alert #closeflash {
position: relative; display: inline-block;
top: -2px; position: relative;
right: -21px; top: -2px;
color: inherit; right: -21px;
cursor: pointer; color: inherit;
opacity: 0.5; cursor: pointer;
float: right; opacity: 0.5;
font-size: 21px; float: right;
font-weight: bold; font-size: 21px;
line-height: 1; font-weight: bold;
text-shadow: 0 1px 0 #ffffff; line-height: 1;
margin: 0; text-shadow: 0 1px 0 #ffffff;
padding: 0; } margin: 0;
/* buttons */ padding: 0;
.bs3-form-btn { }
margin-top: 3px;
margin-bottom: 3px; } /* buttons */
/*image preview in update forms*/ .bs3-form-btn {
.w2p-uploaded-file .btn-group { margin-top: 3px;
vertical-align: top; margin-bottom: 3px;
margin-top: 0; } }
#file-reset-btn {
vertical-align: top; } /*image preview in update forms*/
.w2p-uploaded-file input[type="file"] { .w2p-uploaded-file .btn-group {
display:inline-block; vertical-align: top;
padding-top: 7px; } margin-top: 0;
.w2p-file-preview img { }
max-width: 150px; } #file-reset-btn {
.w2p-file-preview:hover img { vertical-align: top;
background-color: #ebebeb; }
border-color: #adadad; } .w2p-uploaded-file input[type="file"] {
.w2p-file-preview span { display:inline-block;
min-width: 150px; padding-top: 7px;
max-width: 150px; }
display: inline-block; .w2p-file-preview img {
line-height: 40px; max-width: 150px;
min-height: 40px; } }
#no-file { .w2p-file-preview:hover img {
display: inline-block; background-color: #ebebeb;
background-color: #eee; border-color: #adadad;
vertical-align: middle; }
text-align: center; .w2p-file-preview span {
border-radius: 4px; min-width: 150px;
min-width: 150px; max-width: 150px;
max-width: 150px; display: inline-block;
line-height: 43px; line-height: 40px;
min-height: 43px; } min-height: 40px;
/* form-inline */ }
.form-inline .form-group { #no-file {
margin-right: 4px; } display: inline-block;
/* list widget */ background-color: #eee;
.w2p_list li { vertical-align: middle;
margin-bottom: 6px; } text-align: center;
.w2p_list li input { border-radius: 4px;
display: inline-block; min-width: 150px;
width: 59%; max-width: 150px;
margin-right: 4px; } line-height: 43px;
/* autocomplete widget */ min-height: 43px;
div[id^=_autocomplete_] { }
margin-top: -10px; /* form-inline */
z-index: 1; } .form-inline .form-group {
select.autocomplete { margin-right: 4px;
display: block; }
padding: 6px 12px; /* list widget */
font-size: 14px; .w2p_list li {
line-height: 1.428571429; margin-bottom: 6px;
color: #555; }
vertical-align: middle; .w2p_list li input {
background-color: #fff; display: inline-block;
background-image: none; width: 59%;
border: 1px solid #ccc; margin-right: 4px;
border-color: #428bca; }
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); /* autocomplete widget */
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); div[id^=_autocomplete_] {
-webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; margin-top: -10px;
transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; } z-index: 1;
/* nav-tabs */ }
.nav-tabs { select.autocomplete {
margin-bottom: 15px; } display: block;
/* dropdown multilevels in menu*/ padding: 6px 12px;
/* fix issue when screen height is shorter than bs3 default */ font-size: 14px;
.navbar-collapse.short-screen { line-height: 1.428571429;
max-height: 200px !important; } color: #555;
.dropdown-submenu>a:after { vertical-align: middle;
display: block; background-color: #fff;
content: " "; background-image: none;
float: right; border: 1px solid #ccc;
width: 0; border-color: #428bca;
height: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
margin-top: 5px; box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
margin-right: -10px; -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
border-style: solid; transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
/* right-arrow */ }
border-color: transparent #cccccc;
border-width: 4px 0 4px 4px; } /* nav-tabs */
@media (min-width: 768px) { .nav-tabs {
/* animation */ margin-bottom: 15px;
.navbar-nav .dropdown-menu { }
top: -9999px;
display: block; /* dropdown multilevels in menu*/
opacity: 0; /* fix issue when screen height is shorter than bs3 default */
-webkit-transition: opacity .4s ease-in-out; } .navbar-collapse.short-screen {
.dropdown-submenu { max-height: 200px !important;
position: relative; } }
.dropdown-submenu>.dropdown-menu { .dropdown-submenu>a:after {
position: absolute; display: block;
top: 0; content: " ";
left: 100%; float: right;
margin-top: -6px; width: 0;
margin-left: -1px; height: 0;
border-radius: 0 4px 4px 4px; margin-top: 5px;
/* animation */ margin-right: -10px;
left: -9999px; border-style: solid;
opacity: 0; /* right-arrow */
display: block; border-color: transparent #cccccc;
-webkit-transition: opacity .4s ease-in-out; } border-width: 4px 0 4px 4px;
.navbar ul.nav li[data-w2pmenulevel="l0"]:hover >ul.dropdown-menu { }
display: block;
/* animation */ @media (min-width: 768px) {
top: 100%; /* animation */
opacity: 1; } .navbar-nav .dropdown-menu {
.dropdown-submenu:hover>.dropdown-menu { top: -9999px;
display: block; display: block;
/* animation */ opacity: 0;
left: 100%; -webkit-transition: opacity .4s ease-in-out; }
opacity: 1; } .dropdown-submenu {
.dropdown-submenu:hover>a, position: relative; }
.dropdown-submenu:focus>a { .dropdown-submenu>.dropdown-menu {
color: #fff; position: absolute;
text-decoration: none; top: 0;
background-color: #357ebd; } left: 100%;
.navbar-inverse .navbar-nav>li>a:hover, margin-top: -6px;
.navbar-inverse .navbar-nav>li>a:focus, margin-left: -1px;
.navbar-inverse .navbar-nav>li:hover>a { border-radius: 0 4px 4px 4px;
color: #fff; /* animation */
background-color: black; } left: -9999px;
.dropdown-submenu>a:hover:after, opacity: 0;
.dropdown-submenu:hover>a:after { display: block;
/* left-arrow */ -webkit-transition: opacity .4s ease-in-out; }
border-color: transparent #fff; .navbar ul.nav li[data-w2pmenulevel="l0"]:hover >ul.dropdown-menu {
border-width: 4px 4px 4px 0; } display: block;
} /* animation */
@media (max-width: 767px){ top: 100%;
.dropdown-menu { opacity: 1; }
width: 100%; .dropdown-submenu:hover>.dropdown-menu {
display: none; } display: block;
.dropdown-submenu>.dropdown-menu { /* animation */
position: static; left: 100%;
float: none; opacity: 1; }
display: none; .dropdown-submenu:hover>a,
border: none; .dropdown-submenu:focus>a {
margin: 0; color: #fff;
padding: 0; text-decoration: none;
box-shadow: none; background-color: #357ebd; }
text-indent: 8px; } .navbar-inverse .navbar-nav>li>a:hover,
.dropdown-submenu>.dropdown-menu.open { .navbar-inverse .navbar-nav>li>a:focus,
display: block; .navbar-inverse .navbar-nav>li:hover>a {
height: 100%; } color: #fff;
.dropdown-submenu>a:after { background-color: black; }
/* down-arrow */ .dropdown-submenu>a:hover:after,
border-color: #cccccc transparent; .dropdown-submenu:hover>a:after {
border-width: 4px 4px 0px 4px; } /* left-arrow */
.dropdown-submenu>a:hover:after { border-color: transparent #fff;
border-color: #ffffff transparent; } border-width: 4px 4px 4px 0; }
.dropdown-submenu>a.active { }
font-weight: 700; } @media (max-width: 767px){
.dropdown-submenu>a.active:after { .dropdown-menu {
/* up-arrow */ width: 100%;
border-color: #ffffff transparent; display: none; }
border-width: 0px 4px 4px 4px; } .dropdown-submenu>.dropdown-menu {
} position: static;
float: none;
display: none;
/*! border: none;
* application customization margin: 0;
* add custom rules padding: 0;
box-shadow: none;
*/ text-indent: 8px; }
.dropdown-submenu>.dropdown-menu.open {
display: block;
body { height: 100%; }
padding-top: 70px; } .dropdown-submenu>a:after {
/* web2py logo */ /* down-arrow */
#web2py-logo { border-color: #cccccc transparent;
color: #c6cecc; } border-width: 4px 4px 0px 4px; }
#web2py-logo b { .dropdown-submenu>a:hover:after {
display: inline-block; border-color: #ffffff transparent; }
margin-top: -1px; } .dropdown-submenu>a.active {
#web2py-logo b>span { font-weight: 700; }
font-size: 22px; .dropdown-submenu>a.active:after {
color: white; } /* up-arrow */
#web2py-logo:hover { border-color: #ffffff transparent;
color: white; } border-width: 0px 4px 4px 4px; }
/*footer*/ }
#footer>div.row {
padding-top: 9px; /*
margin: 20px 0 40px 0; * application customization
border-top: 1px solid #eee; } * add custom rules
#footer p { */
margin-left: -15px;
margin-right: -15px; } body {
.dropdown .highlighted { padding-top: 70px;
color: #428bca; }
} /* web2py logo */
#web2py-logo {
ul.w2p_list { margin-left: 0px; } color: #c6cecc;
input.date,input.time,input.datetime,input.double,input.integer { width: 33.333%; } }
.container-full {margin: 0 auto; width: 100%;} #web2py-logo b {
.background { background: url(../images/background.jpg) no-repeat center center; } display: inline-block;
body {padding-top: 50px} margin-top: -1px;
header { }
-webkit-box-shadow: 0px 0px 8px 2px #000000; #web2py-logo b>span {
-moz-box-shadow: 0px 0px 8px 2px #000000; font-size: 22px;
box-shadow: 0px 0px 8px 2px #000000; color: white;
} }
#web2py-logo:hover {
main {padding-bottom: 50px;} color: white;
.nav a, .btn, .btn-default {text-shadow: none; font-weight: bold;} }
footer {padding:50px; background: #333; color: #aaa;} /*footer*/
#w2padmin-btn {margin:30px 0 30px 0;} #footer>div.row {
.flash {opacity: 0.9 !important; right: 100px; } padding-top: 9px;
.dropdown { z-index: 2000; } margin: 20px 0 40px 0;
border-top: 1px solid #eee;
}
#footer p {
margin-left: -15px;
margin-right: -15px;
}
.dropdown .highlighted {
color: #428bca;
}
ul.w2p_list {
margin-left: 0px;
}
input.date,input.time,input.datetime,input.double,input.integer {
width: 33.333%;
}
.container-full {
margin: 0 auto; width: 100%;
}
.background {
background: url(../images/background.jpg) no-repeat center center;
}
body {
padding-top: 50px
}
header {
-webkit-box-shadow: 0px 0px 8px 2px #000000;
-moz-box-shadow: 0px 0px 8px 2px #000000;
box-shadow: 0px 0px 8px 2px #000000;
}
main {
padding-bottom: 50px;
}
footer {
padding:50px; background: #333; color: #aaa;
}
header h1 {
color: white !important; text-shadow: 0 0 7px black;
}
.nav a, .btn, .btn-default {
text-shadow: none; font-weight: bold;
}
.flash {
opacity: 0.9 !important; right: 100px;
}
.dropdown {
z-index: 2000;
}
#w2padmin-btn {
margin:30px 0 30px 0;
}
+1 -1
View File
@@ -63,7 +63,7 @@ audio {width:200px}
border-top:1px #DEDEDE solid; border-top:1px #DEDEDE solid;
} }
.header { .header {
/* background:<fill here for header image>; */ /* background:<fill here for header image>; */
} }
@@ -3,7 +3,7 @@
* Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com ) * Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com )
* Released under MIT license * Released under MIT license
* version 1 rev.201402261600 * version 1 rev.201402261600
* *
* Supported version of bootstrap framework: 3.0.2+ * Supported version of bootstrap framework: 3.0.2+
* The full package includes: * The full package includes:
@@ -19,7 +19,7 @@ jQuery(function(){
var fh_label_class = 'col-md-4', var fh_label_class = 'col-md-4',
fh_offest_class = 'col-md-offset-4', fh_offest_class = 'col-md-offset-4',
fh_control_class = 'col-md-8'; fh_control_class = 'col-md-8';
// functions // functions
function menu_is_collapsed() { function menu_is_collapsed() {
return !jQuery('.navbar-toggle').is(':hidden'); return !jQuery('.navbar-toggle').is(':hidden');
@@ -41,7 +41,7 @@ jQuery(function(){
if (settings.parent) if (settings.parent)
parent = this.parent(); parent = this.parent();
else else
parent = window; parent = window;
if (settings.mode != "horizontally") { if (settings.mode != "horizontally") {
this.css("top", Math.max this.css("top", Math.max
(0, ((jQuery(parent).height() - jQuery(this).outerHeight()) / 2) + jQuery(parent).scrollTop()) + "px"); (0, ((jQuery(parent).height() - jQuery(this).outerHeight()) / 2) + jQuery(parent).scrollTop()) + "px");
@@ -52,10 +52,10 @@ jQuery(function(){
} }
return this; return this;
}; };
// alert centering // alert centering
jQuery('.flash.alert.centered').center({'mode': "horizontally"}); jQuery('.flash.alert.centered').center({'mode': "horizontally"});
// navs // navs
jQuery(".nav ul.dropdown-menu").not("#w2p-auth-bar").each(function() { jQuery(".nav ul.dropdown-menu").not("#w2p-auth-bar").each(function() {
var toggle = jQuery(this).parent(); var toggle = jQuery(this).parent();
@@ -73,10 +73,10 @@ jQuery(function(){
jQuery('.navbar-nav a.dropdown-toggle').click(function(e) { jQuery('.navbar-nav a.dropdown-toggle').click(function(e) {
if (menu_is_collapsed()) if (menu_is_collapsed())
e.preventDefault(); e.preventDefault();
else else
window.location=jQuery(this).attr('href'); window.location=jQuery(this).attr('href');
}); });
jQuery(".dropdown-submenu>a").click(function(event) { jQuery(".dropdown-submenu>a").click(function(event) {
if (menu_is_collapsed()) { if (menu_is_collapsed()) {
event.preventDefault(); event.preventDefault();
@@ -99,7 +99,7 @@ jQuery(function(){
window.location=jQuery(this).attr('href'); window.location=jQuery(this).attr('href');
}; };
}); });
jQuery(".nav-tabs .web2py-menu-active").addClass('active'); jQuery(".nav-tabs .web2py-menu-active").addClass('active');
jQuery(".nav-tabs a").not(".dropdown-toggle").attr("data-toggle", "tab"); jQuery(".nav-tabs a").not(".dropdown-toggle").attr("data-toggle", "tab");
// button fixes // button fixes
@@ -118,9 +118,9 @@ jQuery(function(){
cn.removeClass('short-screen'); cn.removeClass('short-screen');
} }
}; };
adjust_maxheight_of_collapsed_nav(); adjust_maxheight_of_collapsed_nav();
// resize and orientation change events // resize and orientation change events
jQuery(window).on('orientationchange resize', function(event) { jQuery(window).on('orientationchange resize', function(event) {
adjust_maxheight_of_collapsed_nav(); adjust_maxheight_of_collapsed_nav();
+39 -40
View File
@@ -1,40 +1,39 @@
{{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}} {{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
{{extend 'layout.html'}} {{extend 'layout.html'}}
{{if 'message' in globals():}} {{if 'message' in globals():}}
<h2>{{=message}}</h2> <h2>{{=message}}</h2>
<p class="lead">{{=T('How did you get here?')}}</p> <p class="lead">{{=T('How did you get here?')}}</p>
<ol> <ol>
<li>{{=T('You are successfully running web2py')}}</li> <li>{{=T('You are successfully running web2py')}}</li>
<li>{{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}</li> <li>{{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}</li>
<li>{{=XML(T('Which called the function %s located in the file %s', <li>{{=XML(T('Which called the function %s located in the file %s',
(A(request.function+'()',_href='#'), (A(request.function+'()',_href='#'),
A('web2py/applications/%(application)s/controllers/%(controller)s.py' % request, A('web2py/applications/%(application)s/controllers/%(controller)s.py' % request,
_href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}</li> _href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}</li>
<li>{{=XML(T('The output of the file is a dictionary that was rendered by the view %s', <li>{{=XML(T('The output of the file is a dictionary that was rendered by the view %s',
A('web2py/applications/%(application)s/views/%(controller)s/index.html' % request, A('web2py/applications/%(application)s/views/%(controller)s/index.html' % request,
_href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}</li> _href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}</li>
<li>{{=T('You can modify this application and adapt it to your needs')}}</li> <li>{{=T('You can modify this application and adapt it to your needs')}}</li>
</ol> </ol>
{{elif 'content' in globals():}} {{elif 'content' in globals():}}
{{=content}} {{=content}}
{{else:}} {{else:}}
{{=BEAUTIFY(response._vars)}} {{=BEAUTIFY(response._vars)}}
{{pass}} {{pass}}
{{block right_sidebar}} {{block right_sidebar}}
<a id="w2padmin-btn" class="btn btn-primary btn-lg btn-block" <a id="w2padmin-btn" class="btn btn-primary btn-lg btn-block"
href="{{=URL('admin','default','index')}}"> href="{{=URL('admin','default','index')}}">
<i class="glyphicon glyphicon-cog"></i> <i class="glyphicon glyphicon-cog"></i>
{{=T("admin")}} {{=T("admin")}}
</a> </a>
<div class="panel panel-info"> <div class="panel panel-info">
<div class="panel-heading">{{=T("Don't know what to do?")}}</div> <div class="panel-heading">{{=T("Don't know what to do?")}}</div>
<ul class="list-group"> <ul class="list-group">
<li class="list-group-item">{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li> <li class="list-group-item">{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
<li class="list-group-item"><a href="http://web2py.com">web2py.com</a></li> <li class="list-group-item"><a href="http://web2py.com">web2py.com</a></li>
<li class="list-group-item"><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li> <li class="list-group-item"><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
</ul> </ul>
</div> </div>
{{end}} {{end}}
@@ -33,4 +33,3 @@
{{pass}} {{pass}}
</script> </script>
{{end page_js}} {{end page_js}}
+1 -1
View File
@@ -115,7 +115,7 @@
</div> </div>
</main> </main>
<!-- Footer ======================================= --> <!-- Footer ======================================= -->
<footer class="container-full"> <footer class="container-full">
<div class="row"> <div class="row">
{{block footer}} {{block footer}}