From: Letizia Dalessandro Date: Wed, 21 Feb 2024 12:29:51 +0000 (+0100) Subject: commit grafico X-Git-Url: https://git.atlas4tour.it/?a=commitdiff_plain;h=99ab153e397c4d19d9f4b4c2b4c82b3278bbcce3;p=pia_atlas.git commit grafico --- diff --git a/.idea/misc.xml b/.idea/misc.xml index ec83ff9..0cbe313 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,10 @@ - + + + + + \ No newline at end of file diff --git a/sistema/datatables.py b/sistema/datatables.py index 5f12e7d..b4c7db7 100644 --- a/sistema/datatables.py +++ b/sistema/datatables.py @@ -26,7 +26,7 @@ class LocalitaDatatables(BaseDatatableView): if column == 'regione': return escape('{0}'.format(row.regione)) if column == 'mod': - return '' % row.pk + return '' % row.pk if column == 'del': return '' % row.pk else: @@ -61,7 +61,7 @@ class MultimediaDatatables(BaseDatatableView): if column == 'descrizione': return escape('{0}'.format(row.descrizione)) if column == 'media': - return f'vedi' + return f' visualizza ' if column == 'del': return '' % row.pk else: @@ -89,7 +89,7 @@ class TipoMultimediaDatatables(BaseDatatableView): if column == 'nome': return escape('{0}'.format(row.nome)) if column == 'mod': - return '' % row.pk + return '' % row.pk if column == 'del': return '' % row.pk else: @@ -120,7 +120,7 @@ class PercorsoDatatables(BaseDatatableView): if column == 'testo': return escape('{0}'.format(row.testo)) if column == 'mod': - return '' % row.pk + return '' % row.pk if column == 'del': return '' % row.pk else: @@ -151,7 +151,7 @@ class PoiDatatables(BaseDatatableView): if column == 'long': return escape('{0}'.format(row.long)) if column == 'mod': - return '' % row.pk + return '' % row.pk if column == 'del': return '' % row.pk else: diff --git a/sistema/static/admin/css/custom.css b/sistema/static/admin/css/custom.css index 87c7899..7deadd7 100644 --- a/sistema/static/admin/css/custom.css +++ b/sistema/static/admin/css/custom.css @@ -6,10 +6,12 @@ body{ margin:0; padding:0; - color: #194d84; + color: #20201e; + font-family: 'Mulish', sans-serif; } body.bg-login{ - background: #042546 url("../img/login.png") no-repeat 0 25px !important; + background: #20201e url("../img/login.png") no-repeat; + background-size: cover; } .card .card-header { border-bottom-color: #e4e6fc; @@ -17,9 +19,34 @@ body.bg-login{ .card .card-header h4 { color: #47bb6b; } +.bg-login .card .card-header { + border-bottom-color: #ddb192; +} +.bg-login.theme-orange .card.card-primary { + border-top: 3px solid #ff5601; +} +.bg-login .card { + background-color: #ffffffbd; + } +.bg-login .card .card-header h4 { + color: #fe5704; +} +.bg-login .card .card-footer { + padding: 15px 25px; + text-align: center; +} +.bg-login .card .card-footer:last-child { + border-radius: calc(0rem - 1px) calc(0rem - 1px) 0 0; +} +.bg-login .card .card-footer.border-top { + border-top: 1px solid #c4b799 !important; +} +.theme-orange .form-control:focus { + border-color: #f9bc9d; +} .form-group .control-label, .form-group > label { - color: #194d84; - } + color: #20201e; +} .custom-select-sm { height: calc(1.8125rem + 2px); padding-top: .375rem; @@ -27,6 +54,12 @@ body.bg-login{ font-size: 75%; } /* COLORS */ +.theme-orange a { + color: #ff5601; +} +.theme-orange a:hover { + text-decoration: inherit; +} .theme-blue.sidebar-mini .main-sidebar .sidebar-menu>li.active>a { background-color:rgba(0,0,0,0.14) } @@ -39,13 +72,6 @@ body.bg-login{ .theme-blue .text-primary { color:#1d5e9f; !important } -.theme-blue a { - color:#1d5e9f; -} -.theme-blue a:hover { - color: #75a3d0; - text-decoration: none; -} .theme-blue .btn-primary { background-color:#1d5e9f; border-color:transparent !important; @@ -288,13 +314,15 @@ body.bg-login{ .dark-sidebar.sidebar-mini .main-sidebar::after { background-color: #001122; } -.btn-success, .btn-success.disabled { +.btn-dark, .btn-dark.disabled { box-shadow: inherit; - background-color: #52c174; - border-color: #52c174; color: #fff; border-radius: 50px; } +.btn { + font-size: 14px; + padding: 0.6rem 0.8rem; + } .table .btn-success, .btn-success.disabled { border-radius: .2rem; } @@ -445,7 +473,7 @@ body:not(.sidebar-mini) .main-sidebar .header-logo{ border-radius: 50px!important; } .form-control, .input-group-text, .custom-select, .custom-file-label { - border-color: #d1d4f4; + border-color: #dbd4d0; } .bg-extralight { background-color: #f6f8f9 !important; @@ -483,7 +511,7 @@ body:not(.sidebar-mini) .main-sidebar .header-logo{ color: #0d3259; } .lobibox, .lobibox-notify { - font-family: "Nunito", "Segoe UI", arial; + font-family: 'Mulish', sans-serif; } .lobibox.lobibox-error, .lobibox.lobibox-success, .lobibox.lobibox-confirm, .lobibox.lobibox-info { border: inherit; diff --git a/sistema/static/admin/js/scripts.js b/sistema/static/admin/js/scripts.js index 49c0c2a..7c632f2 100644 --- a/sistema/static/admin/js/scripts.js +++ b/sistema/static/admin/js/scripts.js @@ -696,7 +696,7 @@ $(function () { //add default class on body tag jQuery("body").addClass("light"); jQuery("body").addClass("dark-sidebar"); - jQuery("body").addClass("theme-blue"); + jQuery("body").addClass("theme-orange"); // set theme default color $(".choose-theme li").removeClass("active"); $(".choose-theme li[title|='white']").addClass("active"); diff --git a/sistema/static/assets/css/custom.css b/sistema/static/assets/css/custom.css index 76dc3e5..eb467af 100755 --- a/sistema/static/assets/css/custom.css +++ b/sistema/static/assets/css/custom.css @@ -1,5 +1,10 @@ /*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3VzdG9tLmNzcyIsInNvdXJjZXMiOlsiY3VzdG9tLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9 */ - +body{ + font-family: 'Mulish', sans-serif; + background: #f4efe7 url("../img/atlas-baackground-bot.png") no-repeat right bottom; + /*background-attachment: fixed;*/ + background-size: contain; +} /*# sourceMappingURL=custom.css.map */ textarea#txt-bisillabici { height: auto !important; @@ -21,7 +26,8 @@ textarea#txt-trisillabici { .dark-sidebar .main-sidebar { /* background-color: #093e61; */ background: rgb(29, 93, 154); - background: linear-gradient(0deg, rgba(29, 93, 154, 1) 43%, rgba(11, 66, 119, 1) 100%); + /* background: linear-gradient(0deg, rgba(29, 93, 154, 1) 43%, rgba(11, 66, 119, 1) 100%);*/ + background: #20201e; } .dark-sidebar .main-sidebar .sidebar-brand { @@ -37,9 +43,11 @@ textarea#txt-trisillabici { color: #e5f2fd; text-transform: inherit; margin-bottom: 1px !important; - border-left: 8px solid #069d06; background: rgba(255, 255, 255, .06); } +.main-sidebar .sidebar-menu li ul.dropdown-menu li a:hover { + background: #383839; +} .main-sidebar .sidebar-menu li ul.dropdown-menu li a::before { color: #fff; @@ -58,9 +66,8 @@ textarea#txt-trisillabici { .navbar .nav-link { color: #457eb5; } - .navbar .nav-link.nav-link-lg .feather { - color: #457eb5; + color: #20201e; } .navbar .nav-link.nav-link-lg .feather { @@ -69,14 +76,12 @@ textarea#txt-trisillabici { } .main-sidebar .sidebar-menu li a { - height: 43px; + height: 50px; letter-spacing: .5px; } - .nav-link { - font-size: 13px; + font-size: 15px; } - .sidebar-mini .main-sidebar .sidebar-menu > li { padding: 0 10px; } @@ -89,9 +94,8 @@ textarea#txt-trisillabici { .dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li ul.dropdown-menu li a::before { left: 8px; } - .dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li ul.dropdown-menu li a { - background-color: #093e61; + background-color: inherit; } .dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li ul.dropdown-menu li a { @@ -99,16 +103,17 @@ textarea#txt-trisillabici { } .dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li ul.dropdown-menu a { - border-bottom: 1px solid #03314f; - margin-bottom: 0px !important; + border-top: 1px solid #5e5e5dcc; + margin-bottom: 1px !important; + margin-top: 1px; } -.dark-sidebar.sidebar-mini .main-sidebar .dropdown-title { - background-color: #03314f; +.sidebar-mini .main-sidebar .sidebar-menu > li ul.dropdown-menu { + left: 80px; } -.dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li ul.dropdown-menu li:hover a { - background-color: #265372; +.dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li ul.dropdown-menu li:hover a, dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li ul.dropdown-menu li a { + background-color: inherit; } .sidebar-mini .main-sidebar .sidebar-menu > li ul.dropdown-menu { @@ -120,25 +125,33 @@ textarea#txt-trisillabici { } .main-sidebar .sidebar-brand { - height: 70px; + height: 170px; line-height: 86px; } -.dark-sidebar.sidebar-mini .main-sidebar:after { - background-color: #093e61; +.dark-sidebar.sidebar-mini .main-sidebar::after { + background-color: #20201e; } - -.dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu { - background-color: #093e61; +.dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li.active a, .dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu li a { + background: inherit; } -.main-sidebar { - width: auto; +.sidebar-mini .main-sidebar { + width: 80px; +} +.sidebar-mini .navbar { + left: 80px; +} +.sidebar-mini .main-sidebar .sidebar-menu > li ul.dropdown-menu { + left: 80px; + box-shadow: inherit; +} +.dark-sidebar.sidebar-mini .main-sidebar .sidebar-menu { + background-color: #20201e; } .main-sidebar .sidebar-brand a .header-logo { - /*height: 60px;*/ - height: 95px; + height: 200px; margin-top: 8px; } @@ -150,7 +163,6 @@ textarea#txt-trisillabici { font-weight: 600; color: #34395e; font-size: 12px; -" } .ordine { @@ -167,17 +179,11 @@ textarea#txt-trisillabici { /* ----------------- */ body { - color: #22364c; -} - -body { - + color: #20201e; } - .bg-light { - background-color: #f8f9fa !important; + background-color: #f3f0eb !important } - .main-content { padding-top: 120px; } @@ -187,7 +193,8 @@ h1 { } h1, h2, h3, h4, h5, h6 { - color: #0e467d; + color: #20201e; + font-weight: 800; } h1.line-default::before { @@ -199,7 +206,7 @@ h1.line-default::before { } .card .card-header h4.clr-default, .clr-default { - color: #2e73b4; + color: #20201e; } h1.config::before { @@ -281,6 +288,9 @@ h1.line-bordereau::before { font-size: 3.3rem; font-weight: 900; } +h2 { + color: #ff5518; +} .btn-bordereau { background: #7f55f4; @@ -296,7 +306,10 @@ h1.line-bordereau::before { .btn.btn-bordereau.disabled, .btn.btn-bordereau:disabled, fieldset:disabled .btn.btn-bordereau { background: #c5b1fc; } - +.btn.btn-dark{ + border-radius: 30px; +} +/* h1.line-bolle::before { content: "|"; margin-right: 10px; @@ -311,12 +324,20 @@ h1.line-fatturazione::before { color: #db752b; font-size: 3.3rem; font-weight: 900; -} +}*/ a, a:hover { text-decoration: none; + color: #ff5424; +} +.card-content a{ + text-decoration: none; + color: #191d21; + text-transform:uppercase; +} +a.bg-light:focus, a.bg-light:hover, button.bg-light:focus, button.bg-light:hover { + background-color: #ff5424 !important; } - /*td a { color: #1f81dd !important; }*/ @@ -326,7 +347,7 @@ a, a:hover { .sidebar-mini .main-sidebar .mobile-logo { display: block; - height: 26px; + height: 65px; } .sidebar-mini .main-sidebar .sidebar-brand { @@ -345,188 +366,45 @@ a:not(.btn-social-icon):not(.btn-social):not(.page-link) .ion, a:not(.btn-social margin-left: 0; } -.dark-sidebar .main-sidebar .sidebar-menu li a { +.dark-sidebar .main-sidebar .sidebar-menu li a, .dark-sidebar .main-sidebar .sidebar-menu li.active a { color: #fff; - background: rgba(255, 255, 255, .12); - margin-bottom: 2px; - text-transform: uppercase; + background: inherit; + width: auto; + border-radius: 0px; } - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-config { - border-left: 8px solid #02f252; +.dark-sidebar .main-sidebar .sidebar-menu li ul.dropdown-menu a { + background: rgba(255, 255, 255, .06); +} +.dark-sidebar .main-sidebar .sidebar-menu li a:hover, .dark-sidebar .main-sidebar .sidebar-menu li.active a:hover{ + background-color: rgba(255,255,255,0.25); +} +.main-sidebar .sidebar-menu li a, .main-sidebar .sidebar-menu li.active a { + font-weight: 800; } - .card .card-header h4 { - color: #093764; + color: #868686; } - .card .card-body .section-title { margin: 30px 0 20px 0; font-size: 23px; } - .section .section-title { - color: #0e467d; -} - -.card .card-header h4.clr-primary, .clr-primary { - color: #134e86; -} - -.card .card-header h4.clr-costo, .clr-costo { - color: #51b80b; -} - -.card .card-header h4.clr-config, .clr-config { - color: #28c76f; -} - -.card .card-header h4.clr-client, .clr-client { - color: #f9c602; -} - -.card .card-header h4.clr-dipend, .clr-dipend { - color: #fca64b; -} - -.card .card-header h4.clr-autisti, .clr-autisti { - color: #fc544b; -} - -.card .card-header h4.clr-listini, .clr-listini { - color: #07e385; -} - -.card .card-header h4.clr-prese, .clr-prese { - color: #30d0f4; -} - -.card .card-header h4.clr-prese, .clr-prese { - color: #30d0f4; -} - -.card .card-header h4.clr-merce, .clr-merce { - color: #0395ff; -} - -.card .card-header h4.clr-bordereau, .clr-bordereau { - color: #7f55f4; -} - -.card .card-header h4.clr-bolle, .clr-bolle { - color: #d155f4; -} - -.card .card-header h4.clr-traccia, .clr-traccia { - color: #ff3b7b; -} - -.card .card-header h4.clr-fatturazione, .clr-fatturazione { - color: #db752b; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-home { - border-left: 8px solid #ffffff; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-clients { - border-left: 8px solid #fff00f; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-dipendenti { - border-left: 8px solid #fca64b; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-autisti { - border-left: 8px solid #fc544b; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-listini { - border-left: 8px solid #4bfcb1; + color: #ff5700; + font-weight: 700; } - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-prese { - border-left: 8px solid #30d0f4; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-merce { - border-left: 8px solid #0395ff; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-bordereau { - border-left: 8px solid #7f55f4; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-bolle { - border-left: 8px solid #d155f4; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-traccia { - border-left: 8px solid #ff3b7b; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-fatturazione { - border-left: 8px solid #db752b; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-costo { - border-left: 8px solid #51b80b; -} - -.dark-sidebar .main-sidebar .sidebar-menu li a.color-gestione { - border-left: 8px solid #143f60; -} - -.dark-sidebar .main-sidebar .sidebar-menu li.fix-gestione ul.dropdown-menu a { - border-left: 8px solid #084778; -} - .main-sidebar .sidebar-menu li a i { font-size: 20px; + background: #ff5700; + border-radius: 50px; } - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a { - color: #6ed085; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-traccia, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-traccia { - color: #ff6a9b; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-bolle, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-bolle { - color: #d668f4; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-bordereau, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-bordereau { - color: #a587f9; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-merce, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-merce { - color: #319fee; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-prese, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-prese { - color: #30d0f4; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-listini, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-listini { - color: #4bfcb1; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-autisti, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-autisti { - color: #f97a73; -} - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-dipendenti, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-dipendenti { - color: #fca64b; +.main-sidebar .sidebar-menu li a { + padding: 0 10px; } - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-clients, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-clients { - color: #fff00f; +body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a { + color: #fff; } - -body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-fatturazione, body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-fatturazione { - color: #ea8a44; +body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a { + padding-left: 10px; } .card .card-header { @@ -534,14 +412,27 @@ body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-fat padding: 14px 15px 12px; background: #f9f9f9; } - +.main-sidebar .sidebar-menu li.active ul.dropdown-menu { + background-color: transparent; +} /*.card { box-shadow: 0 0.46875rem 2.1875rem rgba(90,97,105,0.18),0 0.9375rem 1.40625rem rgba(90,97,105,0.2),0 0.25rem 0.53125rem rgba(90,97,105,0.18),0 0.125rem 0.5875rem rgba(90,97,105,0.18); }*/ .card .card-statistic-4 { - padding: 50px 20px 60px; + padding: 30px 30px 40px; +} +.dark-sidebar .main-sidebar .sidebar-menu li ul.dropdown-menu li a { + color: #bdbdbd; +} +.dark-sidebar .main-sidebar .sidebar-menu li ul.dropdown-menu a { + background-color: #42464e; +} +.dark-sidebar .main-sidebar .sidebar-menu li ul.dropdown-menu li.active>a { + color: #ffffff!important; +} +.dark-sidebar:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu>li.active ul.dropdown-menu li a { + background-color: #32373e; } - .card-header:first-child { border-radius: 10px 10px 0 0; } @@ -551,13 +442,16 @@ body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu > li.active > a.color-fat } .table.table-bordered td, .table.table-bordered th, .table.table-bordered td input { - border-color: #ced5db; + border-color: #c2cad0; } .table-striped tbody tr:nth-of-type(2n+1) { - background-color: rgba(0, 0, 0, 0.006); + background-color: rgba(0, 0, 0, 0.001); +} +table.dataTable thead th, table.dataTable thead td { + border-bottom: 1px solid #c2cad0 !important; + border-top: 1px solid #c2cad0 !important; } - table.dataTable thead th, table.dataTable thead td { padding: 15px 10px 12px; } @@ -569,16 +463,18 @@ table.dataTable thead th, table.dataTable thead td { } .table, .table-striped > tbody > tr:nth-of-type(2n+1) > * { - color: #01274a; + color: #20201e; +} +table.dataTable thead .sorting { + filter: brightness(80%); } - .card .card-footer { padding: .75rem 1.25rem; background-color: rgba(0, 0, 0, .03); border-top: 1px solid rgb(218, 218, 218); } -.table > tbody > tr td:nth-last-of-type(-n+1) { +.table > tbody > tr td:nth-last-of-type(-n+3) { text-align: center; } @@ -613,9 +509,11 @@ table.dataTable thead th, table.dataTable thead td { } .card { - background-color: rgba(255, 255, 255, .85); + background-color: rgba(255, 255, 255, .60); +} +.theme-white .navbar { + background-color: rgba(255, 255, 255, .70); } - table.dataTable tbody tr { background-color: rgba(255, 255, 255, .3); } @@ -624,11 +522,12 @@ table.dataTable tbody tr { background-color: #307dc4; text-transform: uppercase; } - .theme-white a:hover { - color: #307dc4; + color: #fff; +} +.text-danger, .text-danger-all *, .text-danger-all ::before, .text-danger-all ::after { + color: #fb7146 !important; } - .nav-pills .nav-item .nav-link { color: #1c5d99; text-transform: uppercase; @@ -636,11 +535,21 @@ table.dataTable tbody tr { margin-right: 5px; box-shadow: 0 1px 6px #c9c9cd; } - -/*.nav-pills .nav-item .nav-link:hover { - background-color: #c1c4db; - color: #fff; -}*/ +.form-select { + font-size: .9rem; +} +.card .card-header .btn { + margin-top: 0; + padding: 5px 20px; +} +/*.btn-secondary, .btn-secondary.disabled { + background-color: #a5aaae; + border-color: #a5aaae; + }*/ +.btn-secondary, .btn-secondary.disabled { + background-color: #262626; + border-color: #262626; +} .nav-pills .nav-item .nav-link.active { box-shadow: 0 4px 8px #b3b6bb; } @@ -761,7 +670,7 @@ a:not([href]):not([tabindex]), a:not([href]):not([tabindex]):focus, a:not([href] } .btn-check:focus + .btn, .btn:focus { - color: #0c3152; + color: #ccc; } .table:not(.table-sm) thead th { @@ -828,7 +737,11 @@ a:not([href]):not([tabindex]), a:not([href]):not([tabindex]):focus, a:not([href] color: #db752b; background: #f9eae2; } - +.card .card-footer .btn:not(.note-btn) { + border-radius: 30px; + padding-left:20px; + padding-right:20px; +} .display-2 { font-weight: 600; } @@ -881,13 +794,14 @@ ul#id_ruolo { .select2-container.select2-container--open .select2-selection--single { border-color: #8ab0d3; } - .form-control, .swal2-popup { - color: #22364c !important; + color: #20201e !important; } - .swal2-styled.swal2-confirm { - background-color: #307dc4 !important; + background-color: #000 !important; + border-radius: 20px; + padding-left: 25px; + padding-right: 25px; } .swal2-styled.swal2-confirm:focus { @@ -906,7 +820,7 @@ ul#id_ruolo { thead { border-color: #dfe1f1; - background-color: rgba(0, 0, 0, 0.04); + background-color: rgba(0, 0, 0, 0.1); } .table-hover tbody tr:hover { @@ -919,7 +833,7 @@ thead { } .dropdown-item { - color: #0e467d; + color: #20201e; } .form-group > label { @@ -1037,7 +951,12 @@ td input.form-control:not(.form-control-sm):not(.form-control-lg) { .card-footer { border-top: 1px solid rgb(222, 226, 230); } - +.sidebar-mini .main-sidebar .sidebar-menu>li ul.dropdown-menu { + background-color: #42464e; +} +.dark-sidebar.sidebar-mini .main-sidebar .dropdown-title { + background-color: #2b2e35; +} @media (max-width: 1024px) { .navbar { @@ -1084,12 +1003,6 @@ table#tab-ins-costi-tratta td .form-control { padding: 0; margin: 0; } -.slist li { - margin: 10px; - padding: 15px; - border: 1px solid #dfdfdf; - background: #f5f5f5; -} /* (B) DRAG-AND-DROP HINT */ .slist li.hint { @@ -1100,3 +1013,38 @@ table#tab-ins-costi-tratta td .form-control { border: 1px solid #ffa5a5; background: #ffe7e7; } +.theme-white .nav-pills .nav-link.active { + background-color: #ff5700; +} +.nav-pills .nav-item .nav-link { + color: #20201e; +} +.nav-pills .nav-item .nav-link:hover { + background-color: #20201e; + color: #fff; +} +.form-check-input { + position: relative!important; + margin-left: 0!important; +} +.form-check-input { + margin-top: .55em; +} +.help-block { + font-size: 12px; + line-height: 30px; +} +.card .card-body p.help-block{ + color: #96a1ac; +} +.control-group { + margin-top: 20px; +} +.control-label { + font-weight: 600; +} +@media (min-width: 1200px) { + .h1, h1 { + font-size: 2.8rem; + } +} \ No newline at end of file diff --git a/sistema/static/assets/img/atlas-baackground-bot.png b/sistema/static/assets/img/atlas-baackground-bot.png new file mode 100644 index 0000000..c3bf058 Binary files /dev/null and b/sistema/static/assets/img/atlas-baackground-bot.png differ diff --git a/sistema/static/assets/img/banner/1.jpg b/sistema/static/assets/img/banner/1.jpg deleted file mode 100644 index ce065a4..0000000 Binary files a/sistema/static/assets/img/banner/1.jpg and /dev/null differ diff --git a/sistema/static/assets/img/banner/1.png b/sistema/static/assets/img/banner/1.png new file mode 100644 index 0000000..fe203f3 Binary files /dev/null and b/sistema/static/assets/img/banner/1.png differ diff --git a/sistema/static/assets/img/banner/2-1.png b/sistema/static/assets/img/banner/2-1.png new file mode 100644 index 0000000..2b69d04 Binary files /dev/null and b/sistema/static/assets/img/banner/2-1.png differ diff --git a/sistema/static/assets/img/banner/2.png b/sistema/static/assets/img/banner/2.png index a9b7181..85f6ea8 100644 Binary files a/sistema/static/assets/img/banner/2.png and b/sistema/static/assets/img/banner/2.png differ diff --git a/sistema/static/assets/img/banner/3.png b/sistema/static/assets/img/banner/3.png new file mode 100644 index 0000000..a18d2dd Binary files /dev/null and b/sistema/static/assets/img/banner/3.png differ diff --git a/sistema/static/assets/img/banner/4.png b/sistema/static/assets/img/banner/4.png new file mode 100644 index 0000000..914393a Binary files /dev/null and b/sistema/static/assets/img/banner/4.png differ diff --git a/sistema/static/assets/img/favicon.ico b/sistema/static/assets/img/favicon.ico index f1dbbb0..cf6aefe 100755 Binary files a/sistema/static/assets/img/favicon.ico and b/sistema/static/assets/img/favicon.ico differ diff --git a/sistema/static/assets/img/logo-white.png b/sistema/static/assets/img/logo-white.png new file mode 100644 index 0000000..fe8a539 Binary files /dev/null and b/sistema/static/assets/img/logo-white.png differ diff --git a/sistema/templates/add_mod_localita.html b/sistema/templates/add_mod_localita.html index 4db31d8..f37ec1a 100644 --- a/sistema/templates/add_mod_localita.html +++ b/sistema/templates/add_mod_localita.html @@ -5,7 +5,7 @@
-

