phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/templates/default default_scripts.js, NONE,


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] phpgwapi/templates/default default_scripts.js, NONE, 1.1 nextmatchs.tpl, 1.10, 1.11 nextmatchs.xsl, 1.7, 1.8 phpgw.xsl, 1.17, 1.18
Date: Tue, 11 Nov 2003 13:42:02 +0000

Update of /cvsroot/phpgroupware/phpgwapi/templates/default
In directory subversions:/tmp/cvs-serv19968/default

Modified Files:
        nextmatchs.tpl nextmatchs.xsl phpgw.xsl 
Added Files:
        default_scripts.js 
Log Message:
bugfix [bug #3730]

Index: phpgw.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/phpgw.xsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** phpgw.xsl   7 Nov 2003 12:08:20 -0000       1.17
--- phpgw.xsl   11 Nov 2003 13:42:00 -0000      1.18
***************
*** 33,37 ****
                                <link rel="shortcut icon" href="favicon.ico"/>
                                <title><xsl:value-of 
select="website_title"/></title>
!                               <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/default/scripts.js"></script>
                                <xsl:choose>
                                        <xsl:when test="app_java_script != ''">
--- 33,37 ----
                                <link rel="shortcut icon" href="favicon.ico"/>
                                <title><xsl:value-of 
select="website_title"/></title>
!                               <script type="text/javascript" 
language="javascript" 
src="{$webserver_url}/phpgwapi/templates/default/default_scripts.js"></script>
                                <xsl:choose>
                                        <xsl:when test="app_java_script != ''">
***************
*** 77,81 ****
                                                                                
        </xsl:when>
                                                                                
        <xsl:otherwise>
!                                                                               
                <table cellspacing="0" cellpadding="0" width="100%">
                                                                                
                        <tr>
                                                                                
                                <xsl:apply-templates select="applications">
--- 77,81 ----
                                                                                
        </xsl:when>
                                                                                
        <xsl:otherwise>
!                                                                               
                <table cellspacing="0" cellpadding="0" align="right">
                                                                                
                        <tr>
                                                                                
                                <xsl:apply-templates select="applications">

--- NEW FILE: default_scripts.js ---
        function MM_preloadImages()
        { //v3.0
                var d=document; if(d.images)
                {
                        if(!d.MM_p) d.MM_p=new Array();
                        var i,j=d.MM_p.length,a=MM_preloadImages.arguments;
                        for(i=0; i<a.length; i++)
                                if (a[i].indexOf("#")!=0)
                                {
                                        d.MM_p[j]=new Image; 
d.MM_p[j++].src=a[i];
                                }
                }
        }

        var popupw;

        function openwindow(url,width,height)
        {
                if (popupw)
                {
                        if (popupw.closed)
                        {
                                popupw.stop;
                                popupw.close;
                        }
                }
                popupw = window.open(url, "popupWindow","width=" + width + 
",height=" + height + 
",location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no");
                if (popupw.opener == null)
                {
                        popupw.opener = window;
                }
        }

        function done()
        {
                popupw.close()
        }

Index: nextmatchs.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/nextmatchs.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** nextmatchs.tpl      18 Sep 2001 19:42:27 -0000      1.10
--- nextmatchs.tpl      11 Nov 2003 13:42:00 -0000      1.11
***************
*** 28,32 ****
        <tr>
                <td align="{align}">
!                       <input type="image" src="{img}" border="{border}" 
alt="{label}" width="12" height="12" name="start" value="{start}">
                </td>
        </tr>
--- 28,32 ----
        <tr>
                <td align="{align}">
!                       <input type="image" src="{img}" border="0" 
alt="{label}" width="{width}" height="{height}" name="start" value="{start}">
                </td>
        </tr>
***************
*** 47,51 ****
        <tr>
                <td align="{align}">
!                       <img src="{img}" border="{border}" width="12" 
height="12" alt="{label}">
                </td>
        </tr>
--- 47,51 ----
        <tr>
                <td align="{align}">
!                       <img src="{img}" border="0" width="{width}" 
height="{height}" alt="{label}">
                </td>
        </tr>

Index: nextmatchs.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/nextmatchs.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** nextmatchs.xsl      11 Nov 2003 12:46:08 -0000      1.7
--- nextmatchs.xsl      11 Nov 2003 13:42:00 -0000      1.8
***************
*** 28,31 ****
--- 28,34 ----
        <xsl:variable name="all_img"><xsl:value-of 
select="all_img"/></xsl:variable>
  
+       <xsl:variable name="img_width"><xsl:value-of 
select="img_width"/></xsl:variable>
+       <xsl:variable name="img_height"><xsl:value-of 
select="img_height"/></xsl:variable>
+ 
        <xsl:variable name="title_first"><xsl:value-of 
select="title_first"/></xsl:variable>
        <xsl:variable name="title_previous"><xsl:value-of 
select="title_previous"/></xsl:variable>
***************
*** 40,49 ****
                                <xsl:variable name="first"><xsl:value-of 
select="nextmatchs_url"/>&amp;start=0</xsl:variable>
                                        <td width="25">
!                                               <a href="{$first}"><img 
src="{$first_img}" border="0" alt="{$title_first}" title="{$title_first}"/></a>
                                        </td>
                                </xsl:when>
                                <xsl:otherwise>
                                        <td width="25">
!                                               <img src="{$first_grey_img}" 
border="0"/>
                                        </td>
                                </xsl:otherwise>
--- 43,52 ----
                                <xsl:variable name="first"><xsl:value-of 
select="nextmatchs_url"/>&amp;start=0</xsl:variable>
                                        <td width="25">
!                                               <a href="{$first}"><img 
src="{$first_img}" border="0" width="{$img_width}" height="{$img_height}" 
alt="{$title_first}" title="{$title_first}"/></a>
                                        </td>
                                </xsl:when>
                                <xsl:otherwise>
                                        <td width="25">
!                                               <img src="{$first_grey_img}" 
border="0" width="{$img_width}" height="{$img_height}"/>
                                        </td>
                                </xsl:otherwise>
***************
*** 60,64 ****
                                                                <xsl:variable 
name="prev"><xsl:value-of select="nextmatchs_url"/>&amp;start=<xsl:value-of 
select="number($prev_number) - number(1)"/></xsl:variable>
                                                                        <td 
width="25">
!                                                                               
<a href="{$prev}"><img src="{$left_img}" border="0" alt="{$title_previous}" 
title="{$title_previous}"/></a>
                                                                        </td>
                                                                </xsl:when>
--- 63,67 ----
                                                                <xsl:variable 
name="prev"><xsl:value-of select="nextmatchs_url"/>&amp;start=<xsl:value-of 
select="number($prev_number) - number(1)"/></xsl:variable>
                                                                        <td 
width="25">
!                                                                               
<a href="{$prev}"><img src="{$left_img}" border="0" width="{$img_width}" 
height="{$img_height}" alt="{$title_previous}" title="{$title_previous}"/></a>
                                                                        </td>
                                                                </xsl:when>
***************
*** 66,70 ****
                                                                <xsl:variable 
name="prev"><xsl:value-of select="nextmatchs_url"/>&amp;start=0</xsl:variable>
                                                                        <td 
width="25">
!                                                                               
<a href="{$prev}"><img src="{$left_grey_img}" border="0"/></a>
                                                                        </td>
                                                                </xsl:otherwise>
--- 69,73 ----
                                                                <xsl:variable 
name="prev"><xsl:value-of select="nextmatchs_url"/>&amp;start=0</xsl:variable>
                                                                        <td 
width="25">
!                                                                               
<a href="{$prev}"><img src="{$left_grey_img}" border="0" width="{$img_width}" 
height="{$img_height}"/></a>
                                                                        </td>
                                                                </xsl:otherwise>
***************
*** 73,77 ****
                                                <xsl:otherwise>
                                                        <td width="25">
!                                                               <img 
src="{$left_grey_img}" border="0"/>
                                                        </td>
                                                </xsl:otherwise>
--- 76,80 ----
                                                <xsl:otherwise>
                                                        <td width="25">
!                                                               <img 
src="{$left_grey_img}" border="0" width="{$img_width}" height="{$img_height}"/>
                                                        </td>
                                                </xsl:otherwise>
***************
*** 80,84 ****
                                <xsl:otherwise>
                                        <td width="25">
!                                               <img src="{$left_grey_img}" 
border="0"/>
                                        </td>
                                </xsl:otherwise>
--- 83,87 ----
                                <xsl:otherwise>
                                        <td width="25">
!                                               <img src="{$left_grey_img}" 
border="0" width="{$img_width}" height="{$img_height}"/>
                                        </td>
                                </xsl:otherwise>
***************
*** 114,123 ****
                                                <xsl:variable 
name="next"><xsl:value-of select="nextmatchs_url"/>&amp;start=<xsl:value-of 
select="number($next_num) - number(1)"/></xsl:variable>
                                                        <td width="25" 
align="right">
!                                                               <a 
href="{$next}"><img src="{$right_img}" border="0" alt="{$title_next}" 
title="{$title_next}"/></a>
                                                        </td>
                                                </xsl:when>
                                                <xsl:otherwise>
                                                        <td width="25" 
align="right">
!                                                               <img 
src="{$right_grey_img}" border="0"/>
                                                        </td>
                                                </xsl:otherwise>
--- 117,126 ----
                                                <xsl:variable 
name="next"><xsl:value-of select="nextmatchs_url"/>&amp;start=<xsl:value-of 
select="number($next_num) - number(1)"/></xsl:variable>
                                                        <td width="25" 
align="right">
!                                                               <a 
href="{$next}"><img src="{$right_img}" border="0" width="{$img_width}" 
height="{$img_height}" alt="{$title_next}" title="{$title_next}"/></a>
                                                        </td>
                                                </xsl:when>
                                                <xsl:otherwise>
                                                        <td width="25" 
align="right">
!                                                               <img 
src="{$right_grey_img}" border="0" width="{$img_width}" height="{$img_height}"/>
                                                        </td>
                                                </xsl:otherwise>
***************
*** 126,130 ****
                                <xsl:otherwise>
                                        <td width="25" align="right">
!                                               <img src="{$right_grey_img}" 
border="0"/>
                                        </td>
                                </xsl:otherwise>
--- 129,133 ----
                                <xsl:otherwise>
                                        <td width="25" align="right">
!                                               <img src="{$right_grey_img}" 
border="0" width="{$img_width}" height="{$img_height}"/>
                                        </td>
                                </xsl:otherwise>
***************
*** 138,147 ****
                                                <xsl:variable 
name="last"><xsl:value-of select="nextmatchs_url"/>&amp;start=<xsl:value-of 
select="number($last_num)-number(1)"/></xsl:variable>
                                                        <td width="25" 
align="right">
!                                                               <a 
href="{$last}"><img src="{$last_img}" border="0" alt="{$title_last}" 
title="{$title_last}"/></a>
                                                        </td>
                                                </xsl:when>
                                                <xsl:otherwise>
                                                        <td width="25" 
align="right">
!                                                               <img 
src="{$last_grey_img}" border="0"/>
                                                        </td>
                                                </xsl:otherwise>
--- 141,150 ----
                                                <xsl:variable 
name="last"><xsl:value-of select="nextmatchs_url"/>&amp;start=<xsl:value-of 
select="number($last_num)-number(1)"/></xsl:variable>
                                                        <td width="25" 
align="right">
!                                                               <a 
href="{$last}"><img src="{$last_img}" border="0" width="{$img_width}" 
height="{$img_height}" alt="{$title_last}" title="{$title_last}"/></a>
                                                        </td>
                                                </xsl:when>
                                                <xsl:otherwise>
                                                        <td width="25" 
align="right">
!                                                               <img 
src="{$last_grey_img}" border="0" width="{$img_width}" height="{$img_height}"/>
                                                        </td>
                                                </xsl:otherwise>
***************
*** 150,154 ****
                                <xsl:otherwise>
                                        <td width="25" align="right">
!                                               <img src="{$last_grey_img}" 
border="0"/>
                                        </td>
                                </xsl:otherwise>
--- 153,157 ----
                                <xsl:otherwise>
                                        <td width="25" align="right">
!                                               <img src="{$last_grey_img}" 
border="0" width="{$img_width}" height="{$img_height}"/>
                                        </td>
                                </xsl:otherwise>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]