holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed / get it working again

Browse Source 
- Mainscreen Message
- some space between the portal-boxes
- added disable-output-escapeing to msgbox-data
This commit is contained in:
Ralf Becker 2003-04-21 08:37:17 +00:00
parent cad7e38029
commit 33c30dc147
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
home.php
View File

@ -60,13 +60,15 @@
$extra_vars .= '&' . $name . '=' . urlencode($value);
}
}
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link($GLOBALS['phpgw_forward'],$extra_vars));
$GLOBALS['phpgw']->redirect_link($GLOBALS['phpgw_forward'],$extra_vars);
}
$GLOBALS['phpgw']->translation->add_app('mainscreen');
if (lang('mainscreen_message') != 'mainscreen_message'.lang_char())
{
echo '<center>' . stripslashes(lang('mainscreen_message')) . '</center>';
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array(
'mainscreen_message' => stripslashes(lang('mainscreen_message'))
));
}
if ((isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
@ -212,6 +214,7 @@
}
$GLOBALS['phpgw']->preferences->save_repository();
}
$GLOBALS['phpgw_info']['flags']['currentapp'] = 'home'; // has been changed by hook_home's
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
}

2
phpgwapi/templates/default/msgbox.xsl
View File

@ -17,7 +17,7 @@
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</img><xsl:text> </xsl:text>
<xsl:value-of select="msgbox_text"/>
<xsl:value-of disable-output-escaping="yes" select="msgbox_text"/>
</td>
</tr>
</table>

14
phpgwapi/templates/default/portal.xsl
View File

@ -1,13 +1,18 @@
<!-- $Id$ -->
<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>
<xsl:template match="portal_data">
<table cellpadding="0" cellspacing="0" class="portal">
<tr>
<td class="portal_text">
<tr>
<td class="portal_text">
<xsl:value-of disable-output-escaping="yes" select="space"/>
<xsl:value-of select="title"/>
</td>
@ -15,8 +20,8 @@
<xsl:apply-templates select="control_link"/>
</td>
</tr>
<tr>
<td colspan="2">
<tr>
<td colspan="2">
<table cellpadding="3" cellspacing="0" class="portal">
<xsl:choose>
<xsl:when test="listbox != ''">
@ -49,6 +54,7 @@
</td>
</tr>
</table>
<br/>
</xsl:template>
<xsl:template match="control_link">