Merge pull request #6585 from defrance/patch-99

display input border by setting
Dolibarr · Mar 26, 2017 · 95fbe01 · 95fbe01
2 parents ca3a39b + acfdc96
commit 95fbe01
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
@@ -215,6 +215,12 @@
 	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 @@
 	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"))

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
@@ -275,7 +275,10 @@
     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;