From f5ccab3952ce43b76494c8f7bf8c5dbaf286c813 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Sun, 30 Sep 2018 05:55:54 +0200 Subject: [PATCH] Fixes in css --- .../templates/forms/modelform.phtml | 6 +- .../citoplasma/templates/utils/list.phtml | 6 -- paramecio/cromosoma/coreforms.py | 1 + paramecio/modules/admin/index.py | 3 +- paramecio/modules/admin/media/css/admin.css | 93 ++++++++++++++----- paramecio/modules/admin/media/css/style.css | 2 +- .../modules/admin/templates/admin/home.html | 13 ++- 7 files changed, 85 insertions(+), 39 deletions(-) diff --git a/paramecio/citoplasma/templates/forms/modelform.phtml b/paramecio/citoplasma/templates/forms/modelform.phtml index 3f86c60..13fab51 100644 --- a/paramecio/citoplasma/templates/forms/modelform.phtml +++ b/paramecio/citoplasma/templates/forms/modelform.phtml @@ -6,11 +6,7 @@ <%def name="help(help, name)"> % if help: \ - + % endif
diff --git a/paramecio/citoplasma/templates/utils/list.phtml b/paramecio/citoplasma/templates/utils/list.phtml index fe69772..33353ea 100644 --- a/paramecio/citoplasma/templates/utils/list.phtml +++ b/paramecio/citoplasma/templates/utils/list.phtml @@ -1,9 +1,3 @@ - <%def name="select_field(field)"> % if simplelist.search_field==field: selected \ diff --git a/paramecio/cromosoma/coreforms.py b/paramecio/cromosoma/coreforms.py index 69ecbdb..7bf1458 100644 --- a/paramecio/cromosoma/coreforms.py +++ b/paramecio/cromosoma/coreforms.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 from collections import OrderedDict +from html import escape #Forms para python3 diff --git a/paramecio/modules/admin/index.py b/paramecio/modules/admin/index.py index 4a6a506..c1c20d4 100644 --- a/paramecio/modules/admin/index.py +++ b/paramecio/modules/admin/index.py @@ -268,7 +268,7 @@ def login(): user_admin.conditions=['WHERE username=%s', [username]] - arr_user=user_admin.select_a_row_where(['id', 'password', 'privileges', 'lang', 'num_tries']) + arr_user=user_admin.select_a_row_where(['id', 'password', 'privileges', 'lang', 'num_tries', 'email']) if arr_user==False: @@ -293,6 +293,7 @@ def login(): s['login']=1 s['privileges']=arr_user['privileges'] s['lang']=arr_user['lang'] + s['email']=arr_user['email'] if s['lang']=='': s['lang']=I18n.default_lang diff --git a/paramecio/modules/admin/media/css/admin.css b/paramecio/modules/admin/media/css/admin.css index 9444e3f..dff29fd 100644 --- a/paramecio/modules/admin/media/css/admin.css +++ b/paramecio/modules/admin/media/css/admin.css @@ -1,9 +1,11 @@ + body { margin:0px; background-color:#f7f6f1; - font-family: "Helvetica", sans, sans-serif, serif; + font-family: "Roboto", sans, sans-serif, serif; + font-size: 16px; } @@ -28,7 +30,7 @@ a:hover height:47px; color:#000; font-size:22px; - font-family:"Open Sans", sans, serif; + font-family:"Roboto", sans, serif; /*background-image:url('../images/background.png'); background-position:top; background-repeat:repeat-x;*/ @@ -42,7 +44,7 @@ a:hover font-size:28px; padding-left:15px; color: #555555; - font-family:"Open Sans", sans, serif; + font-family:"Roboto", sans, serif; /*font-style:italic;*/ /*text-shadow:#000000 1px 1px 1px; filter: progid:DXImageTransform.Microsoft.Shadow(color='#000000', Direction=130, Strength=4);*/ @@ -63,12 +65,12 @@ a:hover h1, h2 { - font-family:"Helvetica", sans, serif; + font-family:"Roboto", sans, serif; border: solid #cbcbcb; border-width: 0px 0px 1px 1px; font-size:26px; color:#333333; - margin:0px; + margin:0px 0px 20px 0px; padding:5px 10px; font-weight:normal; background: #e6e6e6; @@ -86,6 +88,16 @@ h2 { } +h1 { + + -webkit-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75); + -moz-box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75); + box-shadow: 1px 1px 5px 0px rgba(0,0,0,0.75); + font-size:20px; + padding:3px 10px; + +} + p { border: solid #cbcbcb; @@ -124,23 +136,28 @@ p { width:17%; margin-right:0px; position:relative; - border:solid #cccccc; - border-width:0px 1px 1px 0px; +/* border:solid #cccccc; + border-width:0px 1px 1px 0px;*/ + box-sizing: border-box; + padding-bottom: 100px; + overflow:hidden; } #menu a { - font-size:14px; + font-size:16px; /*font-family:arial, sans;*/ text-decoration:none; - color:#6183b0; + color:#ededed; display:block; border:solid #cccccc; /*border-width:0px 1px 1px 1px;*/ border-width:0px; padding:5px; - background: #ececec; + padding-top:10px; + padding-bottom:10px; + background: transparent; } #menu a:hover @@ -148,7 +165,7 @@ p { text-decoration:underline; color:#fbfbfb; - background: #18788d; + background: #0fb1dd; text-decoration:none; } @@ -167,7 +184,7 @@ p { padding:5px; font-size:18px; - font-family:"Helvetica", sans, serif; + font-family:"Roboto", sans, serif; font-weight:bold; /*background-image:url('../images/background_title.png'); background-position:top; @@ -176,12 +193,15 @@ p { /*border:solid #cccccc; border-width:0px 1px 1px 1px;*/ color: #fbfbfb; + overflow: hidden; + box-sizing: border-box; + } .father_admin { - font-family:"Helvetica", sans, serif; + font-family:"Roboto", sans, serif; padding:5px; font-size:18px; display: block; @@ -218,24 +238,31 @@ p { { margin:auto; - background-color:#ffffff; + background: rgba(18,47,59,1); + background: -moz-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: -webkit-gradient(left top, right top, color-stop(0%, rgba(18,47,59,1)), color-stop(51%, rgba(18,47,59,1)), color-stop(74%, rgba(18,47,59,1)), color-stop(100%, rgba(8,59,77,1))); + background: -webkit-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: -o-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: -ms-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: linear-gradient(to right, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background-size: 17% 100%; + background-repeat:no-repeat; padding:0px; border:solid #bcbcbc; - border-width: 1px; - font-size:14px; + border-width: 0px; + font-size:16px; position:relative; overflow:auto; - /*background: linear-gradient(to right, #ababab , #cbcbcb); - background-size:244px; - background-repeat: repeat-y;*/ - + border: solid #cbcbcb; + border-width: 0px 0px 1px 0px; } .contents { float:right; - width:82%; + width:83%; padding:0px 0px 0px 0px; + box-sizing: border-box; } .content @@ -260,7 +287,7 @@ p { background-color: #337ab7; border-radius: 8px 8px 0px 0px; border:solid #337ab7; - border-width:1px 1px 1px 1px; + border-width:1px 0px 1px 0px; margin-top:8px; } @@ -591,6 +618,7 @@ a:hover.no_choose_flag top:8px; right:5px; + height:10px; } @@ -601,7 +629,7 @@ a:hover.no_choose_flag right:10px; width:55px; font-weight:bold; - font-size:12px; + font-size:10px; text-decoration: none; /*border: solid #000 1px;*/ } @@ -729,6 +757,12 @@ a.form_button_tab:hover /* Media queries */ @media only screen and (max-width: 800px) { + + .content_admin { + + background: transparent; + + } #toggle { @@ -753,6 +787,19 @@ a.form_button_tab:hover width:100%; } + + #menu a { + + background: rgba(18,47,59,1); + background: -moz-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: -webkit-gradient(left top, right top, color-stop(0%, rgba(18,47,59,1)), color-stop(51%, rgba(18,47,59,1)), color-stop(74%, rgba(18,47,59,1)), color-stop(100%, rgba(8,59,77,1))); + background: -webkit-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: -o-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: -ms-linear-gradient(left, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + background: linear-gradient(to right, rgba(18,47,59,1) 0%, rgba(18,47,59,1) 51%, rgba(18,47,59,1) 74%, rgba(8,59,77,1) 100%); + + } + #title_phango { font-size:18px; diff --git a/paramecio/modules/admin/media/css/style.css b/paramecio/modules/admin/media/css/style.css index a22df9e..b1c216a 100644 --- a/paramecio/modules/admin/media/css/style.css +++ b/paramecio/modules/admin/media/css/style.css @@ -899,4 +899,4 @@ a.see { width:40px; text-align:center; -} \ No newline at end of file +} diff --git a/paramecio/modules/admin/templates/admin/home.html b/paramecio/modules/admin/templates/admin/home.html index a8141c3..8ff307a 100644 --- a/paramecio/modules/admin/templates/admin/home.html +++ b/paramecio/modules/admin/templates/admin/home.html @@ -19,8 +19,15 @@ ${add_js_home_local('jquery.min.js', 'admin')} ${add_js_home_local('responsive-nav.min.js', 'admin')} ${add_js_home_local('tooltipster.bundle.min.js', 'admin')} ${HeaderHTML.css_home()|n} + +<%block name="extra_css"> + ${HeaderHTML.js_home()|n} +<%block name="extra_js"> + ${HeaderHTML.header_home()|n} +<%block name="extra_header"> +
@@ -32,7 +39,7 @@ ${HeaderHTML.header_home()|n}