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

Some fixes for custom app-theme css:

Browse Source 
- Make sure including css on ajax response respect app-theme
- Include app-theme for home portlets
This commit is contained in:
Hadi Nategh 2015-10-09 11:46:45 +00:00
parent 52a3e2240c
commit a378d19d2a
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_favorite_portlet.inc.php
View File

@ -59,7 +59,9 @@ class calendar_favorite_portlet extends home_favorite_portlet
{
// Always load app's css
egw_framework::includeCSS('calendar','app');
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();

3
home/inc/class.home_favorite_portlet.inc.php
View File

@ -121,7 +121,8 @@ class home_favorite_portlet extends home_portlet
// Always load app's css
egw_framework::includeCSS($this->context['appname'],'app');
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
egw_framework::validate_file('','app',$this->context['appname']);

3
home/inc/class.home_link_portlet.inc.php
View File

@ -117,7 +117,8 @@ class home_link_portlet extends home_portlet
{
// Always load app's css
egw_framework::includeCSS($this->context['entry']['app'],'app');
egw_framework::includeCSS($this->context['entry']['app'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
egw_framework::includeCSS($this->context['entry']['app'],'app');
try
{

3
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -2276,7 +2276,8 @@ abstract class egw_framework
$app = $GLOBALS['egw_info']['flags']['currentapp'];
// try to add app specific css file
self::includeCSS($app,'app');
self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
self::includeCSS($app,'app');
// add all css files from egw_framework::includeCSS()
$query = null;