Skip to content

Commit 552bc36

Browse files
mantheymanthey
committed
docs: Fix the website
We couldn't remove the vendored version of the agency theme when we upgraded boostrap. That will take some additional work
1 parent 2443648 commit 552bc36

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+27487
-40
lines changed

‎package-lock.json‎

Lines changed: 11 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
"serve-index": "^1.9.1",
8787
"shader-loader": "git+https://github.com/Makio64/shader-loader",
8888
"sinon": "^21.0.0",
89-
"startbootstrap-agency": "^7.0.12",
9089
"style-loader": "^4.0.0",
9190
"stylelint": "<16.3.0 || >16.3.0",
9291
"stylelint-stylus": "^1.0.0",

‎website/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"private": true,
55
"hexo": {
6-
"version": "5.4.2"
6+
"version": "7.3.0"
77
},
88
"dependencies": {
99
"hexo": "^7.0.0",

‎website/themes/agency/_config.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Site
2+
title:
3+
subtitle:
4+
description:
5+
author:
6+
language:
7+
timezone:

‎website/themes/agency/layout/example.ejs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
navbar_affixed: true
3+
no_footer: true
4+
---
5+
<!-- This will put script and link in the body, which has certain drawbacks, but it's relatively minor for the current use -->
6+
<script type="text/javascript" src="<%- url_for("js/example.js") %>"></script>
7+
<link rel="stylesheet" href="<%- url_for("css/example.css") %>">
8+
<script type="text/javascript" src="../bundle.js" charset="UTF-8"></script>
9+
<div class="page example">
10+
<% for(css of page.exampleCss) { %>
11+
<link rel="stylesheet" href="<%- css %>">
12+
<% } %>
13+
<div id="map"></div>
14+
<%- page.content %>
15+
<div class="modal fade screenshot-modal" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel">
16+
<div class="modal-dialog" role="document">
17+
<div class="modal-content">
18+
<div class="modal-header">
19+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
20+
<h4 class="modal-title" id="myModalLabel">Screenshot</h4>
21+
</div>
22+
<div class="modal-body">
23+
<div class="screenshot-result text-right">
24+
<img />
25+
<a download="screenshot.png">Download</a>
26+
</div>
27+
</div>
28+
</div>
29+
</div>
30+
</div>
31+
<div class="container">
32+
<div class="row source-screenshot">
33+
<div class="col-md-4 col-md-offset-8 col-sm-6 col-sm-offset-6 col-xs-9 col-xs-offset-3">
34+
<div class="row">
35+
<div class="col-xs-6">
36+
<a class="source" target="gj-docco-<%- page.title %>" href="docs/main.html">Source code</a>
37+
</div>
38+
<div class="col-xs-6">
39+
<a class="screenshot" href="#">Take screenshot</a>
40+
<div class="screenshot-loading">...</div>
41+
</div>
42+
</div>
43+
</div>
44+
</div>
45+
<div class="row about">
46+
<div class="col-md-12">
47+
<p><%- page.about %></p>
48+
</div>
49+
</div>
50+
</div>
51+
</div>
52+
<% for(js of page.exampleJs) { %>
53+
<script type="text/javascript" src="<%- js %>"></script>
54+
<% } %>

‎website/themes/agency/layout/examples.ejs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<div class="container">
2+
<div class="row">
3+
<div class="col-md-12">
4+
<section>
5+
<h2>Examples</h2>
6+
<p class="text-muted">GeoJS has many features, some of which are shown off in these examples. Some of the examples are intended to showcase all of the options of a feature, such as the <a href="tiles">Tile Layer</a>. Other examples show how real data can be visualized, such as the <a href="hurricanes">Hurricane Tracking Data</a>. Each example has commented source code.</p>
7+
</section>
8+
<div class="row">
9+
<% for (let example of site.data.examples) { %>
10+
<div class="col-md-6 example-container">
11+
<div class="row">
12+
<div class="col-xs-5 thumbnail-container">
13+
<a href="<%- example.name %>/">
14+
<div class="thumbnail-hover">
15+
</div>
16+
<img src="<%
17+
if(fileExists(`source/examples/${example.name}/thumb.jpg`)){
18+
%><%- `${example.name}/thumb.jpg` %><%
19+
}
20+
else {
21+
%><%- 'common/thumb.jpg' %><%
22+
} %>">
23+
</a>
24+
</div>
25+
<div class="col-xs-7 word-container">
26+
<a href="<%- example.name %>"><h4 class="title"><%- example.title %></h4></a>
27+
<div class="description"><%- example.description %></div>
28+
</div>
29+
</div>
30+
</div>
31+
<% } %>
32+
</div>
33+
</div>
34+
</div>
35+
</div>

‎website/themes/agency/layout/index.ejs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%- page.content %>

‎website/themes/agency/layout/layout.ejs‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
<% var navbar_affixed = navbar_affixed || false; %>
2+
<% var no_footer = no_footer || false; %>
3+
<% var narrow_footer = narrow_footer || false; %>
4+
<!DOCTYPE html>
5+
<html lang="en">
6+
7+
<head>
8+
9+
<meta charset="utf-8">
10+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
11+
<meta name="viewport" content="width=device-width, initial-scale=1">
12+
<meta name="description" content="">
13+
<meta name="author" content="">
14+
15+
<title>GeoJS - <%= page.title %></title>
16+
17+
<!-- Bootstrap Core CSS -->
18+
<%- css("vendor/bootstrap/css/bootstrap.min.css") %>
19+
20+
<!-- Custom Fonts -->
21+
<%- css("vendor/font-awesome/css/font-awesome.min.css") %>
22+
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
23+
<link href='https://fonts.googleapis.com/css?family=Kaushan+Script' rel='stylesheet' type='text/css'>
24+
<link href='https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
25+
<link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700' rel='stylesheet' type='text/css'>
26+
27+
<!-- Theme CSS -->
28+
<%- css("css/agency.css") %>
29+
<%- css("css/main.css") %>
30+
<%- css("css/highlight.css") %>
31+
32+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
33+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
34+
<!--[if lt IE 9]>
35+
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js" integrity="sha384-0s5Pv64cNZJieYFkXYOTId2HMA2Lfb6q2nAcx2n0RTLUnCAoTTsS0nKEO27XyKcY" crossorigin="anonymous"></script>
36+
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js" integrity="sha384-ZoaMbDF+4LeFxg6WdScQ9nnR1QC2MIRxA1O9KWEXQwns1G8UNyIEZIQidzb0T1fo" crossorigin="anonymous"></script>
37+
<![endif]-->
38+
39+
<!-- jQuery -->
40+
<%- js("vendor/jquery/jquery.min.js") %>
41+
42+
<!-- Bootstrap Core JavaScript -->
43+
<%- js("vendor/bootstrap/js/bootstrap.min.js") %>
44+
45+
<link rel="apple-touch-icon" sizes="57x57" href="<%- page_url("favicon/apple-icon-57x57.png") %>">
46+
<link rel="apple-touch-icon" sizes="60x60" href="<%- page_url("favicon/apple-icon-60x60.png") %>">
47+
<link rel="apple-touch-icon" sizes="72x72" href="<%- page_url("favicon/apple-icon-72x72.png") %>">
48+
<link rel="apple-touch-icon" sizes="76x76" href="<%- page_url("favicon/apple-icon-76x76.png") %>">
49+
<link rel="apple-touch-icon" sizes="114x114" href="<%- page_url("favicon/apple-icon-114x114.png") %>">
50+
<link rel="apple-touch-icon" sizes="120x120" href="<%- page_url("favicon/apple-icon-120x120.png") %>">
51+
<link rel="apple-touch-icon" sizes="144x144" href="<%- page_url("favicon/apple-icon-144x144.png") %>">
52+
<link rel="apple-touch-icon" sizes="152x152" href="<%- page_url("favicon/apple-icon-152x152.png") %>">
53+
<link rel="apple-touch-icon" sizes="180x180" href="<%- page_url("favicon/apple-icon-180x180.png") %>">
54+
<link rel="icon" type="image/png" sizes="192x192" href="<%- page_url("favicon/android-icon-192x192.png") %>">
55+
<link rel="icon" type="image/png" sizes="32x32" href="<%- page_url("favicon/favicon-32x32.png") %>">
56+
<link rel="icon" type="image/png" sizes="96x96" href="<%- page_url("favicon/favicon-96x96.png") %>">
57+
<link rel="icon" type="image/png" sizes="16x16" href="<%- page_url("favicon/favicon-16x16.png") %>">
58+
<link rel="manifest" href="<%- page_url("favicon/manifest.json") %>">
59+
<meta name="msapplication-TileColor" content="#ffffff">
60+
<meta name="msapplication-TileImage" content="<%- page_url("favicon/ms-icon-144x144.png") %>">
61+
<meta name="theme-color" content="#ffffff">
62+
</head>
63+
64+
<body id="page-top" class="index">
65+
<!-- Navigation -->
66+
<nav id="mainNav" class="navbar navbar-default navbar-custom navbar-fixed-top<% if (navbar_affixed){ %> affix<% } %>">
67+
<div class="container">
68+
<!-- Brand and toggle get grouped for better mobile display -->
69+
<div class="navbar-header">
70+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
71+
<span class="sr-only">Toggle navigation</span><i class="fa fa-bars"></i>
72+
</button>
73+
<a class="navbar-brand" href="<%- url_for("/") %>"><img class="navbar-logo" src="<%- url_for("images/logo_transparent.png") %>" /></a>
74+
</div>
75+
76+
<!-- Collect the nav links, forms, and other content for toggling -->
77+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
78+
<ul class="nav navbar-nav navbar-right">
79+
<li class="hidden">
80+
<a href="#page-top"></a>
81+
</li>
82+
<li class="<% if(path === "index.html"){ %> active <% } %>">
83+
<a href="<%- page_url("/") %>">Welcome</a>
84+
</li>
85+
<li class="<% if(path.indexOf('tutorial')!==-1){ %> active <% } %>">
86+
<a href="<%- page_url("tutorials/") %>">Tutorials</a>
87+
</li>
88+
<li class="<% if(path.indexOf('example')!==-1){ %> active <% } %>">
89+
<a href="<%- page_url("examples/") %>">Examples</a>
90+
</li>
91+
<li>
92+
<a href="<%- page_url("apidocs/") %>">API Docs</a>
93+
</li>
94+
<li>
95+
<a href="https://github.com/OpenGeoscience/geojs">GitHub</a>
96+
</li>
97+
</ul>
98+
</div>
99+
<!-- /.navbar-collapse -->
100+
</div>
101+
<!-- /.container-fluid -->
102+
</nav>
103+
104+
<div class="content-wrapper">
105+
<%- body %>
106+
</div>
107+
<% if (!no_footer){ %>
108+
<footer class="<% if (narrow_footer) { %> narrow<% } %>">
109+
<div class="container">
110+
<div class="row">
111+
<div class="col-sm-3">
112+
<ul class="list-inline social-buttons">
113+
<li><a href="https://github.com/OpenGeoscience/geojs"><i class="fa fa-github"></i></a>
114+
</li>
115+
</ul>
116+
</div>
117+
<div class="col-sm-6">
118+
<span class="copyright">Licensed under the <a href="https://github.com/OpenGeoscience/geojs/blob/master/LICENSE">Apache License 2.0</a></span>
119+
</div>
120+
<div class="col-md-3">
121+
<ul class="list-inline quicklinks">
122+
<li><a href="https://www.kitware.com">Kitware</a>
123+
</li>
124+
</ul>
125+
</div>
126+
</div>
127+
</div>
128+
</footer>
129+
<% } %>
130+
<!-- Theme JavaScript -->
131+
<%- js("js/agency.js") %>
132+
133+
</body>
134+
135+
</html>

‎website/themes/agency/layout/page.ejs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%- page.content %>

‎website/themes/agency/layout/tutorial.ejs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
navbar_affixed: true
3+
no_footer: true
4+
---
5+
<link rel="stylesheet" href="../../css/tutorial.css">
6+
<script type="text/javascript" src="../bundle.js" charset="UTF-8"></script>
7+
<div class="page tutorial">
8+
<%- page.content %>
9+
</div>

0 commit comments

Comments
 (0)