You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2016/11/05 04:51:15 UTC
[30/50] incubator-mynewt-site git commit: talks
talks
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/bf1eb9e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/bf1eb9e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/bf1eb9e4
Branch: refs/heads/develop
Commit: bf1eb9e4572074a7413e17effe20f43dc5cb9a11
Parents: a0f1367
Author: Gavin Jefferies <ga...@runtime.io>
Authored: Fri Oct 21 14:08:29 2016 -0700
Committer: Gavin Jefferies <ga...@runtime.io>
Committed: Fri Oct 21 14:08:29 2016 -0700
----------------------------------------------------------------------
custom-theme/base.html | 4 +++-
custom-theme/nav.html | 5 ++++-
custom-theme/talks.html | 5 +++++
docs/talks.md | 0
mkdocs.yml | 1 +
5 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bf1eb9e4/custom-theme/base.html
----------------------------------------------------------------------
diff --git a/custom-theme/base.html b/custom-theme/base.html
index 01d56f0..5b8d074 100644
--- a/custom-theme/base.html
+++ b/custom-theme/base.html
@@ -53,7 +53,7 @@
{% include "nav.html" %}
- {% set full_width_page_titles = [None, 'Quick Start', 'About', 'Documentation', 'Download', 'Community', 'Events'] %}
+ {% set full_width_page_titles = [None, 'Quick Start', 'About', 'Talks', 'Documentation', 'Download', 'Community', 'Events'] %}
<div class="container">
{% if page_title == None %}
@@ -62,6 +62,8 @@
{% include meta.html[0] %}
{% elif page_title == 'About' %}
{% include "about.html" %}
+ {% elif page_title == 'Talks' %}
+ {% include "talks.html" %}
{% elif page_title == 'Quick Start' %}
{% include "quick-start.html" %}
{% elif page_title == 'Documentation' %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bf1eb9e4/custom-theme/nav.html
----------------------------------------------------------------------
diff --git a/custom-theme/nav.html b/custom-theme/nav.html
index ec15349..553baa2 100644
--- a/custom-theme/nav.html
+++ b/custom-theme/nav.html
@@ -1,5 +1,5 @@
-{% set not_doc_page_titles = ['Home', 'Quick Start', 'About', 'Download', 'Community', 'Events'] %}
+{% set not_doc_page_titles = ['Home', 'Quick Start', 'About', 'Talks', 'Download', 'Community', 'Events'] %}
{% macro active_nav(page, title, classes) %}
class="{% if (page and page.title == title) or (title == 'Home' and meta and meta.sub_page) %}active {% endif %}{{ classes }}"
@@ -36,6 +36,9 @@
<li {{ active_nav(current_page, 'About') }}>
<a href="/about/">About</a>
</li>
+ <li {{ active_nav(current_page, 'Talks') }}>
+ <a href="/talks/">Talks</a>
+ </li>
<li {{ docs_are_active(current_page) }}>
<a href="{% if config.extra.version != 'none' %}/latest{% endif %}/{{ config.extra.doc_path }}">Documentation</a>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bf1eb9e4/custom-theme/talks.html
----------------------------------------------------------------------
diff --git a/custom-theme/talks.html b/custom-theme/talks.html
new file mode 100644
index 0000000..da66cfa
--- /dev/null
+++ b/custom-theme/talks.html
@@ -0,0 +1,5 @@
+<h2>Talks from Mynewt participants</h2>
+
+<p>
+ Talk!
+</p>
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bf1eb9e4/docs/talks.md
----------------------------------------------------------------------
diff --git a/docs/talks.md b/docs/talks.md
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/bf1eb9e4/mkdocs.yml
----------------------------------------------------------------------
diff --git a/mkdocs.yml b/mkdocs.yml
index b952e82..dafd16e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -9,6 +9,7 @@ pages:
- Page Title: 'pages/template.md'
- Quick Start: 'quick-start.md'
- About: 'about.md'
+- Talks: 'talks.md'
- Download: 'download.md'
- Community: 'community.md'
- Events: 'events.md'