Skip to content

Commit ee40c3c

Browse files
mikemccllstrmikemccllstr
committed
Added bootstrap library (v2.2.2), and began using it for some simple error message pages.
1 parent 0ade8b9 commit ee40c3c

11 files changed

+9452
-4
lines changed

‎bootstrap/css/bootstrap-responsive.css

+1,092
Large diffs are not rendered by default.

‎bootstrap/css/bootstrap-responsive.min.css

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/css/bootstrap.css

+6,039
Large diffs are not rendered by default.

‎bootstrap/css/bootstrap.min.css

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/img/glyphicons-halflings-white.png

8.57 KB
Loading

‎bootstrap/img/glyphicons-halflings.png

12.5 KB
Loading

‎bootstrap/js/bootstrap.js

+2,159
Large diffs are not rendered by default.

‎bootstrap/js/bootstrap.min.js

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎error/404.html

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>HTTP Error 404</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<meta name="description" content="">
8+
<meta name="author" content="">
9+
10+
<!-- Le styles -->
11+
<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
12+
<style>
13+
body {
14+
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
15+
}
16+
</style>
17+
<link href="/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
18+
19+
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
20+
<!--[if lt IE 9]>
21+
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
22+
<![endif]-->
23+
24+
<!-- Fav and touch icons -->
25+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/bootstrap/ico/apple-touch-icon-144-precomposed.png">
26+
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/bootstrap/ico/apple-touch-icon-114-precomposed.png">
27+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/bootstrap/ico/apple-touch-icon-72-precomposed.png">
28+
<link rel="apple-touch-icon-precomposed" href="/bootstrap/ico/apple-touch-icon-57-precomposed.png">
29+
<link rel="shortcut icon" href="/bootstrap/ico/favicon.png">
30+
</head>
31+
32+
<body>
33+
34+
<div class="navbar navbar-inverse navbar-fixed-top">
35+
<div class="navbar-inner">
36+
<div class="container">
37+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
38+
<span class="icon-bar"></span>
39+
<span class="icon-bar"></span>
40+
<span class="icon-bar"></span>
41+
</a>
42+
<a class="brand" href="/">CouncilRoom.McCllstr.com</a>
43+
<div class="nav-collapse collapse">
44+
<ul class="nav">
45+
<li class="active"><a href="/">Home</a></li>
46+
</ul>
47+
</div><!--/.nav-collapse -->
48+
</div>
49+
</div>
50+
</div>
51+
52+
<div class="container">
53+
54+
<h1>We regret to inform you...</h1>
55+
<p>... the page you requested cannot be found by our server. We
56+
have no further information at this time.</p>
57+
</div> <!-- /container -->
58+
59+
<!-- Le javascript
60+
================================================== -->
61+
<!-- Placed at the end of the document so the pages load faster -->
62+
<script src="http://code.jquery.com/jquery-latest.js"></script>
63+
<script src="/bootstrap/js/bootstrap.min.js"></script>
64+
65+
</body>
66+
</html>

‎error/502.html

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>HTTP Error 502</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<meta name="description" content="">
8+
<meta name="author" content="">
9+
10+
<!-- Le styles -->
11+
<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
12+
<style>
13+
body {
14+
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
15+
}
16+
</style>
17+
<link href="/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
18+
19+
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
20+
<!--[if lt IE 9]>
21+
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
22+
<![endif]-->
23+
24+
<!-- Fav and touch icons -->
25+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/bootstrap/ico/apple-touch-icon-144-precomposed.png">
26+
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/bootstrap/ico/apple-touch-icon-114-precomposed.png">
27+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/bootstrap/ico/apple-touch-icon-72-precomposed.png">
28+
<link rel="apple-touch-icon-precomposed" href="/bootstrap/ico/apple-touch-icon-57-precomposed.png">
29+
<link rel="shortcut icon" href="/bootstrap/ico/favicon.png">
30+
</head>
31+
32+
<body>
33+
34+
<div class="navbar navbar-inverse navbar-fixed-top">
35+
<div class="navbar-inner">
36+
<div class="container">
37+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
38+
<span class="icon-bar"></span>
39+
<span class="icon-bar"></span>
40+
<span class="icon-bar"></span>
41+
</a>
42+
<a class="brand" href="/">CouncilRoom.McCllstr.com</a>
43+
<div class="nav-collapse collapse">
44+
<ul class="nav">
45+
<li class="active"><a href="/">Home</a></li>
46+
</ul>
47+
</div><!--/.nav-collapse -->
48+
</div>
49+
</div>
50+
</div>
51+
52+
<div class="container">
53+
54+
<h1>We regret to inform you...</h1>
55+
<p>... the page you requested is taking more time to execute
56+
than we're prepared to wait. Unfortunately, this means you don't
57+
get to see the page you asked for. This might be a temporary
58+
problem, or it could indicate a problem with the site that won't
59+
get better if you try again at a later time.</p>
60+
</div> <!-- /container -->
61+
62+
<!-- Le javascript
63+
================================================== -->
64+
<!-- Placed at the end of the document so the pages load faster -->
65+
<script src="http://code.jquery.com/jquery-latest.js"></script>
66+
<script src="/bootstrap/js/bootstrap.min.js"></script>
67+
68+
</body>
69+
</html>

‎nginx/councilroom-prod.conf

+3-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ server {
3636
proxy_set_header Host $host;
3737
proxy_set_header X-Real-IP $remote_addr;
3838
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
39+
proxy_intercept_errors on;
3940
}
4041

41-
#error_page 500 502 503 504 /500.html;
42-
#location = /500.html {
43-
# root /srv/councilroom/councilroom_prod/;
44-
#}
42+
error_page 502 /error/502.html;
43+
error_page 404 /error/404.html;
4544
}

0 commit comments

Comments
 (0)