Gestione località

+

Gestione località

{% if form.instance.pk %} @@ -15,21 +15,22 @@ {% endif %}
-
-
{% csrf_token %} + + +
+ {% csrf_token %} {% if form.instance.pk %} {% endif %} {{form | crispy }} -
+
-
-
diff --git a/sistema/templates/add_mod_percorso.html b/sistema/templates/add_mod_percorso.html index 2722039..bbfef72 100644 --- a/sistema/templates/add_mod_percorso.html +++ b/sistema/templates/add_mod_percorso.html @@ -5,8 +5,7 @@
-

Gestione - percorsi

+

Gestione percorsi

{% if form.instance.pk %} @@ -18,7 +17,7 @@
-
+
Info percorso
{% csrf_token %} {% if form.instance.pk %} @@ -33,30 +32,35 @@
Seleziona i punti di interesse

@@ -68,7 +72,7 @@
- +
diff --git a/sistema/templates/add_mod_poi.html b/sistema/templates/add_mod_poi.html index a0f0f0a..c752281 100644 --- a/sistema/templates/add_mod_poi.html +++ b/sistema/templates/add_mod_poi.html @@ -5,19 +5,18 @@
-

Gestione - punti di interesse

+

Gestione punti di interesse

@@ -29,7 +28,7 @@ {% if form.instance.pk %}

