diff --git a/VERSION b/VERSION index a63466b2..c235bb71 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-31 13:46:15) dev +Version 2.00.0 (2012-07-31 15:06:22) dev diff --git a/applications/admin/static/css/web2py.css b/applications/admin/static/css/web2py.css index cab92321..5b645cc4 100644 --- a/applications/admin/static/css/web2py.css +++ b/applications/admin/static/css/web2py.css @@ -1,190 +1,181 @@ /** these MUST stay **/ -body { margin: 0; padding:0; border: 0; } -a { text-decoration:none; white-space: nowrap;} -a:hover {text-decoration: underline} -a.button {text-decoration: none} -h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica;} - h1 { font-size: 4.00em;} - h2 { font-size: 3.00em;} - h3 { font-size: 2.00em;} - h4 { font-size: 1.50em;} - h5 { font-size: 1.25em;} - h6 { font-size: 1.12em;} -right { float:right; text-align: right; } -left { float:left; text-align: left; } -center { width:100; text-align: center; vertical-align:middle;} -th, label { font-weight: bold; white-space: nowrap; } -td, th { text-align: left; padding: 2px 5px 2px 5px; } -th { vertical-align: middle; border-right: 1px solid white;} -td { vertical-align: top; } -form table tr td label { text-align: left; } -p, table, ol, ul { padding: 0.5em 0 0.5em 0 } -p {text-align: justify } -ol, ul { padding-left: 30px } -li { margin-bottom: 0.5em; } -span, input, select, textarea, button, label, a { display: inline } -img { border: 0; } -blockquote, blockquote p, p blockquote { font-style: italic; margin: 0.5em 30px 0.5em 30px; font-size: 0.9em} -i, em { font-style: italic; } -strong { font-weight: bold; } -small { font-size: 0.8em; } -textarea { width: 100%; } -code { font-family: Courier;} -video { width:400px; } -audio { width:200px; } -input[type=text], input[type=password], select { width: 300px; margin-right: 5px } -ul { list-style-type: none; margin: 0px; padding: 0px; } +a {text-decoration:none; white-space:nowrap} +a:hover {text-decoration:underline} +a.button {text-decoration:none} +h1,h2,h3,h4,h5,h6 {margin:0.5em 0 0.25em 0; display:block; + font-family:Helvetica} +h1 {font-size:4.00em} +h2 {font-size:3.00em} +h3 {font-size:2.00em} +h4 {font-size:1.50em} +h5 {font-size:1.25em} +h6 {font-size:1.12em} +th,label {font-weight:bold; white-space:nowrap} +td,th {text-align:left; padding:2px 5px 2px 5px} +th {vertical-align:middle; border-right:1px solid white} +td {vertical-align:top} +form table tr td label {text-align:left} +p,table,ol,ul {padding:0; margin: 0.5em 0} +p {text-align:justify} +ol, ul {list-style-position:inside} +li {margin-bottom:0.5em} +span,input,select,textarea,button,label,a {display:inline} +img {border:0} +blockquote,blockquote p,p blockquote { + font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em} +i,em {font-style:italic} +strong {font-weight:bold} +small {font-size:0.8em} +code {font-family:Courier} +textarea {width:100%} +video {width:400px} +audio {width:200px} +input[type=text],input[type=password],select{width:300px; margin-right:5px} .hidden {display:none;visibility:visible} +.right {float:right; text-align:right} +.left {float:left; text-align:left} +.center {width:100; text-align:center; vertical-align:middle} /** end **/ /* Sticky footer begin */ -html, body { - height: 100%; -} + .wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -8em; /* set last value to footer height plus footer vertical padding */ + min-height:100%; + height:auto !important; + height:100%; + margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */ } .main { - padding: 20px 0 50px 0; + padding:20px 0 50px 0; } -.footer, .push { - height: 6em; - padding: 1em 0; - clear: both; +.footer,.push { + height:6em; + padding:1em 0; + clear:both; } -.footer-content {position: relative; bottom: -4em; width: 100%;} +.footer-content {position:relative; bottom:-4em; width:100%} .auth_navbar { - white-space: nowrap; + white-space:nowrap; } /* Sticky footer end */ .footer { - border-top: 1px #DEDEDE solid; + border-top:1px #DEDEDE solid; } .header { - // background: ; + // background:; } -fieldset { padding: 16px; border-top: 1px #DEDEDE solid;} -fieldset legend {text-transform:uppercase; font-weight: bold; padding: 4px 16px 4px 16px; background: #f1f1f1;} +fieldset {padding:16px; border-top:1px #DEDEDE solid} +fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1} /* fix ie problem with menu */ -.ie-lte7 .topbar .container {z-index: 2; } +.ie-lte7 .topbar .container {z-index:2} -td.w2p_fw {padding-bottom: 1px;} -td.w2p_fl, td.w2p_fw, td.w2p_fc { vertical-align:top; } -td.w2p_fl { text-align:right; } -td.w2p_fl, td.w2p_fw {padding-right: 7px;} -td.w2p_fl, td.w2p_fc { padding-top: 4px; } +td.w2p_fw {padding-bottom:1px} +td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top} +td.w2p_fl {text-align:right} +td.w2p_fl, td.w2p_fw {padding-right:7px} +td.w2p_fl,td.w2p_fc {padding-top:4px} -/* tr#submit_record__row {border-top: 1px solid #E5E5E5;} */ -#submit_record__row td {padding-top: .5em;} +/* tr#submit_record__row {border-top:1px solid #E5E5E5} */ +#submit_record__row td {padding-top:.5em} /* Fix */ -#auth_user_remember__row label {display: inline;} -#web2py_user_form td { vertical-align:top; } +#auth_user_remember__row label {display:inline} +#web2py_user_form td {vertical-align:top} /*********** web2py specific ***********/ div.flash { - font-weight: bold; - display: none; - position: fixed; - padding: 10px; - top: 48px; - right: 50px; - min-width: 280px; - opacity: 0.85; - margin: 0px 0px 10px 10px; - color: #fff; - vertical-align: middle; - cursor: pointer; - background: #000; - border: 2px solid #fff; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - z-index: 2; + font-weight:bold; + display:none; + position:fixed; + padding:10px; + top:48px; + right:50px; + min-width:280px; + opacity:0.85; + margin:0px 0px 10px 10px; + color:#fff; + vertical-align:middle; + cursor:pointer; + background:#000; + border:2px solid #fff; + border-radius:5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + z-index:2000; } -div.flash {z-index:2000;} -div.error_wrapper { display: block; } +div.error_wrapper {display:block} div.error { - background-color: red; - color: white; - padding: 3px; - display: inline-block; + background-color:red; + color:white; + padding:3px; + display:inline-block; } .topbar { - padding: 10px 0; + padding:10px 0; width:100%; - color: #959595; - vertical-align: middle; - padding: auto; - background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + color:#959595; + vertical-align:middle; + padding:auto; + background-image:-khtml-gradient(linear,left top,left bottom,from(#333333),to(#222222)); + background-image:-moz-linear-gradient(top,#333333,#222222); + background-image:-ms-linear-gradient(top,#333333,#222222); + background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#333333),color-stop(100%,#222222)); + background-image:-webkit-linear-gradient(top,#333333,#222222); + background-image:-o-linear-gradient(top,#333333,#222222); + background-image:linear-gradient(top,#333333,#222222); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0); + -webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); + -moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); + box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); } .topbar a { - color: #e1e1e1; + color:#e1e1e1; } -#navbar {float: right; padding: 5px; /* same as superfish */} - -.right { - width:100%; - text-align: right; - float: right; -} +#navbar {float:right; padding:5px; /* same as superfish */} .statusbar { - background-color: #F5F5F5; - margin-top: 1em; - margin-bottom: 1em; - padding: .5em 1em; - border: 1px solid #ddd; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; + background-color:#F5F5F5; + margin-top:1em; + margin-bottom:1em; + padding:.5em 1em; + border:1px solid #ddd; + border-radius:5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; } -.breadcrumbs { float: left; } +.breadcrumbs {float:left} -.copyright {float: left;} -#poweredBy {float: right;} +.copyright {float:left} +#poweredBy {float:right} /* #MEDIA QUERIES SECTION */ /* All Mobile Sizes (devices and browser) */ - @media only screen and (max-width: 767px) { + @media only screen and (max-width:767px) { /* removed because of bootswatch - .topbar {text-align: center;} - #navbar, #menu {float: none;} - #navbar {font-size: 1.2em; padding: .6em 0 1.2em;} - #menu {padding: 0 0 1.5em;} - #menu select {font-size: 1.2em; margin: 0; padding: 0;} + .topbar {text-align:center} + #navbar,#menu {float:none} + #navbar {font-size:1.2em; padding:.6em 0 1.2em} + #menu {padding:0 0 1.5em} + #menu select {font-size:1.2em; margin:0; padding:0} - div.flash {top: 110px; right: 10px;} + div.flash {top:110px; right:10px} */ - } + } /* *Grid @@ -193,43 +184,47 @@ div.error { * will look better with the declarations below * if needed to remove base.css consider keeping these following lines in some css file. */ -// .web2py_table { border: 1px solid #ccc; } -.web2py_paginator { } -.web2py_grid {width: 100% } -.web2py_grid table { width: 100% } +// .web2py_table {border:1px solid #ccc} +.web2py_paginator {} +.web2py_grid {width:100%} +.web2py_grid table {width:100%} .web2py_grid tbody td { - padding: 2px 5px 2px 5px; - vertical-align: middle; + padding:2px 5px 2px 5px; + vertical-align:middle; } -.web2py_grid thead th, .web2py_grid tfoot td { +.web2py_grid thead th,.web2py_grid tfoot td { background-color:#EAEAEA; - padding: 10px 5px 10px 5px; + padding:10px 5px 10px 5px; } -.web2py_grid tr.odd {background-color: #F9F9F9;} -.web2py_grid tr:hover {background-color: #F5F5F5; } +.web2py_grid tr.odd {background-color:#F9F9F9} +.web2py_grid tr:hover {background-color:#F5F5F5} /* .web2py_breadcrumbs a { - line-height: 20px; margin-right: 5px; display: inline-block; - padding: 3px 5px 3px 5px; - font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; - color: #3C3C3D; - text-shadow: 1px 1px 0 #FFFFFF; - white-space: nowrap; overflow: visible; cursor: pointer; + line-height:20px; margin-right:5px; display:inline-block; + padding:3px 5px 3px 5px; + font-family:'lucida grande',tahoma,verdana,arial,sans-serif; + color:#3C3C3D; + text-shadow:1px 1px 0 #FFFFFF; + white-space:nowrap; overflow:visible; cursor:pointer; background:#ECECEC; - border: 1px solid #CACACA; - -webkit-border-radius: 2px; -moz-border-radius: 2px; - -webkit-background-clip: padding-box; border-radius: 2px; - outline: none; position: relative; zoom: 1; *display: inline; + border:1px solid #CACACA; + -webkit-border-radius:2px; -moz-border-radius:2px; + -webkit-background-clip:padding-box; border-radius:2px; + outline:none; position:relative; zoom:1; *display:inline; } */ .web2py_console form { width:100%; + display:inline; } +.web2py_console form select { + margin:0; +} .web2py_search_actions{ float:left; @@ -238,14 +233,14 @@ div.error { .web2py_grid .row_buttons { min-height:25px; - vertical-align: middle; + vertical-align:middle; } .web2py_grid .row_buttons a { - margin: 3px; + margin:3px; } .web2py_search_actions { - width: 100%; + width:100%; } .web2py_grid .row_buttons a, @@ -254,13 +249,13 @@ div.error { .web2py_console input[type=submit], .web2py_console input[type=button], .web2py_console button { - line-height: 20px; - margin-right: 5px; display: inline-block; - padding: 3px 5px 3px 5px; + line-height:20px; + margin-right:5px; display:inline-block; + padding:3px 5px 3px 5px; } .web2py_counter { - margin-top: 5px; + margin-top:5px; margin-right:5px; width:35%; float:right; @@ -268,37 +263,37 @@ div.error { } /*Fix firefox problem*/ -.web2py_table {clear: both; display: block;} +.web2py_table {clear:both; display:block} .web2py_paginator { - padding: 5px; + padding:5px; text-align:right; - background-color: #f2f2f2; + background-color:#f2f2f2; } .web2py_paginator ul { - list-style-type: none; - margin: 0px; - padding: 0px; + list-style-type:none; + margin:0px; + padding:0px; } .web2py_paginator ul li { - display: inline; + display:inline; } .web2py_paginator .current { - font-weight: bold; + font-weight:bold; } #w2p_query_panel {} .web2py_breadcrumbs ul { - list-style: none; - margin-bottom: 18px; + list-style:none; + margin-bottom:18px; } .web2py_breadcrumbs ul li { - display: inline-block; + display:inline-block; } -.ie9 #query_panel {padding-bottom:2px;} +.ie9 #query_panel {padding-bottom:2px} diff --git a/applications/examples/static/css/web2py.css b/applications/examples/static/css/web2py.css index cab92321..5b645cc4 100644 --- a/applications/examples/static/css/web2py.css +++ b/applications/examples/static/css/web2py.css @@ -1,190 +1,181 @@ /** these MUST stay **/ -body { margin: 0; padding:0; border: 0; } -a { text-decoration:none; white-space: nowrap;} -a:hover {text-decoration: underline} -a.button {text-decoration: none} -h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica;} - h1 { font-size: 4.00em;} - h2 { font-size: 3.00em;} - h3 { font-size: 2.00em;} - h4 { font-size: 1.50em;} - h5 { font-size: 1.25em;} - h6 { font-size: 1.12em;} -right { float:right; text-align: right; } -left { float:left; text-align: left; } -center { width:100; text-align: center; vertical-align:middle;} -th, label { font-weight: bold; white-space: nowrap; } -td, th { text-align: left; padding: 2px 5px 2px 5px; } -th { vertical-align: middle; border-right: 1px solid white;} -td { vertical-align: top; } -form table tr td label { text-align: left; } -p, table, ol, ul { padding: 0.5em 0 0.5em 0 } -p {text-align: justify } -ol, ul { padding-left: 30px } -li { margin-bottom: 0.5em; } -span, input, select, textarea, button, label, a { display: inline } -img { border: 0; } -blockquote, blockquote p, p blockquote { font-style: italic; margin: 0.5em 30px 0.5em 30px; font-size: 0.9em} -i, em { font-style: italic; } -strong { font-weight: bold; } -small { font-size: 0.8em; } -textarea { width: 100%; } -code { font-family: Courier;} -video { width:400px; } -audio { width:200px; } -input[type=text], input[type=password], select { width: 300px; margin-right: 5px } -ul { list-style-type: none; margin: 0px; padding: 0px; } +a {text-decoration:none; white-space:nowrap} +a:hover {text-decoration:underline} +a.button {text-decoration:none} +h1,h2,h3,h4,h5,h6 {margin:0.5em 0 0.25em 0; display:block; + font-family:Helvetica} +h1 {font-size:4.00em} +h2 {font-size:3.00em} +h3 {font-size:2.00em} +h4 {font-size:1.50em} +h5 {font-size:1.25em} +h6 {font-size:1.12em} +th,label {font-weight:bold; white-space:nowrap} +td,th {text-align:left; padding:2px 5px 2px 5px} +th {vertical-align:middle; border-right:1px solid white} +td {vertical-align:top} +form table tr td label {text-align:left} +p,table,ol,ul {padding:0; margin: 0.5em 0} +p {text-align:justify} +ol, ul {list-style-position:inside} +li {margin-bottom:0.5em} +span,input,select,textarea,button,label,a {display:inline} +img {border:0} +blockquote,blockquote p,p blockquote { + font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em} +i,em {font-style:italic} +strong {font-weight:bold} +small {font-size:0.8em} +code {font-family:Courier} +textarea {width:100%} +video {width:400px} +audio {width:200px} +input[type=text],input[type=password],select{width:300px; margin-right:5px} .hidden {display:none;visibility:visible} +.right {float:right; text-align:right} +.left {float:left; text-align:left} +.center {width:100; text-align:center; vertical-align:middle} /** end **/ /* Sticky footer begin */ -html, body { - height: 100%; -} + .wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -8em; /* set last value to footer height plus footer vertical padding */ + min-height:100%; + height:auto !important; + height:100%; + margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */ } .main { - padding: 20px 0 50px 0; + padding:20px 0 50px 0; } -.footer, .push { - height: 6em; - padding: 1em 0; - clear: both; +.footer,.push { + height:6em; + padding:1em 0; + clear:both; } -.footer-content {position: relative; bottom: -4em; width: 100%;} +.footer-content {position:relative; bottom:-4em; width:100%} .auth_navbar { - white-space: nowrap; + white-space:nowrap; } /* Sticky footer end */ .footer { - border-top: 1px #DEDEDE solid; + border-top:1px #DEDEDE solid; } .header { - // background: ; + // background:; } -fieldset { padding: 16px; border-top: 1px #DEDEDE solid;} -fieldset legend {text-transform:uppercase; font-weight: bold; padding: 4px 16px 4px 16px; background: #f1f1f1;} +fieldset {padding:16px; border-top:1px #DEDEDE solid} +fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1} /* fix ie problem with menu */ -.ie-lte7 .topbar .container {z-index: 2; } +.ie-lte7 .topbar .container {z-index:2} -td.w2p_fw {padding-bottom: 1px;} -td.w2p_fl, td.w2p_fw, td.w2p_fc { vertical-align:top; } -td.w2p_fl { text-align:right; } -td.w2p_fl, td.w2p_fw {padding-right: 7px;} -td.w2p_fl, td.w2p_fc { padding-top: 4px; } +td.w2p_fw {padding-bottom:1px} +td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top} +td.w2p_fl {text-align:right} +td.w2p_fl, td.w2p_fw {padding-right:7px} +td.w2p_fl,td.w2p_fc {padding-top:4px} -/* tr#submit_record__row {border-top: 1px solid #E5E5E5;} */ -#submit_record__row td {padding-top: .5em;} +/* tr#submit_record__row {border-top:1px solid #E5E5E5} */ +#submit_record__row td {padding-top:.5em} /* Fix */ -#auth_user_remember__row label {display: inline;} -#web2py_user_form td { vertical-align:top; } +#auth_user_remember__row label {display:inline} +#web2py_user_form td {vertical-align:top} /*********** web2py specific ***********/ div.flash { - font-weight: bold; - display: none; - position: fixed; - padding: 10px; - top: 48px; - right: 50px; - min-width: 280px; - opacity: 0.85; - margin: 0px 0px 10px 10px; - color: #fff; - vertical-align: middle; - cursor: pointer; - background: #000; - border: 2px solid #fff; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - z-index: 2; + font-weight:bold; + display:none; + position:fixed; + padding:10px; + top:48px; + right:50px; + min-width:280px; + opacity:0.85; + margin:0px 0px 10px 10px; + color:#fff; + vertical-align:middle; + cursor:pointer; + background:#000; + border:2px solid #fff; + border-radius:5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + z-index:2000; } -div.flash {z-index:2000;} -div.error_wrapper { display: block; } +div.error_wrapper {display:block} div.error { - background-color: red; - color: white; - padding: 3px; - display: inline-block; + background-color:red; + color:white; + padding:3px; + display:inline-block; } .topbar { - padding: 10px 0; + padding:10px 0; width:100%; - color: #959595; - vertical-align: middle; - padding: auto; - background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + color:#959595; + vertical-align:middle; + padding:auto; + background-image:-khtml-gradient(linear,left top,left bottom,from(#333333),to(#222222)); + background-image:-moz-linear-gradient(top,#333333,#222222); + background-image:-ms-linear-gradient(top,#333333,#222222); + background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#333333),color-stop(100%,#222222)); + background-image:-webkit-linear-gradient(top,#333333,#222222); + background-image:-o-linear-gradient(top,#333333,#222222); + background-image:linear-gradient(top,#333333,#222222); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0); + -webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); + -moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); + box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); } .topbar a { - color: #e1e1e1; + color:#e1e1e1; } -#navbar {float: right; padding: 5px; /* same as superfish */} - -.right { - width:100%; - text-align: right; - float: right; -} +#navbar {float:right; padding:5px; /* same as superfish */} .statusbar { - background-color: #F5F5F5; - margin-top: 1em; - margin-bottom: 1em; - padding: .5em 1em; - border: 1px solid #ddd; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; + background-color:#F5F5F5; + margin-top:1em; + margin-bottom:1em; + padding:.5em 1em; + border:1px solid #ddd; + border-radius:5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; } -.breadcrumbs { float: left; } +.breadcrumbs {float:left} -.copyright {float: left;} -#poweredBy {float: right;} +.copyright {float:left} +#poweredBy {float:right} /* #MEDIA QUERIES SECTION */ /* All Mobile Sizes (devices and browser) */ - @media only screen and (max-width: 767px) { + @media only screen and (max-width:767px) { /* removed because of bootswatch - .topbar {text-align: center;} - #navbar, #menu {float: none;} - #navbar {font-size: 1.2em; padding: .6em 0 1.2em;} - #menu {padding: 0 0 1.5em;} - #menu select {font-size: 1.2em; margin: 0; padding: 0;} + .topbar {text-align:center} + #navbar,#menu {float:none} + #navbar {font-size:1.2em; padding:.6em 0 1.2em} + #menu {padding:0 0 1.5em} + #menu select {font-size:1.2em; margin:0; padding:0} - div.flash {top: 110px; right: 10px;} + div.flash {top:110px; right:10px} */ - } + } /* *Grid @@ -193,43 +184,47 @@ div.error { * will look better with the declarations below * if needed to remove base.css consider keeping these following lines in some css file. */ -// .web2py_table { border: 1px solid #ccc; } -.web2py_paginator { } -.web2py_grid {width: 100% } -.web2py_grid table { width: 100% } +// .web2py_table {border:1px solid #ccc} +.web2py_paginator {} +.web2py_grid {width:100%} +.web2py_grid table {width:100%} .web2py_grid tbody td { - padding: 2px 5px 2px 5px; - vertical-align: middle; + padding:2px 5px 2px 5px; + vertical-align:middle; } -.web2py_grid thead th, .web2py_grid tfoot td { +.web2py_grid thead th,.web2py_grid tfoot td { background-color:#EAEAEA; - padding: 10px 5px 10px 5px; + padding:10px 5px 10px 5px; } -.web2py_grid tr.odd {background-color: #F9F9F9;} -.web2py_grid tr:hover {background-color: #F5F5F5; } +.web2py_grid tr.odd {background-color:#F9F9F9} +.web2py_grid tr:hover {background-color:#F5F5F5} /* .web2py_breadcrumbs a { - line-height: 20px; margin-right: 5px; display: inline-block; - padding: 3px 5px 3px 5px; - font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; - color: #3C3C3D; - text-shadow: 1px 1px 0 #FFFFFF; - white-space: nowrap; overflow: visible; cursor: pointer; + line-height:20px; margin-right:5px; display:inline-block; + padding:3px 5px 3px 5px; + font-family:'lucida grande',tahoma,verdana,arial,sans-serif; + color:#3C3C3D; + text-shadow:1px 1px 0 #FFFFFF; + white-space:nowrap; overflow:visible; cursor:pointer; background:#ECECEC; - border: 1px solid #CACACA; - -webkit-border-radius: 2px; -moz-border-radius: 2px; - -webkit-background-clip: padding-box; border-radius: 2px; - outline: none; position: relative; zoom: 1; *display: inline; + border:1px solid #CACACA; + -webkit-border-radius:2px; -moz-border-radius:2px; + -webkit-background-clip:padding-box; border-radius:2px; + outline:none; position:relative; zoom:1; *display:inline; } */ .web2py_console form { width:100%; + display:inline; } +.web2py_console form select { + margin:0; +} .web2py_search_actions{ float:left; @@ -238,14 +233,14 @@ div.error { .web2py_grid .row_buttons { min-height:25px; - vertical-align: middle; + vertical-align:middle; } .web2py_grid .row_buttons a { - margin: 3px; + margin:3px; } .web2py_search_actions { - width: 100%; + width:100%; } .web2py_grid .row_buttons a, @@ -254,13 +249,13 @@ div.error { .web2py_console input[type=submit], .web2py_console input[type=button], .web2py_console button { - line-height: 20px; - margin-right: 5px; display: inline-block; - padding: 3px 5px 3px 5px; + line-height:20px; + margin-right:5px; display:inline-block; + padding:3px 5px 3px 5px; } .web2py_counter { - margin-top: 5px; + margin-top:5px; margin-right:5px; width:35%; float:right; @@ -268,37 +263,37 @@ div.error { } /*Fix firefox problem*/ -.web2py_table {clear: both; display: block;} +.web2py_table {clear:both; display:block} .web2py_paginator { - padding: 5px; + padding:5px; text-align:right; - background-color: #f2f2f2; + background-color:#f2f2f2; } .web2py_paginator ul { - list-style-type: none; - margin: 0px; - padding: 0px; + list-style-type:none; + margin:0px; + padding:0px; } .web2py_paginator ul li { - display: inline; + display:inline; } .web2py_paginator .current { - font-weight: bold; + font-weight:bold; } #w2p_query_panel {} .web2py_breadcrumbs ul { - list-style: none; - margin-bottom: 18px; + list-style:none; + margin-bottom:18px; } .web2py_breadcrumbs ul li { - display: inline-block; + display:inline-block; } -.ie9 #query_panel {padding-bottom:2px;} +.ie9 #query_panel {padding-bottom:2px} diff --git a/applications/examples/views/layout.html b/applications/examples/views/layout.html index 0f5cc8d8..8903b09b 100644 --- a/applications/examples/views/layout.html +++ b/applications/examples/views/layout.html @@ -122,7 +122,7 @@
{{block footer}}
- {{=T('Copyright')}} © 2011 + {{=T('Copyright')}} © 2012 - User communities in English, French, Japanese, Portuguese, and Spanish.
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index b6ae2a25..5b645cc4 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -1,187 +1,181 @@ /** these MUST stay **/ -a { text-decoration:none; white-space: nowrap;} -a:hover {text-decoration: underline} -a.button {text-decoration: none} -h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica;} - h1 { font-size: 4.00em;} - h2 { font-size: 3.00em;} - h3 { font-size: 2.00em;} - h4 { font-size: 1.50em;} - h5 { font-size: 1.25em;} - h6 { font-size: 1.12em;} -right { float:right; text-align: right; } -left { float:left; text-align: left; } -center { width:100; text-align: center; vertical-align:middle;} -th, label { font-weight: bold; white-space: nowrap; } -td, th { text-align: left; padding: 2px 5px 2px 5px; } -th { vertical-align: middle; border-right: 1px solid white;} -td { vertical-align: top; } -form table tr td label { text-align: left; } -p, table, ol, ul { padding: 0.5em 0 0.5em 0 } -p {text-align: justify } -ol, ul { padding-left: 30px } -li { margin-bottom: 0.5em; } -span, input, select, textarea, button, label, a { display: inline } -img { border: 0; } -blockquote, blockquote p, p blockquote { font-style: italic; margin: 0.5em 30px 0.5em 30px; font-size: 0.9em} -i, em { font-style: italic; } -strong { font-weight: bold; } -small { font-size: 0.8em; } -textarea { width: 100%; } -code { font-family: Courier;} -video { width:400px; } -audio { width:200px; } -input[type=text], input[type=password], select { width: 300px; margin-right: 5px } -ul { list-style-type: none; margin: 0px; padding: 0px; } +a {text-decoration:none; white-space:nowrap} +a:hover {text-decoration:underline} +a.button {text-decoration:none} +h1,h2,h3,h4,h5,h6 {margin:0.5em 0 0.25em 0; display:block; + font-family:Helvetica} +h1 {font-size:4.00em} +h2 {font-size:3.00em} +h3 {font-size:2.00em} +h4 {font-size:1.50em} +h5 {font-size:1.25em} +h6 {font-size:1.12em} +th,label {font-weight:bold; white-space:nowrap} +td,th {text-align:left; padding:2px 5px 2px 5px} +th {vertical-align:middle; border-right:1px solid white} +td {vertical-align:top} +form table tr td label {text-align:left} +p,table,ol,ul {padding:0; margin: 0.5em 0} +p {text-align:justify} +ol, ul {list-style-position:inside} +li {margin-bottom:0.5em} +span,input,select,textarea,button,label,a {display:inline} +img {border:0} +blockquote,blockquote p,p blockquote { + font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em} +i,em {font-style:italic} +strong {font-weight:bold} +small {font-size:0.8em} +code {font-family:Courier} +textarea {width:100%} +video {width:400px} +audio {width:200px} +input[type=text],input[type=password],select{width:300px; margin-right:5px} .hidden {display:none;visibility:visible} +.right {float:right; text-align:right} +.left {float:left; text-align:left} +.center {width:100; text-align:center; vertical-align:middle} /** end **/ /* Sticky footer begin */ .wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -8em; /* set last value to footer height plus footer vertical padding */ + min-height:100%; + height:auto !important; + height:100%; + margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */ } .main { - padding: 20px 0 50px 0; + padding:20px 0 50px 0; } -.footer, .push { - height: 6em; - padding: 1em 0; - clear: both; +.footer,.push { + height:6em; + padding:1em 0; + clear:both; } -.footer-content {position: relative; bottom: -4em; width: 100%;} +.footer-content {position:relative; bottom:-4em; width:100%} .auth_navbar { - white-space: nowrap; + white-space:nowrap; } /* Sticky footer end */ .footer { - border-top: 1px #DEDEDE solid; + border-top:1px #DEDEDE solid; } .header { - // background: ; + // background:; } -fieldset { padding: 16px; border-top: 1px #DEDEDE solid;} -fieldset legend {text-transform:uppercase; font-weight: bold; padding: 4px 16px 4px 16px; background: #f1f1f1;} +fieldset {padding:16px; border-top:1px #DEDEDE solid} +fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1} /* fix ie problem with menu */ -.ie-lte7 .topbar .container {z-index: 2; } +.ie-lte7 .topbar .container {z-index:2} -td.w2p_fw {padding-bottom: 1px;} -td.w2p_fl, td.w2p_fw, td.w2p_fc { vertical-align:top; } -td.w2p_fl { text-align:right; } -td.w2p_fl, td.w2p_fw {padding-right: 7px;} -td.w2p_fl, td.w2p_fc { padding-top: 4px; } +td.w2p_fw {padding-bottom:1px} +td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top} +td.w2p_fl {text-align:right} +td.w2p_fl, td.w2p_fw {padding-right:7px} +td.w2p_fl,td.w2p_fc {padding-top:4px} -/* tr#submit_record__row {border-top: 1px solid #E5E5E5;} */ -#submit_record__row td {padding-top: .5em;} +/* tr#submit_record__row {border-top:1px solid #E5E5E5} */ +#submit_record__row td {padding-top:.5em} /* Fix */ -#auth_user_remember__row label {display: inline;} -#web2py_user_form td { vertical-align:top; } +#auth_user_remember__row label {display:inline} +#web2py_user_form td {vertical-align:top} /*********** web2py specific ***********/ div.flash { - font-weight: bold; - display: none; - position: fixed; - padding: 10px; - top: 48px; - right: 50px; - min-width: 280px; - opacity: 0.85; - margin: 0px 0px 10px 10px; - color: #fff; - vertical-align: middle; - cursor: pointer; - background: #000; - border: 2px solid #fff; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - z-index: 2; + font-weight:bold; + display:none; + position:fixed; + padding:10px; + top:48px; + right:50px; + min-width:280px; + opacity:0.85; + margin:0px 0px 10px 10px; + color:#fff; + vertical-align:middle; + cursor:pointer; + background:#000; + border:2px solid #fff; + border-radius:5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + z-index:2000; } -div.flash {z-index:2000;} -div.error_wrapper { display: block; } +div.error_wrapper {display:block} div.error { - background-color: red; - color: white; - padding: 3px; - display: inline-block; + background-color:red; + color:white; + padding:3px; + display:inline-block; } .topbar { - padding: 10px 0; + padding:10px 0; width:100%; - color: #959595; - vertical-align: middle; - padding: auto; - background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + color:#959595; + vertical-align:middle; + padding:auto; + background-image:-khtml-gradient(linear,left top,left bottom,from(#333333),to(#222222)); + background-image:-moz-linear-gradient(top,#333333,#222222); + background-image:-ms-linear-gradient(top,#333333,#222222); + background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#333333),color-stop(100%,#222222)); + background-image:-webkit-linear-gradient(top,#333333,#222222); + background-image:-o-linear-gradient(top,#333333,#222222); + background-image:linear-gradient(top,#333333,#222222); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0); + -webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); + -moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); + box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1); } .topbar a { - color: #e1e1e1; + color:#e1e1e1; } -#navbar {float: right; padding: 5px; /* same as superfish */} - -.right { - width:100%; - text-align: right; - float: right; -} +#navbar {float:right; padding:5px; /* same as superfish */} .statusbar { - background-color: #F5F5F5; - margin-top: 1em; - margin-bottom: 1em; - padding: .5em 1em; - border: 1px solid #ddd; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; + background-color:#F5F5F5; + margin-top:1em; + margin-bottom:1em; + padding:.5em 1em; + border:1px solid #ddd; + border-radius:5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; } -.breadcrumbs { float: left; } +.breadcrumbs {float:left} -.copyright {float: left;} -#poweredBy {float: right;} +.copyright {float:left} +#poweredBy {float:right} /* #MEDIA QUERIES SECTION */ /* All Mobile Sizes (devices and browser) */ - @media only screen and (max-width: 767px) { + @media only screen and (max-width:767px) { /* removed because of bootswatch - .topbar {text-align: center;} - #navbar, #menu {float: none;} - #navbar {font-size: 1.2em; padding: .6em 0 1.2em;} - #menu {padding: 0 0 1.5em;} - #menu select {font-size: 1.2em; margin: 0; padding: 0;} + .topbar {text-align:center} + #navbar,#menu {float:none} + #navbar {font-size:1.2em; padding:.6em 0 1.2em} + #menu {padding:0 0 1.5em} + #menu select {font-size:1.2em; margin:0; padding:0} - div.flash {top: 110px; right: 10px;} + div.flash {top:110px; right:10px} */ - } + } /* *Grid @@ -190,46 +184,46 @@ div.error { * will look better with the declarations below * if needed to remove base.css consider keeping these following lines in some css file. */ -// .web2py_table { border: 1px solid #ccc; } -.web2py_paginator { } -.web2py_grid {width: 100% } -.web2py_grid table { width: 100% } +// .web2py_table {border:1px solid #ccc} +.web2py_paginator {} +.web2py_grid {width:100%} +.web2py_grid table {width:100%} .web2py_grid tbody td { - padding: 2px 5px 2px 5px; - vertical-align: middle; + padding:2px 5px 2px 5px; + vertical-align:middle; } -.web2py_grid thead th, .web2py_grid tfoot td { +.web2py_grid thead th,.web2py_grid tfoot td { background-color:#EAEAEA; - padding: 10px 5px 10px 5px; + padding:10px 5px 10px 5px; } -.web2py_grid tr.odd {background-color: #F9F9F9;} -.web2py_grid tr:hover {background-color: #F5F5F5; } +.web2py_grid tr.odd {background-color:#F9F9F9} +.web2py_grid tr:hover {background-color:#F5F5F5} /* .web2py_breadcrumbs a { - line-height: 20px; margin-right: 5px; display: inline-block; - padding: 3px 5px 3px 5px; - font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; - color: #3C3C3D; - text-shadow: 1px 1px 0 #FFFFFF; - white-space: nowrap; overflow: visible; cursor: pointer; + line-height:20px; margin-right:5px; display:inline-block; + padding:3px 5px 3px 5px; + font-family:'lucida grande',tahoma,verdana,arial,sans-serif; + color:#3C3C3D; + text-shadow:1px 1px 0 #FFFFFF; + white-space:nowrap; overflow:visible; cursor:pointer; background:#ECECEC; - border: 1px solid #CACACA; - -webkit-border-radius: 2px; -moz-border-radius: 2px; - -webkit-background-clip: padding-box; border-radius: 2px; - outline: none; position: relative; zoom: 1; *display: inline; + border:1px solid #CACACA; + -webkit-border-radius:2px; -moz-border-radius:2px; + -webkit-background-clip:padding-box; border-radius:2px; + outline:none; position:relative; zoom:1; *display:inline; } */ .web2py_console form { width:100%; - display: inline; + display:inline; } .web2py_console form select { - margin: 0; + margin:0; } .web2py_search_actions{ @@ -239,14 +233,14 @@ div.error { .web2py_grid .row_buttons { min-height:25px; - vertical-align: middle; + vertical-align:middle; } .web2py_grid .row_buttons a { - margin: 3px; + margin:3px; } .web2py_search_actions { - width: 100%; + width:100%; } .web2py_grid .row_buttons a, @@ -255,13 +249,13 @@ div.error { .web2py_console input[type=submit], .web2py_console input[type=button], .web2py_console button { - line-height: 20px; - margin-right: 5px; display: inline-block; - padding: 3px 5px 3px 5px; + line-height:20px; + margin-right:5px; display:inline-block; + padding:3px 5px 3px 5px; } .web2py_counter { - margin-top: 5px; + margin-top:5px; margin-right:5px; width:35%; float:right; @@ -269,37 +263,37 @@ div.error { } /*Fix firefox problem*/ -.web2py_table {clear: both; display: block;} +.web2py_table {clear:both; display:block} .web2py_paginator { - padding: 5px; + padding:5px; text-align:right; - background-color: #f2f2f2; + background-color:#f2f2f2; } .web2py_paginator ul { - list-style-type: none; - margin: 0px; - padding: 0px; + list-style-type:none; + margin:0px; + padding:0px; } .web2py_paginator ul li { - display: inline; + display:inline; } .web2py_paginator .current { - font-weight: bold; + font-weight:bold; } #w2p_query_panel {} .web2py_breadcrumbs ul { - list-style: none; - margin-bottom: 18px; + list-style:none; + margin-bottom:18px; } .web2py_breadcrumbs ul li { - display: inline-block; + display:inline-block; } -.ie9 #query_panel {padding-bottom:2px;} +.ie9 #query_panel {padding-bottom:2px} diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index c1b9924d..9cc15022 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -61,24 +61,6 @@ uncomment to load jquery-ui //--> - {{block head}}{{end}} @@ -88,11 +70,6 @@
- - - - - web2py™ 
@@ -105,9 +82,9 @@
-
{{=response.flash or ''}}
-
+
{{=response.flash or ''}}
+