mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Removing the langdir stuff from themes

Browse Source
This commit is contained in:
moodler 2007-08-09 10:09:34 +00:00
parent 26101be8e0
commit f31701c4ab
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/weblib.php
View File

@ -2788,7 +2788,7 @@ function current_category_theme($categoryid=0) {
* @param int $lifetime ?
* @param string $thename ?
*/
function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $forceconfig='', $lang='', $langdir='ltr') {
function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $forceconfig='', $lang='') {
global $CFG, $THEME;
@ -2896,15 +2896,12 @@ function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $force
}
}
$oppositlangdir = ($langdir == 'rtl') ? '_ltr' : '_rtl';
if ($files) {
/// Produce a list of all the files first
echo '/**************************************'."\n";
echo ' * THEME NAME: '.$themename."\n *\n";
echo ' * Files included in this sheet:'."\n *\n";
foreach ($files as $file) {
if (strstr($file[1], $oppositlangdir)) continue;
echo ' * '.$file[1]."\n";
}
echo ' **************************************/'."\n\n";
@ -2916,7 +2913,6 @@ function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $force
/// Actually collect all the files in order.
$css = '';
foreach ($files as $file) {
if (strstr($file[1], $oppositlangdir)) continue;
$css .= '/***** '.$file[1].' start *****/'."\n\n";
$css .= file_get_contents($file[0].'/'.$file[1]);
$ccs .= '/***** '.$file[1].' end *****/'."\n\n";
@ -2927,14 +2923,12 @@ function style_sheet_setup($lastmodified=0, $lifetime=300, $themename='', $force
/// Actually output all the files in order.
if (empty($CFG->CSSEdit) && empty($THEME->CSSEdit)) {
foreach ($files as $file) {
if (strstr($file[1], $oppositlangdir)) continue;
echo '/***** '.$file[1].' start *****/'."\n\n";
@include_once($file[0].'/'.$file[1]);
echo '/***** '.$file[1].' end *****/'."\n\n";
}
} else {
foreach ($files as $file) {
if (strstr($file[1], $oppositlangdir)) continue;
echo '/* @group '.$file[1].' */'."\n\n";
if (strstr($file[1], '.css') !== FALSE) {
echo '@import url("'.$CFG->themewww.'/'.$file[1].'");'."\n\n";
@ -2974,12 +2968,6 @@ function theme_setup($theme = '', $params=NULL) {
$params = array();
}
/// Add parameter for the language direction
$langdir = get_string('thisdirection');
if ($langdir == 'rtl') {
$params[] = 'langdir='.get_string('thisdirection');
}
if ($theme != $CFG->theme) {
$params[] = 'forceconfig='.$theme;
}
@ -3042,6 +3030,7 @@ function theme_setup($theme = '', $params=NULL) {
// RTL support - only for RTL languages, add RTL CSS
if (get_string('thisdirection') == 'rtl') {
$CFG->stylesheets[] = $CFG->themewww.'/standard/rtl.css'.$paramstring;
$CFG->stylesheets[] = $CFG->themewww.'/'.$theme.'/rtl.css'.$paramstring;
}
}