ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=68b39ed334a1caee0d6586ad01202fcd46286257

commit 68b39ed334a1caee0d6586ad01202fcd46286257
Author: Andy Williams <[email protected]>
Date:   Thu Nov 30 16:14:35 2017 +0000

    navigation: Add nav to /docs/ and remove link lists from the text body
---
 pages/develop/navigation.txt             |  2 --
 pages/docs/navigation.txt                | 17 ++++++++++
 pages/docs/sidebar.txt                   |  3 ++
 pages/{docs.txt => docs/start.txt}       | 56 +++++++++-----------------------
 pages/{ => docs}/themes/knob_example.txt |  0
 pages/{ => docs}/themes/start.txt        |  0
 6 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/pages/develop/navigation.txt b/pages/develop/navigation.txt
index 20526dbb0..a68cb4196 100644
--- a/pages/develop/navigation.txt
+++ b/pages/develop/navigation.txt
@@ -1,5 +1,3 @@
-~~NOCACHE~~
-
   * [[/develop/start.md] | Developing with EFL]]
   * [[/develop/setup/start.md | Setting Up EFL]]
     * [[/develop/setup/c/start.md | EFL for C Development [TODO]]]
diff --git a/pages/docs/navigation.txt b/pages/docs/navigation.txt
new file mode 100644
index 000000000..906060331
--- /dev/null
+++ b/pages/docs/navigation.txt
@@ -0,0 +1,17 @@
+  * [[/docs/distros/|Installing EFL]]
+    * [[/docs/distros/ubuntu-start|EFL on Ubuntu]]
+    * [[/docs/distros/archlinux-start|EFL on Arch Linux]]
+    * [[/docs/distros/debian-start|EFL on Debian]]
+    * [[/docs/distros/fedora-start|EFL on Fedora]]
+    * [[/docs/distros/freebsd-start|EFL on FreeBSD]]
+    * [[/docs/distros/opensuse-start|EFL on openSUSE]]
+    * [[/docs/distros/yocto-start|EFL on Yocto]]
+    * [[/docs/distros/osx-start|EFL on Mac OS X]]
+  * [[/docs/c/start]]
+  * [[/develop/efl/|Getting started with EFL Development]]
+  * [[/develop/legacy/api/c/|EFL API (C language)]]
+  * [[/docs/themes/start|Themeing EFL apps]]
+    * [[/about-eflete|Eflete - GUI Theme design tool]]
+    * [[/about-enventor|Enventor - GUI Edje file design tool]]
+    * [[/docs/themes/knob_example|Edje theme example]]
+
diff --git a/pages/docs/sidebar.txt b/pages/docs/sidebar.txt
new file mode 100644
index 000000000..4986dcf3b
--- /dev/null
+++ b/pages/docs/sidebar.txt
@@ -0,0 +1,3 @@
+~~NOCACHE~~
+
+{{navi>:docs:navigation}}
diff --git a/pages/docs.txt b/pages/docs/start.txt
similarity index 68%
rename from pages/docs.txt
rename to pages/docs/start.txt
index 68d295f10..7f50bf33f 100755
--- a/pages/docs.txt
+++ b/pages/docs/start.txt
@@ -10,8 +10,6 @@ Aimed primarily at slick graphical presentation and optimal 
runtime we
 created the Enlightenment Foundation Libraries and have created the following
 documentation to help everyone get involved - thanks for stopping by.
 
-<columns 100% 33% - 33% ->
-
 ====Getting Started====
 
 If you are going to use EFL, we encourage you to actually work with
@@ -23,51 +21,27 @@ course you can use stable packages for your distribution as 
well.
 
 === Getting EFL ===
 
-  * [[docs/distros/|Get EFL installed from source]]
-  * [[docs/distros/ubuntu-start|EFL on Ubuntu]]
-  * [[docs/distros/archlinux-start|EFL on Arch Linux]]
-  * [[docs/distros/debian-start|EFL on Debian]]
-  * [[docs/distros/fedora-start|EFL on Fedora]]
-  * [[docs/distros/freebsd-start|EFL on FreeBSD]]
-  * [[docs/distros/opensuse-start|EFL on openSUSE]]
-  * [[docs/distros/yocto-start|EFL on Yocto]]
-  * [[docs/distros/osx-start|EFL on Mac OS X]]
-
-Go check the current available version of EFL on each distro/platform:
-[[https://phab.enlightenment.org/w/packaging_status/|Table of current version 
of EFL]]
-
-=== Working with Code ===
-
-  * [[docs/c/start|A basic primer on C]]
+Many operating systems have packages of EFL, Enlightenment and many of our 
apps.
+The specific information for each platform is available from [[/docs/distros/]]
+and sub-pages.
 
+We also track the current available version of EFL and our apps on each
+distro/platform, you can see the latest information at
+[[https://phab.enlightenment.org/w/packaging_status/|Table of current version 
of EFL]]
 
-<newcolumn>
+----
 
 ====EFL Documentation====
 
 The EFL is currently undergoing a significant redesign to give a better
-developer experience when building apps using our platform.
-For now we recommend using the stable API and it's Bindings.
-
-=== Working with EFL ===
-
-  * [[develop/efl/start|Get started with EFL]]
-  * [[develop/efl/advanced/start|Advanced EFL Topics]]
-  * [[develop/apps_efl_debugging|EFL application debugging]]
-  * [[develop/remote_debugging|Remote Debugging]]
+developer experience when building apps using our platform. We will be
+announcing the new API shortly to get early feedback from developers but
+for now we recommend using the stable API and it's Bindings.
 
-=== Stable API ===
-
-  * [[/develop/legacy/api/c/|C (our main language)]]
-  * [[/develop/legacy/api/cpp/|C++ Bindings]]
-  * [[https://docs.enlightenment.org/python-efl/current|Python Bindings]]
-
-=== Beta API using EO ===
-
-  * [[develop/api/|EFL EO API documentation (C)]]
-
-
-<newcolumn>
+You can find all the documentation for our [[/develop/legacy/api/c/|stable C 
API]],
+and bindings to [[/develop/legacy/api/cpp/|C++]] and 
+[[https://docs.enlightenment.org/python-efl/current|Python]].
+We also have a preview available for our [[develop/api/|Beta API 
documentation]].
 
 ==== Themes / Edje / EDC ====
 
@@ -78,7 +52,6 @@ A core part of Enlightenment and EFL is the design/theme 
abstraction layer. This
   * [[themes/start|Getting started]] with Edje and themes at the EDC file level
   * [[themes/knob_example|Edje theme example]] A knob theme for the Elementary 
slider widget
 
-</columns>
 
 ----
 
@@ -105,3 +78,4 @@ get involved in bug reporting, fixing or other types of 
[[contrib/|contributing]
 From there you can get to know the team, how we work, and earn a place on the 
team as a core developer :)
 
 </columns>
+
diff --git a/pages/themes/knob_example.txt b/pages/docs/themes/knob_example.txt
similarity index 100%
rename from pages/themes/knob_example.txt
rename to pages/docs/themes/knob_example.txt
diff --git a/pages/themes/start.txt b/pages/docs/themes/start.txt
similarity index 100%
rename from pages/themes/start.txt
rename to pages/docs/themes/start.txt

-- 


Reply via email to