This commit is contained in:
Laurent Destailleur 2020-01-31 14:52:43 +01:00
parent 51c6540a56
commit 0db77c1de6
3 changed files with 101 additions and 26 deletions

View File

@ -67,7 +67,7 @@ class MyObject extends CommonObject
* 'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
* Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
* 'label' the translation key.
* 'enabled' is a condition when the field must be managed.
* 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
* 'position' is the sort order of field.
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

View File

@ -38,14 +38,6 @@ select.vmenusearchselectcombo {
background-color: unset;
}
input.select2-input {
border-bottom: none ! important;
}
.select2-choice {
border: none;
border-bottom: solid 1px rgba(0,0,0,.2) !important; /* required to avoid to lose bottom line when focus is lost on select2. */
}
.liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
.liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
@ -235,9 +227,6 @@ select.flat, form.flat select {
.optionblue {
color: rgb(<?php echo $colortextlink; ?>);
}
.select2-results .select2-highlighted.optionblue {
color: #FFF !important;
}
.optiongrey, .opacitymedium {
opacity: 0.4;
}
@ -481,6 +470,18 @@ textarea.centpercent {
.paddingright2 {
padding-<?php print $right; ?>: 2px;
}
.paddingtop {
padding-bottom: 4px;
}
.paddingtop2 {
padding-bottom: 2px;
}
.paddingbottom {
padding-bottom: 4px;
}
.paddingbottom2 {
padding-bottom: 2px;
}
.marginleft2 {
margin-<?php print $left; ?>: 2px;
}
@ -534,14 +535,20 @@ body[class*="colorblind-"] .text-success{
color: rgb(<?php echo $colortexttitle; ?>) !important;
}
.floatnone {
float: none !important;
}
.fa-toggle-on, .fa-toggle-off { font-size: 2em; }
.websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
.asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off {
font-size: 1.5em; vertical-align: text-bottom;
}
/* Themes for badges */
<?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
<?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
.borderrightlight
{
@ -574,6 +581,31 @@ div.divsearchfield {
padding-bottom: 5px;
opacity: 0.6;
}
.divadvancedsearchfield:first-child {
margin-top: 3px;
}
.divadvancedsearchfield {
float: left;
padding-left: 15px;
padding-bottom: 2px;
padding-top: 2px;
}
.divadvancedsearchfield span.select2.select2-container.select2-container--default {
padding-bottom: 4px;
}
.search_component_params {
/*display: flex; */
-webkit-flex-flow: row wrap;
flex-flow: row wrap;
background: #fff;
padding: 3px;
}
.search_component_params_input, .search_component_params_input:focus {
border-bottom: none;
width: auto;
margin: 0 !important;
padding: 3px;
}
<?php
// Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
if ($conf->browser->layout == 'phone') {
@ -4781,6 +4813,28 @@ div.dataTables_length select {
/* Select2 */
/* ============================================================================== */
span.select2.select2-container.select2-container--default {
border-left: none;
border-top: none;
border-right: none;
}
input.select2-input {
border-bottom: none ! important;
}
.select2-choice {
border: none;
border-bottom: solid 1px rgba(0,0,0,.2) !important; /* required to avoid to lose bottom line when focus is lost on select2. */
}
.select2-results .select2-highlighted.optionblue {
color: #FFF !important;
}
.select2-container .select2-selection--multiple {
min-height: 30px !important;
}
.select2-container--default .select2-selection--multiple .select2-selection__choice {
margin-top: 5px !important;
border: none;
}
.select2-container--focus span.select2-selection.select2-selection--single {
border-bottom: 1px solid #666 !important;
}
@ -4848,8 +4902,16 @@ div.dataTables_length select {
box-shadow: none !important;
border-radius: 0 !important;
}
.select2-container--default.select2-container--focus .select2-selection--multiple {
border-top: none;
border-left: none;
border-right: none;
}
.select2-container--default .select2-selection--multiple {
border: solid 1px rgba(0,0,0,.2);
border-bottom: solid 1px rgba(0,0,0,.2);
border-top: none;
border-left: none;
border-right: none;
border-radius: 0 !important;
}
.select2-search__field
@ -4942,7 +5004,7 @@ a span.select2-chosen
opacity: 0.4;
}
.select2-container-multi .select2-choices .select2-search-choice {
margin-bottom: 3px;
margin-bottom: 3px;
}
.select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, .select2-container-multi .select2-choices,
.select2-container-multi.select2-container-active .select2-choices

View File

@ -269,13 +269,6 @@ textarea:focus, button:focus {
input:focus, textarea:focus, button:focus, select:focus {
border-bottom: 1px solid #666;
}
input.select2-input {
border-bottom: none ! important;
}
.select2-choice {
border: none;
border-bottom: 1px solid #ccc !important;
}
textarea.cke_source:focus
{
@ -453,9 +446,6 @@ select.flat, form.flat select {
.optionblue {
color: rgb(<?php echo $colortextlink; ?>);
}
.select2-results .select2-highlighted.optionblue {
color: #FFF !important;
}
.optiongrey, .opacitymedium {
opacity: 0.5;
}
@ -763,6 +753,10 @@ body[class*="colorblind-"] .text-success{
font-size: 1.5em; vertical-align: text-bottom;
}
.floatnone {
float: none !important;
}
/* Themes for badges */
<?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
@ -4919,6 +4913,17 @@ div.dataTables_length select {
/* Select2 */
/* ============================================================================== */
input.select2-input {
border-bottom: none ! important;
}
.select2-choice {
border: none;
border-bottom: 1px solid #ccc !important;
}
.select2-results .select2-highlighted.optionblue {
color: #FFF !important;
}
.blockvmenusearch .select2-container--default .select2-selection--single,
.blockvmenubookmarks .select2-container--default .select2-selection--single
{
@ -4980,8 +4985,16 @@ div.dataTables_length select {
box-shadow: none !important;
border-radius: 0 !important;
}
.select2-container--default.select2-container--focus .select2-selection--multiple {
border-top: none;
border-left: none;
border-right: none;
}
.select2-container--default .select2-selection--multiple {
border: solid 1px rgba(0,0,0,.2);
border-bottom: solid 1px rgba(0,0,0,.2);
border-top: none;
border-left: none;
border-right: none;
border-radius: 0 !important;
}
.select2-search__field