[Phpgroupware-cvs] CVS: phpgwapi/templates/default msgbox.xsl,1.3,1.4 portal.xsl,1.12,1.13

[Ralf Becker <address@hidden>]

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

Modified Files:
        msgbox.xsl portal.xsl 
Log Message:
fixed / get it working again
- Mainscreen Message
- some space between the portal-boxes
- added disable-output-escapeing to msgbox-data

Index: msgbox.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/msgbox.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** msgbox.xsl  29 Oct 2002 22:15:32 -0000      1.3
--- msgbox.xsl  21 Apr 2003 08:34:23 -0000      1.4
***************
*** 1,24 ****
! <!-- $Id$ -->
! 
!       <xsl:template name="msgbox">
!               <xsl:apply-templates select="msgbox_data"/>
!       </xsl:template>
! 
!       <xsl:template match="msgbox_data">
!               <table cellpadding="2" cellspacing="0" align="center" 
class="msgbox">
!                       <tr>
!                               <td align="center" valign="middle">
!                                       <xsl:variable 
name="msgbox_img"><xsl:value-of select="msgbox_img"/></xsl:variable>
!                                       <xsl:variable 
name="msgbox_img_alt"><xsl:value-of select="msgbox_img_alt"/></xsl:variable>
!                                       <img src="{$msgbox_img}" 
alt="{$msgbox_img_alt}" onMouseout="window.status='';return true;">
!                                               <xsl:attribute 
name="onMouseover">
!                                                       
<xsl:text>window.status='</xsl:text>
!                                                               <xsl:value-of 
select="lang_msgbox_statustext"/>
!                                                       <xsl:text>'; return 
true;</xsl:text>
!                                               </xsl:attribute>
!                                       </img><xsl:text> </xsl:text>
!                                       <xsl:value-of select="msgbox_text"/>
!                               </td>
!                       </tr>
!               </table>
!       </xsl:template>
--- 1,24 ----
! <!-- $Id$ -->
! 
!       <xsl:template name="msgbox">
!               <xsl:apply-templates select="msgbox_data"/>
!       </xsl:template>
! 
!       <xsl:template match="msgbox_data">
!               <table cellpadding="2" cellspacing="0" align="center" 
class="msgbox">
!                       <tr>
!                               <td align="center" valign="middle">
!                                       <xsl:variable 
name="msgbox_img"><xsl:value-of select="msgbox_img"/></xsl:variable>
!                                       <xsl:variable 
name="msgbox_img_alt"><xsl:value-of select="msgbox_img_alt"/></xsl:variable>
!                                       <img src="{$msgbox_img}" 
alt="{$msgbox_img_alt}" onMouseout="window.status='';return true;">
!                                               <xsl:attribute 
name="onMouseover">
!                                                       
<xsl:text>window.status='</xsl:text>
!                                                               <xsl:value-of 
select="lang_msgbox_statustext"/>
!                                                       <xsl:text>'; return 
true;</xsl:text>
!                                               </xsl:attribute>
!                                       </img><xsl:text> </xsl:text>
!                                       <xsl:value-of 
disable-output-escaping="yes" select="msgbox_text"/>
!                               </td>
!                       </tr>
!               </table>
!       </xsl:template>

Index: portal.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/default/portal.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** portal.xsl  29 Oct 2002 23:35:01 -0000      1.12
--- portal.xsl  21 Apr 2003 08:34:23 -0000      1.13
***************
*** 2,5 ****
--- 2,10 ----
  
        <xsl:template name="portal">
+               <xsl:choose>
+                       <xsl:when test="mainscreen_message != ''">
+                               <xsl:value-of disable-output-escaping="yes" 
select="mainscreen_message"/>
+                       </xsl:when>
+               </xsl:choose>
                <xsl:apply-templates select="portal_data"/>
        </xsl:template>
***************
*** 7,12 ****
        <xsl:template match="portal_data">
                <table cellpadding="0" cellspacing="0" class="portal">
!                       <tr>
!                               <td class="portal_text">
                                        <xsl:value-of 
disable-output-escaping="yes" select="space"/>
                                        <xsl:value-of select="title"/>
--- 12,17 ----
        <xsl:template match="portal_data">
                <table cellpadding="0" cellspacing="0" class="portal">
!                       <tr>
!                               <td class="portal_text">
                                        <xsl:value-of 
disable-output-escaping="yes" select="space"/>
                                        <xsl:value-of select="title"/>
***************
*** 16,21 ****
                                </td>
                        </tr>
!                       <tr>
!                               <td colspan="2">
                                        <table cellpadding="3" cellspacing="0" 
class="portal">
                                                <xsl:choose>
--- 21,26 ----
                                </td>
                        </tr>
!                       <tr>
!                               <td colspan="2">
                                        <table cellpadding="3" cellspacing="0" 
class="portal">
                                                <xsl:choose>
***************
*** 50,53 ****
--- 55,59 ----
                        </tr>
                </table>
+               <br/>
        </xsl:template>