Modifica il punto di interesse #{{ form.instance.pk }}

{% else %} -

Aggiungi una nuovo punto di interesse nel sistema

+

Aggiungi un nuovo punto di interesse nel sistema

{% endif %}
{% csrf_token %} @@ -39,11 +38,10 @@ {% endif %} {{ form | crispy }} -
-
@@ -94,7 +92,7 @@ {{ form_multimedia | crispy }}
- @@ -109,6 +107,10 @@ diff --git a/sistema/templates/base.html b/sistema/templates/base.html index 77fa057..95650d9 100644 --- a/sistema/templates/base.html +++ b/sistema/templates/base.html @@ -7,9 +7,9 @@ - Socoin Atlas + Socoin ATLAS - Digital Tourist - + @@ -52,9 +52,9 @@ integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous"> - + @@ -131,55 +131,55 @@
@@ -221,13 +227,6 @@
-
-
-
- Copyright © Dyrecta - 2022 -
-
-
diff --git a/sistema/templates/home.html b/sistema/templates/home.html index b3bc64a..e64833a 100644 --- a/sistema/templates/home.html +++ b/sistema/templates/home.html @@ -1,5 +1,101 @@ {% extends 'base.html' %} {% load static %} {% block content %} - CIAO, {{ request.session.roles }} + + +
+

