Skip to content
Snippets Groups Projects
Commit 95fbe014 authored by Laurent Destailleur's avatar Laurent Destailleur Committed by GitHub
Browse files

Merge pull request #6585 from defrance/patch-99

	display input border by setting
parents ca3a39b7 acfdc961
No related branches found
No related tags found
No related merge requests found
......@@ -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"))
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment