socid; ?>
dol_use_jmobile))
+ // add company icon before select list
+ if ($selectedCompany)
{
- $companystatic->fetch($selectedCompany);
- echo $companystatic->getNomUrl(2, '', 0, 1);
+ echo img_object('', 'company', 'class="hideonsmartphone"');
}
?>
selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0); ?>
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index bc7cf44ce66..f0e69b01b81 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -72,14 +72,14 @@ else $typeofdata='textarea:12:100';
-
>editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam); ?>
-
editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam); ?>
+
>editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0); ?>
+
editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1); ?>
societe_id)) { ?>
-
>editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam); ?>
-
editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam); ?>
+
>editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0); ?>
+
editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1); ?>
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index f4c5d871fc6..5d8674eb261 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -698,7 +698,7 @@ else
// Label
print '
'.$langs->trans("Label").' ';
- print '';
+ print '
';
// Thirdparty
if ($conf->societe->enabled)
@@ -752,7 +752,7 @@ else
// Date start
print '
'.$langs->trans("DateStart").' ';
print $form->select_date($object->date_start?$object->date_start:-1,'projectstart',0,0,0,'',1,0,1);
- print ' '. $langs->trans("ProjectReportDate");
print ' ';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f1368099864..a2471cd8aa8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -542,7 +542,7 @@ div.myavailability {
margin-top: 6px;
margin-left: 4px;
}
-.selectlimit {
+.selectlimit, .marginrightonly {
margin-right: 10px !important;
}
.strikefordisabled {
@@ -622,6 +622,7 @@ div.myavailability {
.minwidth500imp { min-width: 500px !important; }
}
.maxwidth50 { max-width: 50px; }
+.maxwidth75 { max-width: 75px; }
.maxwidth100 { max-width: 100px; }
.maxwidth150 { max-width: 150px; }
.maxwidth200 { max-width: 200px; }
@@ -665,12 +666,18 @@ div.myavailability {
div.titre {
line-height: 2em;
}
+ .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
+ height: 40px !important;
+ }
- input[type=text], select, textarea {
+ .quatrevingtpercent, .inputsearch {
+ width: 95%;
+ }
+
+ input, input[type=text], input[type=password], select, textarea {
min-width: 20px;
min-height: 1.4em;
line-height: 1.4em;
- margin: .5em 0;
padding: .4em .1em;
border: 1px solid #BBB;
}
@@ -679,6 +686,7 @@ div.myavailability {
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
.maxwidth50onsmartphone { max-width: 50px; }
+ .maxwidth75onsmartphone { max-width: 75px; }
.maxwidth100onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 150px; }
.maxwidth200onsmartphone { max-width: 200px; }
@@ -699,7 +707,6 @@ div.myavailability {
}
select {
width: 98%;
- dol_use_jmobile)) { ?>max-width: 100px;
min-width: 40px;
}
div.divphotoref {
@@ -2357,10 +2364,7 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord
table.borderplus {
border: 1px solid #BBB;
}
-.border tbody tr, .border tbody tr td {
- height: 20px;
-}
-div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
+.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
height: 20px;
}
div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9935c3b2231..de92d29361b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -549,7 +549,7 @@ div.myavailability {
margin-top: 6px;
margin-left: 4px;
}
-.selectlimit {
+.selectlimit, .marginrightonly {
margin-right: 10px !important;
}
.strikefordisabled {
@@ -627,6 +627,7 @@ div.myavailability {
.minwidth500imp { min-width: 500px !important; }
}
.maxwidth50 { max-width: 50px; }
+.maxwidth75 { max-width: 75px; }
.maxwidth100 { max-width: 100px; }
.maxwidth150 { max-width: 150px; }
.maxwidth200 { max-width: 200px; }
@@ -670,12 +671,18 @@ div.myavailability {
div.titre {
line-height: 2em;
}
+ .border tbody tr, .border tbody tr td, div.tabBar table.border tr {
+ height: 40px !important;
+ }
- input[type=text], select, textarea {
+ .quatrevingtpercent, .inputsearch {
+ width: 95%;
+ }
+
+ input, input[type=text], input[type=password], select, textarea {
min-width: 20px;
min-height: 1.4em;
line-height: 1.4em;
- margin: .5em 0;
padding: .4em .1em;
border: 1px solid #BBB;
}
@@ -684,6 +691,7 @@ div.myavailability {
.noenlargeonsmartphone { width : 50px !important; display: inline !important; }
.maxwidthonsmartphone { max-width: 100px; }
.maxwidth50onsmartphone { max-width: 50px; }
+ .maxwidth75onsmartphone { max-width: 75px; }
.maxwidth100onsmartphone { max-width: 100px; }
.maxwidth150onsmartphone { max-width: 150px; }
.maxwidth200onsmartphone { max-width: 200px; }
@@ -697,6 +705,28 @@ div.myavailability {
.minwidth500imp { min-width: 50px !important; }
.titlefield { width: auto; }
.titlefieldcreate { width: auto; }
+
+ #tooltip {
+ position: absolute;
+ width: px;
+ }
+ select {
+ width: 98%;
+ min-width: 40px;
+ }
+ div.divphotoref {
+ padding-right: 5px;
+ }
+ img.photoref, div.photoref {
+ border: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ padding: 4px;
+ height: 20px;
+ width: 20px;
+ object-fit: contain;
+ }
}
.linkobject { cursor: pointer; }
@@ -2245,10 +2275,7 @@ table.borderplus {
border: 1px solid #BBB;
}
-.border tbody tr, .border tbody tr td {
- height: 20px;
-}
-div.tabBar table.border tr {
+.border tbody tr, .border tbody tr td, div.tabBar table.border tr {
height: 20px;
}