Changeset 6747

Timestamp:

10/06/08 20:35:17 (2 months ago)

Author:

jmathis

Message:

 

Location:

trunk/centreon/www/include/monitoring/status/status-ndo

Files:

• makeJS_Common.php (modified) (4 diffs)
• makeJS_service.php (modified) (9 diffs)

trunk/centreon/www/include/monitoring/status/status-ndo/makeJS_Common.php

@@ -293 +293 @@
          */
 
-for ($i = 1; $i <= 2; $i++) { ?>
-        var istart = 0;
-        for (i = 5, istart = _num; istart && i > 0 && istart > 0; i--)
-                istart--;
-        
-        for (i2 = 0, iend = _num; ( iend <  (_numRows / _limit -1)) && ( i2 < (5 + i)); i2++)
-                iend++;
-        
-        for (i = istart; i <= iend && page_max > 1; i++){
-                var span_space = document.createElement("span");
-                span_space.innerHTML = '&nbsp;';
-                _pagination<?php echo $i; ?>.appendChild(span_space);
-
-                var _linkaction_num = document.createElement("a");
-                _linkaction_num.href = '#' ;
-                _linkaction_num.indice = i;
-                _linkaction_num.onclick=function(){change_page(this.indice)};
-                _linkaction_num.innerHTML = parseInt(i + 1);
-                _linkaction_num.className = "otherPageNumber";
+        for ($i = 1; $i <= 2; $i++) { ?>
+                var istart = 0;
+                for (i = 5, istart = _num; istart && i > 0 && istart > 0; i--)
+                        istart--;
                 
-                if (i == _num)
-                        _linkaction_num.className = "currentPageNumber";
-                _pagination<?php echo $i; ?>.appendChild(_linkaction_num);
-
-                var span_space = document.createElement("span");
-                span_space.innerHTML = '&nbsp;';
-                _pagination<?php echo $i; ?>.appendChild(span_space);
-        }
-
-        if (_num < page_max - 1){
-                _pagination<?php echo $i; ?>.appendChild(_linkaction_right<?php echo $i; ?>);
-                _pagination<?php echo $i; ?>.appendChild(_linkaction_last<?php echo $i; ?>);
-        }
-        
-<?php 
-} ?>
+                for (i2 = 0, iend = _num; ( iend <  (_numRows / _limit -1)) && ( i2 < (5 + i)); i2++)
+                        iend++;
+                
+                for (i = istart; i <= iend && page_max > 1; i++){
+                        var span_space = document.createElement("span");
+                        span_space.innerHTML = '&nbsp;';
+                        _pagination<?php echo $i; ?>.appendChild(span_space);
+        
+                        var _linkaction_num = document.createElement("a");
+                        _linkaction_num.href = '#' ;
+                        _linkaction_num.indice = i;
+                        _linkaction_num.onclick=function(){change_page(this.indice)};
+                        _linkaction_num.innerHTML = parseInt(i + 1);
+                        _linkaction_num.className = "otherPageNumber";
+                        
+                        if (i == _num)
+                                _linkaction_num.className = "currentPageNumber";
+                        _pagination<?php echo $i; ?>.appendChild(_linkaction_num);
+        
+                        var span_space = document.createElement("span");
+                        span_space.innerHTML = '&nbsp;';
+                        _pagination<?php echo $i; ?>.appendChild(span_space);
+                }
+        
+                if (_num < page_max - 1){
+                        _pagination<?php echo $i; ?>.appendChild(_linkaction_right<?php echo $i; ?>);
+                        _pagination<?php echo $i; ?>.appendChild(_linkaction_last<?php echo $i; ?>);
+                }
+                
+        <?php 
+        } ?>
         
         var _sel1 = document.getElementById('sel1');
@@ -347 +347 @@
 
         var _index = 0;
