Skip to content

Commit 9806b20

Browse files
jeevatkmjeevatkm
committed
Merging develop to master for v0.13.0 release
2 parents 44b0218 + f2666d2 commit 9806b20

Some content is hidden

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

48 files changed

+8367
-428
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
_site
22
*.pyc
3+
*.kate-swp
34

‎_data/version.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
revel: 0.12.0
2-
golang: 1.3+
3-
date: 2015-03-25
1+
revel: 0.13.0
2+
golang: 1.4+
3+
date: 2016-06-05

‎_includes/disqus.html

-14
This file was deleted.

‎_includes/footer.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<footer>
2-
3-
<p>&copy; Revel Team 2015 - Revel is released under the <a href="https://github.com/revel/revel/blob/master/LICENSE">MIT License</a></p>
2+
<p>&copy; Revel Team 2016 - Revel is released under the <a href="https://github.com/revel/revel/blob/master/LICENSE">MIT License</a></p>
43
</footer>

‎_includes/github_links.html

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{% if page.github %}
2+
<div class="revel-github-bar">
3+
<h6>GitHub Labels</h6>
4+
<ul>
5+
<li><b>Issues: </b>
6+
{% for lbl in page.github.labels %}
7+
<a href="https://github.com/revel/revel/labels/{{lbl}}" target="_revel_issues">{{lbl}}</a>
8+
{% if forloop.rindex > 1 %}|{% endif %}
9+
{% endfor %}
10+
</li>
11+
<li><b>Pull Requests: </b>
12+
{% for lbl in page.github.labels %}
13+
<a href="https://github.com/revel/revel/pulls?q=is%3Apr+is%3Aopen+label%3A{{lbl}}" target="_revel_pull_requests">{{lbl}}</a>
14+
{% if forloop.rindex > 1 %}|{% endif %}
15+
{% endfor %}
16+
</li>
17+
</ul>
18+
</div>
19+
{% endif %}
20+

‎_includes/head.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<link rel="icon" href="/img/favicon.ico" type="image/x-icon" />
77
<link rel="shortcut icon" href="/img/favicon.png" type="image/png" />
88

9-
<link href="{{ page.root }}/css/bootstrap-3.3.1.min.css" rel="stylesheet">
10-
<link href="{{ page.root }}/css/bootstrap-theme-3.3.1.min.css" rel="stylesheet">
9+
<link href="{{ page.root }}/css/bootstrap-3.3.6/bootstrap.min.css" rel="stylesheet">
10+
<link href="{{ page.root }}/css/bootstrap-3.3.6/bootstrap-theme.min.css" rel="stylesheet">
1111
<link href="{{ page.root }}/css/jekyll-github.css" rel="stylesheet">
1212

1313
{% comment %}
@@ -16,9 +16,9 @@
1616
<script src="{{ page.root }}/js/lang-go.js" type="text/javascript"></script>
1717
{% endcomment %}
1818
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
19-
<script src="{{ page.root }}/js/bootstrap-3.3.1.min.js" type="text/javascript"></script>
19+
<script src="{{ page.root }}/js/bootstrap-3.3.6.min.js" type="text/javascript"></script>
2020

2121

22-
<link href="{{ page.root }}/css/revel.3.css" rel="stylesheet">
22+
<link href="{{ page.root }}/css/revel.4.css" rel="stylesheet">
2323

2424
{% include analytics.html %}

‎_includes/leftnav.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="leftnav">
2-
<ul class="nav">
3-
{% for group in page.nav %}
2+
<ul class="nav">
3+
{% for group in layout.nav %}
44
<li class="nav-header">{{ group.name }}</li>
55
{% for node in group.articles %}
66
{% capture node_url %}/{{ page.name }}/{{ node.url }}{% endcapture %}

‎_includes/nav.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% assign navurl = page.url | remove: 'index.html' %}
2+
23
<ul>
34
{% for item in include.nav %}
45
<li>

‎_includes/topnav.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<a href="{{ page.root }}/samples/index.html">Samples</a></li>
2020

2121
<li {% if page.layout == 'godoc' %}class="active"{% endif %}>
22-
<a href="{{ page.root }}/docs/godoc/index.html">godoc</a></li>
22+
<a href="https://godoc.org/github.com/revel/revel" target="_godoc">GoDoc</a></li>
23+
2324
<li class="dropdown">
2425
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">github <span class="caret"></span></a>
2526
<ul class="dropdown-menu" role="menu">

‎_layouts/manual.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@
119119
<h1>{{ page.title }}</h1>
120120
</div>
121121
{{ content }}
122-
123-
{% include disqus.html %}
122+
123+
{% include github_links.html %}
124+
124125
</div>
125126
</div>
126127

‎_layouts/quickstart.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
root: ..
33
name: quickstart
4-
section_title: Revel Quicl Start
4+
section_title: Revel Quick Start
55
nav:
66
-
77
name: Code Basics
@@ -38,8 +38,8 @@
3838
<h1>{{ page.title }}</h1>
3939
</div>
4040
{{ content }}
41-
42-
{% include disqus.html %}
41+
42+
4343
</div>
4444
</div>
4545

‎_layouts/samples.html

-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
<h1>{{ page.title }}</h1>
5454
</div>
5555
{{ content }}
56-
57-
{% include disqus.html %}
5856
</div>
5957
</div>
6058
{% include footer.html %}

‎_layouts/tutorial.html

-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
<h1>{{ page.title }}</h1>
4545
</div>
4646
{{ content }}
47-
48-
{% include disqus.html %}
4947
</div>
5048
</div>
5149
{% include footer.html %}

‎css/bootstrap-3.3.1.min.css

-5
This file was deleted.

0 commit comments

Comments
 (0)