[Phpgroupware-cvs] property inc/class.solocation.inc.php inc/class...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/27 10:55:49

Modified files:
        inc            : class.solocation.inc.php 
                         class.uilocation.inc.php 
        templates/base : location.xsl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/location.xsl?cvsroot=phpgroupware&r1=1.9&r2=1.10

Patches:
Index: inc/class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- inc/class.solocation.inc.php        12 Oct 2006 09:09:28 -0000      1.38
+++ inc/class.solocation.inc.php        27 Oct 2006 10:55:48 -0000      1.39
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.solocation.inc.php,v 1.38 2006/10/12 09:09:28 
sigurdne Exp $
+       * @version $Id: class.solocation.inc.php,v 1.39 2006/10/27 10:55:48 
sigurdne Exp $
        */
 
        /**
@@ -215,8 +215,8 @@
                                }
 
 
-                               $street_level = 
$this->soadmin_location->read_config_single('street_id');
-                               if ($street_level > $type_id)
+       //                      $street_level = 
$this->soadmin_location->read_config_single('street_id');
+       //                      if ($street_level > $type_id)
                                {
                                        $cols.= ',fm_location1.loc1_name as 
loc1_name';
                                        $cols_return[]                          
= 'loc1_name';

Index: inc/class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- inc/class.uilocation.inc.php        20 Oct 2006 11:50:40 -0000      1.40
+++ inc/class.uilocation.inc.php        27 Oct 2006 10:55:48 -0000      1.41
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uilocation.inc.php,v 1.40 2006/10/20 11:50:40 
sigurdne Exp $
+       * @version $Id: class.uilocation.inc.php,v 1.41 2006/10/27 10:55:48 
sigurdne Exp $
        */
 
        /**
@@ -876,7 +876,7 @@
                                        {
                                                $lookup_functions .= 'function 
' . $functions[$j]['name'] ."\n";
                                                $lookup_functions .= '{'."\r\n";
-                                               $lookup_functions .= "var link 
= '" . $functions[$i]['link'] ."';" . "\n";
+                                               $lookup_functions .= "var link 
= '" . $functions[$j]['link'] ."';" . "\n";
                                                $lookup_functions .= 'link = 
link.split("amp;").join("");' ."\n";
                                                $lookup_functions .= 
$functions[$j]['action'] ."\n";
                                                $lookup_functions .= '}'."\r\n";

Index: templates/base/location.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/location.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- templates/base/location.xsl 12 Sep 2006 09:15:55 -0000      1.9
+++ templates/base/location.xsl 27 Oct 2006 10:55:49 -0000      1.10
@@ -1,4 +1,4 @@
-<!-- $Id: location.xsl,v 1.9 2006/09/12 09:15:55 sigurdne Exp $ -->
+<!-- $Id: location.xsl,v 1.10 2006/10/27 10:55:49 sigurdne Exp $ -->
 
        <xsl:template name="app_data">
                <xsl:choose>
@@ -244,9 +244,9 @@
                </script>
 
                <xsl:variable name="dateformat_source"><xsl:value-of 
select="dateformat_source"/></xsl:variable>
-               <SCRIPT LANGUAGE="JavaScript" 
SRC="{$dateformat_source}"></SCRIPT>
+               <SCRIPT type="text/javascript" 
SRC="{$dateformat_source}"></SCRIPT>
 
-               <script language="JavaScript">
+               <script type="text/javascript">
                        self.name="first_Window";
                        <xsl:value-of select="lookup_functions"/>
                </script>