Tim Landscheidt has submitted this change and it was merged.
Change subject: Add default styling to error pages
......................................................................
Add default styling to error pages
Add css and markup to error pages that matches the index page styling.
Change-Id: I542c760aff40d9995ff81618a9e03396f71ce8c4
---
M www/content/403.php
M www/content/404.php
M www/content/500.php
M www/content/503.php
M www/index.php
5 files changed, 77 insertions(+), 7 deletions(-)
Approvals:
Tim Landscheidt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/www/content/403.php b/www/content/403.php
index 1961072..8b44a6e 100644
--- a/www/content/403.php
+++ b/www/content/403.php
@@ -4,8 +4,11 @@
<meta charset="UTF-8">
<title>403 Forbidden</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=yes,
width=device-width">
+<link rel="StyleSheet" href="/style.css" type="text/css" media="screen">
</head>
<body>
+<div class="colmask leftmenu"><div class="colright">
+<div class="col1wrap"><div class="col1">
<?php
require_once dirname( __FILE__ ) . '/common.inc.php';
$uri = $_SERVER['HTTP_X_ORIGINAL_URI'];
@@ -24,5 +27,20 @@
<p>Perhaps the webserver has temporarily lost its mind, or the link you've
followed doesn't actually lead somewhere useful?</p>
<p>If you're pretty sure this shouldn't be an error, you may wish to notify
the <a href="/?tool=admin">project administrators</a> about the error and how
you ended up here.</p>
<?php } ?>
+</div></div>
+<div class="col2">
+<div id="logo"><a href="/"><img src="/Tool_Labs_logo_thumb.png" width="122"
height="138" alt="Wikitech and Wikimedia Labs" /></a></div>
+<ul>
+<li><a href="/?list">Tools</a></li>
+<li><a href="/?status">Status</a></li>
+<li><a href="/?Privacy">Privacy policy</a></li>
+</ul>
+<em>Maintainers:</em>
+<ul>
+<li><a href="/?Help">Help</a></li>
+<li><a href="/?Rules">Rules</a></li>
+</ul>
+</div>
+</div></div>
</body>
</html>
diff --git a/www/content/404.php b/www/content/404.php
index 5f778b1..3e553bf 100644
--- a/www/content/404.php
+++ b/www/content/404.php
@@ -4,8 +4,11 @@
<meta charset="UTF-8">
<title>404 Not Found</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=yes,
width=device-width">
+<link rel="StyleSheet" href="/style.css" type="text/css" media="screen">
</head>
<body>
+<div class="colmask leftmenu"><div class="colright">
+<div class="col1wrap"><div class="col1">
<?php
require_once dirname( __FILE__ ) . '/common.inc.php';
$uri = $_SERVER['HTTP_X_ORIGINAL_URI'];
@@ -22,5 +25,20 @@
<p>Perhaps the webserver has temporarily lost its mind, or the link you've
followed doesn't actually lead somewhere useful?</p>
<p>You might want to looks at the <a href="/?list">list of tools</a> to find
what you were looking for, or one of the links on the sidebar to the left. If
you're pretty sure this shouldn't be an error, you may wish to notify the <a
href="/?tool=admin">project administrators</a> about the error and how you
ended up here.</p>
<?php } ?>
+</div></div>
+<div class="col2">
+<div id="logo"><a href="/"><img src="/Tool_Labs_logo_thumb.png" width="122"
height="138" alt="Wikitech and Wikimedia Labs" /></a></div>
+<ul>
+<li><a href="/?list">Tools</a></li>
+<li><a href="/?status">Status</a></li>
+<li><a href="/?Privacy">Privacy policy</a></li>
+</ul>
+<em>Maintainers:</em>
+<ul>
+<li><a href="/?Help">Help</a></li>
+<li><a href="/?Rules">Rules</a></li>
+</ul>
+</div>
+</div></div>
</body>
</html>
diff --git a/www/content/500.php b/www/content/500.php
index 9e5c5b5..8b2dbcd 100644
--- a/www/content/500.php
+++ b/www/content/500.php
@@ -4,8 +4,11 @@
<meta charset="UTF-8">
<title>500 Internal Server Error</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=yes,
width=device-width">
+<link rel="StyleSheet" href="/style.css" type="text/css" media="screen">
</head>
<body>
+<div class="colmask leftmenu"><div class="colright">
+<div class="col1wrap"><div class="col1">
<?php
require_once dirname( __FILE__ ) . '/common.inc.php';
$uri = $_SERVER['HTTP_X_ORIGINAL_URI'];
@@ -24,5 +27,20 @@
<p>Perhaps the webserver has temporarily lost its mind, or the link you've
followed doesn't actually lead somewhere useful?</p>
<p>If you're pretty sure this shouldn't be an error, you may wish to notify
the <a href="/?tool=admin">project administrators</a> about the error and how
you ended up here.</p>
<?php } ?>
+</div></div>
+<div class="col2">
+<div id="logo"><a href="/"><img src="/Tool_Labs_logo_thumb.png" width="122"
height="138" alt="Wikitech and Wikimedia Labs" /></a></div>
+<ul>
+<li><a href="/?list">Tools</a></li>
+<li><a href="/?status">Status</a></li>
+<li><a href="/?Privacy">Privacy policy</a></li>
+</ul>
+<em>Maintainers:</em>
+<ul>
+<li><a href="/?Help">Help</a></li>
+<li><a href="/?Rules">Rules</a></li>
+</ul>
+</div>
+</div></div>
</body>
</html>
diff --git a/www/content/503.php b/www/content/503.php
index 86b70b6..08b63df 100644
--- a/www/content/503.php
+++ b/www/content/503.php
@@ -4,8 +4,11 @@
<meta charset="UTF-8">
<title>503 Service Unavailable</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=yes,
width=device-width">
+<link rel="StyleSheet" href="/style.css" type="text/css" media="screen">
</head>
<body>
+<div class="colmask leftmenu"><div class="colright">
+<div class="col1wrap"><div class="col1">
<?php
require_once dirname( __FILE__ ) . '/common.inc.php';
$uri = $_SERVER['HTTP_X_ORIGINAL_URI'];
@@ -27,5 +30,20 @@
<p>This URI is not currently part of any tool.</p>
<p>If you're pretty sure this shouldn't be an error, you may wish to notify
the <a href="/?tool=admin">project administrators</a> about the error and how
you ended up here.</p>
<?php } ?>
+</div></div>
+<div class="col2">
+<div id="logo"><a href="/"><img src="/Tool_Labs_logo_thumb.png" width="122"
height="138" alt="Wikitech and Wikimedia Labs" /></a></div>
+<ul>
+<li><a href="/?list">Tools</a></li>
+<li><a href="/?status">Status</a></li>
+<li><a href="/?Privacy">Privacy policy</a></li>
+</ul>
+<em>Maintainers:</em>
+<ul>
+<li><a href="/?Help">Help</a></li>
+<li><a href="/?Rules">Rules</a></li>
+</ul>
+</div>
+</div></div>
</body>
</html>
diff --git a/www/index.php b/www/index.php
index 77b77cf..20409f8 100644
--- a/www/index.php
+++ b/www/index.php
@@ -124,11 +124,10 @@
</script>
</head>
<body>
-<div class="colmask leftmenu">
-<div class="colright">
-<div class="col1wrap">
-<div class="col1"><?php include "content/{$content}.php"; ?></div>
-</div>
+<div class="colmask leftmenu"><div class="colright">
+<div class="col1wrap"><div class="col1">
+<?php include "content/{$content}.php"; ?>
+</div></div>
<div class="col2">
<div id="logo"><a href="/"><img src="/Tool_Labs_logo_thumb.png" width="122"
height="138" alt="Wikitech and Wikimedia Labs" /></a></div>
<ul>
@@ -142,7 +141,6 @@
<li><a href="/?Rules">Rules</a></li>
</ul>
</div>
-</div>
-</div>
+</div></div>
</body>
</html>
--
To view, visit https://gerrit.wikimedia.org/r/266171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I542c760aff40d9995ff81618a9e03396f71ce8c4
Gerrit-PatchSet: 2
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Tim Landscheidt <t...@tim-landscheidt.de>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
