diff --git a/html/test.php b/html/test.php index d8b890a74..bdd2ef980 100644 --- a/html/test.php +++ b/html/test.php @@ -38,12 +38,12 @@ require_once('lib/icon_action.class.php'); require_once ('lib/function_javascript.php'); require_once 'class/user.class.php'; require_once NOALYSS_INCLUDE.'/lib/http_input.class.php'; - +html_page_start(); global $http; $http=new HttpInput(); -load_all_script(); + $gDossier=$http->request('gDossier',"number", -1); if ($gDossier==-1) { @@ -64,7 +64,7 @@ if (!file_exists('authorized_debug')) exit(); } define('ALLOWED', 1); -html_page_start("Classic"); +load_all_script(); /******************************************************************************************************************/ /* Utilities /******************************************************************************************************************/ diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php index e9837127f..a1dab5910 100644 --- a/include/lib/icon_action.class.php +++ b/include/lib/icon_action.class.php @@ -368,27 +368,28 @@ class Icon_Action if ( $p_value == 0 ) { return \Icon_Action::iconoff($p_id, $p_javascript,$p_style);} } - static function checked ($p_id,$p_javascript="") { + static function checked ($p_id,$p_javascript="",$p_classrange="") { $lock_cur=""; - - $r=sprintf( '%s', + $r=sprintf( '%s', $p_id, $p_javascript, + $p_classrange, $lock_cur); return $r; } - static function unchecked ($p_id,$p_javascript="") { + static function unchecked ($p_id,$p_javascript="",$p_classrange="") { $lock_cur=""; - $r=sprintf( '%s', + $r=sprintf( '%s', $p_id, $p_javascript, + $p_classrange, $lock_cur); return $r; } - static function checkbox ($p_id,$p_javascript="",$p_value=0) { - if ( $p_value == 0 ) { return \Icon_Action::checked($p_id, $p_javascript); } - if ( $p_value == 1 ) { return \Icon_Action::unchecked($p_id, $p_javascript);} + static function checkbox ($p_id,$p_javascript="",$p_value=0,$p_classrange="") { + if ( $p_value == 0 ) { return \Icon_Action::checked($p_id, $p_javascript,$p_classrange); } + if ( $p_value == 1 ) { return \Icon_Action::unchecked($p_id, $p_javascript,$p_classrange);} } static function full_size($p_div) { $js=sprintf("full_size('%s')",$p_div); diff --git a/include/lib/input_checkbox.class.php b/include/lib/input_checkbox.class.php index a81ac5780..a6d67938b 100644 --- a/include/lib/input_checkbox.class.php +++ b/include/lib/input_checkbox.class.php @@ -50,6 +50,7 @@ class InputCheckBox extends HtmlInput $this->id_hidden=$p_id; $this->id_icon=uniqid($p_id); $this->javascript=""; + $this->classrange=""; } function input($p_name=NULL, $p_value=0) @@ -75,9 +76,9 @@ class InputCheckBox extends HtmlInput $this->javascript); if ($this->value=='1') { - $r.=Icon_Action::checked($this->id_icon,$this->javascript); + $r.=Icon_Action::checked($this->id_icon,$this->javascript,$this->classrange); } else { - $r.=Icon_Action::unchecked($this->id_icon,$this->javascript); + $r.=Icon_Action::unchecked($this->id_icon,$this->javascript,$this->classrange); } return $r; } diff --git a/scenario/HtmlInput.test.php b/scenario/HtmlInput.test.php index 54675cb38..0a0c1e02f 100644 --- a/scenario/HtmlInput.test.php +++ b/scenario/HtmlInput.test.php @@ -92,12 +92,15 @@ $http=new HttpInput(); for ($i = 0 ; $i < 10 ; $i ++) : echo '
  • '; $check[$i]=new InputCheckBox("check[]",1,"checkid".$i); + $check[$i]->classrange="improvechkbox"; echo $i, " - name = ",$check[$i]->value_container,",id = " , $check[$i]->id_icon,$check[$i]->input(); + echo '
  • '; endfor; ?> - + +

    Submit

             echo HtmlInput::submit("submit", _("Envoi"));
    @@ -129,7 +132,7 @@ $http=new HttpInput();
         Fichier - IFile
     
     
    - + "; + } }