diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index e4bab32a544..70f68a31894 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -208,7 +208,10 @@ class FormFile $out .= ''; if (!empty($options)) $out .= ''.$options.''; $out .= ''; - $out .= ' '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName")); + $out .= ' '; + $out .= ''; + $out .= $langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName")); + $out .= ''; $out .= ''; $out .= ''; } diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php index 790d30b444f..866c87ba66e 100644 --- a/htdocs/product/inventory/inventory.php +++ b/htdocs/product/inventory/inventory.php @@ -349,7 +349,7 @@ if ($object->id > 0) print ''.$langs->trans('UpdateByScaningLot').''; }*/ if ($conf->barcode->enabled || $conf->productbatch->enabled) { - print ''.$langs->trans("UpdateByScaning").''; + print ''.$langs->trans("UpdateByScaning").''; } } else { print ''.$langs->trans('Save').''."\n"; @@ -381,6 +381,17 @@ if ($object->id > 0) print ''."\n"; } + + if ($action == 'updatebyscaning') { + + print '
'; + + print 'TODO'; + + print '
'; + } + + print '
'; print ''; print ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 0bed245996d..92ae2d44d3d 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -773,9 +773,15 @@ span.fa.fa-plus-circle.paddingleft { #formuserfile { margin-top: 4px; } +#formuserfile input[type='file'] { + font-size: 1em; +} #formuserfile_link { margin-left: 1px; } +#formuserfile_link input[type='text'] { + font-size: 1em; +} .listofinvoicetype { height: 28px; vertical-align: middle; @@ -857,6 +863,18 @@ div.divsearchfield { opacity: 0.6; } +div.div-for-modal { + /* display: none; */ + position:absolute; + top:calc(50% - 200px); + left:calc(50% - 250px); + width:500px; /* adjust as per your needs */ + height:400px; /* adjust as per your needs */ + background: #fff; + border: 1px solid #bbb; + box-shadow: 2px 2px 20px #ddd; + z-index: 100; +}