From 85c3bbaa5cbf2617752bad36b0d0d73915b81637 Mon Sep 17 00:00:00 2001 From: thienan Date: Mon, 28 Jun 2021 16:36:47 +0200 Subject: [PATCH 1/4] correction couleurs et ajout liens infobox --- mondumas/static/css/style.less | 495 +++++++++++----------- mondumas/templates/parametres/new_home.pt | 123 ++++-- 2 files changed, 338 insertions(+), 280 deletions(-) diff --git a/mondumas/static/css/style.less b/mondumas/static/css/style.less index 8f1fa17..4ebd068 100644 --- a/mondumas/static/css/style.less +++ b/mondumas/static/css/style.less @@ -1,240 +1,255 @@ -/* style.less */ -@error: #b94a48; - -/* ajout pour Nicola */ -@media (max-width: 992px) { - .navbar-header { - float: none; - } - .navbar-left,.navbar-right { - float: none !important; - } - .navbar-toggle { - display: block; - } - .navbar-collapse { - border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); - } - .navbar-fixed-top { - top: 0; - border-width: 0 0 1px; - } - .navbar-collapse.collapse { - display: none!important; - } - .navbar-nav { - float: none!important; - margin-top: 7.5px; - } - .navbar-nav>li { - float: none; - } - .navbar-nav>li>a { - padding-top: 10px; - padding-bottom: 10px; - } - .collapse.in{ - display:block !important; - } -} - -.navbar { - margin-bottom: 0; - background-color: #fe9900; - color: #404040 !important; - z-index: 9999; - border: 0; - font-size: 20px !important; - line-height: 1.42857143 !important; - letter-spacing: 4px; - border-radius: 0; -} - -.navbar li a, .navbar .navbar-brand { - color: #404040 !important; - font-size: 14px !important; -} - -.navbar-nav li a:hover, .navbar-nav li.active a { - color: #f4511e !important; - font-size: 14px !important; - background-color: #fff !important; -} - -.navbar-default .navbar-toggle { - border-color: transparent; - color: #fff !important; -} - -/* Dropdown */ -.open .dropdown-toggle { - color: #000000 ; - background-color: #555 !important; -} - -/* Dropdown links */ -.dropdown-menu li a { - color: #000000 !important; -} - -/* On hover, the dropdown links will turn red */ -.dropdown-menu li a:hover { - background-color: #f4511e !important; - color: #000000 !important; -} - -/* push modal dialog down the viewport */ -.modal-dialog { - top:7%; -} -.type-ligne-panel { - padding-left: 25px; - margin-top: 5px; - margin-bottom: 20px; - display: none; -} - -.footer { - background-color: #2f2f2f; - color: #ffffff; - padding-top: 2em; - padding-bottom: 1em; -} - -.form-group { - label.error { - color: @error; - } -} - -.gly-spin { - -webkit-animation: spin 2s infinite linear; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -#bg { - position: fixed; - top: 0; - left: 0; - - /* Set up proportionate scaling */ - width: 100%; - height: auto; - - /* Set rules to fill background */ - min-width: 100%; - min-height: 100%; -} - -.logo { - height: 60px; -} - -.logo-primary { - color: #337ab7; - font-size: 50px; -} -.logo-info { - color: #5BC0DE; - font-size: 50px; -} -.logo-success { - color: #5CB85C; - font-size: 50px; -} -.logo-danger { - color: #D9534F; - font-size: 50px; -} -.logo-warning { - color: #F0AD4E; - font-size: 50px; -} -.logo-small { - font-size: 50px; -} -.bg-PE { - background-color: #ffffb3 !important; - color: black; -} -.bg-ME { - background-color: #ffe44d !important; - color: black; -} -.bg-PL { - background-color: #b3ff66 !important; - color: black; -} -.bg-PO { - background-color: #b1dae7 !important; - color: black; -} -.bg-CD { - background-color: #ffb3cc !important; - color: black; -} - -.new-page { - page-break-before: always; -} - - - -#signature_img { - width: 350px; - height: 150px; - padding: 20px; -} - -.gly-spin { - -webkit-animation: spin 2s infinite linear; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} - -@-moz-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - } - 100% { - -moz-transform: rotate(359deg); - } -} -@-webkit-keyframes spin { - 0% { - -webkit-transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - } -} -@-o-keyframes spin { - 0% { - -o-transform: rotate(0deg); - } - 100% { - -o-transform: rotate(359deg); - } -} -@keyframes spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - - -/* ne pas affichier l'url after the link */ -@media print { - a[href]:after { - content: none !important; - } -} +/* style.less */ +@error: #b94a48; + +/* ajout pour Nicola */ +@media (max-width: 992px) { + .navbar-header { + float: none; + } + .navbar-left,.navbar-right { + float: none !important; + } + .navbar-toggle { + display: block; + } + .navbar-collapse { + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + } + .navbar-fixed-top { + top: 0; + border-width: 0 0 1px; + } + .navbar-collapse.collapse { + display: none!important; + } + .navbar-nav { + float: none!important; + margin-top: 7.5px; + } + .navbar-nav>li { + float: none; + } + .navbar-nav>li>a { + padding-top: 10px; + padding-bottom: 10px; + } + .collapse.in{ + display:block !important; + } +} + +.navbar { + margin-bottom: 0; + background-color: #fe9900; + color: #404040 !important; + z-index: 9999; + border: 0; + font-size: 20px !important; + line-height: 1.42857143 !important; + letter-spacing: 4px; + border-radius: 0; +} + +.navbar li a, .navbar .navbar-brand { + color: #404040 !important; + font-size: 14px !important; +} + +.navbar-nav li a:hover, .navbar-nav li.active a { + color: #f4511e !important; + font-size: 14px !important; + background-color: #fff !important; +} + +.navbar-default .navbar-toggle { + border-color: transparent; + color: #fff !important; +} + +/* Dropdown */ +.open .dropdown-toggle { + color: #000000 ; + background-color: #555 !important; +} + +/* Dropdown links */ +.dropdown-menu li a { + color: #000000 !important; +} + +/* On hover, the dropdown links will turn red */ +.dropdown-menu li a:hover { + background-color: #f4511e !important; + color: #000000 !important; +} + +/* push modal dialog down the viewport */ +.modal-dialog { + top:7%; +} +.type-ligne-panel { + padding-left: 25px; + margin-top: 5px; + margin-bottom: 20px; + display: none; +} + +.footer { + background-color: #2f2f2f; + color: #ffffff; + padding-top: 2em; + padding-bottom: 1em; +} + +.form-group { + label.error { + color: @error; + } +} + +.gly-spin { + -webkit-animation: spin 2s infinite linear; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} + +#bg { + position: fixed; + top: 0; + left: 0; + + /* Set up proportionate scaling */ + width: 100%; + height: auto; + + /* Set rules to fill background */ + min-width: 100%; + min-height: 100%; +} + +.logo { + height: 60px; +} + +.logo-primary { + color: #337ab7; + font-size: 50px; +} +.logo-info { + color: #5BC0DE; + font-size: 50px; +} +.logo-success { + color: #5CB85C; + font-size: 50px; +} +.logo-danger { + color: #D9534F; + font-size: 50px; +} +.logo-warning { + color: #F0AD4E; + font-size: 50px; +} +.logo-small { + font-size: 50px; +} +.bg-PE { + background-color: #ffffb3 !important; + color: black; +} +.bg-ME { + background-color: #ffe44d !important; + color: black; +} +.bg-PL { + background-color: #b3ff66 !important; + color: black; +} +.bg-PO { + background-color: #b1dae7 !important; + color: black; +} +.bg-CD { + background-color: #ffb3cc !important; + color: black; +} + +.bg-mar { + background-color: #800000 !important; +color: white; +} + +.bg-choco { + background-color: #D2691E !important; + color: white; +} + +.bg-tan { + background-color: #D2B48C !important; + color: black; +} + +.new-page { + page-break-before: always; +} + + + +#signature_img { + width: 350px; + height: 150px; + padding: 20px; +} + +.gly-spin { + -webkit-animation: spin 2s infinite linear; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} + +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } +} +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } +} +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } +} +@keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} + + +/* ne pas affichier l'url after the link */ +@media print { + a[href]:after { + content: none !important; + } +} diff --git a/mondumas/templates/parametres/new_home.pt b/mondumas/templates/parametres/new_home.pt index c909cf5..68df868 100644 --- a/mondumas/templates/parametres/new_home.pt +++ b/mondumas/templates/parametres/new_home.pt @@ -1,15 +1,37 @@
+ + +
+
-
- - -

