From e371e27e0efda0e5e3bfd4f538006970cdfe97c9 Mon Sep 17 00:00:00 2001 From: Paul Arthur Date: Fri, 25 Jan 2013 17:03:02 -0500 Subject: Change css handling for RTL languages Code duplication is bad even when it's CSS, mmkay? If a theme has templates/rtl.css, it will be loaded in addition to default.css. This is more sane than the old behaviour, which loaded default-rtl.css instead of default.css. I'm not feeling ambitious enough to actually check whether the current -rtl.css files work and change them to overrides instead of modified copypasta, so I just dropped them for now. --- templates/header.inc.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'templates') diff --git a/templates/header.inc.php b/templates/header.inc.php index 1b43c3d3..f6d5a8ad 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -25,13 +25,7 @@ if (INIT_LOADED != '1') { exit; } $web_path = Config::get('web_path'); $htmllang = str_replace("_","-",Config::get('lang')); $location = get_location(); -$dir = is_rtl(Config::get('lang')) ? "rtl" : "ltr"; -$themecss = Config::get('theme_path') . '/templates/'; -$css = ($dir == 'rtl') ? $themecss.'default-rtl.css' : $themecss.'default.css'; -$cssdir = Config::get('prefix').$themecss; -if(!is_file($cssdir.'default-rtl.css')) { - $css = $themecss.'default.css'; -} +$theme_path = Config::get('theme_path') . '/templates'; ?> @@ -47,7 +41,15 @@ if (Config::get('use_rss')) { ?> <?php echo scrub_out(Config::get('site_title')); ?> - <?php echo $location['title']; ?> - + + + + -- cgit