From 230dcf9409cfbd9e9d4e36e624b5a138ca77aa02 Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique@fournier38.fr>
Date: Wed, 21 Sep 2016 08:58:42 +0000
Subject: [PATCH] form : don't force a <br/> at the end of the help messages

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3055 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
---
 form.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/form.php b/form.php
index 91bd0f4..d8831c4 100644
--- a/form.php
+++ b/form.php
@@ -502,7 +502,9 @@ class formfield
       $res .= "      <span class='help-block' id='$this->formName"."_";
       $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_help'>";
       if (isset ($this->help))
-        $res .= "<span class='text-muted'>".$this->help."</span><br/>";
+        $res .= "<span class='text-muted'>".$this->help."</span>";
+      if (isset ($this->help) && isset ($this->errors))
+        $res .= "<br/>";
       if (isset ($this->errors)) $res .= $this->errors[1];
       $res .= "</span>\n";
     }
@@ -586,7 +588,9 @@ class formfield
       $res .= "      <span class='help-block' id='$this->formName"."_";
       $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_help'>";
       if (isset ($this->help))
-        $res .= "<span class='text-muted'>".$this->help."</span><br/>";
+        $res .= "<span class='text-muted'>".$this->help."</span>";
+      if (isset ($this->help) && isset ($this->errors))
+        $res .= "<br/>";
       if (isset ($this->errors)) $res .= $this->errors[1];
       $res .= "</span>\n";
     }
@@ -661,7 +665,9 @@ class formfield
       $res .= "      <span class='help-block' id='$this->formName"."_";
       $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_help'>";
       if (isset ($this->help))
-        $res .= "<span class='text-muted'>".$this->help."</span><br/>";
+        $res .= "<span class='text-muted'>".$this->help."</span>";
+      if (isset ($this->help) && isset ($this->errors))
+        $res .= "<br/>";
       if (isset ($this->errors)) $res .= $this->errors[1];
       $res .= "</span>\n";
     }
@@ -763,7 +769,9 @@ class formfield
         $res .= "      <span class='help-block' id='$this->formName"."_";
         $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_help'>";
         if (isset ($this->help))
-          $res .= "<span class='text-muted'>".$this->help."</span><br/>";
+          $res .= "<span class='text-muted'>".$this->help."</span>";
+      if (isset ($this->help) && isset ($this->errors))
+        $res .= "<br/>";
         if (isset ($this->errors)) $res .= $this->errors[1];
         $res .= "</span>\n";
       }
@@ -867,7 +875,9 @@ class formfield
       $res .= "      <span class='help-block' id='$this->formName"."_";
       $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_help'>";
       if (isset ($this->help))
-        $res .= "<span class='text-muted'>".$this->help."</span><br/>";
+        $res .= "<span class='text-muted'>".$this->help."</span>";
+      if (isset ($this->help) && isset ($this->errors))
+        $res .= "<br/>";
       if (isset ($this->errors)) $res .= $this->errors[1];
       $res .= "</span>\n";
     }
@@ -932,7 +942,9 @@ class formfield
       $res .= "      <span class='help-block' id='$this->formName"."_";
       $res .= htmlspecialchars ($this->name, ENT_QUOTES)."_help'>";
       if (isset ($this->help))
-        $res .= "<span class='text-muted'>".$this->help."</span><br/>";
+        $res .= "<span class='text-muted'>".$this->help."</span>";
+      if (isset ($this->help) && isset ($this->errors))
+        $res .= "<br/>";
       if (isset ($this->errors)) $res .= $this->errors[1];
       $res .= "</span>\n";
     }