arenard
/
paniers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update interface to responsive

This commit is contained in:
Adrien RENARD 2024-01-27 20:04:57 +01:00
parent ec321d26d6
commit d51e0e4ff0
38 changed files with 592 additions and 691 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/settings.php
View File

@ -10,7 +10,9 @@ define("SITE_NAME", "La p'tite fourmi - Gestion paniers");
// ONLINE REPO //////////////////////////////////////////////////////// // ONLINE REPO ////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
define('ONLINE_REPOSITORY', !($_SERVER["SERVER_NAME"] == "localhost" || $_SERVER["SERVER_NAME"] == "127.0.0.1")); define('ONLINE_REPOSITORY', !( $_SERVER["SERVER_NAME"] == "localhost"
|| $_SERVER["SERVER_NAME"] == "127.0.0.1"
|| substr($_SERVER["SERVER_NAME"], 0, 8) == "192.168." ));
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// DEBUG & PHP ERROR SETTINGS ////////////////////////////////////////// // DEBUG & PHP ERROR SETTINGS //////////////////////////////////////////
@ -43,7 +45,7 @@ if(ONLINE_REPOSITORY) {
} }
else { else {
define('ROOT_DIR_PATH', '/Applications/MAMP/htdocs/paniers/'); define('ROOT_DIR_PATH', '/Applications/MAMP/htdocs/paniers/');
define('PUBLIC_HTML_ADMIN','http://localhost/paniers/public_html_admin/'); define('PUBLIC_HTML_ADMIN','http://'.$_SERVER["SERVER_NAME"].'/paniers/public_html_admin/');
} }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

571
public_html_admin/css/admin.css
View File

