Repository: flink
Updated Branches:
  refs/heads/release-1.0 f0aec61d6 -> 486dd93ae


[docs] Move quickstart top nav link

- User reported too wide page with quickstart and concepts
- Moved setup, Scala, Java quickstarts to setup section
- Moved wikiedits example to streaming guide
- Quickstarts are linked as before from the project page


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/486dd93a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/486dd93a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/486dd93a

Branch: refs/heads/release-1.0
Commit: 486dd93ae6b2ba6b3522e797897e89bbbe998d84
Parents: f0aec61
Author: Ufuk Celebi <[email protected]>
Authored: Mon Apr 4 12:01:43 2016 +0200
Committer: Ufuk Celebi <[email protected]>
Committed: Mon Apr 4 12:01:44 2016 +0200

----------------------------------------------------------------------
 docs/_includes/navbar.html                 | 22 ++++++++++------------
 docs/apis/streaming/event_time.md          |  2 +-
 docs/apis/streaming/fault_tolerance.md     |  2 +-
 docs/apis/streaming/savepoints.md          |  2 +-
 docs/apis/streaming/storm_compatibility.md |  2 +-
 docs/apis/streaming/windows.md             |  2 +-
 docs/quickstart/run_example_quickstart.md  |  8 ++++----
 docs/quickstart/setup_quickstart.md        |  2 +-
 8 files changed, 20 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/_includes/navbar.html
----------------------------------------------------------------------
diff --git a/docs/_includes/navbar.html b/docs/_includes/navbar.html
index d69ba6e..5821a46 100644
--- a/docs/_includes/navbar.html
+++ b/docs/_includes/navbar.html
@@ -43,17 +43,6 @@ under the License.
 
             <li class="{% if page.url == '/concepts/concepts.html' %}active{% 
endif %}"><a href="{{ site.baseurl}}/concepts/concepts.html">Concepts</a></li>
 
-            <!-- Quickstart -->
-            <li class="dropdown{% if page.url contains '/quickstart/' %} 
active{% endif %}">
-              <a href="{{ quickstart }}" class="dropdown-toggle" 
data-toggle="dropdown" role="button" aria-expanded="false">Quickstart <span 
class="caret"></span></a>
-              <ul class="dropdown-menu" role="menu">
-                {% assign quickstart_group = (site.pages | where: 
"top-nav-group" , "quickstart" | sort: "top-nav-pos") %}
-                {% for quickstart_page in quickstart_group %}
-                <li class="{% if page.url contains quickstart_page.url 
%}active{% endif %}"><a href="{{ site.baseurl }}{{ quickstart_page.url }}">{% 
if quickstart_page.top-nav-title %}{{ quickstart_page.top-nav-title }}{% else 
%}{{ quickstart_page.title }}{% endif %}</a></li>
-                {% endfor %}
-              </ul>
-            </li>
-
             <!-- Setup -->
             <li class="dropdown{% if page.url contains '/setup/' %} active{% 
endif %}">
               <a href="{{ setup }}" class="dropdown-toggle" 
data-toggle="dropdown" role="button" aria-expanded="false">Setup <span 
class="caret"></span></a>
@@ -64,6 +53,15 @@ under the License.
                 {% endfor %}
 
                 <li class="divider"></li>
+                <li role="presentation" 
class="dropdown-header"><strong>Quickstart</strong></li>
+
+                <!-- Quickstart -->
+                {% assign quickstart_group = (site.pages | where: 
"top-nav-group" , "quickstart" | sort: "top-nav-pos") %}
+                {% for quickstart_page in quickstart_group %}
+                <li class="{% if page.url contains quickstart_page.url 
%}active{% endif %}"><a href="{{ site.baseurl }}{{ quickstart_page.url }}">{% 
if quickstart_page.top-nav-title %}{{ quickstart_page.top-nav-title }}{% else 
%}{{ quickstart_page.title }}{% endif %}</a></li>
+                {% endfor %}
+
+                <li class="divider"></li>
                 <li role="presentation" 
class="dropdown-header"><strong>Deployment</strong></li>
                 {% assign deployment_group = (site.pages | where: 
"top-nav-group" , "deployment" | sort: "top-nav-pos") %}
                 {% for deployment_group_page in deployment_group %}
