forked from extern/egroupware
fixed / get it working again
- Mainscreen Message - some space between the portal-boxes - added disable-output-escapeing to msgbox-data
This commit is contained in:
parent
cad7e38029
commit
33c30dc147
7
home.php
7
home.php
@ -60,13 +60,15 @@
|
|||||||
$extra_vars .= '&' . $name . '=' . urlencode($value);
|
$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');
|
$GLOBALS['phpgw']->translation->add_app('mainscreen');
|
||||||
if (lang('mainscreen_message') != 'mainscreen_message'.lang_char())
|
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']) &&
|
if ((isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
|
||||||
@ -212,6 +214,7 @@
|
|||||||
}
|
}
|
||||||
$GLOBALS['phpgw']->preferences->save_repository();
|
$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);
|
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$GLOBALS['phpgw']->portalbox->output);
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
<xsl:text>'; return true;</xsl:text>
|
<xsl:text>'; return true;</xsl:text>
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
</img><xsl:text> </xsl:text>
|
</img><xsl:text> </xsl:text>
|
||||||
<xsl:value-of select="msgbox_text"/>
|
<xsl:value-of disable-output-escaping="yes" select="msgbox_text"/>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
<!-- $Id$ -->
|
<!-- $Id$ -->
|
||||||
|
|
||||||
<xsl:template name="portal">
|
<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:apply-templates select="portal_data"/>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
@ -49,6 +54,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
<br/>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
<xsl:template match="control_link">
|
<xsl:template match="control_link">
|
||||||
|
Loading…
Reference in New Issue
Block a user