diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-28 12:06:00 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-28 13:26:11 -0500 |
| commit | 17613d090558dc2cd5e28e97917fe873c631e3ba (patch) | |
| tree | c5ddbf76bd7c956f6f3b0b0f3a8511daf7c09c23 | |
| parent | cd54a287fa5860ac10bc7b4cfd6b015b0d8de4c8 (diff) | |
| download | ampache-17613d090558dc2cd5e28e97917fe873c631e3ba.tar.gz ampache-17613d090558dc2cd5e28e97917fe873c631e3ba.tar.bz2 ampache-17613d090558dc2cd5e28e97917fe873c631e3ba.zip | |
Rework the stylesheet loading for the HTML5 player
Move the standard stylesheet head lines into a separate include file,
so that the player will actually do the standard and pick up the RTL
and things like that.
| -rw-r--r-- | templates/header.inc.php | 13 | ||||
| -rw-r--r-- | templates/show_html5_player.inc.php | 2 | ||||
| -rw-r--r-- | templates/stylesheets.inc.php | 36 |
3 files changed, 38 insertions, 13 deletions
diff --git a/templates/header.inc.php b/templates/header.inc.php index 803147c9..3bc77dd1 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -25,7 +25,6 @@ if (INIT_LOADED != '1') { exit; } $web_path = Config::get('web_path'); $htmllang = str_replace("_","-",Config::get('lang')); $location = get_location(); -$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;?>"> @@ -40,17 +39,7 @@ if (Config::get('use_rss')) { ?> <?php } ?> <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 . $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" /> +<?php require_once Config::get('prefix') . '/templates/stylesheets.inc.php'; ?> </head> <body> <script src="<?php echo $web_path; ?>/modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> diff --git a/templates/show_html5_player.inc.php b/templates/show_html5_player.inc.php index 04a25652..1abd96d2 100644 --- a/templates/show_html5_player.inc.php +++ b/templates/show_html5_player.inc.php @@ -29,7 +29,7 @@ header('Expires: ' . gmdate(DATE_RFC1123, time()-1)); <head> <title><?php echo Config::get('site_title'); ?></title> <link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/html5_player.css" type="text/css" media="screen" /> -<link rel="stylesheet" href="<?php echo Config::get('web_path').Config::get('theme_path').'/templates/'.'default.css'; ?>" type="text/css" media="screen" /> +<?php require_once Config::get('prefix') . '/templates/stylesheets.inc.php'; ?> <script src="<?php echo Config::get('web_path'); ?>/modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> <script type="text/javascript"> var playlist_items={ diff --git a/templates/stylesheets.inc.php b/templates/stylesheets.inc.php new file mode 100644 index 00000000..02a3a197 --- /dev/null +++ b/templates/stylesheets.inc.php @@ -0,0 +1,36 @@ +<?php +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ +/** + * + * LICENSE: GNU General Public License, version 2 (GPLv2) + * Copyright 2001 - 2013 Ampache.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License v2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +$web_path = Config::get('web_path'); +$theme_path = Config::get('theme_path') . '/templates'; +?> +<link rel="stylesheet" href="<?php echo $web_path; ?>/templates/base.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($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" /> |