@ -1,62 +1,54 @@
div.mainPage { padding: 0; } div.mainPage { padding: 0; }
.icon { height: 16px; }
th.icon,
td.icon { width: 24px; }
.center { text-align: center; } .center { text-align: center; }
.right { text-align: right; } .right { text-align: right; }
.border-left { border-left: 1px solid #ddd; } .border-left { border-left: 1px solid #ddd; }
.border-right { border-right: 1px solid #ddd; } .border-right { border-right: 1px solid #ddd; }
tr.subLine > td { .noselect {
padding-top: 3px !important; -webkit-touch-callout: none;
padding-bottom: 3px !important; -webkit-user-select: none;
border: none !important; -khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
} }
span.nb_item_list { span.hl_results { font-weight: bold; }
display: block;
float: right;
color: darkgrey;
font-style: italic;
}
span.hl_results { .imgContainer {
font-weight: bold;
}
input[type=date].form-control {
padding-right: 3px;
}
@media (min-width: 1180px) {
.modal-xl {
width: 1120px;
}
}
/* MAIN NAV BAR */
div.main-navbar {
margin-bottom: 0;
}
.iconTobBar {
display: block;
float: left;
width: 30px;
height: 30px;
position: relative;
top: -5px;
left: -5px;
margin-bottom: -15px;
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
} }
input[type=date].form-control { padding-right: 3px; }
select.form-control { padding-left: 8px!important; }
textarea { padding: 4px!important; }
.input-group-addon.active { background-color: #5bc0de; }
div.intl-tel-input { display: block; }
.ui-autocomplete { z-index: 10000; }
@media (min-width: 1180px) { .modal-xl { width: 1120px; } }
/* MAIN NAV BAR */
div.main-navbar { margin-bottom: 0; }
div.main-navbar a.brand img {
height: 46px;
position: relative;
top: -11px;
}
div.main-navbar button.navbar-toggle { margin-right: 5px; padding: 5px; }
/* SECOND BAR */ /* SECOND BAR */
div.secondbar { div.secondbar {
@ -65,6 +57,12 @@ div.secondbar {
margin-bottom: 0; margin-bottom: 0;
} }
div.secondbar button.navbar-toggle {
margin: 5px;
padding: 4px 9px;
border-color: #CCC;
}
div.secondbar a.brand > img { div.secondbar a.brand > img {
display: inline-block; display: inline-block;
height: 46px; height: 46px;
@ -81,12 +79,6 @@ div.secondbar a.brand > span {
top: -13px; top: -13px;
} }
div.secondbar form.navbar_filtre {
margin-left: auto!important;
}
div.secondbar form.navbar-right { padding-right: 0; }
div.secondbar ul.navbar-nav li > a:hover, div.secondbar ul.navbar-nav li > a:hover,
div.secondbar ul.navbar-nav li.active > a:hover, div.secondbar ul.navbar-nav li.active > a:hover,
div.secondbar ul.navbar-nav li.active > a { div.secondbar ul.navbar-nav li.active > a {
@ -94,21 +86,47 @@ div.secondbar ul.navbar-nav li.active > a {
color: #3296C8; color: #3296C8;
} }
i.btnClearSearch { div.secondbar form.form-filtre-search { padding-right: 0; }
cursor: pointer;
div.secondbar form.form-filtre-search i.btnClearSearch { cursor: pointer; }
div.secondbar form.form-filtre-search span.separator {
display: inline-table;
vertical-align: middle;
width: 0; height: 30px;
margin: 0 5px;
border-left: 1px solid #CCCCCC;
} }
div.intl-tel-input { display: block; } div.secondbar form.form-filtre-search button.btnPrint span.txt { display: none; }
.ui-autocomplete { z-index: 10000; } @media (max-width: 767px) {
div.main-navbar a.brand img { height: 40px; }
.db_ref { div.secondbar { min-height: 0; }
float: right; div.secondbar a.brand { height: 40px; padding: 10px; }
position: relative;
top: 28px; div.secondbar div.navbar-filtre-search { border-top: 1px solid #CCCCCC; padding: 0 5px; }
right: -12px; div.secondbar form.form-filtre-search { padding: 5px 0; margin: 0; }
color: #CCCCCC; div.secondbar form.form-filtre-search > *:not(:last-child) { padding-bottom: 7px; }
font-style: italic;
div.secondbar form.form-filtre-search span.separator {
width: 100%; height: 0px;
margin: 0;
border-left: none;
border-top: 1px solid #CCCCCC;
}
div.secondbar form.form-filtre-search button.btnPrint { width: 100%; }
div.secondbar form.form-filtre-search button.btnPrint span.txt { display: inline; }
div.secondbar div.input-group.order {
display: table!important;
width: 100%;
border-top: 1px solid #ccc;
padding: 7px 0 0 0;
}
div.secondbar button.btnPrint { margin: -5px; }
} }
/* LIST */ /* LIST */
@ -165,46 +183,7 @@ table.scrollingTableList td.loader {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
/* FEEDBACKS */ table.scrollingTableList img.icon {
span.form-control-feedback { position: absolute; }
div.form-group.has-feedback > span.form-control-feedback { top: 33px; }
div.has-feedback > span.form-control-feedback { top: 9px; }
.td_btn_action {
width: 20px;
text-align: center;
padding-left: 0!important;
padding-right: 0!important;
}
.td_btn_action > button {
text-decoration:none!important;
padding-left: 2px;
padding-right: 2px;
}
.td_btn_action li > a:hover,
.td_btn_delete > button, .td_btn_delete > a { color: #d9534f; }
.td_btn_delete > button:hover, .td_btn_delete > a:hover { color: #c9302c; }
.td_btn_archive > button, .td_btn_archive > a { color: #f0ad4e; }
.td_btn_archive > button:hover, .td_btn_archive > a:hover { color: #ec971f; }
.td_btn_unarchive > button, .td_btn_unarchive > a { color: #5bc0de; }
.td_btn_unarchive > button:hover, .td_btn_unarchive > a:hover { color: #269abc; }
.imgContainer {
background-size: contain;
background-repeat: no-repeat;
background-position: center;
}
img.icon {
width: 16px; width: 16px;
height: 16px; height: 16px;
position: relative; position: relative;
@ -213,161 +192,98 @@ img.icon {
margin-right: 2px; margin-right: 2px;
} }
.input-group-addon.active { background-color: #5bc0de; } .td_btn_action {
width: 30px;
/*
/* NAV TABS PANEL
/*/
.nav-tabs-panel {
border-radius: 5px 5px 0 0;
border-bottom: none;
color: #fff;
background-color: #3296c8;
padding-top: 5px;
padding-left: 5px;
}
.nav-tabs-panel>li>a {
color: white;
padding-top: 5px;
padding-bottom: 5px;
}
.nav-tabs-panel>li>a:hover {
color: #2a6496;
}
.tab-content-panel {
padding: 10px;
border: 1px solid #ddd;
border-radius: 0 0 5px 5px;
}
/* END NAV TABS PANEL */
.center {
text-align: center; text-align: center;
padding-left: 0!important;
padding-right: 0!important;
}
.td_btn_action > button {
text-decoration:none!important;
padding-left: 2px;
padding-right: 2px;
}
.td_btn_action li > a:hover, .td_btn_delete > button, .td_btn_delete > a { color: #d9534f; }
.td_btn_delete > button:hover, .td_btn_delete > a:hover { color: #c9302c; }
.td_btn_archive > button, .td_btn_archive > a { color: #f0ad4e; }
.td_btn_archive > button:hover, .td_btn_archive > a:hover { color: #ec971f; }
.td_btn_unarchive > button, .td_btn_unarchive > a { color: #5bc0de; }
.td_btn_unarchive > button:hover, .td_btn_unarchive > a:hover { color: #269abc; }
@media only screen and (hover: none) and (pointer: coarse){
table.scrollingTableList:not(.no-scroll) thead { width: 100%!important; }
} }
.align_right { /* MODALS */
text-align: right;
}
.unitCell { div.modaLoader {
padding-left: 0 !important; position: absolute;
width:16px; top: 0;
} left: 0;
height: 100%;
img.icon { width: 100%;
width: 20px; background-color: rgba(64, 64, 64, 0.3);
} background-image: url(../img/wait.svg);
.noselect {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
textarea {
padding: 4px!important;
}
select.form-control {
padding-left: 8px!important;
}
thead.fixedHead > tr > td {
height:0;
padding:0;
border:none;
}
thead.fixedHead > tr > th {
border-width: 0!important;
}
tr.editDisabled > td,
th.editDisabled,
td.editDisabled {
color: #7c7c7c;
}
.img-thumbnail {
min-width: 30px;
min-height: 30px;
background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain;
background-position: center; background-position: center;
z-index: 2000;
display: none;
} }
div.modaLoader.show { display: block; }
/* div.modal-header > h2.modal-title > img { height: 50px; margin-right: 5px; }
/* EdiTable
/*/
td.ediTable, div.modal-header > .db_ref {
td.editable { float: right;
-webkit-touch-callout: none; position: relative;
-webkit-user-select: none; top: 28px;
-khtml-user-select: none; right: -12px;
-moz-user-select: none; color: #CCCCCC;
-ms-user-select: none;
user-select: none;
white-space: nowrap;
overflow: hidden;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
}
td.ediTabling {
padding: 4px!important;
}
input.ediTable {
width: 100%;
}
select.ediTable {
display: block;
width: 100%;
height: 30px;
padding: 6px 12px;
font-size: 14px;
line-height: 1.42857143;
color: #555;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
}
/*
/* NEW FILE
/*/
.new_file_name {
color: grey;
font-size: 0.8em;
font-style: italic; font-style: italic;
} }
.new_file_error { table.modal-body { margin-bottom: 0; }
color: red; table.modal-body tr:last-child { border-bottom-left-radius: 6px; border-bottom-right-radius: 6px; }
table.modal-body tr:last-child td:first-child { border-bottom-left-radius: 6px; !important }
table.modal-body tr:last-child th:first-child { border-bottom-left-radius: 6px; !important }
table.modal-body tr:last-child td:last-child { border-bottom-right-radius: 6px; !important }
@media (max-width: 767px) {
div.modal-header, div.modal-footer { padding: 10px; }
div.modal-header > h2.modal-title { font-size: 22px; }
div.modal-header > h2.modal-title > img { height: 35px; }
div.modal-header > .db_ref { top: 22px; }
.modal-body { font-size: 12px; }
} }
#new_doc { /* INLINE SELECT MANAGER */
display: none;
div.inlineSelectManager .form-control { height: 35px;}
div.inlineSelectManager span.input-group-btn { border: none; }
div.inlineSelectManager span.input-group-btn button { height: 35px;}
div.inlineSelectManager .btnSecondAction { border-radius: 0; border-left: none; }
/* FORM TABS */
div.formTabs div.tab:not(.active) { display: none; }
div.formTabs div.tab { overflow-y: scroll; }
div.formTabs table.modal-body tr:first-child th,
div.formTabs table.modal-body tr:first-child td { border-top: none; }
@media (max-width: 767px) {
ul.formTabsBtns > li > a { padding: 10px; }
} }
/* FEEDBACKS */
span.form-control-feedback { position: absolute; }
div.form-group.has-feedback > span.form-control-feedback { top: 33px; }
div.has-feedback > span.form-control-feedback { top: 9px; }
/* CUSTOM COLOR */
/* Panel */ /* Panel */
.panel-custom { .panel-custom {
@ -393,9 +309,7 @@ select.ediTable {
border-color: #357ebd; border-color: #357ebd;
} }
.btn-custom >a{ .btn-custom > a { color: #fff; }
color: #fff;
}
.btn-custom:hover, .btn-custom:hover,
.btn-custom:focus, .btn-custom:focus,
@ -406,171 +320,15 @@ select.ediTable {
background-color: #4687bf; background-color: #4687bf;
border-color: #285e8e; border-color: #285e8e;
} }
.btn-custom:active, .btn-custom:active, .btn-custom.active,
.btn-custom.active, .open .dropdown-toggle.btn-custom { background-image: none; }
.open .dropdown-toggle.btn-custom {
background-image: none;
}
.btn-custom.disabled,
.btn-custom[disabled],
fieldset[disabled] .btn-custom,
.btn-custom.disabled:hover,
.btn-custom[disabled]:hover,
fieldset[disabled] .btn-custom:hover,
.btn-custom.disabled:focus,
.btn-custom[disabled]:focus,
fieldset[disabled] .btn-custom:focus,
.btn-custom.disabled:active,
.btn-custom[disabled]:active,
fieldset[disabled] .btn-custom:active,
.btn-custom.disabled.active,
.btn-custom[disabled].active,
fieldset[disabled] .btn-custom.active {
background-color: #3296c8;
border-color: #357ebd;
}
.btn-custom .badge {
color: #3296c8;
background-color: #fff;
}
/* MODAL VIEW */ .btn-custom.disabled, .btn-custom[disabled], fieldset[disabled] .btn-custom,
.btn-custom.disabled:hover, .btn-custom[disabled]:hover, fieldset[disabled] .btn-custom:hover,
div.modalView .modal-title > img.photo { .btn-custom.disabled:focus, .btn-custom[disabled]:focus, fieldset[disabled] .btn-custom:focus,
border: 1px solid #3296c8; .btn-custom.disabled:active, .btn-custom[disabled]:active, fieldset[disabled] .btn-custom:active,
border-radius: 3px; .btn-custom.disabled.active, .btn-custom[disabled].active, fieldset[disabled] .btn-custom.active { background-color: #3296c8; border-color: #357ebd; }
padding: 6px; .btn-custom .badge { color: #3296c8; background-color: #fff; }
float: left;
height: 70px;
}
div.modalView .modal-title div.title {
line-height: 20px;
padding-top: 25px;
}
div.modalView .modal-title span.title {
display: inline-block;
margin-left: 10px;
}
div.modalView .modal-title span.name {
font-size: 0.8em;
color: #3296c8;
}
div.modalView .modal-title span.subline {
display: inline-block;
font-size: 0.5em;
color: #777;
margin-left: 10px;
line-height: 15px;
}
div.modalView .modal-title span.subline > span.birthday {
font-weight: 300;
}
div.modaLoader {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
background-color: rgba(64, 64, 64, 0.3);
background-image: url(../img/wait.svg);
background-repeat: no-repeat;
background-size: contain;
background-position: center;
z-index: 2000;
display: none;
}
div.modaLoader.show { display: block; }
table.modal-body { margin-bottom: 0; }
table.modal-body tr:last-child {
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
}
table.modal-body tr:last-child td:first-child { border-bottom-left-radius: 6px; !important }
table.modal-body tr:last-child th:first-child { border-bottom-left-radius: 6px; !important }
table.modal-body tr:last-child td:last-child { border-bottom-right-radius: 6px; !important }
/* INLINE SELECT MANAGER */
.btnSecondAction {
border-radius: 0;
border-left: none;
}
/* FORM TABS */
div.formTabs div.tab:not(.active) { display: none; }
div.formTabs div.tab { overflow-y: scroll; }
div.formTabs table.modal-body tr:first-child th,
div.formTabs table.modal-body tr:first-child td { border-top: none; }
/* PANIER FORM */
.formPanier .btnGroupeSecondAction {
border-radius: 0;
border-left: none;
}
.formPanier div.input-group select.form-control,
.formPanier div.input-group input.form-control,
.formPanier div.input-group span.input-group-btn {
box-sizing: border-box;
height: 35px;
}
/* CONTRAT FORM */
.formContrat div.custom_type { margin-top: -10px; }
.formContrat .btnLieuSecondAction,
.formContrat .btnContratTypeSecondAction {
border-radius: 0;
border-left: none;
}
.formContrat div.input-group select.form-control,
.formContrat div.input-group input.form-control,
.formContrat div.input-group span.input-group-btn {
box-sizing: border-box;
height: 35px;
}
/* MODAL VIEW LEGUME */
.has-next-tarif { background-color: #e5ffe7; }
#modalViewLegume tr.tarifs_titre { background-color: #f2f2f2; border-top: 3px solid #ddd; }
#modalViewLegume tr.tarifs_titre th.groupe { border-left: 1px solid #999999; border-right: 1px solid #999999; }
#modalViewLegume tr.tarif td { border-top: 1px solid #999999; }
#modalViewLegume tr.tarif:not(:last-child) td { border-bottom: 1px solid #999999; }
#modalViewLegume tr.tarif td:not(:first-child) { border-left: 1px solid #999999; }
#modalViewLegume tr.tarif td:not(:first-last) { border-right: 1px solid #999999; }
#modalViewLegume td.tarif { text-align: center; }
#modalViewLegume td.tarif.next { background-color: #e5ffe7!important; }
#modalViewLegume td.tarif.current { background-color: #bfe2ff;!important; }
#modalViewLegume td.tarif.old { background-color: #f2f2f2!important; }
#modalViewLegume td.tarif.not_apply { background-color: #ccc!important; }
/* FORM LEGUME */
.formLegume div.tarif { margin-bottom: 5px; }
.formLegume div.tarifs:last-child { margin-bottom: 0; }
.formLegume div.input-group.deleted select.form-control,
.formLegume div.input-group.deleted input.form-control,
.formLegume div.input-group.deleted span.input-group-addon {
text-decoration: line-through;
color: #d9534f;
}
/* MODAL ADMIN CONSOLE */ /* MODAL ADMIN CONSOLE */
@ -589,4 +347,3 @@ div.formTabs table.modal-body tr:first-child td { border-top: none; }
} }
#modalAdminConsole div.modal-body > ul > li.mt { margin-top: 10px; } #modalAdminConsole div.modal-body > ul > li.mt { margin-top: 10px; }

71
public_html_admin/css/clients.css
View File

@ -6,58 +6,47 @@
#modalViewClient .formClient { margin: -15px; } #modalViewClient .formClient { margin: -15px; }
/* NAV TABS */
.formClient ul.nav.nav-tabs { padding-left: 10px; }
div.formClientTabs > div.tab {
display: none;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
overflow-y: scroll;
}
div.formClientTabs > div.tab.active { display: block; }
div.formClientTabs > div.tab span.nullChild { display: block; padding: 10px; }
div.formClientTabs > div.tab span.nullChild { display: block; padding: 10px; }
/* TAB INFOS */
div.formClientTabs > div.tabInfos table tr:first-child > th,
div.formClientTabs > div.tabInfos table tr:first-child > td { border-top: none; }
div.formClientTabs > div.tabInfos table th { width: 100px; }
/* TAB CONTRATS */
div.formClientTabs > div.tabContrats table { margin-bottom: 0; }
/* TAB ABSENCES */ /* TAB ABSENCES */
div.formClientTabs > div.tabAbsences table { margin-bottom: 0; } #modalViewClient div.tabAbsences table { margin-bottom: 0; }
div.formClientTabs > div.tabAbsences table td.ref { width: 30px; } #modalViewClient div.tabAbsences table td.ref { width: 30px; }
div.formClientTabs > div.tabAbsences table td.debut, #modalViewClient div.tabAbsences table td.date { text-align: center; padding: 8px 0; }
div.formClientTabs > div.tabAbsences table td.fin { width: 130px; text-align: center; } #modalViewClient div.tabAbsences table td.debut { width: 130px; }
#modalViewClient div.tabAbsences table td.fin { width: 120px; }
div.formClientTabs > div.tabAbsences table tr.editable { background-color: #cce4f9; } #modalViewClient div.tabAbsences table tr.editable { background-color: #cce4f9; }
div.formClientTabs > div.tabAbsences table tr.editable td.debut, #modalViewClient div.tabAbsences table tr.editable td.date { padding: 0; text-align: right; }
div.formClientTabs > div.tabAbsences table tr.editable td.fin, #modalViewClient div.tabAbsences table tr.editable td.remarque { padding: 0; }
div.formClientTabs > div.tabAbsences table tr.editable td.remarque { padding: 0; }
div.formClientTabs > div.tabAbsences table tr.editable input { #modalViewClient div.tabAbsences table tr.editable input {
border: none; border: none;
padding: 0; padding: 0;
width: 100%; width: 100%;
height: 24px; height: 24px;
margin-top: 6px; margin-top: 6px;
border-radius: 4px;
border: 1px solid #CCC;
} }
div.formClientTabs > div.tabAbsences table tr.editable input:focus { outline-style: none; }
div.formClientTabs > div.tabAbsences table tr.editable td.debut input, #modalViewClient div.tabAbsences table tr.editable td.date input {
div.formClientTabs > div.tabAbsences table tr.editable td.fin input { width: 110px; margin-left: 10px; margin-right: 10px; text-align: right; } width: 110px;
div.formClientTabs > div.tabAbsences table tr.editable td.remarque input { padding-left: 8px; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; font-size: 14px; } margin-right: 10px;
text-align: right;
}
#modalViewClient div.tabAbsences table tr.editable td.remarque input {
padding-left: 8px;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 14px;
}
@media only screen and (hover: none) and (pointer: coarse) {
#modalViewClient div.tabAbsences table td.debut { width: 110px; }
#modalViewClient div.tabAbsences table td.fin { width: 100px; }
#modalViewClient div.tabAbsences table tr.editable td.date input { width: 90px; }
#modalViewClient div.tabAbsences table .td-btn-action { text-align: right; }
}

67
public_html_admin/css/contrats.css
View File

@ -1,4 +1,4 @@
/* MODAL & FORM LIVRAISON */ /* MODAL VIEW */
#modalViewContrat { overflow: hidden; } #modalViewContrat { overflow: hidden; }
@ -8,31 +8,48 @@
#modalViewContrat div.tabPaniers table { margin-bottom: 0!important; } #modalViewContrat div.tabPaniers table { margin-bottom: 0!important; }
/* CONTRAT FORM */
.formContrat div.custom_type { margin-top: -10px; }
@media (max-width: 1000px) {
.formContrat div.custom_type {
display: block;
padding: 6px 6px 1px 6px;
border: 1px solid #CCC;
background-color: #f6f6f6;
border-radius: 4px;
}
.formContrat div.custom_type span.input-group-addon {
float: left;
box-sizing: border-box;
width: 100px;
height: 35px;
padding: 9px;
border-top-left-radius: 4px!important;
border-bottom-left-radius: 4px!important;
margin-bottom: 5px;
border-right: none;
}
.formContrat div.custom_type .form-control {
display: inline-block;
box-sizing: border-box;
height: 35px;
width: calc(100% - 100px);
border-top-right-radius: 4px!important;
border-bottom-right-radius: 4px!important;
margin-bottom: 5px;
}
}
@media only screen and (hover: none) and (pointer: coarse) {
.formContrat .form-control[type=date] { width: calc(100vw - 52px); }
.formContrat div.checkbox > label { line-height: 24px; }
.formContrat div.checkbox:not(.last) { margin-bottom: 15px; }
}
/* NAV TABS */ /* NAV TABS */
.formContrat ul.nav.nav-tabs { padding-left: 10px; } .formContrat ul.nav.nav-tabs { padding-left: 10px; }
div.formContratTabs > div.tab {
display: none;
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
overflow-y: scroll;
}
div.formContratTabs > div.tab.active { display: block; }
div.formContratTabs > div.tab span.nullChild { display: block; padding: 10px; }
div.formContratTabs > div.tab span.nullChild { display: block; padding: 10px; }
/* TAB INFOS */
div.formContratTabs > div.tabInfos table tr:first-child > th,
div.formContratTabs > div.tabInfos table tr:first-child > td { border-top: none; }
div.formContratTabs > div.tabInfos table { margin-bottom: 0; }
div.formContratTabs > div.tabInfos table th { width: 200px; }
/* TAB PANIERS */
div.formContratTabs > div.tabPaniers table { margin-bottom: 0; }

71
public_html_admin/css/legumes.css Normal file
View File

@ -0,0 +1,71 @@
/* MODAL VIEW LEGUME */
.has-next-tarif { background-color: #e5ffe7; }
#modalViewLegume tr.tarifs_titre { background-color: #f2f2f2; border-top: 3px solid #ddd; }
#modalViewLegume tr.tarifs_titre th.groupe { border-left: 1px solid #999999; border-right: 1px solid #999999; }
#modalViewLegume tr.tarif td { border-top: 1px solid #999999; }
#modalViewLegume tr.tarif:not(:last-child) td { border-bottom: 1px solid #999999; }
#modalViewLegume tr.tarif td:not(:first-child) { border-left: 1px solid #999999; }
#modalViewLegume tr.tarif td:not(:first-last) { border-right: 1px solid #999999; }
#modalViewLegume td.tarif { text-align: center; }
#modalViewLegume td.tarif.next { background-color: #e5ffe7!important; }
#modalViewLegume td.tarif.current { background-color: #bfe2ff;!important; }
#modalViewLegume td.tarif.old { background-color: #f2f2f2!important; }
#modalViewLegume td.tarif.not_apply { background-color: #ccc!important; }
/* MODAL FORM LEGUME */
.formLegume div.tarif { margin-bottom: 7px; }
.formLegume div.tarifs div.tarif:last-child { margin-bottom: 0; }
.formLegume div.input-group.deleted select.form-control,
.formLegume div.input-group.deleted input.form-control,
.formLegume div.input-group.deleted span.input-group-addon {
text-decoration: line-through;
color: #d9534f;
}
@media (max-width: 1000px) {
.formLegume div.tarif {
display: block;
padding: 6px;
border: 1px solid #CCC;
background-color: #f6f6f6;
border-radius: 4px;
}
.formLegume div.tarif span.input-group-addon {
float: left;
box-sizing: border-box;
width: 80px;
height: 35px;
padding: 9px;
border-top-left-radius: 4px!important;
border-bottom-left-radius: 4px!important;
margin-bottom: 5px;
border-right: none;
}
.formLegume div.tarif .form-control {
display: inline-block;
box-sizing: border-box;
height: 35px;
margin-bottom: 5px;
}
.formLegume div.tarif .form-control:not([type=date]) {
width: calc(100% - 80px);
border-top-right-radius: 4px!important;
border-bottom-right-radius: 4px!important;
}
.formLegume div.tarif .form-control[type=date] { width: calc(100% - 120px); }
.formLegume div.tarif .btnDel { box-sizing: border-box; width: 40px; height: 35px; }
}
@media only screen and (hover: none) and (pointer: coarse) {
.formLegume div.tarif .form-control[type=date] {
width: calc(100vw - 186px)
}
}

72
public_html_admin/css/livraisons.css
View File

@ -35,6 +35,10 @@
.formLivraison div.formTabs > div.tabGeneral table th { width: 160px; } .formLivraison div.formTabs > div.tabGeneral table th { width: 160px; }
@media only screen and (hover: none) and (pointer: coarse) {
.formLivraison div.formTabs > div.tabGeneral input[type=date] { width: calc(100vw - 52px); }
}
/* TABLE PANIER */ /* TABLE PANIER */
.formLivraison table.panier { .formLivraison table.panier {
@ -48,7 +52,7 @@
.formLivraison table.panier { margin-top: 10px; } .formLivraison table.panier { margin-top: 10px; }
.formLivraison table.panier th, .formLivraison table.panier th,
.formLivraison table.panier td { padding: 4px !important; } .formLivraison table.panier td { padding: 4px; }
.formLivraison table.panier tr.absent { background-color: #f3f3f3; color: #8f8f8f; } .formLivraison table.panier tr.absent { background-color: #f3f3f3; color: #8f8f8f; }
.formLivraison table.panier tr.absent td.nom { text-decoration: line-through; } .formLivraison table.panier tr.absent td.nom { text-decoration: line-through; }
@ -57,7 +61,7 @@
.formLivraison table.panier tr.lieuTitre th { .formLivraison table.panier tr.lieuTitre th {
background-color: black; background-color: black;
color: white; color: white;
font-size: 1.5em; font-size: 18px;
border: none; border: none;
} }
.formLivraison table.panier tr.lieuTitre th:last-child { text-align: right; } .formLivraison table.panier tr.lieuTitre th:last-child { text-align: right; }
@ -69,7 +73,7 @@
.formLivraison table.panier tr.title th { .formLivraison table.panier tr.title th {
background-color: black; background-color: black;
color: white; color: white;
font-size: 1.5em; font-size: 18px;
} }
.formLivraison table.panier th.titre small { font-size: 0.75em; font-weight: 400; font-style: italic; } .formLivraison table.panier th.titre small { font-size: 0.75em; font-weight: 400; font-style: italic; }
.formLivraison table.panier th.total { text-align: right; vertical-align: bottom; } .formLivraison table.panier th.total { text-align: right; vertical-align: bottom; }
@ -85,23 +89,27 @@
.formLivraison table.panier tr.head > th:first-child { border-left: none; } .formLivraison table.panier tr.head > th:first-child { border-left: none; }
.formLivraison table.panier tr.head > th:last-child { border-right: none; } .formLivraison table.panier tr.head > th:last-child { border-right: none; }
.formLivraison table.panier tr.head > th.nom,
.formLivraison table.panier tr.head > th.frequence { width: 50%; }
.formLivraison table.panier tr.head > th.complement, .formLivraison table.panier tr.head > th.complement,
.formLivraison table.panier tr.head > th.complement_regle { min-width: 100px; } .formLivraison table.panier tr.head > th.complement_regle { width: 100px; }
.formLivraison table.panier tr.head > th.tarif, .formLivraison table.panier tr.head > th.tarif,
.formLivraison table.panier tr.head > th.quantite, .formLivraison table.panier tr.head > th.quantite,
.formLivraison table.panier tr.head > th.montant { text-align: center; min-width: 120px; } .formLivraison table.panier tr.head > th.montant { text-align: center; width: 120px; }
.formLivraison table.panier tr.head > th.action { text-align: center; min-width: 30px; } .formLivraison table.panier tr.head > th.status,
.formLivraison table.panier tr.head > th.action { text-align: center; width: 30px; }
.formLivraison table.panier tr.legume > td.tarif,
.formLivraison table.panier tr.legume > td.montant { text-align: center; }
.formLivraison table.panier tr.legume > td.quantite { text-align: right; width: 80px; }
.formLivraison .tabLegumes table.panier tr.legume > td.quantite,
#modalViewLivraison .formLivraison table.panier tr.legume td.quantite { text-align: center; }
.formLivraison table.panier tr.legume td.tarif,
.formLivraison table.panier tr.legume td.quantite,
.formLivraison table.panier tr.legume td.montant { text-align: right; }
.formLivraison table.panier tr.legume td.unite { width: 40px; } .formLivraison table.panier tr.legume td.unite { width: 40px; }
.formLivraison table.panier th.nb_paniers_restants, .formLivraison table.panier th.nb_paniers_restants,
.formLivraison table.panier td.nb_paniers_restants { min-width: 160px; text-align: center; } .formLivraison table.panier td.nb_paniers_restants { width: 120px; text-align: center; }
.formLivraison table.panier input.editable { border: none; padding: 0; } .formLivraison table.panier input.editable { border: none; padding: 0; }
.formLivraison table.panier input.editable:focus { outline-style: none; } .formLivraison table.panier input.editable:focus { outline-style: none; }
@ -113,9 +121,29 @@
.formLivraison table.panier td.editable { cursor: pointer; } .formLivraison table.panier td.editable { cursor: pointer; }
@media (max-width: 767px) {
.formLivraison table.panier tr.lieuTitre th,
.formLivraison table.panier tr.title th { font-size: 14px; }
.formLivraison table.panier tr.head > th.tarif,
.formLivraison table.panier tr.head > th.quantite,
.formLivraison table.panier tr.head > th.montant { min-width: 65px; }
.formLivraison table.panier tr.head > th.tarif,
#modalViewLivraison .formLivraison table.panier tr.head > th.quantite,
.formLivraison .tabLegumes table.panier tr.head > th.quantite,
.formLivraison table.panier tr.head > th.montant { width: 70px; }
.formLivraison table.panier tr.legume td.tarif,
.formLivraison table.panier tr.legume td.quantite,
.formLivraison table.panier tr.legume td.montant { width: 60px; }
.formLivraison table.panier tr.legume td.unite { width: 25px; }
}
/* TAB PANIERS */ /* TAB PANIERS */
.formLivraison div.formTabs > div.tabPaniers input[type=checkbox] { cursor: pointer; } .formLivraison div.formTabs > div.tabPaniers input[type=checkbox] { cursor: pointer; margin-left: 4px; }
.formLivraison div.formTabs > div.tabPaniers table.panier tbody div.tooltip { max-width: 170px; } .formLivraison div.formTabs > div.tabPaniers table.panier tbody div.tooltip { max-width: 170px; }
@ -123,6 +151,12 @@
.formLivraison div.formTabs > div.tabPaniers tr.panier.absent, .formLivraison div.formTabs > div.tabPaniers tr.panier.absent,
.formLivraison div.formTabs > div.tabPaniers tr.panier.absent input[type=checkbox] { cursor: not-allowed; } .formLivraison div.formTabs > div.tabPaniers tr.panier.absent input[type=checkbox] { cursor: not-allowed; }
.formLivraison div.formTabs > div.tabPaniers tr.panier td { line-height: 16px; vertical-align: middle; }
@media only screen and (hover: none) and (pointer: coarse) {
.formLivraison div.formTabs > div.tabPaniers tr.panier td { line-height: 24px; }
}
/* TAB COMPO */ /* TAB COMPO */
.formLivraison div.formTabs > div.tabCompo table.panier { margin: 10px 0; } .formLivraison div.formTabs > div.tabCompo table.panier { margin: 10px 0; }
@ -133,12 +167,18 @@
/* TAB LEGUMES */ /* TAB LEGUMES */
.formLivraison div.formTabs > div.tabLegumes table.panier { margin-top: 10px; } .formLivraison div.formTabs > div.tabLegumes table.panier { margin-top: 10px; }
.formLivraison div.formTabs > div.tabLegumes table.panier th.total.montant { font-size: 1.5em; }
.formLivraison div.formTabs > div.tabLegumes table.panier th.total.unite { font-size: 1.5em; }
/* BTN PRINT */ /* BTN PRINT */
#modalViewLivraison div.btnPrint { margin-right: 10px; } #modalViewLivraison div.btnPrint {
position: relative;
top: 4px;
right: 10px;
}
@media only screen and (hover: none) and (pointer: coarse) {
#modalViewLivraison div.btnPrint button { padding: 6px; }
}
/* PRINT - DISTRIB */ /* PRINT - DISTRIB */

48
public_html_admin/js/contrats.js
View File

@ -99,8 +99,6 @@ function modalViewContrat_loadDatas(modal, id) {
modal.find("small.db_ref > span").html(datas.ref); modal.find("small.db_ref > span").html(datas.ref);
modal.find("td.type").html(datas.type_nom);
client = datas.client_prenom+" "+datas.client_nom; client = datas.client_prenom+" "+datas.client_nom;
if((datas.client_tel!="" && datas.client_tel!=null) || (datas.client_email!="" && datas.client_email!=null)) { if((datas.client_tel!="" && datas.client_tel!=null) || (datas.client_email!="" && datas.client_email!=null)) {
client += " <small>("; client += " <small>(";
@ -112,27 +110,24 @@ function modalViewContrat_loadDatas(modal, id) {
client += ")</small>"; client += ")</small>";
} }
modal.find("td.client").html(client); modal.find("td.client").html(client);
modal.find("td.tel").html((datas.client_tel!="") ? '<a href="tel:'+datas.client_tel+'">'+datas.client_tel+'</a>' : '.');
modal.find("td.email").html((datas.client_email!="") ? '<a href="mailto:'+datas.client_email+'">'+datas.client_email+'</a>' : '.'); modal.find("td.type").html(datas.type_nom);
modal.find("td.freq").html(datas.frequence_print);
modal.find("td.date").html(datas.date_print); modal.find("td.date").html(datas.date_print);
modal.find("td.frequence").html(datas.frequence_print); if(parseInt(datas.lieu_depot_ref)>0) modal.find("td.lieu_depot").html(datas.lieu_depot_nom);
modal.find("td.paniers").html(datas.nb_panier + datas.panier_type); if(parseInt(datas.nb_cheque)>0) modal.find("td.nb_cheque").html(datas.nb_cheque);
modal.find("td.panier_type").html(datas.panier_type);
modal.find("td.lieu_depot").html(datas.lieu_depot_nom);
modal.find("td.nb_cheque").html(datas.nb_cheque);
nb_panier_livre = datas.nb_paniers_livres + " / " + datas.nb_paniers; nb_panier_livre = datas.nb_paniers_livres + " / " + datas.nb_paniers;
if(datas.np_paniers_distrib_avt_saisie>0) { if(datas.np_paniers_distrib_avt_saisie>0) {
nb_panier_livre += " <small>(dont "+datas.np_paniers_distrib_avt_saisie+" livré"; nb_panier_livre += " <small>(dont "+datas.np_paniers_distrib_avt_saisie+" livré";
if(datas.np_paniers_distrib_avt_saisie>1) nb_panier_livre += "s"; if(datas.np_paniers_distrib_avt_saisie>1) nb_panier_livre += "s";
nb_panier_livre += " avant la saisie du contrat)</small>"; nb_panier_livre += " avant saisie)</small>";
} }
modal.find("td.nb_panier_livre").html(nb_panier_livre); modal.find("td.nb_panier_livre").html(nb_panier_livre);
modal.find("td.nb_panier_restant").html(datas.nb_paniers_restants + " / " + datas.nb_paniers); modal.find("td.nb_panier_restant").html(datas.nb_paniers_restants + " / " + datas.nb_paniers);
// COMPLEMENTS // COMPLEMENTS
comp = ".";
if(datas.complements>0 || datas.complements_regles>0 || datas.complements_dus>0) { if(datas.complements>0 || datas.complements_regles>0 || datas.complements_dus>0) {
comp = number_format(datas.complements, 2)+" €"; comp = number_format(datas.complements, 2)+" €";
if(datas.complements_regles>0) { if(datas.complements_regles>0) {
@ -140,8 +135,8 @@ function modalViewContrat_loadDatas(modal, id) {
comp += " => "+number_format(Math.abs(datas.complements_dus), 2)+((datas.complements_dus >= 0) ? " € à régler" : " € d'avoir"); comp += " => "+number_format(Math.abs(datas.complements_dus), 2)+((datas.complements_dus >= 0) ? " € à régler" : " € d'avoir");
} }
else if(datas.complements_dus>0) comp += " => "+number_format(Math.abs(datas.complements_dus), 2)+((datas.complements_dus >= 0) ? " € à régler" : " € d'avoir"); else if(datas.complements_dus>0) comp += " => "+number_format(Math.abs(datas.complements_dus), 2)+((datas.complements_dus >= 0) ? " € à régler" : " € d'avoir");
}
modal.find("td.complements").html(comp); modal.find("td.complements").html(comp);
}
// PANIERS // PANIERS
$.post(contratsConf.baseURL, { 'ref' : id, 'action' : 'modalView_getTab', 'tab' : 'paniers' }, function(result) { $.post(contratsConf.baseURL, { 'ref' : id, 'action' : 'modalView_getTab', 'tab' : 'paniers' }, function(result) {
@ -158,26 +153,15 @@ function modalViewContrat_clear(modal) {
modal.find("small.db_ref > span").html(""); modal.find("small.db_ref > span").html("");
modal.find("ul.formContratTabs > li").removeClass('active hide'); modal.find("td.client").html(".");
modal.find("ul.formContratTabs > li:first-child").addClass('active'); modal.find("td.type").html(".");
modal.find("div.formContratTabs > div.tab").removeClass("active"); modal.find("td.freq").html(".");
modal.find("div.formContratTabs > div.tab:first-child").addClass("active"); modal.find("td.date").html(".");
modal.find("td.lieu_depot").html(".");
modal.find("td.nom").html(""); modal.find("td.nb_cheque").html(".");
modal.find("td.tel").html(""); modal.find("td.nb_panier_livre").html(".");
modal.find("td.email").html(""); modal.find("td.nb_panier_restant").html(".");
modal.find("td.complements").html(".");
modal.find("td.date").html("");
modal.find("td.frequence").html("");
modal.find("td.nb_panier").html("");
modal.find("td.panier_type").html("");
modal.find("td.lieu_depot").html("");
modal.find("td.nb_cheque").html("");
modal.find("td.nb_panier_livre").html("");
modal.find("td.nb_panier_restant").html("");
modal.find("td.complements").html("");
modal.find("div.tabPaniers").html(""); modal.find("div.tabPaniers").html("");
} }

2
public_html_admin/js/functions.js
View File

@ -828,7 +828,7 @@ function initEdiTable(elem,beforeFct,callbacbFct) {
if(cell.hasClass('float')) initFloatInput(ipt); if(cell.hasClass('float')) initFloatInput(ipt);
if(cell.hasClass('center')) ipt.addClass('center'); if(cell.hasClass('center')) ipt.addClass('center');
if(cell.hasClass('align_right')) ipt.addClass('align_right'); if(cell.hasClass('right')) ipt.addClass('right');
ipt.focus(); ipt.focus();
}); });

54
public_html_admin/js/livraisons.js
View File

@ -458,10 +458,9 @@ function modalFormLivraison_addPanierTypeCompo(modal, datas) {
// HEADER // HEADER
var thead = $("<thead></thead>"); var thead = $("<thead></thead>");
var trT = $("<tr class='title'></tr>"); var trT = $("<tr class='title'></tr>");
trT.append( $("<th class='titre' colspan='3'></th>").html(datas.nom+" <small>(x"+datas.nb+")</small>") ); trT.append( $("<th class='titre' colspan='2'></th>").html(datas.nom+" <small>(x"+datas.nb+")</small>") );
trT.append( $("<th class='total' colspan='2'>TOTAL :</th>") ); trT.append( $("<th class='total' colspan='2'>TOTAL :</th>") );
trT.append( $("<th class='total montant'>0.00</th>") ); trT.append( $("<th class='total montant'>0.00 €</th>") );
trT.append( $("<th class='total unite'>€</th>") );
btnCopyCompo = $("<button class='btn btn-xs btn-default glyphicon glyphicon-copy btnCopyCompo'></button>"); btnCopyCompo = $("<button class='btn btn-xs btn-default glyphicon glyphicon-copy btnCopyCompo'></button>");
trT.append( $("<th class='action'></th>").append(btnCopyCompo) ); trT.append( $("<th class='action'></th>").append(btnCopyCompo) );
thead.append(trT); thead.append(trT);
@ -473,9 +472,9 @@ function modalFormLivraison_addPanierTypeCompo(modal, datas) {
var trH = $("<tr class='head'></tr>"); var trH = $("<tr class='head'></tr>");
trH.append( $("<th class='nom'>légume</th>") ); trH.append( $("<th class='nom'>légume</th>") );
trH.append( $("<th class='tarif' colspan='2'>tarif</th>") ); trH.append( $("<th class='tarif'>tarif</th>") );
trH.append( $("<th class='quantite' colspan='2'>quantité</th>") ); trH.append( $("<th class='quantite' colspan='2'>quantité</th>") );
trH.append( $("<th class='montant' colspan='2'>montant</th>") ); trH.append( $("<th class='montant'>montant</th>") );
btnAddLegume = $("<button class='btn btn-xs btn-info glyphicon glyphicon-plus btnAddLegume'></button>"); btnAddLegume = $("<button class='btn btn-xs btn-info glyphicon glyphicon-plus btnAddLegume'></button>");
trH.append( $("<th class='action'></th>").append(btnAddLegume) ); trH.append( $("<th class='action'></th>").append(btnAddLegume) );
thead.append(trH); thead.append(trH);
@ -502,16 +501,14 @@ function modalFormLivraison_addPanierTypeCompoLegume(modal, panier, datas) {
/*** CREATE ***/ /*** CREATE ***/
var trL = $("<tr class='legume editable'></tr>"); var trL = $("<tr class='legume editable'></tr>");
tdNom = $("<td class='nom'></td>"); tdNom = $("<td class='nom noselect'></td>");
tdTarif = $("<td class='tarif'>0.00</td>"); tdTarif = $("<td class='tarif noselect'>0.00 €</td>");
tdTarifUnit = $("<td class='tarif_unite unite'>€/kg</td>"); tdQ = $("<td class='quantite noselect'>0.000</td>");
tdQ = $("<td class='quantite'>0.000</td>"); tdQunit = $("<td class='quantite_unite unite noselect'>kg</td>");
tdQunit = $("<td class='quantite_unite unite'>kg</td>"); tdMontant = $("<td class='montant noselect'>0.00 €</td>");
tdMontant = $("<td class='montant'>0.00</td>");
tdMunit = $("<td class='montant_unite unite'>€</td>");
btnDel = $("<button class='btn btn-xs btn-link glyphicon glyphicon-trash btnDeleteLegume'></button>"); btnDel = $("<button class='btn btn-xs btn-link glyphicon glyphicon-trash btnDeleteLegume'></button>");
tdAct = $("<td class='action'></td>").append(btnDel); tdAct = $("<td class='action'></td>").append(btnDel);
trL.append(tdNom).append(tdTarif).append(tdTarifUnit).append(tdQ).append(tdQunit).append(tdMontant).append(tdMunit).append(tdAct); trL.append(tdNom).append(tdTarif).append(tdQ).append(tdQunit).append(tdMontant).append(tdAct);
/*** LOAD DATAS ***/ /*** LOAD DATAS ***/
if(datas!=null && typeof(datas)=="object") { if(datas!=null && typeof(datas)=="object") {
@ -525,15 +522,14 @@ function modalFormLivraison_addPanierTypeCompoLegume(modal, panier, datas) {
.attr('tarif_prix', datas.tarif_prix) .attr('tarif_prix', datas.tarif_prix)
.attr('tarif_unite', datas.tarif_unite); .attr('tarif_unite', datas.tarif_unite);
tdTarif.html(number_format(datas.tarif_prix,2)); tdTarif.html(number_format(datas.tarif_prix,2)+" €/"+unite);
tdTarifUnit.html("€/"+unite);
tdQ.html(number_format(datas.quantite,3)); tdQ.html(number_format(datas.quantite,3));
tdQ.attr("unite", datas.tarif_unite); tdQ.attr("unite", datas.tarif_unite);
tdQunit.html(unite); tdQunit.html(unite);
tdMontant.html(number_format(datas.tarif_prix * datas.quantite, 2)); tdMontant.html(number_format(datas.tarif_prix * datas.quantite, 2)+" €");
modalFormLivraison_refreshPanierTypeCompoLegumeTarif(modal, panier, trL); modalFormLivraison_refreshPanierTypeCompoLegumeTarif(modal, panier, trL);
} }
@ -605,7 +601,7 @@ function modalFormLivraison_addPanierTypeCompoLegume(modal, panier, datas) {
val = $(this).html(); val = $(this).html();
unite = $(this).attr("unite"); unite = $(this).attr("unite");
if(unite in legumeTarifUnitesAccronymes) { if(unite in legumeTarifUnitesAccronymes) {
var ipt = $("<input class='editable quantite' type='text'>"); var ipt = $("<input class='editable quantite' type='number' step='0.1'>");
$(this).html("").append(ipt); $(this).html("").append(ipt);
initFloatInput(ipt); initFloatInput(ipt);
ipt.val( parseFloat(val) ); ipt.val( parseFloat(val) );
@ -636,8 +632,7 @@ function modalFormLivraison_loadPanierTypeCompoLegumeTarif(row, tarif_ref, tarif
.attr('tarif_prix', tarif_prix) .attr('tarif_prix', tarif_prix)
.attr('tarif_unite', tarif_unite); .attr('tarif_unite', tarif_unite);
row.find("td.tarif").html(number_format(tarif_prix,2)).attr("ref", tarif_ref); row.find("td.tarif").html(number_format(tarif_prix,2)+" €/"+unite).attr("ref", tarif_ref);
row.find("td.tarif_unite").html("€/"+unite);
q = row.find("td.quantite").attr('unite', tarif_unite).html(); q = row.find("td.quantite").attr('unite', tarif_unite).html();
if(tarif_unite=="kg") row.find("td.quantite").html( number_format(q,3) ); if(tarif_unite=="kg") row.find("td.quantite").html( number_format(q,3) );
@ -698,7 +693,7 @@ function modalFormLivraison_copyPanierTypeCompo(modal, panier, btn) {
$.fn.updateCompoLegumeMontant = function() { $.fn.updateCompoLegumeMontant = function() {
q = parseFloat($(this).find("td.quantite").html()); q = parseFloat($(this).find("td.quantite").html());
t = parseFloat($(this).find("td.tarif").html()); t = parseFloat($(this).find("td.tarif").html());
$(this).find("td.montant").html( number_format(q * t, 2) ); $(this).find("td.montant").html( number_format(q * t, 2)+" €" );
// UPDATE TOTAL // UPDATE TOTAL
panier = $(this).parent().parent(); panier = $(this).parent().parent();
@ -709,7 +704,7 @@ $.fn.updateCompoLegumeMontant = function() {
function modalFormLivraison_updateMontantTotalPanier(panier) { function modalFormLivraison_updateMontantTotalPanier(panier) {
var total = 0; var total = 0;
panier.find("tr.legume td.montant").each(function(n,e) { total += parseFloat($(this).html()); }) panier.find("tr.legume td.montant").each(function(n,e) { total += parseFloat($(this).html()); })
panier.find("th.total.montant").html(number_format(total, 2)); panier.find("th.total.montant").html(number_format(total, 2)+" €");
modal = $("#"+panier.attr('modal')); modal = $("#"+panier.attr('modal'));
if(modal.length>0) modalFormLivraison_updateTotalLegumes(modal); if(modal.length>0) modalFormLivraison_updateTotalLegumes(modal);
} }
@ -745,16 +740,13 @@ function modalFormLivraison_updateTotalLegumes(modal) {
for(ref in legumes) { for(ref in legumes) {
l = legumes[ref]; l = legumes[ref];
unite = legumeTarifUnitesAccronymes[l.tarif_unite]; unite = legumeTarifUnitesAccronymes[l.tarif_unite];
number_format(l.quantite,2);
trL = $("<tr class='legume'></tr>"); trL = $("<tr class='legume'></tr>");
tdNom = $("<td class='nom'></td>").html(l.nom); tdNom = $("<td class='nom noselect'></td>").html(l.nom);
tdTarif = $("<td class='tarif'></td>").html(number_format(l.tarif_prix,2)); tdTarif = $("<td class='tarif noselect'></td>").html(number_format(l.tarif_prix,2)+" €/"+unite);
tdTarifUnit = $("<td class='tarif_unite unite'></td>").html("€/"+unite); tdQ = $("<td class='quantite noselect'></td>").html( round_number(l.quantite,3)+" "+unite );
tdQ = $("<td class='quantite'></td>").html( l.tarif_unite=="kg" ? number_format(l.quantite, 3) : l.quantite ); tdMontant = $("<td class='montant noselect'></td>").html(number_format((l.quantite * l.tarif_prix),2)+" €");
tdQunit = $("<td class='quantite_unite unite'></td>").html(unite); trL.append(tdNom).append(tdTarif).append(tdQ).append(tdMontant);
tdMontant = $("<td class='montant'></td>").html(number_format((l.quantite * l.tarif_prix),2));
tdMunit = $("<td class='montant_unite unite'>€</td>");
trL.append(tdNom).append(tdTarif).append(tdTarifUnit).append(tdQ).append(tdQunit).append(tdMontant).append(tdMunit);
modal.find("table.legumesTotal tbody").append(trL); modal.find("table.legumesTotal tbody").append(trL);
modal.find("table.legumesTotal tr.nullChild").addClass('hide'); modal.find("table.legumesTotal tr.nullChild").addClass('hide');
@ -763,7 +755,7 @@ function modalFormLivraison_updateTotalLegumes(modal) {
} }
/*** MONTANT TOTAL ***/ /*** MONTANT TOTAL ***/
modal.find("table.legumesTotal th.total.montant").html(number_format(total, 2)); modal.find("table.legumesTotal th.total.montant").html(number_format(total, 2)+" €");
} }
// GET FORM DATAS // GET FORM DATAS

1
public_html_admin/legumes.php
View File

@ -5,6 +5,7 @@ $GLOBALS['smarty']->assign('page','legumes');
$GLOBALS['template'] = 'legumes/legumes_list.tpl'; $GLOBALS['template'] = 'legumes/legumes_list.tpl';
$GLOBALS['smarty']->assign('secondbar','legumes/legumes_secondbar.tpl'); $GLOBALS['smarty']->assign('secondbar','legumes/legumes_secondbar.tpl');
$jsFiles[] = PUBLIC_HTML_ADMIN.'js/legumes.js'; $jsFiles[] = PUBLIC_HTML_ADMIN.'js/legumes.js';
$cssFiles[] = PUBLIC_HTML_ADMIN.'css/legumes.css';
if($id>0 && $action) { if($id>0 && $action) {
$infos = getLegumeDatas($id); $infos = getLegumeDatas($id);

4
public_html_admin/templates/clients/client_modal_view.tpl
View File

@ -4,9 +4,9 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<small class="db_ref visible-md visible-lg">ref: <span>#</span></small> <small class="db_ref">ref: <span>#</span></small>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/client.svg"> <img src="img/client.svg">
Fiche client Fiche client
</h2> </h2>
</div> </div>

11
public_html_admin/templates/clients/client_modal_view_absences_tab.tpl
View File

@ -1,18 +1,17 @@
<table class="table"> <table class="table">
<thead> <thead>
<tr class="head"> <tr class="head">
<th class="center">debut</th> <th class="center date">debut</th>
<th class="center">fin</th> <th class="center date">fin</th>
<th>remarque</th> <th>remarque</th>
<th style="width: 30px;"></th> <th class="btn_action right" colspan="2"><button class="btn btn-xs btn-info glyphicon glyphicon-plus" id="btnAddAbsence"></button></th>
<th style="width: 30px;"><button class="btn btn-xs btn-info glyphicon glyphicon-plus" id="btnAddAbsence"></button></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{foreach from=$infos.absences item=i} {foreach from=$infos.absences item=i}
<tr class="absence" ref="{$i.ref}"> <tr class="absence" ref="{$i.ref}">
<td class="debut">{$i.debut_print}</td> <td class="date debut">{$i.debut_print}</td>
<td class="fin">{$i.fin_print}</td> <td class="date fin">{$i.fin_print}</td>
<td class="remarque">{$i.remarque}</td> <td class="remarque">{$i.remarque}</td>
<td class="td_btn_action"><button class="btn btn-xs btn-link glyphicon glyphicon-edit btnEditAbsence" ref="{$i.ref}"></button></td> <td class="td_btn_action"><button class="btn btn-xs btn-link glyphicon glyphicon-edit btnEditAbsence" ref="{$i.ref}"></button></td>
<td class="td_btn_action td_btn_delete"><button class="btn btn-xs btn-link glyphicon glyphicon-trash btnDeleteAbsence" ref="{$i.ref}" periode="{$i.periode}"></button></td> <td class="td_btn_action td_btn_delete"><button class="btn btn-xs btn-link glyphicon glyphicon-trash btnDeleteAbsence" ref="{$i.ref}" periode="{$i.periode}"></button></td>

16
public_html_admin/templates/clients/client_modal_view_contrats_tab.tpl
View File

@ -1,27 +1,27 @@
<table class="table"> <table class="table">
<thead> <thead>
<tr class="head"> <tr class="head">
<th>#</th> <th class="visible-md">#</th>
<th>type</th> <th class="visible-md">type</th>
<th>début</th> <th>début</th>
<th>fréquence</th> <th>fréquence</th>
<th>panier</th> <th>panier</th>
<th>livrés</th> <th>livrés</th>
<th>restant</th> <th class="visible-md">restant</th>
<th>lieu</th> <th class="visible-md">lieu</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{foreach from=$infos.contrats item=i} {foreach from=$infos.contrats item=i}
<tr class="{if $i.archive>0}archive{/if}{if $i.warning_nb_paniers} warning{/if}{if $i.nb_paniers_restants<=0} danger{/if}"> <tr class="{if $i.archive>0}archive{/if}{if $i.warning_nb_paniers} warning{/if}{if $i.nb_paniers_restants<=0} danger{/if}">
<td>{$i.ref}</td> <td class="visible-md">{$i.ref}</td>
<td>{$i.type_nom}</td> <td class="visible-md">{$i.type_nom}</td>
<td>{$i.date_print}</td> <td>{$i.date_print}</td>
<td>{$i.frequence_print}</td> <td>{$i.frequence_print}</td>
<td>{$i.panier_type_nom}</td> <td>{$i.panier_type_nom}</td>
<td>{$i.nb_paniers_livres} / {$i.nb_paniers}</td> <td>{$i.nb_paniers_livres} / {$i.nb_paniers}</td>
<td>{$i.nb_paniers_restants}{if $i.force_eligible>0} <i class="glyphicon glyphicon-star"></i>{/if}</td> <td class="visible-md">{$i.nb_paniers_restants}{if $i.force_eligible>0} <i class="glyphicon glyphicon-star"></i>{/if}</td>
<td>{$i.lieu_depot_nom}</td> <td class="visible-md">{$i.lieu_depot_nom}</td>
</tr> </tr>
{foreachelse} {foreachelse}
<tr> <tr>

6
public_html_admin/templates/clients/clients_list.tpl
View File

@ -50,7 +50,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/client.svg"> <img src="img/client.svg">
Ajouter un client Ajouter un client
</h2> </h2>
</div> </div>
@ -81,7 +81,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/client.svg"> <img src="img/client.svg">
Modifier un client Modifier un client
</h2> </h2>
</div> </div>
@ -107,7 +107,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/client.svg"> <img src="img/client.svg">
Supprimer un client Supprimer un client
</h2> </h2>
</div> </div>

16
public_html_admin/templates/clients/clients_secondbar.tpl
View File

@ -7,13 +7,25 @@
<span>{$list_limits.max} CLIENT{if $list_limits.max>1}S{/if}</span> <span>{$list_limits.max} CLIENT{if $list_limits.max>1}S{/if}</span>
</a> </a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse navbar-filtre-search">
<form class="navbar-form navbar-right" role="search" id="clientsSearch"> <form class="navbar-form navbar-right form-filtre-search" role="search" id="clientsSearch">
<div class="input-group class"> <div class="input-group class">
<span class="input-group-addon{if $search!=""} active{/if}"><i class="glyphicon glyphicon-search"></i></span> <span class="input-group-addon{if $search!=""} active{/if}"><i class="glyphicon glyphicon-search"></i></span>
<input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}"> <input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}">
{if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if} {if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if}
</div> </div>
<!-- ORDRE - SMALL SCREEN -->
<div class="input-group order visible-xs">
<span class="input-group-addon" filtre="{$filtre_items}">ordre :</span>
<select class="form-control" name="order">
{foreach from=$allowOrder key=id item=name}<option value="{$id}"{if $order == $id} selected{/if}>{$name}</option>{/foreach}
</select>
<div class="input-group-btn">
<button class="btn btn-default {$sens}" name="sens">
<i class="glyphicon glyphicon-chevron-{if $sens=="ASC"}up{else}down{/if}"></i>
</button>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>

26
public_html_admin/templates/contrats/contrat_form.tpl
View File

@ -8,17 +8,13 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>type de contrat :</label> <label>type de contrat :</label>
<div class="input-group"> <div class="input-group inlineSelectManager">
<select class="form-control" name="type">{include file='contrats/contrats_types_select_list.tpl'}</select> <select class="form-control" name="type">{include file='contrats/contrats_types_select_list.tpl'}</select>
<span class="input-group-btn hide"> <span class="input-group-btn hide">
<button class="btn btn-default btnSecondAction"> <button class="btn btn-default btnSecondAction"><i class="glyphicon glyphicon-remove"></i></button>
<i class="glyphicon glyphicon-remove"></i>
</button>
</span> </span>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default btnAction add"> <button class="btn btn-default btnAction add"><i class="glyphicon glyphicon-plus"></i></button>
<i class="glyphicon glyphicon-plus"></i>
</button>
</span> </span>
</div> </div>
</div> </div>
@ -51,17 +47,13 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>lieu de dépôt :</label> <label>lieu de dépôt :</label>
<div class="input-group"> <div class="input-group inlineSelectManager">
<select class="form-control" name="lieu_depot">{include file='contrats/lieux_select_list.tpl'}</select> <select class="form-control" name="lieu_depot">{include file='contrats/lieux_select_list.tpl'}</select>
<span class="input-group-btn hide"> <span class="input-group-btn hide">
<button class="btn btn-default btnSecondAction"> <button class="btn btn-default btnSecondAction"><i class="glyphicon glyphicon-remove"></i></button>
<i class="glyphicon glyphicon-remove"></i>
</button>
</span> </span>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default btnAction add"> <button class="btn btn-default btnAction add"><i class="glyphicon glyphicon-plus"></i></button>
<i class="glyphicon glyphicon-plus"></i>
</button>
</span> </span>
</div> </div>
</div> </div>
@ -75,12 +67,12 @@
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="force_eligible"> forcer le contrat une fois le nombre de paniers livrés dépassé <input type="checkbox" name="force_eligible"> forcer une fois le nombre de paniers livrés dépassé
</label> </label>
</div> </div>
<div class="checkbox"> <div class="checkbox last">
<label> <label>
<input type="checkbox" name="ignore_warning"> ignore les alertes liées au nombre de paniers livrés dépassé <input type="checkbox" name="ignore_warning"> ignorer les alertes liées au nombre de paniers livrés
</label> </label>
</div> </div>
</div> </div>

11
public_html_admin/templates/contrats/contrat_modal_view.tpl
View File

@ -4,9 +4,9 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<small class="db_ref visible-md visible-lg">ref: <span>#</span></small> <small class="db_ref">ref: <span>#</span></small>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/contrat.svg"> <img src="img/contrat.svg">
Fiche contrat Fiche contrat
</h2> </h2>
</div> </div>
@ -18,13 +18,14 @@
<div class="formTabs"> <div class="formTabs">
<div class="tab tabInfos active"> <div class="tab tabInfos active">
<table class="table modal-body"> <table class="table modal-body">
<tr><th>type de contrat :</th><td class="type"></td></tr>
<tr><th>client :</th><td class="client"></td></tr> <tr><th>client :</th><td class="client"></td></tr>
<tr><th>type de contrat :</th><td class="type"></td></tr>
<tr><th>frequence :</th><td class="freq"></td></tr>
<tr><th>date de début :</th><td class="date"></td></tr> <tr><th>date de début :</th><td class="date"></td></tr>
<tr><th>lieu de dépôt :</th><td class="lieu_depot"></td></tr> <tr><th>lieu de dépôt :</th><td class="lieu_depot"></td></tr>
<tr><th>nb. de chèque :</th><td class="nb_cheque"></td></tr> <tr><th>nb. de chèque :</th><td class="nb_cheque"></td></tr>
<tr><th>nb. de panier(s) livré(s) :</th><td class="nb_panier_livre"></td></tr> <tr><th>paniers livrés :</th><td class="nb_panier_livre"></td></tr>
<tr><th>nb. de panier(s) restant(s) :</th><td class="nb_panier_restant"></td></tr> <tr><th>paniers restants :</th><td class="nb_panier_restant"></td></tr>
<tr><th>compléments :</th><td class="complements"></td></tr> <tr><th>compléments :</th><td class="complements"></td></tr>
</table> </table>
</div> </div>

4
public_html_admin/templates/contrats/contrat_modal_view_tab_paniers.tpl
View File

@ -3,7 +3,7 @@
<tr class="head"> <tr class="head">
<th>date</th> <th>date</th>
<th>panier</th> <th>panier</th>
<th>lieu</th> <th class="visible-md">lieu</th>
<th class="center">complement</th> <th class="center">complement</th>
<th class="center">réglé</th> <th class="center">réglé</th>
</tr> </tr>
@ -13,7 +13,7 @@
<tr> <tr>
<td>{$i.livraison_date_print}</td> <td>{$i.livraison_date_print}</td>
<td>{$i.panier_type_nom}</td> <td>{$i.panier_type_nom}</td>
<td>{$i.lieu_depot_nom}</td> <td class="visible-md">{$i.lieu_depot_nom}</td>
<td class="center">{$i.complement}</td> <td class="center">{$i.complement}</td>
<td class="center">{$i.complement_regle} €</td> <td class="center">{$i.complement_regle} €</td>
</tr> </tr>

8
public_html_admin/templates/contrats/contrats_list.tpl
View File

@ -85,7 +85,7 @@
<button type="button" class="btn btn-custom btnSave">Enregistrer</button> <button type="button" class="btn btn-custom btnSave">Enregistrer</button>
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/contrat.svg"> <img src="img/contrat.svg">
Ajouter un contrat Ajouter un contrat
</h2> </h2>
</div> </div>
@ -115,7 +115,7 @@
<button type="button" class="btn btn-custom btnSave">Enregistrer</button> <button type="button" class="btn btn-custom btnSave">Enregistrer</button>
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/contrat.svg"> <img src="img/contrat.svg">
Modifier un contrat Modifier un contrat
</h2> </h2>
</div> </div>
@ -141,7 +141,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/contrat.svg"> <img src="img/contrat.svg">
Archiver un contrat Archiver un contrat
</h2> </h2>
</div> </div>
@ -163,7 +163,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/contrat.svg"> <img src="img/contrat.svg">
Supprimer un contrat Supprimer un contrat
</h2> </h2>
</div> </div>

22
public_html_admin/templates/contrats/contrats_secondbar.tpl
View File

@ -7,8 +7,8 @@
<span>{$list_limits.max} CONTRAT{if $list_limits.max>1}S{/if}</span> <span>{$list_limits.max} CONTRAT{if $list_limits.max>1}S{/if}</span>
</a> </a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse navbar-filtre-search">
<form class="navbar-form navbar-right" role="search" id="contratsSearch"> <form class="navbar-form navbar-right form-filtre-search" role="search" id="contratsSearch">
<!-- GROUPE --> <!-- GROUPE -->
<div class="input-group"> <div class="input-group">
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span> <span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
@ -52,8 +52,24 @@
<input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}"> <input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}">
{if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if} {if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if}
</div> </div>
<!-- ORDRE - SMALL SCREEN -->
<div class="input-group order visible-xs">
<span class="input-group-addon" filtre="{$filtre_items}">ordre :</span>
<select class="form-control" name="order">
{foreach from=$allowOrder key=id item=name}<option value="{$id}"{if $order == $id} selected{/if}>{$name}</option>{/foreach}
</select>
<div class="input-group-btn">
<button class="btn btn-default {$sens}" name="sens">
<i class="glyphicon glyphicon-chevron-{if $sens=="ASC"}up{else}down{/if}"></i>
</button>
</div>
</div>
<!-- PRINT LIST --> <!-- PRINT LIST -->
<button type="button" class="btn btn-default" id="btnPrintContratsList"><i class="glyphicon glyphicon-print"></i></button> <span class="separator"></span>
<button type="button" class="btn btn-default btnPrint" id="btnPrintContratsList">
<i class="glyphicon glyphicon-print"></i>
<span class="txt">Imprimer la liste...</span>
</button>
</form> </form>
</div> </div>
</div> </div>

2
public_html_admin/templates/legumes/legume_form.tpl
View File

@ -18,7 +18,7 @@
{/foreach} {/foreach}
</select> </select>
<span class="input-group-addon">prix :</span> <span class="input-group-addon">prix :</span>
<input type="text" class="form-control" name="prix" placeholder="prix" ref="new"> <input type="number" class="form-control" name="prix" placeholder="prix" ref="new">
<span class="input-group-addon">unité :</span> <span class="input-group-addon">unité :</span>
<select class="form-control" name="unite"> <select class="form-control" name="unite">
<option value="kg" selected>kg</option> <option value="kg" selected>kg</option>

4
public_html_admin/templates/legumes/legume_modal_view.tpl
View File

@ -4,9 +4,9 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<small class="db_ref visible-md visible-lg">ref: <span>#</span></small> <small class="db_ref">ref: <span>#</span></small>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/legumes.svg"> <img src="img/legumes.svg">
Fiche légume Fiche légume
</h2> </h2>
</div> </div>

6
public_html_admin/templates/legumes/legumes_list.tpl
View File

@ -48,7 +48,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/legumes.svg"> <img src="img/legumes.svg">
Ajouter un légume Ajouter un légume
</h2> </h2>
</div> </div>
@ -79,7 +79,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/legumes.svg"> <img src="img/legumes.svg">
Modifier un légume Modifier un légume
</h2> </h2>
</div> </div>
@ -105,7 +105,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/legumes.svg"> <img src="img/legumes.svg">
Supprimer un légume Supprimer un légume
</h2> </h2>
</div> </div>

23
public_html_admin/templates/legumes/legumes_secondbar.tpl
View File

@ -7,14 +7,31 @@
<span>{$list_limits.max} LÉGUME{if $list_limits.max>1}S{/if}</span> <span>{$list_limits.max} LÉGUME{if $list_limits.max>1}S{/if}</span>
</a> </a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse navbar-filtre-search">
<form class="navbar-form navbar-right" role="search" id="legumesSearch"> <form class="navbar-form navbar-right form-filtre-search" role="search" id="legumesSearch">
<div class="input-group class searchGrp"> <div class="input-group class searchGrp">
<span class="input-group-addon{if $search!=""} active{/if}"><i class="glyphicon glyphicon-search"></i></span> <span class="input-group-addon{if $search!=""} active{/if}"><i class="glyphicon glyphicon-search"></i></span>
<input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}"> <input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}">
{if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if} {if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if}
</div> </div>
<button type="button" class="btn btn-default" id="btnPrintLegumesList"><i class="glyphicon glyphicon-print"></i></button> <!-- ORDRE - SMALL SCREEN -->
<div class="input-group order visible-xs">
<span class="input-group-addon" filtre="{$filtre_items}">ordre :</span>
<select class="form-control" name="order">
{foreach from=$allowOrder key=id item=name}<option value="{$id}"{if $order == $id} selected{/if}>{$name}</option>{/foreach}
</select>
<div class="input-group-btn">
<button class="btn btn-default {$sens}" name="sens">
<i class="glyphicon glyphicon-chevron-{if $sens=="ASC"}up{else}down{/if}"></i>
</button>
</div>
</div>
<!-- PRINT LIST -->
<span class="separator"></span>
<button type="button" class="btn btn-default btnPrint" id="btnPrintLegumesList">
<i class="glyphicon glyphicon-print"></i>
<span class="txt">Imprimer la liste...</span>
</button>
</form> </form>
</div> </div>
</div> </div>

15
public_html_admin/templates/livraisons/livraison_form.tpl
View File

@ -2,8 +2,8 @@
<ul class="nav nav-tabs formTabsBtns"> <ul class="nav nav-tabs formTabsBtns">
<li role="presentation" class="active"><a href="#" class="formTabBtn" tab="tabGeneral">Général</a></li> <li role="presentation" class="active"><a href="#" class="formTabBtn" tab="tabGeneral">Général</a></li>
<li role="presentation"><a href="#" class="formTabBtn" tab="tabPaniers">Paniers</a></li> <li role="presentation"><a href="#" class="formTabBtn" tab="tabPaniers">Paniers</a></li>
<li role="presentation"><a href="#" class="formTabBtn" tab="tabCompo">Composition</a></li> <li role="presentation"><a href="#" class="formTabBtn" tab="tabCompo"><span class="visible-xs">Compo</span><span class="hidden-xs">Composition</span></a></li>
<li role="presentation"><a href="#" class="formTabBtn" tab="tabLegumes">Total Légumes</a></li> <li role="presentation"><a href="#" class="formTabBtn" tab="tabLegumes"><span class="visible-xs">Légumes</span><span class="hidden-xs">Total Légumes</span></a></li>
</ul> </ul>
<div class="formTabs"> <div class="formTabs">
<div class="tab tabGeneral active"> <div class="tab tabGeneral active">
@ -59,15 +59,14 @@
<table class="panier legumesTotal"> <table class="panier legumesTotal">
<thead> <thead>
<tr class="title"> <tr class="title">
<th class="titre" colspan="5">TOTAL :</th> <th class="titre" colspan="2">TOTAL :</th>
<th class="total montant">0.00</th> <th class="total montant" colspan="2">0.00</th>
<th class="total unite">€</th>
</tr> </tr>
<tr class="head"> <tr class="head">
<th class="nom">légume</th> <th class="nom">légume</th>
<th class="tarif" colspan="2">tarif</th> <th class="tarif">tarif</th>
<th class="quantite" colspan="2">quantité</th> <th class="quantite">quantité</th>
<th class="montant" colspan="2">montant</th> <th class="montant">montant</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

20
public_html_admin/templates/livraisons/livraison_form_tab_paniers.tpl
View File

@ -2,27 +2,27 @@
<table class="table panier"> <table class="table panier">
<thead> <thead>
<tr class="lieuTitre" lieu_ref="{$lieu.ref}"> <tr class="lieuTitre" lieu_ref="{$lieu.ref}">
<th colspan="3">{$lieu.nom}</th> <th class="noselect" colspan="2">{$lieu.nom}</th>
<th class="nb_total_paniers">{$lieu.nb_paniers} paniers</th> <th class="nb_total_paniers noselect" colspan="2">{$lieu.nb_paniers} paniers</th>
</tr> </tr>
<tr class="head"> <tr class="head">
<th class="status">#</th> <th class="status noselect">#</th>
<th class="nom">client</th> <th class="nom noselect">client</th>
<th class="frequence">fréquence</th> <th class="frequence visible-md noselect">fréquence</th>
<th class="nb_paniers_restants">nb. de paniers restant</th> <th class="nb_paniers_restants noselect">paniers restant</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{foreach from=$lieu.paniers item=pType} {foreach from=$lieu.paniers item=pType}
<tr class="panierTitre" type_ref="{$pType.type_ref}"> <tr class="panierTitre" type_ref="{$pType.type_ref}">
<th colspan="4">{$pType.type_nom} <small>(x{$pType.paniers|@count})</small></th> <th class="noselect" colspan="4">{$pType.type_nom} <small>(x{$pType.paniers|@count})</small></th>
</tr> </tr>
{foreach from=$pType.paniers item=p} {foreach from=$pType.paniers item=p}
<tr class="panier{if $p.absence} absent{/if}" lieu_ref="{$p.lieu_depot_ref}" contrat="{$p.contrat_ref}" type_ref="{$pType.type_ref}" type_nom="{$pType.type_nom}"{if $p.absence} data-toggle="tooltip" data-placement="left" title="Absent {$p.absence.periode}{if $p.absence.remarque!=''} ({$p.absence.remarque}){/if}"{/if}> <tr class="panier{if $p.absence} absent{/if}" lieu_ref="{$p.lieu_depot_ref}" contrat="{$p.contrat_ref}" type_ref="{$pType.type_ref}" type_nom="{$pType.type_nom}"{if $p.absence} data-toggle="tooltip" data-placement="left" title="Absent {$p.absence.periode}{if $p.absence.remarque!=''} ({$p.absence.remarque}){/if}"{/if}>
<td class="status"><input type='checkbox' name='status'{if $p.absence} disabled{/if}/></td> <td class="status"><input type='checkbox' name='status'{if $p.absence} disabled{/if}/></td>
<td class="nom">{$p.client_prenom} {$p.client_nom}</td> <td class="nom noselect">{$p.client_prenom} {$p.client_nom}</td>
<td class="frequence">{$p.frequence_print}</td> <td class="frequence visible-md noselect">{$p.frequence_print}</td>
<td class="nb_paniers_restants">{$p.nb_paniers_restants}</td> <td class="nb_paniers_restants noselect">{$p.nb_paniers_restants}</td>
</tr> </tr>
{/foreach} {/foreach}
{/foreach} {/foreach}

8
public_html_admin/templates/livraisons/livraison_modal_view.tpl
View File

@ -4,9 +4,9 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<small class="db_ref visible-md visible-lg">ref: <span>#</span></small> <small class="db_ref">ref: <span>#</span></small>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/livraison.svg"> <img src="img/livraison.svg">
Fiche livraison Fiche livraison
</h2> </h2>
</div> </div>
@ -27,8 +27,8 @@
<ul class="nav nav-tabs formTabsBtns"> <ul class="nav nav-tabs formTabsBtns">
<li tab="tabGeneral"><a href="#" class="formTabBtn" tab="tabGeneral">Général</a></li> <li tab="tabGeneral"><a href="#" class="formTabBtn" tab="tabGeneral">Général</a></li>
<li tab="tabPaniers"><a href="#" class="formTabBtn" tab="tabPaniers">Paniers</a></li> <li tab="tabPaniers"><a href="#" class="formTabBtn" tab="tabPaniers">Paniers</a></li>
<li tab="tabCompo"><a href="#" class="formTabBtn" tab="tabCompo">Composition</a></li> <li tab="tabCompo"><a href="#" class="formTabBtn" tab="tabCompo"><span class="visible-xs">Compo</span><span class="hidden-xs">Composition</span></a></li>
<li tab="tabLegumes"><a href="#" class="formTabBtn" tab="tabLegumes">Total Légumes</a></li> <li tab="tabLegumes"><a href="#" class="formTabBtn" tab="tabLegumes"><span class="visible-xs">Légumes</span><span class="hidden-xs">Total Légumes</span></a></li>
</ul> </ul>
<div class="formTabs"> <div class="formTabs">
<div class="tab tabGeneral active"> <div class="tab tabGeneral active">

22
public_html_admin/templates/livraisons/livraison_modal_view_tab_compo.tpl
View File

@ -2,28 +2,24 @@
<table class="panier"> <table class="panier">
<thead> <thead>
<tr class="title"> <tr class="title">
<th class="titre" colspan="3">{$p.nom} <small>(x{$p.nb})</small></th> <th class="titre" colspan="2">{$p.nom} <small>(x{$p.nb})</small></th>
<th class="total" colspan="2">TOTAL :</th> <th class="total">TOTAL :</th>
<th class="total montant">{$p.montant|string_format:"%.2f"}</th> <th class="total montant">{$p.montant|string_format:"%.2f"} €</th>
<th class="total unite">€</th>
</tr> </tr>
<tr class="head"> <tr class="head">
<th class="nom">légume</th> <th class="nom">légume</th>
<th class="tarif" colspan="2">tarif</th> <th class="tarif">tarif</th>
<th class="quantite" colspan="2">quantité</th> <th class="quantite">quantité</th>
<th class="montant" colspan="2">montant</th> <th class="montant">montant</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{foreach from=$p.legumes item=l} {foreach from=$p.legumes item=l}
<tr class="legume"> <tr class="legume">
<td class="nom">{$l.nom}</td> <td class="nom">{$l.nom}</td>
<td class="tarif">{$l.tarif_prix|string_format:"%.2f"}</td> <td class="tarif">{$l.tarif_prix|string_format:"%.2f"} €/{$l.tarif_unite_acro}</td>
<td class="tarif_unite unite">€/{$l.tarif_unite_acro}</td> <td class="quantite">{$l.quantite_print}</td>
<td class="quantite">{$l.quantite|string_format:"%.3f"}</td> <td class="montant">{($l.tarif_prix * $l.quantite)|string_format:"%.2f"} €</td>
<td class="quantite_unite unite">{$l.tarif_unite_acro}</td>
<td class="montant">{($l.tarif_prix * $l.quantite)|string_format:"%.2f"}</td>
<td class="montant_unite unite">€</td>
</tr> </tr>
{/foreach} {/foreach}
</tbody> </tbody>

20
public_html_admin/templates/livraisons/livraison_modal_view_tab_legumes.tpl
View File

@ -1,27 +1,23 @@
<table class="panier legumesTotal"> <table class="panier legumesTotal">
<thead> <thead>
<tr class="title"> <tr class="title">
<th class="titre" colspan="5">TOTAL :</th> <th class="titre">TOTAL :</th>
<th class="total montant">{$infos.total_legumes.montant|string_format:"%.2f"}</th> <th class="total montant" colspan="3">{$infos.total_legumes.montant|string_format:"%.2f"} €</th>
<th class="total unite">€</th>
</tr> </tr>
<tr class="head"> <tr class="head">
<th class="nom">légume</th> <th class="nom">légume</th>
<th class="tarif" colspan="2">tarif</th> <th class="tarif">tarif</th>
<th class="quantite" colspan="2">quantité</th> <th class="quantite">quantité</th>
<th class="montant" colspan="2">montant</th> <th class="montant">montant</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{foreach from=$infos.total_legumes.legumes item=l} {foreach from=$infos.total_legumes.legumes item=l}
<tr class="legume"> <tr class="legume">
<td class="nom">{$l.nom}</td> <td class="nom">{$l.nom}</td>
<td class="tarif">{$l.tarif_prix|string_format:"%.2f"}</td> <td class="tarif">{$l.tarif_prix|string_format:"%.2f"} €</td>
<td class="tarif_unite unite">€/{$l.tarif_unite_acro}</td> <td class="quantite">{$l.quantite_print}</td>
<td class="quantite">{if $l.tarif_unite=="kg"}{$l.quantite|string_format:"%.3f"}{else}{$l.quantite|string_format:"%.d"}{/if}</td> <td class="montant">{($l.montant)|string_format:"%.2f"} €</td>
<td class="quantite_unite unite">{$l.tarif_unite_acro}</td>
<td class="montant">{($l.montant)|string_format:"%.2f"}</td>
<td class="montant_unite unite">€</td>
</tr> </tr>
{foreachelse} {foreachelse}
<tr> <tr>

8
public_html_admin/templates/livraisons/livraison_modal_view_tab_paniers.tpl
View File

@ -7,8 +7,8 @@
</tr> </tr>
<tr class="head"> <tr class="head">
<th class="nom">client</th> <th class="nom">client</th>
<th class="frequence">fréquence</th> <th class="frequence visible-md">fréquence</th>
<th class="nb_paniers_restants">nb. de paniers restant</th> <th class="nb_paniers_restants visible-sm">paniers restant</th>
{if $smarty.request.complements==1} {if $smarty.request.complements==1}
<th class="complement center">complement</th> <th class="complement center">complement</th>
<th class="complement_regle center">réglé</th> <th class="complement_regle center">réglé</th>
@ -23,8 +23,8 @@
{foreach from=$pType.paniers item=p} {foreach from=$pType.paniers item=p}
<tr{if !$p.present} class="absent"{/if} contrat="{$p.contrat_ref}"> <tr{if !$p.present} class="absent"{/if} contrat="{$p.contrat_ref}">
<td class="nom">{$p.client_prenom} {$p.client_nom}</td> <td class="nom">{$p.client_prenom} {$p.client_nom}</td>
<td class="frequence">{if $p.present}{$p.frequence_print}{else}absent{/if}</td> <td class="frequence visible-md">{if $p.present}{$p.frequence_print}{else}absent{/if}</td>
<td class="nb_paniers_restants">{$p.nb_paniers_restants}</td> <td class="nb_paniers_restants visible-sm">{$p.nb_paniers_restants}</td>
{if $smarty.request.complements==1} {if $smarty.request.complements==1}
<td class="complement center">{if $p.complement >0}{$p.complement} €{else}.{/if}</td> <td class="complement center">{if $p.complement >0}{$p.complement} €{else}.{/if}</td>
<td class="complement_regle center">{if $p.complement_regle >0}{$p.complement_regle} €{else}.{/if}</td> <td class="complement_regle center">{if $p.complement_regle >0}{$p.complement_regle} €{else}.{/if}</td>

8
public_html_admin/templates/livraisons/livraisons_list.tpl
View File

@ -52,7 +52,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/livraison.svg"> <img src="img/livraison.svg">
Ajouter une livraison Ajouter une livraison
</h2> </h2>
</div> </div>
@ -83,7 +83,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/livraison.svg"> <img src="img/livraison.svg">
Modifier une livraison Modifier une livraison
</h2> </h2>
</div> </div>
@ -109,7 +109,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/livraison.svg"> <img src="img/livraison.svg">
Archiver une livraison Archiver une livraison
</h2> </h2>
</div> </div>
@ -131,7 +131,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/livraison.svg"> <img src="img/livraison.svg">
Supprimer une livraison Supprimer une livraison
</h2> </h2>
</div> </div>

16
public_html_admin/templates/livraisons/livraisons_secondbar.tpl
View File

@ -7,8 +7,8 @@
<span>{$list_limits.max} LIVRAISON{if $list_limits.max>1}S{/if}</span> <span>{$list_limits.max} LIVRAISON{if $list_limits.max>1}S{/if}</span>
</a> </a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse navbar-filtre-search">
<form class="navbar-form navbar-right" role="search" id="livraisonsSearch"> <form class="navbar-form navbar-right form-filtre-search" role="search" id="livraisonsSearch">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span> <span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
<select class="form-control" name="groupe" load_value="{$groupe}" filtre_request="groupe">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select> <select class="form-control" name="groupe" load_value="{$groupe}" filtre_request="groupe">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select>
@ -21,6 +21,18 @@
<option value="1">oui</option> <option value="1">oui</option>
</select> </select>
</div> </div>
<!-- ORDRE - SMALL SCREEN -->
<div class="input-group order visible-xs">
<span class="input-group-addon" filtre="{$filtre_items}">ordre :</span>
<select class="form-control" name="order">
{foreach from=$allowOrder key=id item=name}<option value="{$id}"{if $order == $id} selected{/if}>{$name}</option>{/foreach}
</select>
<div class="input-group-btn">
<button class="btn btn-default {$sens}" name="sens">
<i class="glyphicon glyphicon-chevron-{if $sens=="ASC"}up{else}down{/if}"></i>
</button>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>

12
public_html_admin/templates/paniers/panier_form.tpl
View File

@ -8,24 +8,20 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>groupe de contrats :</label> <label>groupe de contrats :</label>
<div class="input-group"> <div class="input-group inlineSelectManager">
<select class="form-control" name="groupe">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select> <select class="form-control" name="groupe">{include file='paniers_groupes/paniers_groupes_select_list.tpl'}</select>
<span class="input-group-btn hide"> <span class="input-group-btn hide">
<button class="btn btn-default btnSecondAction"> <button class="btn btn-default btnSecondAction"><i class="glyphicon glyphicon-remove"></i></button>
<i class="glyphicon glyphicon-remove"></i>
</button>
</span> </span>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-default btnAction add"> <button class="btn btn-default btnAction add"><i class="glyphicon glyphicon-plus"></i></button>
<i class="glyphicon glyphicon-plus"></i>
</button>
</span> </span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>valeur :</label> <label>valeur :</label>
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" name="valeur" placeholder="valeur"> <input type="number" class="form-control" name="valeur" placeholder="valeur">
<span class="input-group-addon">€</span> <span class="input-group-addon">€</span>
</div> </div>
</div> </div>

4
public_html_admin/templates/paniers/panier_modal_view.tpl
View File

@ -4,9 +4,9 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<small class="db_ref visible-md visible-lg">ref: <span>#</span></small> <small class="db_ref">ref: <span>#</span></small>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/panier.svg"> <img src="img/panier.svg">
Fiche panier Fiche panier
</h2> </h2>
</div> </div>

6
public_html_admin/templates/paniers/paniers_list.tpl
View File

@ -46,7 +46,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/panier.svg"> <img src="img/panier.svg">
Ajouter un type de panier Ajouter un type de panier
</h2> </h2>
</div> </div>
@ -77,7 +77,7 @@
</div> </div>
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/panier.svg"> <img src="img/panier.svg">
Modifier un type de panier Modifier un type de panier
</h2> </h2>
</div> </div>
@ -103,7 +103,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-title"> <h2 class="modal-title">
<img style="width:50px;" class="hidden-xs" src="img/panier.svg"> <img src="img/panier.svg">
Supprimer un type de panier Supprimer un type de panier
</h2> </h2>
</div> </div>

16
public_html_admin/templates/paniers/paniers_secondbar.tpl
View File

@ -7,8 +7,8 @@
<span>{$list_limits.max} PANIER{if $list_limits.max>1}S{/if}</span> <span>{$list_limits.max} PANIER{if $list_limits.max>1}S{/if}</span>
</a> </a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse navbar-filtre-search">
<form class="navbar-form navbar-right" role="search" id="paniersSearch"> <form class="navbar-form navbar-right form-filtre-search" role="search" id="paniersSearch">
<!-- GROUPE --> <!-- GROUPE -->
<div class="input-group"> <div class="input-group">
<span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span> <span class="input-group-addon{if $groupe>0} active{/if}">groupe :</span>
@ -20,6 +20,18 @@
<input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}"> <input type="text" class="form-control" placeholder="rechercher..." name="search" value="{$search}">
{if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if} {if $search!=""}<span class="input-group-addon btn-danger btnClearSearch"><i class="glyphicon glyphicon-remove"></i></span>{/if}
</div> </div>
<!-- ORDRE - SMALL SCREEN -->
<div class="input-group order visible-xs">
<span class="input-group-addon" filtre="{$filtre_items}">ordre :</span>
<select class="form-control" name="order">
{foreach from=$allowOrder key=id item=name}<option value="{$id}"{if $order == $id} selected{/if}>{$name}</option>{/foreach}
</select>
<div class="input-group-btn">
<button class="btn btn-default {$sens}" name="sens">
<i class="glyphicon glyphicon-chevron-{if $sens=="ASC"}up{else}down{/if}"></i>
</button>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>

2
public_html_admin/templates/structure/top.tpl
View File

@ -7,7 +7,7 @@
<title>{$site_name}</title> <title>{$site_name}</title>
<!-- On ouvre la fenêtre à la largeur de l'écran --> <!-- On ouvre la fenêtre à la largeur de l'écran -->
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<!-- logo --> <!-- logo -->
<link rel="icon" type="image/svg" href="img/logo.svg" /> <link rel="icon" type="image/svg" href="img/logo.svg" />

2
public_html_admin/templates/structure/topBar.tpl
View File

@ -11,7 +11,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<!-- Nav Bar Titre --> <!-- Nav Bar Titre -->
<a class="navbar-brand brand" href="#" target="_blank"><img src="img/logo.svg" alt="" style="height: 46px;position: relative;top: -11px;"></a> <a class="navbar-brand brand" href="#" target="_blank"><img src="img/logo.svg"></a>
</div><!-- end Nav Bar header --> </div><!-- end Nav Bar header -->
<div class="collapse navbar-collapse topBar"> <div class="collapse navbar-collapse topBar">