- LSformElement_xmpp & LSformElement_url & LSformElement_rss

-> Refonte avec l'utilisation de l'héritage de LSformElement_text
  -> Utilisation d'un fieldTemplate commum : LSformElement_uri_field.tpl
- LSformElement_mail
  -> Utilisation du fieldTemplate commum : LSformElement_uri_field.tpl
- LSformElement : Ajout du paramètre $fetchVariables qui contient les variables
  ajouter au contexte de la méthode fetchTemplate()

trunk/includes/class/class.LSformElement.php

@@ -40,6 +40,7 @@ class LSformElement {
   var $attr_html;
   var $fieldTemplate = 'LSformElement_field.tpl';
   var $template = 'LSformElement.tpl';
+  var $fetchVariables = array();
 
   /**
    * Constructeur
@@ -303,6 +304,7 @@ class LSformElement {
       $template,
       array_merge_recursive(
         $variables,
+        $this -> fetchVariables,
         array(
           'freeze' => $this -> isFreeze(),
           'multiple'=> $this -> isMultiple(),

trunk/includes/class/class.LSformElement_mail.php

@@ -42,7 +42,13 @@ class LSformElement_mail extends LSformElement_text {
     'LSsmoothbox.css',
     'LSconfirmBox.css'
   );
-  var $fieldTemplate = 'LSformElement_mail_field.tpl';
+  
+  var $fetchVariables = array(
+    'uriClass' => 'LSformElement_mail',
+    'uriPrefix' => 'mailto:'
+  );
+  
+  var $fieldTemplate = 'LSformElement_uri_field.tpl';
 }
 
 ?>

trunk/includes/class/class.LSformElement_rss.php

@@ -30,58 +30,17 @@
  * @author Benjamin Renard <brenard@easter-eggs.com>
  */
 
-class LSformElement_rss extends LSformElement {
+class LSformElement_rss extends LSformElement_text {
 
- /**
+  var $JSscripts = array(
-  * Retourne les infos d'affichage de l'élément
+    'LSformElement_rss.js'
-  * 
+  );
-  * Cette méthode retourne les informations d'affichage de l'élement
+  var $fetchVariables = array(
-  *
+    'uriClass' => 'LSformElement_rss'
-  * @retval array
+  );
-  */
+  
-  function getDisplay(){
+  var $fieldTemplate = 'LSformElement_uri_field.tpl';
-    $return = $this -> getLabelInfos();
+  
-    // value
-    if (!$this -> isFreeze()) {
-      $return['html'] = "<ul class='LSform'>\n";
-      if (empty($this -> values)) {
-        $return['html'] .= "<li>".$this -> getEmptyField()."</li>\n";
-      }
-      else {
-        foreach ($this -> values as $value) {
-          $multiple = $this -> getMultipleData();
-          $id = "LSform_".$this -> name."_".rand();
-          $return['html'] .= "<li><input class='LSformElement_rss' type='text' name='".$this -> name."[]' value=\"".$value."\" id='".$id."'>$multiple</li>\n";
-        }
-      }
-      $return['html'] .= "</ul>\n";
-      $GLOBALS['LSsession'] -> addJSscript('LSformElement_rss.js');
-    }
-    else {
-      $return['html'] = "<ul class='LSform'>\n";
-      if (empty($this -> values)) {
-        $return['html'] .= "<li>"._('Aucune valeur definie')."</li>\n";
-      }
-      else {
-        foreach ($this -> values as $value) {
-          $return['html'] .= "<li><a class='LSformElement_rss' href='".$value."'>".$value."</a></li>\n";
-          $GLOBALS['LSsession'] -> addJSscript('LSformElement_rss.js');
-        }
-      }
-      $return['html'] .= "</ul>\n";
-    }
-    return $return;
-  }
-
- /**
-  * Retourne le code HTML d'un champ vide
-  *
-  * @retval string Code HTML d'un champ vide.
-  */
-  function getEmptyField() {
-    $multiple = $this -> getMultipleData();
-    return "<input class='LSformElement_rss' type='text' name='".$this -> name."[]' id='LSform_".$this -> name."_".rand()."'>".$multiple;
-  }
 }
 
 ?>

trunk/includes/class/class.LSformElement_url.php

@@ -30,58 +30,17 @@
  * @author Benjamin Renard <brenard@easter-eggs.com>
  */
 
-class LSformElement_url extends LSformElement {
+class LSformElement_url extends LSformElement_text {
 
- /**
+  var $JSscripts = array(
-  * Retourne les infos d'affichage de l'élément
+    'LSformElement_url.js'
-  * 
+  );
-  * Cette méthode retourne les informations d'affichage de l'élement
+  
-  *
+  var $fetchVariables = array(
-  * @retval array
+    'uriClass' => 'LSformElement_url'
-  */
+  );
-  function getDisplay(){
+  
-    $return = $this -> getLabelInfos();
+  var $fieldTemplate = 'LSformElement_uri_field.tpl';
-    // value
-    if (!$this -> isFreeze()) {
-      $return['html'] = "<ul class='LSform'>\n";
-      if (empty($this -> values)) {
-        $return['html'] .= "<li>".$this -> getEmptyField()."</li>\n";
-      }
-      else {
-        foreach ($this -> values as $value) {
-          $multiple = $this -> getMultipleData();
-          $id = "LSform_".$this -> name."_".rand();
-          $return['html'] .= "<li><input class='LSformElement_url' type='text' name='".$this -> name."[]' value=\"".$value."\" id='".$id."' title=\"".$this -> getTitle()."\">$multiple</li>\n";
-        }
-      }
-      $return['html'] .= "</ul>\n";
-      $GLOBALS['LSsession'] -> addJSscript('LSformElement_url.js');
-    }
-    else {
-      $return['html'] = "<ul class='LSform'>\n";
-      if (empty($this -> values)) {
-        $return['html'] .= "<li>"._('Aucune valeur definie')."</li>\n";
-      }
-      else {
-        foreach ($this -> values as $value) {
-          $return['html'] .= "<li><a class='LSformElement_url' href='".$value."' title=\"".$this -> getTitle()."\">".$value."</a></li>\n";
-        }
-        $GLOBALS['LSsession'] -> addJSscript('LSformElement_url.js');
-      }
-      $return['html'] .= "</ul>\n";
-    }
-    return $return;
-  }
-
- /**
-  * Retourne le code HTML d'un champ vide
-  *
-  * @retval string Code HTML d'un champ vide.
-  */
-  function getEmptyField() {
-    $multiple = $this -> getMultipleData();
-    return "<input class='LSformElement_url' type='text' name='".$this -> name."[]' id='LSform_".$this -> name."_".rand()."' title=\"".$this -> getTitle()."\">".$multiple;
-  }
 
 }
 

trunk/includes/class/class.LSformElement_xmpp.php

@@ -30,58 +30,17 @@
  * @author Benjamin Renard <brenard@easter-eggs.com>
  */
 
-class LSformElement_xmpp extends LSformElement {
+class LSformElement_xmpp extends LSformElement_text {
-
+  var $JSscripts = array(
- /**
+    'LSformElement_xmpp.js'
-  * Retourne les infos d'affichage de l'élément
+  );
-  * 
+  
-  * Cette méthode retourne les informations d'affichage de l'élement
+  var $fetchVariables = array(
-  *
+    'uriClass' => 'LSformElement_xmpp',
-  * @retval array
+    'uriPrefix' => 'xmpp:'
-  */
+  );
-  function getDisplay(){
+  
-    $return = $this -> getLabelInfos();
+  var $fieldTemplate = 'LSformElement_uri_field.tpl';
-    // value
-    if (!$this -> isFreeze()) {
-      $return['html'] = "<ul class='LSform'>\n";
-      if (empty($this -> values)) {
-        $return['html'] .= "<li>".$this -> getEmptyField()."</li>\n";
-      }
-      else {
-        foreach ($this -> values as $value) {
-          $multiple = $this -> getMultipleData();
-          $id = "LSform_".$this -> name."_".rand();
-          $return['html'] .= "<li><input class='LSformElement_xmpp' type='text' name='".$this -> name."[]' value=\"".$value."\" id='".$id."'>$multiple</li>\n";
-        }
-      }
-      $return['html'] .= "</ul>\n";
-      $GLOBALS['LSsession'] -> addJSscript('LSformElement_xmpp.js');
-    }
-    else {
-      $return['html'] = "<ul class='LSform'>\n";
-      if (empty($this -> values)) {
-        $return['html'] .= "<li>"._('Aucune valeur definie')."</li>\n";
-      }
-      else {
-        foreach ($this -> values as $value) {
-          $return['html'] .= "<li><a class='LSformElement_xmpp' href='xmpp:".$value."'>".$value."</a></li>\n";
-          $GLOBALS['LSsession'] -> addJSscript('LSformElement_xmpp.js');
-        }
-      }
-      $return['html'] .= "</ul>\n";
-    }
-    return $return;
-  }
-
- /**
-  * Retourne le code HTML d'un champ vide
-  *
-  * @retval string Code HTML d'un champ vide.
-  */
-  function getEmptyField() {
-    $multiple = $this -> getMultipleData();
-    return "<input class='LSformElement_xmpp' type='text' name='".$this -> name."[]' id='LSform_".$this -> name."_".rand()."'>".$multiple;
-  }
 }
 
 ?>

trunk/includes/js/LSformElement_rss.js

@@ -31,6 +31,7 @@ var LSformElement_rss = new Class({
     },
     
     reinitialize: function(el) {
+      varLSform.initializeModule('LSformElement_text',el);
       this.initialiseLSformElement_rss(el);
     },
     

trunk/includes/js/LSformElement_url.js

@@ -41,6 +41,7 @@ var LSformElement_url = new Class({
     },
     
     reinitialize: function(el) {
+      varLSform.initializeModule('LSformElement_text',el);
       this.initialiseLSformElement_url(el);
     },
     
@@ -59,8 +60,8 @@ var LSformElement_url = new Class({
       if (typeof(href)=="undefined") {
         href = btn.getParent().getFirst().href;
       }
-      var name = btn.getParent().getFirst().title;
       if (href!="") {
+        var name = href;
         if (window.sidebar) {
           window.sidebar.addPanel(name,href,'');
         }

trunk/includes/js/LSformElement_xmpp.js

@@ -31,6 +31,7 @@ var LSformElement_xmpp = new Class({
     },
     
     reinitialize: function(el) {
+      varLSform.initializeModule('LSformElement_text',el);
       this.initialiseLSformElement_xmpp(el);
     },
     

trunk/templates/default/LSformElement_mail_field.tpl

@@ -1,5 +0,0 @@
-{if $freeze}
-<span class='LSformElement_text'>{if $value}<a class='LSformElement_mail' href='mailto:{$value}'>{$value}</a>{else}{$noValueTxt}{/if}</span><input type='hidden' name='{$attr_name}[]' class='LSformElement_text' value="{$value}"/>
-{else}
-<input type='text' name='{$attr_name}[]' class='LSformElement_text LSformElement_mail' value="{$value}"/>
-{/if}

trunk/templates/default/LSformElement_uri_field.tpl

@@ -0,0 +1,12 @@
+{if $freeze}
+  <span class='LSformElement_text'>
+  {if $value}
+    <a class='{$uriClass}' href='{$uriPrefix}{$value}'>{$value}</a>
+  {else}
+    {$noValueTxt}
+  {/if}
+  </span>
+  <input type='hidden' name='{$attr_name}[]' class='LSformElement_text' value="{$value}"/>
+{else}
+  <input type='text' name='{$attr_name}[]' class='LSformElement_text {$uriClass}' value="{$value}"/>
+{/if}