Permalink
Browse files

Merge pull request #41 from linuxgemini/master

Various fixes on viewer pages

- fix on stylesheet handling when app not installed at webserver root  
- fix on capitalisation of server variables when determining connection protocol
  • Loading branch information...
aerouk committed Oct 23, 2017
2 parents 7eb7575 + 8b23322 commit ed97393b60fdfd8a4128ad6f6b40c8a3027022ab
@@ -1,9 +1,10 @@
<?php $stylesheetDir = IMAGESERVE_DIR . "/assets/css/style.css"; ?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title><?php echo APP_NAME . " - Error"; ?></title>
<link rel="stylesheet" href="/assets/css/style.css">
<link rel="stylesheet" href="<?php echo $stylesheetDir; ?>">
</head>

<body>
@@ -1,9 +1,10 @@
<?php $stylesheetDir = IMAGESERVE_DIR . "/assets/css/style.css"; ?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title><?php echo APP_NAME . " - Home"; ?></title>
<link rel="stylesheet" href="/assets/css/style.css">
<link rel="stylesheet" href="<?php echo $stylesheetDir; ?>">
</head>

<body>
@@ -1,13 +1,14 @@
<?php
$imgurl = IMAGESERVE_DIR . "/images/$type/$file.$type";
$protocol = isset($_SERVER['https']) && $_SERVER['https'] != "off" ? "https" : "http";
$protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off" ? "https" : "http";
$stylesheetDir = IMAGESERVE_DIR . "/assets/css/style.css";
?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title><?php echo APP_NAME . " - $file.$type"; ?></title>
<link rel="stylesheet" href="/assets/css/style.css">
<link rel="stylesheet" href="<?php echo $stylesheetDir; ?>">
<?php if (TWITTER_CARDS) { ?>
<meta name="twitter:card" content="photo" />
<meta name="twitter:site" content="<?php echo TWITTER_HANDLE; ?>" />

0 comments on commit ed97393

Please sign in to comment.