mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
Some fixes for custom app-theme css:
- Make sure including css on ajax response respect app-theme - Include app-theme for home portlets
This commit is contained in:
parent
52a3e2240c
commit
a378d19d2a
@ -59,7 +59,9 @@ class calendar_favorite_portlet extends home_favorite_portlet
|
||||
{
|
||||
|
||||
// Always load app's css
|
||||
egw_framework::includeCSS('calendar', 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
|
||||
egw_framework::includeCSS('calendar','app');
|
||||
|
||||
if($this->favorite['state']['view'] == 'listview' || is_array($this->favorite) && !$this->favorite['state']['view'])
|
||||
{
|
||||
$ui = new calendar_uilist();
|
||||
|
@ -121,6 +121,7 @@ class home_favorite_portlet extends home_portlet
|
||||
|
||||
|
||||
// Always load app's css
|
||||
egw_framework::includeCSS($this->context['appname'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
|
||||
egw_framework::includeCSS($this->context['appname'],'app');
|
||||
|
||||
// Always load app's javascript, so most actions have a chance of working
|
||||
|
@ -117,6 +117,7 @@ class home_link_portlet extends home_portlet
|
||||
{
|
||||
|
||||
// Always load app's css
|
||||
egw_framework::includeCSS($this->context['entry']['app'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
|
||||
egw_framework::includeCSS($this->context['entry']['app'],'app');
|
||||
|
||||
try
|
||||
|
@ -2276,6 +2276,7 @@ abstract class egw_framework
|
||||
$app = $GLOBALS['egw_info']['flags']['currentapp'];
|
||||
|
||||
// try to add app specific css file
|
||||
self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
|
||||
self::includeCSS($app,'app');
|
||||
|
||||
// add all css files from egw_framework::includeCSS()
|
||||
|
Loading…
Reference in New Issue
Block a user