-        for (i = 10; i <= 100 ;i += 10){
+        var _i = 10;
+        for (i = 10; i <= 1000 ; i += _i){
+                if (i >= 100)
+                        _i = 100;
+                if (i >= 1000)
+                        _i = 1000;
                 if (i < _limit)
                         _index++;
@@ -357 +362 @@
         }
         var _index = 0;
-        for (i = 10; i <= 100 ;i += 10){
+        var _i = 10;
+        for (i = 10; i <= 1000 ;i += _i){
+                if (i >= 100)
+                        _i = 100;
+                if (i >= 1000)
+                        _i = 1000;
                 if (i < _limit)
                         _index++;
@@ -368 +378 @@
         sel1.selectedIndex = _index;
         _sel1.appendChild(sel1);
+        
         sel2.selectedIndex = _index;
         _sel2.appendChild(sel2);

trunk/centreon/www/include/monitoring/status/status-ndo/makeJS_service.php

@@ -64 +64 @@
 // linkBar to log/reporting/graph/ID_card
 
-        function getCheckedList(_input_name){
-                var mesinputs = document.getElementsByTagName("input" );
-                var tab = new Array();
-                var nb = 0;
-        
-                for (var i = 0; i < mesinputs.length; i++) {
-                        if (mesinputs[i].type.toLowerCase() == 'checkbox' && mesinputs[i].checked && mesinputs[i].name.substr(0,6) == _input_name) {
-                                var name = mesinputs[i].name;
-                                var l = name.length;
-                                tab[nb] = name.substr(7,l-8);
-                                nb++;
-                        }
-                }
-                return tab;
-        }
-
-        if (document.getElementById('linkBar')) {
-                var _linkBar = document.getElementById('linkBar')
-                var _divBar = document.createElement("div");
-                
-                _divBar.appendChild(create_graph_link('select','svc_id'));
-                _divBar.appendChild(create_log_link('select','svc_id'));
-                _divBar.setAttribute('style','float:right; margin-right:10px;' );
-                _linkBar.appendChild(_divBar);
-        }
+function getCheckedList(_input_name){
+        var mesinputs = document.getElementsByTagName("input");
+        var tab = new Array();
+        var nb = 0;
+
+        for (var i = 0; i < mesinputs.length; i++) {
+                if (mesinputs[i].type.toLowerCase() == 'checkbox' && mesinputs[i].checked && mesinputs[i].name.substr(0,6) == _input_name) {
+                        var name = mesinputs[i].name;
+                        var l = name.length;
+                        tab[nb] = name.substr(7,l-8);
+                        nb++;
+                }
+        }
+        return tab;
+}
+
+if (document.getElementById('linkBar')) {
+        var _linkBar = document.getElementById('linkBar')
+        var _divBar = document.createElement("div");
+        
+        _divBar.appendChild(create_graph_link('select','svc_id'));
+        _divBar.appendChild(create_log_link('select','svc_id'));
+        _divBar.setAttribute('style','float:right; margin-right:10px;' );
+        _linkBar.appendChild(_divBar);
+}
+
 //end for linkBar
 
@@ -229 +230 @@
 }
 
-function goM(_time_reload,_sid,_o){
-
+function goM(_time_reload, _sid, _o){
+        //viewDebugInfo('--Begin--');
         _lock = 1;
         var proc = new Transformation();
@@ -239 +240 @@
 
         _lock = 0;
-        viewDebugInfo('--end--');
+        //viewDebugInfo('--End--');
         
         _timeoutID = setTimeout('goM("'+ _time_reload +'","'+ _sid +'","'+_o+'")', _time_reload);
@@ -248 +249 @@
 }
 
-function displayPOPUP(id){
+function displayPOPUP(id) {
+        viewDebugInfo('Recup span_'+id);
         var span = document.getElementById('span_'+id);
         var proc_popup = new Transformation();
@@ -266 +268 @@
                 span.style.top = '-'+ span.offsetHeight +'px';
         }
+        viewDebugInfo('Display span_'+id);
 }
 
 function displayPOPUP_svc(id){
+        viewDebugInfo('Recup span_'+id);
         var span = document.getElementById('span_'+id);
         var proc_popup = new Transformation();
@@ -286 +290 @@
                 span.style.top = '-'+ span.offsetHeight +'px';
         }
+        viewDebugInfo('Display span_'+id);
 }
 
 function hiddenPOPUP(id){
-                var span = document.getElementById('span_'+id);
-                span.innerHTML = '';
-}
-
-function displayIMG(index, s_id, id)    {
-        // Pour les navigateurs recents
+        var span = document.getElementById('span_'+id);
+        span.innerHTML = '';
+        viewDebugInfo('Hidde span_'+id);
+}
+
+function displayIMG(index, s_id, id) {
+        viewDebugInfo('Display IMG');
     if ( document.getElementById && document.getElementById( 'div_img' ) ){
+        // Pour les navigateurs recents
         Pdiv = document.getElementById( 'div_img' );
         PcH = true;
@@ -309 +316 @@
         PcH = false;
     }
-    if ( PcH ){
+    if (PcH){
                 _img = mk_img('include/views/graphs/graphODS/generateImages/generateODSImage.php?session_id='+s_id+'&index='+index, 'graph popup'+'&index='+index);
                 Pdiv.appendChild(_img);
@@ -315 +322 @@
                 var h=screen.availHeight; //calcul auto de la hauteur de l'ecran client                 
                 var posy = tempY + 10;
-                if(h - tempY < 420){
+                if (h - tempY < 420){
                         posy = tempY-310;
                 }
@@ -322 +329 @@
                 Pdiv.style.top = posy +'px';
     }
-}
-
-function hiddenIMG(id){
-        // Pour les navigateurs récents
-    if ( document.getElementById && document.getElementById( 'div_img' ) ){
-        Pdiv = document.getElementById( 'div_img' );
-        PcH = true;
-    }
-    // Pour les veilles versions
-    else if ( document.all && document.all[ 'div_img' ] ){
-        Pdiv = document.all[ 'div_img' ];
-        PcH = true;
-    }
-    // Pour les trÚs veilles versions
-    else if ( document.layers && document.layers[ 'div_img' ] ){
-        Pdiv = document.layers[ 'div_img' ];
-        PcH = true;
-    }
-    else{
+    viewDebugInfo('End Display IMG');
+}
+
+function hiddenIMG(id) {
+        viewDebugInfo('Hidde IMG');
+    if (document.getElementById && document.getElementById( 'div_img' ) ){
+                // Pour les navigateurs recents
+        Pdiv = document.getElementById('div_img');
+        PcH = true;
+    } else if (document.all && document.all['div_img']){
+        // Pour les veilles versions
+        Pdiv = document.all['div_img'];
+        PcH = true;
+    } else if (document.layers && document.layers['div_img']){
+        // Pour les tres veilles versions
+        Pdiv = document.layers['div_img'];
+        PcH = true;
+    } else {
         PcH = false;
     }
-    if ( PcH ){
+    if (PcH) {
                 Pdiv.style.display = "none";
                 Pdiv.innerHTML = '';
         }
+        viewDebugInfo('End : Hidde IMG');
 }
 </SCRIPT>