E-DEVIS

 -
-
+
DEMANDES DEVIS @@ -21,7 +43,7 @@
-
+
DEVIS @@ -33,7 +55,7 @@
-
+
FACTURES @@ -44,26 +66,35 @@
+
+
+ +
+ +
+ E-DEVIS +
+
+ +
+

-
+
-
-

MON AGENDA

 -
-
-
- -
- AGENDA - A traiter : - ${nb_rdv.nb_rdv} +
+ +
+ AGENDA + A traiter : + ${nb_rdv.nb_rdv} +
-
+
-
+
RDF @@ -73,38 +104,50 @@
-
- -
- EMAILS - A traiter : - ${nb_mails} + +
+ +
+ EMAILS + A traiter : + ${nb_mails} +
-
+

-
+
-
-

PLANNING

 -
-
- - -

EMAILS DOSSIERS

 +
+ +
+ PLANNING +
+
+
- -

PDF DOSSIERS

 +
+ +
+ PDF DOSSIERS +
+
+
- -

STATISTIQUES

 +
+ +
+ STATS +
+
+

From 90fa9af74ac90eb4002e91294531dcf6063c89c1 Mon Sep 17 00:00:00 2001 From: thienan Date: Tue, 29 Jun 2021 14:10:09 +0200 Subject: [PATCH 2/4] tentative d'ajout sidebar --- mondumas/templates/global_layout.pt | 3 +- mondumas/templates/parametres/new_home.pt | 41 ++++++++++++++--------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/mondumas/templates/global_layout.pt b/mondumas/templates/global_layout.pt index 7ccea64..a94e295 100644 --- a/mondumas/templates/global_layout.pt +++ b/mondumas/templates/global_layout.pt @@ -11,6 +11,7 @@ + @@ -33,7 +34,7 @@ - +
-
-
- -
- +
+ +
+
- E-DEVIS + RECHERCHE
- -
+

@@ -61,7 +59,7 @@
AGENDA - A traiter : + Rendez-vous : ${nb_rdv.nb_rdv}
@@ -79,16 +77,14 @@
-
- -
- -
- EMAILS - A traiter : - ${nb_mails} -
+
+ +
+ +
+ E-DEVIS
+
@@ -115,6 +111,18 @@
+
+ +
+ +
+ EMAILS + A traiter : + ${nb_mails} +
+
+ +