Changeset 6072

Timestamp:

05/02/12 16:46:46 (12 years ago)

Author:

thiago

Message:

Ticket #2674 - Problema corrigido com codigos em jquery

Location:

trunk

Files:

• expressoAdmin1_2/js/jscode/finder.js (modified) (3 diffs)
• index.php (modified) (3 diffs)

trunk/expressoAdmin1_2/js/jscode/finder.js

@@ -187 +187 @@
         var select = Element( selectId );
 
-        select.innerHTML = fill;
-
+        //select.innerHTML = fill;
+        
+        $("#"+selectId).html(fill);
+        
         return( select.options.length );
     }
 
     var content = "";
-
+        
     for( var section in fill )
     {
@@ -200 +202 @@
 
         var entry = entryTag( section );
-
-        content += entry.outerHTML;
+        
+        if(typeof entry == "string")
+                content += entry;
+        else
+                content += entry.outerHTML;
+        
         content += fill[section];
-    }
-
+    }   
+        
     return fillContentSelect( content, selectId );
 }
@@ -212 +218 @@
 {
     var line = '-------------------';
-
-    var option = new Option( line + ' ' + get_lang(label) + ' ' + line + ' ', -1 );
-    option.disabled = true;
+        
+    //var option = new Option( line + ' ' + get_lang(label) + ' ' + line + ' ', -1 );
+    //option.disabled = true;
+        
+        var option = "<option value='-1' disabled='disabled'>"+line+" "+get_lang(label)+" "+line+"</option>";
 
     if( typeof select === "undefined" )

trunk/index.php

@@ -9 +9 @@
         *  option) any later version.                                              *
         \**************************************************************************/
-
+        
         $current_url = substr($_SERVER["SCRIPT_NAME"], 0, strpos($_SERVER["SCRIPT_NAME"],'index.php'));
 
@@ -63 +63 @@
         if (($GLOBALS['phpgw_info']['server']['use_https'] == 2) && ($_SERVER['HTTPS'] != 'on'))
         {
+        
                 Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
                 exit;
@@ -140 +141 @@
                 $GLOBALS['phpgw']->common->phpgw_footer();
         }*/
+                
+        echo '<script type="text/javascript" src="prototype/plugins/jquery/jquery.min.js"></script>';
 ?>