Skip to content

Commit f88dea2

Browse files
fniephausfniephaus
committed
Remove globals and fix default layout
1 parent 1b17721 commit f88dea2

9 files changed

+31
-61
lines changed

‎_includes/footer.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="container text-center">
33
<p class="small">
44
&copy; 1996-{{ site.time | date: '%Y' }} {{ site.copyright }} -
5-
<a href="{{ basePath }}imprint/">Imprint</a> -
5+
<a href="/imprint/">Imprint</a> -
66
<a href="http://forum.world.st/Squeak-f45487.html" target="_blank"><i class="fa fa-globe"></i></a>
77
<a href="https://twitter.com/squeaksmalltalk" target="_blank"><i class="fa fa-twitter"></i></a>
88
<a href="https://www.linkedin.com/groups?gid=98736" target="_blank"><i class="fa fa-linkedin"></i></a>
@@ -18,7 +18,7 @@
1818
</form>
1919

2020
<!-- Placed at the end of the document so the pages load faster -->
21-
<script src="{{ staticPath }}js/jquery.min.js"></script>
22-
<script src="{{ staticPath }}js/bootstrap.min.js"></script>
23-
<script src="{{ staticPath }}js/svgeezy.min.js"></script>
24-
<script src="{{ staticPath }}js/ready.js{{ cacheSuffix }}"></script>
21+
<script src="/static/js/jquery.min.js"></script>
22+
<script src="/static/js/bootstrap.min.js"></script>
23+
<script src="/static/js/svgeezy.min.js"></script>
24+
<script src="/static/js/ready.js?v={{ site.build_version }}"></script>

‎_includes/globals.html

-9
This file was deleted.

‎_includes/head.html

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{% include globals.html %}
21
<head>
32
<meta charset="utf-8">
43
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -10,15 +9,15 @@
109
<title>{{ site.title }}{% if page.section.title %} | {{ page.section.title }}{% else %}{% if page.title %} | {{ page.title }}{% endif %}{% endif %}</title>
1110

1211
<!-- Favicon -->
13-
<link rel="shortcut icon" type="image/png" href="{{ staticPath }}img/favicon.png" />
14-
<!--[if IE]><link rel="shortcut icon" href="{{ staticPath }}img/favicon.ico"><![endif]-->
12+
<link rel="shortcut icon" type="image/png" href="/static/img/favicon.png" />
13+
<!--[if IE]><link rel="shortcut icon" href="/static/img/favicon.ico"><![endif]-->
1514

1615
<!-- CSS -->
17-
<link href="{{ staticPath }}site.css{{ cacheSuffix }}" rel="stylesheet">
16+
<link href="/static/site.css?v={{ site.build_version }}" rel="stylesheet">
1817

1918
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
2019
<!--[if lt IE 9]>
21-
<script src="{{ staticPath }}js/html5shiv.min.js"></script>
22-
<script src="{{ staticPath }}js/respond.min.js"></script>
20+
<script src="/static/js/html5shiv.min.js"></script>
21+
<script src="/static/js/respond.min.js"></script>
2322
<![endif]-->
2423
</head>

‎_includes/item_with_img.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a href="{{ item.href }}"{% if item.href-external %} target="_blank"{% endif %}>
55
{% endif %}
66
{% if item.img-src %}
7-
<img src="{{ basePath }}img/{{ item.img-src }}" alt="" class="item-img img-center img-rounded img-responsive{% if item.img-border %} img-border{% endif %}">
7+
<img src="/img/{{ item.img-src }}" alt="" class="item-img img-center img-rounded img-responsive{% if item.img-border %} img-border{% endif %}">
88
{% else %}
99
<div class="box-icon">
1010
<i class="fa fa-{{ item.icon }}"></i>

‎_includes/navigation.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<nav class="navbar navbar-default navbar-fixed-top">
22
<div class="container">
33
<div class="navbar-header">
4-
<a id="squeak-navbar-mobile" class="visible-xs pull-left" href="{{ basePath }}">
5-
<img alt="{{ site.title }}" src="{{ staticPath }}img/squeak.svg" alt="">
4+
<a id="squeak-navbar-mobile" class="visible-xs pull-left" href="/">
5+
<img alt="{{ site.title }}" src="/static/img/squeak.svg" alt="">
66
</a>
77
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
88
<span class="sr-only">Toggle navigation</span>
@@ -14,8 +14,8 @@
1414
<div id="navbar" class="navbar-collapse collapse">
1515
<ul class="nav navbar-nav">
1616
<li class="hidden-xs">
17-
<a id="squeak-navbar" href="{{ basePath }}">
18-
<img alt="{{ site.title }}" src="{{ staticPath }}img/squeak.svg" alt="">
17+
<a id="squeak-navbar" href="/">
18+
<img alt="{{ site.title }}" src="/static/img/squeak.svg" alt="">
1919
</a>
2020
</li>
2121
{% for collection in site.collections %}
@@ -24,7 +24,7 @@
2424
{% assign liClass = 'active' %}
2525
{% endif %}
2626
<li class="{{ liClass }}">
27-
<a href="{{ basePath }}{{ collection[1].label }}/" title="{{ collection[1].title }}">
27+
<a href="/{{ collection[1].label }}/" title="{{ collection[1].title }}">
2828
{% if collection[1].visible-sm %}
2929
<span class="hidden-sm">{{ collection[1].title }}</span>
3030
<span class="visible-sm">{{ collection[1].visible-sm }}</span>
@@ -37,7 +37,7 @@
3737
</ul>
3838
<ul class="nav navbar-nav navbar-right">
3939
<li{% if page.section.label == 'license' %} class="active"{% endif %}>
40-
<a href="{{ basePath }}license/">
40+
<a href="/license/">
4141
<span class="visible-xs visible-lg">License</span>
4242
<span class="hidden-xs hidden-lg"><i class="fa fa-file-text-o"></i></span>
4343
</a>

‎_includes/section_preview.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h1 class="section-heading"><span>{{ section.title }}</span></h1>
1414

1515
<div class="row">
1616
<div class="col-sm-12 col-md-12 col-lg-12 text-center section-tail">
17-
<p class="lead"><a href="{{ basePath }}{{ section.label }}/"><b>More...</b></a></p>
17+
<p class="lead"><a href="/{{ section.label }}/"><b>More...</b></a></p>
1818
</div>
1919
</div>
2020
</div><!-- /.section -->

‎_layouts/default.html

+11-17
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
---
2-
layout: compress
2+
layout: basic
33
---
4-
<!DOCTYPE html>
5-
<html>
6-
7-
{% include head.html %}
8-
9-
<body>
10-
11-
{% include navigation.html %}
12-
13-
{{ content }}
14-
15-
{% include footer.html %}
16-
17-
</body>
18-
19-
</html>
4+
<div class="container">
5+
<div class="section">
6+
<h1 class="section-heading"><span>{{ page.title }}</span></h1>
7+
<div class="row">
8+
<div class="col-md-12 col-lg-12">
9+
{{ content }}
10+
</div>
11+
</div> <!-- /row -->
12+
</div> <!-- /section -->
13+
</div> <!-- /container -->

‎_layouts/full.html

-13
This file was deleted.

‎index.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
download_link: http://ftp.squeak.org/4.5/Squeak-4.5-All-in-One.zip
1313
preview_link: http://ftp.squeak.org/4.6/
14-
download_more: /downloads/
1514

1615
sub_button_group:
1716
- title: News
@@ -43,7 +42,7 @@
4342
<div class="container">
4443
<div class="row">
4544
<div class="col-md-6 col-lg-6">
46-
<img id="squeak-logo" src="{{ basePath }}{{ site.staticurl }}img/balloon.svg" alt="" class="img-responsive img-center">
45+
<img id="squeak-logo" src="/static/img/balloon.svg" alt="" class="img-responsive img-center">
4746
</div>
4847
<div id="welcome-text" class="col-md-6 col-lg-6">
4948
<h2>{{ page.headline }}</h2>
@@ -58,7 +57,7 @@ <h2>{{ page.headline }}</h2>
5857
<a id="download-button" class="btn btn-primary" href="{{ page.preview_link }}" target="_blank" role="button">
5958
4.6 Release Candidate
6059
</a>
61-
<p><a href="{{ basePath }}{{ page.download_more }}">More...</a></p>
60+
<p><a href="/downloads/">More...</a></p>
6261

6362
<div id="sub-button-group" class="btn-group btn-group-sm" role="group" aria-label="...">
6463
{% for button in page.sub_button_group %}

0 commit comments

Comments
 (0)