Benvenuto, {{ request.session.roles }}

+
+
+
+
+
+
+
+

Utenti

+ Amministratori + Tour Operator + Clienti +
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+
+
+

Punti di interesse

+ Lista punti di interesse + Tipologia Multimedia +
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+
+
+
+

Località

+ + + +
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+

Percorsi

+ + + +
+
+
+ +
+
+
+
+
+
+
+
+ + + + {% endblock %} \ No newline at end of file diff --git a/sistema/templates/localita_list.html b/sistema/templates/localita_list.html index b59a328..8616849 100644 --- a/sistema/templates/localita_list.html +++ b/sistema/templates/localita_list.html @@ -3,13 +3,13 @@ {% block content %}
-

Gestione località

+

Gestione località

Lista località

- +
diff --git a/sistema/templates/percorsi_list.html b/sistema/templates/percorsi_list.html index 985df3e..3a3377a 100644 --- a/sistema/templates/percorsi_list.html +++ b/sistema/templates/percorsi_list.html @@ -3,13 +3,13 @@ {% block content %}
-

Gestione Percorsi

+

Gestione Percorsi

Lista percorsi

- +
diff --git a/sistema/templates/poi_list.html b/sistema/templates/poi_list.html index a74ab2d..faf5775 100644 --- a/sistema/templates/poi_list.html +++ b/sistema/templates/poi_list.html @@ -3,13 +3,13 @@ {% block content %}
-

Gestione punti di interesse

+

Gestione punti di interesse

Lista punti di interesse

- +
@@ -41,6 +41,10 @@ diff --git a/utenti/templates/add_mod_tour_operator.html b/utenti/templates/add_mod_tour_operator.html index 76bd1f7..e605cdf 100644 --- a/utenti/templates/add_mod_tour_operator.html +++ b/utenti/templates/add_mod_tour_operator.html @@ -5,13 +5,13 @@
-

Gestione tour operator

+

Gestione tour operator

{% if form.instance.pk %}

Modifica il tour operator #{{ form.instance.pk }}

{% else %} -

Registra una nuovo tour operator nel sistema

+

Registra un nuovo tour operator nel sistema

{% endif %}
@@ -23,8 +23,6 @@ {% endif %} {{form | crispy }} - -
Associa località
{% csrf_token %} @@ -37,8 +35,7 @@
Località già associate
- + @@ -55,14 +52,11 @@ {% endif %} -
- -
-
+
+
- - @@ -70,6 +64,13 @@