Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6585 from defrance/patch-99

Browse Source 
display input border by setting
This commit is contained in:
Laurent Destailleur
2017-03-26 13:06:48 +02:00
committed by GitHub
parent ca3a39b71e acfdc96121
commit 95fbe0147d
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/admin/ihm.php
View File

@@ -215,6 +215,12 @@ if ($action == 'edit') // Edit
print '<td width="20">&nbsp;</td>';
print '</tr>';
// show input border
print '<tr><td width="35%">'.$langs->trans("showInputBorder").'</td><td>';
print $form->selectyesno('main_showInputBorder',isset($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)?$conf->global->THEME_ELDY_SHOW_BORDER_INPUT:0,1);
print '</td>';
print '<td width="20">&nbsp;</td>';
print '</tr>';
// Disable javascript and ajax
print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
print $form->selectyesno('main_disable_javascript',isset($conf->global->MAIN_DISABLE_JAVASCRIPT)?$conf->global->MAIN_DISABLE_JAVASCRIPT:0,1);
@@ -390,12 +396,16 @@ else // Show
print '<td width="20">&nbsp;</td>';
print "</tr>";
print '<tr><td width="35%">'.$langs->trans("showInputBorder").'</td><td>';
print yn($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)."</td>";
print '<td width="20">&nbsp;</td>';
print "</tr>";
// Disable javascript/ajax
print '<tr><td width="35%">'.$langs->trans("DisableJavascript").'</td><td>';
print yn($conf->global->MAIN_DISABLE_JAVASCRIPT)."</td>";
print '<td width="20">&nbsp;</td>';
print "</tr>";
print '<td width="20">&nbsp;</td>';
print "</tr>";
// Activate preview tab on element card
if (class_exists("Imagick"))

5
htdocs/theme/eldy/style.css.php
View File

@@ -275,7 +275,10 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
font-size: <?php print $fontsize ?>px;
font-family: <?php print $fontlist ?>;
border: none;
<?php if(empty($conf->global->THEME_ELDY_SHOW_BORDER_INPUT))
print "border: none;"
?>
border-bottom: solid 1px rgba(0,0,0,.2);
outline: none;
margin: 0px 0px 0px 0px;