@@ -84,7 +82,7 @@ under the License.
             </li>
 
             <!-- Libraries -->
-            <li class="dropdown{% if page.url contains '/libs/' %} active{% 
endif %} hidden-sm">
+            <li class="dropdown{% if page.url contains '/libs/' %} active{% 
endif %}">
               <a href="{{ libs }}" class="dropdown-toggle" 
data-toggle="dropdown" role="button" aria-expanded="false">Libraries <span 
class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                   {% assign libs_group = (site.pages | where: "top-nav-group" 
, "libs" | sort: "top-nav-pos") %}

http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/apis/streaming/event_time.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/event_time.md 
b/docs/apis/streaming/event_time.md
index 90eb67a..0b4da03 100644
--- a/docs/apis/streaming/event_time.md
+++ b/docs/apis/streaming/event_time.md
@@ -3,7 +3,7 @@ title: "Event Time"
 
 sub-nav-id: eventtime
 sub-nav-group: streaming
-sub-nav-pos: 2
+sub-nav-pos: 3
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/apis/streaming/fault_tolerance.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/fault_tolerance.md 
b/docs/apis/streaming/fault_tolerance.md
index 00f4b50..d85038b 100644
--- a/docs/apis/streaming/fault_tolerance.md
+++ b/docs/apis/streaming/fault_tolerance.md
@@ -4,7 +4,7 @@ is_beta: false
 
 sub-nav-group: streaming
 sub-nav-id: fault_tolerance
-sub-nav-pos: 4
+sub-nav-pos: 5
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/apis/streaming/savepoints.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/savepoints.md 
b/docs/apis/streaming/savepoints.md
index 63f0980..53a1ee8 100644
--- a/docs/apis/streaming/savepoints.md
+++ b/docs/apis/streaming/savepoints.md
@@ -2,7 +2,7 @@
 title: "Savepoints"
 is_beta: false
 sub-nav-group: streaming
-sub-nav-pos: 5
+sub-nav-pos: 6
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/apis/streaming/storm_compatibility.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/storm_compatibility.md 
b/docs/apis/streaming/storm_compatibility.md
index 955674e..6c8c018 100644
--- a/docs/apis/streaming/storm_compatibility.md
+++ b/docs/apis/streaming/storm_compatibility.md
@@ -2,7 +2,7 @@
 title: "Storm Compatibility"
 is_beta: true
 sub-nav-group: streaming
-sub-nav-pos: 8
+sub-nav-pos: 9
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/apis/streaming/windows.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/windows.md b/docs/apis/streaming/windows.md
index 8af303b..277a6a0 100644
--- a/docs/apis/streaming/windows.md
+++ b/docs/apis/streaming/windows.md
@@ -3,7 +3,7 @@ title: "Windows"
 
 sub-nav-id: windows
 sub-nav-group: streaming
-sub-nav-pos: 3
+sub-nav-pos: 4
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/quickstart/run_example_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/quickstart/run_example_quickstart.md 
b/docs/quickstart/run_example_quickstart.md
index 5515c29..0d5e919 100644
--- a/docs/quickstart/run_example_quickstart.md
+++ b/docs/quickstart/run_example_quickstart.md
@@ -1,9 +1,9 @@
 ---
-title: "Quick Start: Monitoring the Wikipedia Edit Stream"
+title: "Monitoring the Wikipedia Edit Stream"
 # Top navigation
-top-nav-group: quickstart
-top-nav-pos: 2
-top-nav-title: "Example: Wikipedia Edit Stream"
+sub-nav-group: streaming
+sub-nav-pos: 2
+sub-nav-title: "Example: Wikipedia Edits"
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/flink/blob/486dd93a/docs/quickstart/setup_quickstart.md
----------------------------------------------------------------------
diff --git a/docs/quickstart/setup_quickstart.md 
b/docs/quickstart/setup_quickstart.md
index 94d41ac..22f7c6f 100644
--- a/docs/quickstart/setup_quickstart.md
+++ b/docs/quickstart/setup_quickstart.md
@@ -3,7 +3,7 @@ title: "Quickstart: Setup"
 # Top navigation
 top-nav-group: quickstart
 top-nav-pos: 1
-top-nav-title: Setup
+top-nav-title: Setup & Run Example
 ---
 <!--
 Licensed to the Apache Software Foundation (ASF) under one

Reply via email to