Merging develop to master for v0.13.0 release

.gitignore

@@ -1,3 +1,4 @@
 _site
 *.pyc
+*.kate-swp
 

_data/version.yaml

@@ -1,3 +1,3 @@
-revel: 0.12.0
-golang: 1.3+
-date: 2015-03-25
+revel: 0.13.0
+golang: 1.4+
+date: 2016-06-05 

_includes/footer.html

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

_includes/github_links.html

@@ -0,0 +1,20 @@
+{% if page.github %}
+<div class="revel-github-bar">
+  <h6>GitHub Labels</h6>
+  <ul>
+    <li><b>Issues: </b> 
+      {% for lbl in page.github.labels %}
+      <a href="https://github.com/revel/revel/labels/{{lbl}}" target="_revel_issues">{{lbl}}</a> 
+      {% if forloop.rindex > 1 %}|{% endif %}
+      {% endfor %}
+    </li>
+    <li><b>Pull Requests: </b> 
+      {% for lbl in page.github.labels %}
+      <a href="https://github.com/revel/revel/pulls?q=is%3Apr+is%3Aopen+label%3A{{lbl}}" target="_revel_pull_requests">{{lbl}}</a>
+      {% if forloop.rindex > 1 %}|{% endif %}
+      {% endfor %}
+    </li>
+  </ul>
+</div>
+{% endif %}
+

_includes/head.html

@@ -6,8 +6,8 @@
 <link rel="icon" href="/img/favicon.ico" type="image/x-icon" /> 
 <link rel="shortcut icon" href="/img/favicon.png" type="image/png" />
 
-<link href="{{ page.root }}/css/bootstrap-3.3.1.min.css" rel="stylesheet">
-<link href="{{ page.root }}/css/bootstrap-theme-3.3.1.min.css" rel="stylesheet">
+<link href="{{ page.root }}/css/bootstrap-3.3.6/bootstrap.min.css" rel="stylesheet">
+<link href="{{ page.root }}/css/bootstrap-3.3.6/bootstrap-theme.min.css" rel="stylesheet">
 <link href="{{ page.root }}/css/jekyll-github.css" rel="stylesheet">
 
 {% comment %}
@@ -16,9 +16,9 @@
 <script src="{{ page.root }}/js/lang-go.js" type="text/javascript"></script>
 {% endcomment %}
 <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-<script src="{{ page.root }}/js/bootstrap-3.3.1.min.js" type="text/javascript"></script>
+<script src="{{ page.root }}/js/bootstrap-3.3.6.min.js" type="text/javascript"></script>
 
 
-<link href="{{ page.root }}/css/revel.3.css" rel="stylesheet">
+<link href="{{ page.root }}/css/revel.4.css" rel="stylesheet">
 
 {% include analytics.html %}

_includes/leftnav.html

@@ -1,6 +1,6 @@
 <div class="leftnav">
-  <ul class="nav">
-{% for group in page.nav %}
+<ul class="nav">
+{% for group in layout.nav %}
     <li class="nav-header">{{ group.name }}</li>
     {% for node in group.articles %}
         {% capture node_url %}/{{ page.name }}/{{ node.url }}{% endcapture %}

_includes/nav.html

@@ -1,4 +1,5 @@
 {% assign navurl = page.url | remove: 'index.html' %}
+
 <ul>
 {% for item in include.nav %}
     <li>

_includes/topnav.html

@@ -19,7 +19,8 @@
                     <a href="{{ page.root }}/samples/index.html">Samples</a></li>
 
                 <li {% if page.layout == 'godoc' %}class="active"{% endif %}>
-                    <a href="{{ page.root }}/docs/godoc/index.html">godoc</a></li>
+                    <a href="https://godoc.org/github.com/revel/revel" target="_godoc">GoDoc</a></li>
+
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">github <span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">

_layouts/manual.html

@@ -119,8 +119,9 @@
                     <h1>{{ page.title }}</h1>
                 </div>
                 {{ content }}
-
-                {% include disqus.html %}
+
+                {% include github_links.html %}
+
             </div>
         </div>
 

_layouts/quickstart.html

@@ -1,7 +1,7 @@
 ---
 root: ..
 name: quickstart
-section_title: Revel Quicl Start
+section_title: Revel Quick Start
 nav:
 -
   name:  Code Basics
@@ -38,8 +38,8 @@
                     <h1>{{ page.title }}</h1>
                 </div>
                 {{ content }}
-
-                {% include disqus.html %}
+                
+
             </div>
         </div>
 

_layouts/samples.html

@@ -53,8 +53,6 @@
             <h1>{{ page.title }}</h1>
           </div>
           {{ content }}
-
-          {% include disqus.html %}
         </div>
       </div>
       {% include footer.html %}

_layouts/tutorial.html

@@ -44,8 +44,6 @@
             <h1>{{ page.title }}</h1>
           </div>
           {{ content }}
-
-          {% include disqus.html %}
         </div>
       </div>
       {% include footer.html %}