From 6f26e868b5632132af465593640781ab8d068ede Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Tue, 9 Sep 2008 17:26:15 +0000
Subject: [PATCH] =?UTF-8?q?-=20LSform=20:=20=09->=20Ajout=20d'un=20espace?=
 =?UTF-8?q?=20entre=20deux=20champs=20de=20formulaire=20d'un=20m=C3=AAme?=
 =?UTF-8?q?=20attribut=20=09->=20Uniformisation=20de=20la=20non-appartenan?=
 =?UTF-8?q?ce=20des=20li=20a=20la=20classe=20LSform?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/includes/class/class.LSformElement_select.php    |  2 +-
 .../class/class.LSformElement_select_object.php        |  4 ++--
 trunk/includes/class/class.LSformElement_ssh_key.php   | 10 +++++-----
 trunk/includes/class/class.LSformElement_textarea.php  |  8 ++++----
 trunk/templates/css/LSform.css                         |  3 ++-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/trunk/includes/class/class.LSformElement_select.php b/trunk/includes/class/class.LSformElement_select.php
index fd733cae..fc5997da 100644
--- a/trunk/includes/class/class.LSformElement_select.php
+++ b/trunk/includes/class/class.LSformElement_select.php
@@ -65,7 +65,7 @@ class LSformElement_select extends LSformElement {
     else {
       $return['html']="<ul class='LSform'>\n";
       foreach ($this -> values as $value) {
-        $return['html'].="<li class='LSform'>".$this -> params['text_possible_values'][$value]."</strong></li>";
+        $return['html'].="<li>".$this -> params['text_possible_values'][$value]."</strong></li>";
       }
       $return['html'].="</ul>\n";
     }
diff --git a/trunk/includes/class/class.LSformElement_select_object.php b/trunk/includes/class/class.LSformElement_select_object.php
index ae525427..c09b5af3 100644
--- a/trunk/includes/class/class.LSformElement_select_object.php
+++ b/trunk/includes/class/class.LSformElement_select_object.php
@@ -50,7 +50,7 @@ class LSformElement_select_object extends LSformElement {
     
     
     if (!$this -> isFreeze()) {
-      $addBtn="<li class='LSform LSformElement_select_object_addBtn'>
+      $addBtn="<li class='LSformElement_select_object_addBtn'>
       <a href='select.php?LSobject=".$this -> selectableObject."' class='LSformElement_select_object LSformElement_select_object_addBtn' id='a_LSformElement_select_object_".$this -> name."_$id'>"._('Modifier')."</a>\n
       <input type='hidden' name='LSformElement_select_object_objecttype' id='LSformElement_select_object_objecttype_$id' value='".$this -> selectableObject."' />\n
       </li>\n";
@@ -66,7 +66,7 @@ class LSformElement_select_object extends LSformElement {
     $return['html']="<ul class='LSform ".$class."' id='LSformElement_select_object_".$this -> name."_$id'>\n";
     $return['html'].=$addBtn;
     foreach ($this -> values as $value => $txt) {
-      $return['html'].="<li class='LSform ".$class."'><a href='view.php?LSobject=".$this -> selectableObject."&amp;dn=".$value."' title='"._('Voir')." ' class='LSformElement_select_object'>".$txt."</a><input type='hidden' class='LSformElement_select_object' name='".$this -> name."[]' value='".$value."' />$delete</li>\n";
+      $return['html'].="<li class='".$class."'><a href='view.php?LSobject=".$this -> selectableObject."&amp;dn=".$value."' title='"._('Voir')." ' class='LSformElement_select_object'>".$txt."</a><input type='hidden' class='LSformElement_select_object' name='".$this -> name."[]' value='".$value."' />$delete</li>\n";
     }
     $return['html'].="</ul>\n";
     if (!$this -> isFreeze()) {
diff --git a/trunk/includes/class/class.LSformElement_ssh_key.php b/trunk/includes/class/class.LSformElement_ssh_key.php
index 488d6dfb..434ac5fb 100644
--- a/trunk/includes/class/class.LSformElement_ssh_key.php
+++ b/trunk/includes/class/class.LSformElement_ssh_key.php
@@ -46,28 +46,28 @@ class LSformElement_ssh_key extends LSformElement {
     $return['html'] = "<ul class='LSform'>\n";
     if (!$this -> isFreeze()) {
       if (empty($this -> values)) {
-        $return['html'] .= "<li class='LSform'>".$this -> getEmptyField()."</li>\n";
+        $return['html'] .= "<li>".$this -> getEmptyField()."</li>\n";
       }
       else {
         foreach($this -> values as $value) {
           $multiple = $this -> getMultipleData();
           $id = "LSform_".$this -> name."_".rand();
-          $return['html'].="<li class='LSform LSformElement_ssh_key'><textarea name='".$this -> name."[]' id='".$id."' class='LSform LSformElement_ssh_key'>".$value."</textarea>\n".$multiple."</li>";
+          $return['html'].="<li class='LSformElement_ssh_key'><textarea name='".$this -> name."[]' id='".$id."' class='LSform LSformElement_ssh_key'>".$value."</textarea>\n".$multiple."</li>";
         }
       }
     }
     else {
       if (empty($this -> values)) {
-        $return['html'].="<li class='LSform'>"._('Aucune valeur definie')."</li>\n";
+        $return['html'].="<li>"._('Aucune valeur definie')."</li>\n";
       }
       else {
         $GLOBALS['LSsession'] -> addJSscript('LSformElement_ssh_key.js');
         foreach ($this -> values as $value) {
           if (ereg('^ssh-([a-z]+) (.*)== (.*)$',$value,$regs)) {
-            $return['html'].="<li class='LSform'><span class='LSformElement_ssh_key_short_display' title='"._("Cliquer pour afficher la valeur complète")."'>".substr($regs[2],0,10)."...</span> (Type : ".$regs[1].") <a href='mailto:".$regs[3]."'>".$regs[3]."</a><p class='LSformElement_ssh_key_value'>".$value."</p></li>\n";
+            $return['html'].="<li><span class='LSformElement_ssh_key_short_display' title='"._("Cliquer pour afficher la valeur complète")."'>".substr($regs[2],0,10)."...</span> (Type : ".$regs[1].") <a href='mailto:".$regs[3]."'>".$regs[3]."</a><p class='LSformElement_ssh_key_value'>".$value."</p></li>\n";
           }
           else {
-            $return['html'].="<li class='LSform'><span class='LSformElement_ssh_key_short_display'>".substr($value,0,15)."...</span> ("._('Type non reconnu').")<p class='LSformElement_ssh_key_value'>".$value."</p></li>\n";
+            $return['html'].="<li><span class='LSformElement_ssh_key_short_display'>".substr($value,0,15)."...</span> ("._('Type non reconnu').")<p class='LSformElement_ssh_key_value'>".$value."</p></li>\n";
           }
         }
       }
diff --git a/trunk/includes/class/class.LSformElement_textarea.php b/trunk/includes/class/class.LSformElement_textarea.php
index 4034370b..aa97bdf7 100644
--- a/trunk/includes/class/class.LSformElement_textarea.php
+++ b/trunk/includes/class/class.LSformElement_textarea.php
@@ -45,23 +45,23 @@ class LSformElement_textarea extends LSformElement {
     $return['html'] = "<ul class='LSform'>\n";
     if (!$this -> isFreeze()) {
       if (empty($this -> values)) {
-        $return['html'] .= "<li class='LSform'>".$this -> getEmptyField()."</li>\n";
+        $return['html'] .= "<li>".$this -> getEmptyField()."</li>\n";
       }
       else {
         foreach($this -> values as $value) {
           $multiple = $this -> getMultipleData();
           $id = "LSform_".$this -> name."_".rand();
-          $return['html'].="<li class='LSform'><textarea name='".$this -> name."[]' id='".$id."' class='LSform'>".$value."</textarea>\n".$multiple."</li>";
+          $return['html'].="<li><textarea name='".$this -> name."[]' id='".$id."' class='LSform'>".$value."</textarea>\n".$multiple."</li>";
         }
       }
     }
     else {
       if (empty($this -> values)) {
-        $return['html'].="<li class='LSform'>"._('Aucune valeur definie')."</li>\n";
+        $return['html'].="<li>"._('Aucune valeur definie')."</li>\n";
       }
       else {
         foreach ($this -> values as $value) {
-          $return['html'].="<li class='LSform'>".$value."</li>\n";
+          $return['html'].="<li>".$value."</li>\n";
         }
       }
     }
diff --git a/trunk/templates/css/LSform.css b/trunk/templates/css/LSform.css
index a8bf0725..06536e02 100644
--- a/trunk/templates/css/LSform.css
+++ b/trunk/templates/css/LSform.css
@@ -34,8 +34,9 @@ ul.LSform {
   margin:                     0;
 }
 
-li.LSform {
+ul.LSform li {
   overflow:                   auto;
+  margin-bottom:              2px;
 }
 
 /*