template: Add support for submenus

7 files changed, 89 insertions, 5 deletions

diff --git a/content/pages/documentation.rst b/content/pages/documentation.rst
index 83d6f31..13e64bc 100644
--- a/content/pages/documentation.rst
+++ b/content/pages/documentation.rst
@@ -2,7 +2,7 @@ Documentation
 ###############################################################################
 
 :slug: documentation
-:part-of: documentation
+:submenu: documentation
 :modified: 2015-10-13 09:00
 
 .. _Apache 2.0: {filename}/static/docs/Apache_License_2.0.txt
diff --git a/content/pages/features.rst b/content/pages/features.rst
new file mode 100644
index 0000000..d8922b6
--- /dev/null
+++ b/content/pages/features.rst
@@ -0,0 +1,55 @@
+Features
+###############################################################################
+
+:slug: features
+:submenu: documentation
+:modified: 2015-10-20 10:20
+
+**Current Features**
+
+- Graphic commands - processes and transmits 2D graphic commands
+- Video streaming - heuristically identifies video streams and transmits M-JPEG
+  video streams
+- Image compression - offers verios compression algorithm that were built
+  specifically for Spice, including QUIC (based on SFALIC), LZ, GLZ
+  (history-based global dictionary), and auto (heuristic compression choice per
+  image)
+- Hardware cursor - processes and transmits cursor-specific commands
+- Image, palette and cursor caching - manages client caches to reduce bandwidth
+  requirements
+- Live migration - supports clients while migrating Spice servers to new hosts,
+  thus avoiding interruptions
+- Windows drivers - Windows drivers for QXL display device and VDI-port
+- Multiple monitors (in virt-viewer/remote-viewer)
+- Screen management - add support for enabling selection of the screen used by
+  the client (in virt-viewer/remote-viewer)
+- Two way audio - supports audio playback and captures; audio data stream is
+  optionally compressed using CELT Encryption - using OpenSSL
+- Two mouse modes - provides client (more user-friendly) and server (increased
+  accuracy and fully synchronized) modes
+- Lip-sync - synchronizes video streams with audio clocks
+- Spice agent - running on the guest and performs tasks for the client
+- Clipboard sharing - allows copy paste between clients and the virtual machine
+- USB redirection - allows clients to use their USB devices with Spice servers
+- Linux features parity
+
+**Future Features**
+
+- Network tunneling (in progress) - using virtual network interface to enable
+  sharing of network resources. Currently the focus is on printer sharing but is
+  not limited to that.
+- Off-screen surfaces (in progress) - supports off-screen surfaces as
+  infrastructure for future DirectDraw, video acceleration and 3D acceleration.
+  GDI and X11 will also benefit from this feature. It will also lay foundation
+  for multi-head support
+- USB sharing (in progress) - allows clients to share their USB devices with
+  Spice servers
+- Direct Draw Client GUI - Enables user-friendly configuration
+- Screen management - add support for enabling selection of the screen used by
+  the client
+- Configuration file - enables persistent user and administrative settings
+- CD sharing - share your CD with Spice server
+- Video acceleration
+- 3D acceleration Support Aero
+- OSX client
+- Simultaneous clients connection
\ No newline at end of file
diff --git a/content/pages/introduction.rst b/content/pages/introduction.rst
index d66f4c0..6ce700b 100644
--- a/content/pages/introduction.rst
+++ b/content/pages/introduction.rst
@@ -2,7 +2,7 @@ Introduction
 ###############################################################################
 
 :slug: introduction
-:part-of: documentation
+:submenu: documentation
 :modified: 2015-10-13 10:30
 
 The Spice project aims to provide a complete open source solution for
diff --git a/pelicanconf.py b/pelicanconf.py
index 5b579d4..a9f4e62 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -44,6 +44,16 @@ MENUITEMS = [
 	("FAQ", "pages/faq.html"),
 	("Documentation", "pages/documentation.html"),
 	("Developers", "pages/developers.html"),
-	("Introduction", "pages/introduction.html"),
 	("Contact", "pages/contact.html"),
 ]
+
+SUBMENUS = {
+	"documentation" : [
+		("Introduction", "pages/introduction.html"),
+		("Overview", "pages/documentation.html"),
+		("Manual", "pages/manual.html"),
+		("spice-gtk API", "pages/spice-gtk.html"),
+		("Support", "pages/support.html"),
+		("Features", "pages/features.html"),
+	],
+}
\ No newline at end of file
diff --git a/spice-space/static/css/main.css b/spice-space/static/css/main.css
index 28ce93f..e3bcb6c 100644
--- a/spice-space/static/css/main.css
+++ b/spice-space/static/css/main.css
@@ -282,6 +282,12 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
   text-decoration: underline;
 }
 
+#content nav li {
+	display: inline;
+	margin-top: 4px;
+	margin-right: 10px;
+}
+
 /*
 	Extras
 *****************/
diff --git a/spice-space/templates/base.html b/spice-space/templates/base.html
index c3d4834..d1e6552 100644
--- a/spice-space/templates/base.html
+++ b/spice-space/templates/base.html
@@ -25,11 +25,13 @@
                     <input type="hidden" name="sitesearch" value="spice-space.org"/>
                     </form>
                 </div>
-                <nav><ul>
+                <nav>
+                <ul>
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li>
                 {% endfor %}
-                </ul></nav>
+                </ul>
+                </nav>
                 <div class="gradient"/>
         </header><!-- /#banner -->
         {% block content %}
diff --git a/spice-space/templates/page.html b/spice-space/templates/page.html
index 0d8283f..670f061 100644
--- a/spice-space/templates/page.html
+++ b/spice-space/templates/page.html
@@ -3,6 +3,17 @@
 {% block content %}
 <section id="content" class="body">
     <h1 class="entry-title">{{ page.title }}</h1>
+	{% if page.submenu and SUBMENUS[page.submenu] %}
+	<div>
+		<nav>
+		<ul>
+			{% for title, link in SUBMENUS[page.submenu] %}
+			<li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li>
+			{% endfor %}
+		</ul>
+		</nav>
+	</div>
+	{% endif %}
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
     {{ page.content }}