|
@@ -54,23 +54,26 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
|
|
/**
|
|
/**
|
|
* Stylesheets are loaded in the following order:
|
|
* Stylesheets are loaded in the following order:
|
|
* 1) All stylesheets provided by the template. Normally, these are
|
|
* 1) All stylesheets provided by the template. Normally, these are
|
|
- * stylsheets in $sTplDir/css/. This is accomplished by calling
|
|
|
|
|
|
+ * stylsheets in templates/<template>/css/. This is accomplished by calling
|
|
* $oTemplate->fetch_standard_stylesheet_links().
|
|
* $oTemplate->fetch_standard_stylesheet_links().
|
|
* 2) An optional user-defined stylesheet. This is set in the Display
|
|
* 2) An optional user-defined stylesheet. This is set in the Display
|
|
* Preferences.
|
|
* Preferences.
|
|
* 3) src/style.php which sets some basic font prefs.
|
|
* 3) src/style.php which sets some basic font prefs.
|
|
* 4) If we are dealing with an RTL language, we load rtl.css from the
|
|
* 4) If we are dealing with an RTL language, we load rtl.css from the
|
|
* template set.
|
|
* template set.
|
|
- **/
|
|
|
|
-
|
|
|
|
|
|
+ */
|
|
|
|
+
|
|
// 1. Stylesheets from the template.
|
|
// 1. Stylesheets from the template.
|
|
$header_tags .= $oTemplate->fetch_standard_stylesheet_links();
|
|
$header_tags .= $oTemplate->fetch_standard_stylesheet_links();
|
|
|
|
|
|
$aUserStyles = array();
|
|
$aUserStyles = array();
|
|
|
|
+
|
|
// 2. Option user-defined stylesheet from preferences.
|
|
// 2. Option user-defined stylesheet from preferences.
|
|
// FIXME: the following user pref ("sUserStyle"; rename as necessary) will have to be populated by the display prefs screen from a widget similar to the color themes widget (which it replaces) where its values should be full relative paths (from SM_PATH) to the selected css "themes" (either in template css/alternates dir or SM_PATH/css/alternates dir)
|
|
// FIXME: the following user pref ("sUserStyle"; rename as necessary) will have to be populated by the display prefs screen from a widget similar to the color themes widget (which it replaces) where its values should be full relative paths (from SM_PATH) to the selected css "themes" (either in template css/alternates dir or SM_PATH/css/alternates dir)
|
|
// FIXME: uhhh, getPref() is not available yet here. (at least on login page) Ugh. Nor has load_prefs been included yet -- how do we fix this?
|
|
// FIXME: uhhh, getPref() is not available yet here. (at least on login page) Ugh. Nor has load_prefs been included yet -- how do we fix this?
|
|
// $aUserStyles[] = getPref($data_dir, $username, 'sUserStyle', '');
|
|
// $aUserStyles[] = getPref($data_dir, $username, 'sUserStyle', '');
|
|
|
|
+// Steve, can you please document what u_ means? Will it work with the
|
|
|
|
+// new template inheritance system and auto-detection of alternate sheets?
|
|
if (!empty($chosen_theme) && substr($chosen_theme, 0, 2) == 'u_') {
|
|
if (!empty($chosen_theme) && substr($chosen_theme, 0, 2) == 'u_') {
|
|
$aUserStyles[] = substr($chosen_theme, 2) .'default.css';
|
|
$aUserStyles[] = substr($chosen_theme, 2) .'default.css';
|
|
}
|
|
}
|