Author: ralfbecker
New Revision: 55053
URL: http://svn.stylite.de/viewvc/egroupware?rev=55053&view=rev
Log:
get mobil template to load its own css, falling back to pixelegg and default
Modified:
trunk/phpgwapi/inc/class.egw_framework.inc.php
trunk/pixelegg/inc/class.pixelegg_framework.inc.php
— trunk/phpgwapi/inc/class.egw_framework.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_framework.inc.php Wed Feb 17 17:50:54 2016
@@ -53,6 +53,13 @@
var $template_dir;
/**
-
- Application specific template directories to try in given order for CSS
-
-
-
*/
-
var $template_dirs = array();
-
-
/**
- true if $this->header() was called
-
-
@var boolean
@@ -81,6 +88,9 @@
$GLOBALS[‘egw’]->framework = $this;
}
$this->template_dir = ‘/phpgwapi/templates/’.$template;
-
-
$this->template_dirs[] = $template;
-
$this->template_dirs[] = 'default';
}
/**
@@ -2252,10 +2262,12 @@
if (!is_null($name))
{
-
$path = '/'.$app.'/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/'.$name.'.css';
-
if (!file_exists(EGW_SERVER_ROOT.$path))
-
{
-
$path = '/'.$app.'/templates/default/'.$name.'.css';
— trunk/pixelegg/inc/class.pixelegg_framework.inc.php (original)
+++ trunk/pixelegg/inc/class.pixelegg_framework.inc.php Wed Feb 17 17:50:54 2016
@@ -27,6 +27,8 @@
*/
const JS_INCLUDE_APP = ‘pixelegg’;
-
-
/**
- Enable to use this template sets login.tpl for login page
*/
@@ -42,6 +44,9 @@
function __construct($template=self::APP)
{
parent::__construct($template); // call the constructor of the extended class
-
-
// search 'mobile' dirs first
-
if (html::$ua_mobile) array_unshift ($this->template_dirs, 'mobile');
}
/**
@@ -181,7 +186,7 @@
}
body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_category_active{background-color: $sidebox_color !important};
";
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs