Skip to content

Commit d0424b5

Browse files
authored
Merge pull request #1440 from scala/multipage-overview-next-previous-links
Support “next” and “previous” links between pages of overviews
2 parents 90fa1d5 + c56c5bd commit d0424b5

18 files changed

+43
-1
lines changed

_data/overviews.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
- title: Trait Iterable
1616
url: "collections-2.13/trait-iterable.html"
1717
- title: The sequence traits Seq, IndexedSeq, and LinearSeq
18+
url: "collections-2.13/seqs.html"
1819
- title: Concrete Immutable Collection Classes
1920
url: "collections-2.13/concrete-immutable-collection-classes.html"
2021
- title: Concrete Mutable Collection Classes

_layouts/multipage-overview.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@
1212
{{content}}
1313
</div>
1414

15+
<div class="two-columns">
16+
{% if page.previous-page %}
17+
<a href="{{page.previous-page}}.html">&larr; <strong>previous</strong></a>
18+
{% else %}
19+
<div></div>
20+
{% endif %}
21+
{% if page.next-page %}
22+
<a href="{{page.next-page}}.html"><strong>next</strong> &rarr;</a>
23+
{% endif %}
24+
</div>
25+
1526
{% include contributors-list.html %}
1627
</div>
1728
</div>

_overviews/collections-2.13/arrays.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 10
11+
previous-page: concrete-mutable-collection-classes
12+
next-page: strings
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/concrete-immutable-collection-classes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 8
11+
previous-page: maps
12+
next-page: concrete-mutable-collection-classes
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/concrete-mutable-collection-classes.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 9
11+
previous-page: concrete-immutable-collection-classes
12+
next-page: arrays
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/conversions-between-java-and-scala-collections.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 17
11+
previous-page: creating-collections-from-scratch
1112

1213
permalink: /overviews/collections-2.13/:title.html
1314
---

_overviews/collections-2.13/creating-collections-from-scratch.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 16
11+
previous-page: iterators
12+
next-page: conversions-between-java-and-scala-collections
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/equality.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 13
11+
previous-page: performance-characteristics
12+
next-page: views
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/introduction.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 1
11+
next-page: overview
1112

1213
permalink: /overviews/collections-2.13/:title.html
1314
---

_overviews/collections-2.13/iterators.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 15
11+
previous-page: views
12+
next-page: creating-collections-from-scratch
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/maps.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 7
11+
previous-page: sets
12+
next-page: concrete-immutable-collection-classes
1113

12-
permalink: /overviews/collections2.13/:title.html
14+
permalink: /overviews/collections-2.13/:title.html
1315
---
1416

1517
A [Map](http://www.scala-lang.org/api/current/scala/collection/Map.html) is an [Iterable](http://www.scala-lang.org/api/current/scala/collection/Iterable.html) consisting of pairs of keys and values (also named _mappings_ or _associations_). Scala's [Predef](http://www.scala-lang.org/api/current/scala/Predef$.html) object offers an implicit conversion that lets you write `key -> value` as an alternate syntax for the pair `(key, value)`. For instance `Map("x" -> 24, "y" -> 25, "z" -> 26)` means exactly the same as `Map(("x", 24), ("y", 25), ("z", 26))`, but reads better.

_overviews/collections-2.13/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 2
11+
previous-page: introduction
12+
next-page: trait-iterable
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/performance-characteristics.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 12
11+
previous-page: strings
12+
next-page: equality
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/seqs.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 5
11+
previous-page: trait-iterable
12+
next-page: sets
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/sets.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 6
11+
previous-page: seqs
12+
next-page: maps
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/strings.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 11
11+
previous-page: arrays
12+
next-page: performance-characteristics
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/trait-iterable.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 4
11+
previous-page: overview
12+
next-page: seqs
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

_overviews/collections-2.13/views.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ partof: collections-213
88
overview-name: Collections
99

1010
num: 14
11+
previous-page: equality
12+
next-page: iterators
1113

1214
permalink: /overviews/collections-2.13/:title.html
1315
---

0 commit comments

Comments
 (0)