diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-25 17:03:02 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-25 18:01:08 -0500 |
| commit | e371e27e0efda0e5e3bfd4f538006970cdfe97c9 (patch) | |
| tree | 9521caa0f2de48533184938ab0f0e151b6e4c3e0 /templates/header.inc.php | |
| parent | 2ab840a48bef2ebc9a94c5aeef5fc23d836e45da (diff) | |
| download | ampache-e371e27e0efda0e5e3bfd4f538006970cdfe97c9.tar.gz ampache-e371e27e0efda0e5e3bfd4f538006970cdfe97c9.tar.bz2 ampache-e371e27e0efda0e5e3bfd4f538006970cdfe97c9.zip | |
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.
Diffstat (limited to 'templates/header.inc.php')
| -rw-r--r-- | templates/header.inc.php | 18 |
1 files changed, 10 insertions, 8 deletions
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'; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>" dir="<?php echo $dir;?>"> @@ -47,7 +41,15 @@ if (Config::get('use_rss')) { ?> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo Config::get('site_charset'); ?>" /> <title><?php echo scrub_out(Config::get('site_title')); ?> - <?php echo $location['title']; ?></title> <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/base.css" type="text/css" media="screen" /> -<link rel="stylesheet" href="<?php echo $web_path; ?><?php echo $css; ?>" type="text/css" media="screen" /> +<link rel="stylesheet" href="<?php echo $web_path . $theme_path; ?>/default.css" type="text/css" media="screen" /> +<?php +if (is_rtl(Config::get('lang')) + && is_file(Config::get('theme_path') . '/templates/rtl.css')) { +?> +<link rel="stylesheet" href="<?php echo $web_path . $theme_path; ?>/rtl.css type="text/css" media="screen" /> +<?php +} +?> <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/print.css" type="text/css" media="print" /> </head> <body> |