You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/07/01 21:47:05 UTC

svn commit: r1834807 - in /directory/site/trunk: content/ content/escimo/ content/scimple/ lib/ templates/ templates/escimo/ templates/scimple/

Author: elecharny
Date: Sun Jul  1 21:47:04 2018
New Revision: 1834807

URL: http://svn.apache.org/viewvc?rev=1834807&view=rev
Log:
Removed Escimo, added SCIMple

Added:
    directory/site/trunk/content/scimple/
    directory/site/trunk/content/scimple/index.mdtext
    directory/site/trunk/content/scimple/news.mdtext
    directory/site/trunk/templates/scimple/
    directory/site/trunk/templates/scimple/index.html
    directory/site/trunk/templates/scimple/page.html
Removed:
    directory/site/trunk/content/escimo/
    directory/site/trunk/templates/escimo/
Modified:
    directory/site/trunk/content/extpaths.txt
    directory/site/trunk/lib/path.pm
    directory/site/trunk/templates/footer.html
    directory/site/trunk/templates/header.html
    directory/site/trunk/templates/navigation.html

Modified: directory/site/trunk/content/extpaths.txt
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/extpaths.txt?rev=1834807&r1=1834806&r2=1834807&view=diff
==============================================================================
--- directory/site/trunk/content/extpaths.txt (original)
+++ directory/site/trunk/content/extpaths.txt Sun Jul  1 21:47:04 2018
@@ -1,5 +1,8 @@
 # File format: lines starting with # or space chars are ignored.
 
+# SCIMple
+scimple/gen-docs/1.0.0
+
 # Fortress
 fortress/gen-docs/1.0.1
 fortress/gen-docs/1.0.0

Added: directory/site/trunk/content/scimple/index.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/scimple/index.mdtext?rev=1834807&view=auto
==============================================================================
--- directory/site/trunk/content/scimple/index.mdtext (added)
+++ directory/site/trunk/content/scimple/index.mdtext Sun Jul  1 21:47:04 2018
@@ -0,0 +1,24 @@
+Title: Welcome to Apache eSCIMo
+Notice: Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    .
+    http://www.apache.org/licenses/LICENSE-2.0
+    .
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+# Apache SCIMple™
+
+The Apache SCIMple™ is an implementation of SCIM v2.0 specification.
+
+Using Apache SCIMple™ user and group details can be transferred easily between
+SCIM aware applications.  
\ No newline at end of file

Added: directory/site/trunk/content/scimple/news.mdtext
URL: http://svn.apache.org/viewvc/directory/site/trunk/content/scimple/news.mdtext?rev=1834807&view=auto
==============================================================================
--- directory/site/trunk/content/scimple/news.mdtext (added)
+++ directory/site/trunk/content/scimple/news.mdtext Sun Jul  1 21:47:04 2018
@@ -0,0 +1 @@
+# News

Modified: directory/site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/directory/site/trunk/lib/path.pm?rev=1834807&r1=1834806&r2=1834807&view=diff
==============================================================================
--- directory/site/trunk/lib/path.pm (original)
+++ directory/site/trunk/lib/path.pm Sun Jul  1 21:47:04 2018
@@ -6,7 +6,7 @@ our $version_apacheds = "2.0.0-M24";
 our $version_studio = "2.0.0.v20170904-M13";
 our $version_studio_name = "2.0.0-M13";
 our $version_mavibot = "1.0.0-M8";
-our $version_escimo = "1.0.0-M1";
+our $version_scimple = "1.0.0";
 our $version_fortress = "2.0.0";
 our $version_kerby = "1.1.1";
 
@@ -29,7 +29,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -42,7 +42,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -55,7 +55,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -68,7 +68,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -81,7 +81,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -94,7 +94,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -107,7 +107,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
@@ -120,7 +120,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -133,7 +133,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -150,7 +150,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -163,7 +163,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
@@ -176,7 +176,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -189,7 +189,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -206,7 +206,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -219,7 +219,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
@@ -232,7 +232,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -245,7 +245,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -262,7 +262,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -275,7 +275,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -288,7 +288,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -301,7 +301,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
@@ -314,7 +314,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
@@ -327,63 +327,63 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
 
     #
-    # Apache ESCIMO sub-project pages
+    # Apache SCIMple sub-project pages
     #
     
-    # Download Apache ESCIMO Archive page
-    [qr!escimo\/download\/download-archive\.mdtext$!, template_page => {
-        template => "escimo/download-archive.html",
-        isDirEscimo => true, 
+    # Download Apache SCIMple Archive page
+    [qr!scimple\/download\/download-archive\.mdtext$!, template_page => {
+        template => "scimple/download-archive.html",
+        isDirScimple => true, 
         version_api => $version_api,
         version_apacheds => $version_apacheds,
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
-    # Download Apache ESCIMO Sources page
-    [qr!escimo\/download\/download-sources\.mdtext$!, template_page => {
-        template => "escimo/download-sources.html",
-        isDirEscimo => true, 
+    # Download Apache SCIMple Sources page
+    [qr!scimple\/download\/download-sources\.mdtext$!, template_page => {
+        template => "scimple/download-sources.html",
+        isDirScimple => true, 
         version_api => $version_api,
         version_apacheds => $version_apacheds,
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
-    # Apache ESCIMO Index page
-    [qr!escimo\/index\.mdtext$!, template_page => {
-        template => "escimo/index.html",
-        isDirEscimo => true, 
+    # Apache SCIMple Index page
+    [qr!scimple\/index\.mdtext$!, template_page => {
+        template => "scimple/index.html",
+        isDirScimple => true, 
         version_api => $version_api,
         version_apacheds => $version_apacheds,
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
-    # Standard Apache ESCIMO page
-    [qr!escimo\/.*?\.mdtext$!, template_page => {
-        template => "escimo/page.html",
-        isDirEscimo => true, 
+    # Standard Apache SCIMple page
+    [qr!scimple\/.*?\.mdtext$!, template_page => {
+        template => "scimple/page.html",
+        isDirScimple => true, 
         version_api => $version_api,
         version_apacheds => $version_apacheds,
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
 
@@ -400,7 +400,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -413,7 +413,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
@@ -426,7 +426,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -439,7 +439,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -457,7 +457,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -470,7 +470,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
         
@@ -483,7 +483,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -496,7 +496,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
 
@@ -513,7 +513,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
     
@@ -526,7 +526,7 @@ our @patterns = (
         version_studio => $version_studio,
         version_studio_name => $version_studio_name,
         version_mavibot => $version_mavibot,
-        version_escimo => $version_escimo,
+        version_scimple => $version_scimple,
         version_kerby => $version_kerby,
         version_fortress => $version_fortress } ],
 );

Modified: directory/site/trunk/templates/footer.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/footer.html?rev=1834807&r1=1834806&r2=1834807&view=diff
==============================================================================
--- directory/site/trunk/templates/footer.html (original)
+++ directory/site/trunk/templates/footer.html Sun Jul  1 21:47:04 2018
@@ -2,8 +2,8 @@
                 <div id="endContent"></div>
             </div><!-- content -->
             <div id="footer">&copy; 2003-2018, <a href="http://www.apache.org">The Apache Software Foundation</a> - <a href="{{base}}privacy-policy.html">Privacy Policy</a><br />
-                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Fortress, Apache Fortress, EnMasse, Apache EnMasse, Apache Kerby, Kerby
-                Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
+                Apache Directory, ApacheDS, Apache Directory Server, Apache Directory Studio, Apache LDAP API, Apache Triplesec, Triplesec, Apache Mavibot, Mavibot, Apache eSCIMo, eSCIMo, Apache SCIMple, SCIMple,Fortress, Apache Fortress, EnMasse, Apache EnMasse, 
+                Apache Kerby, Kerby, Apache, the Apache feather logo, and the Apache Directory project logos are trademarks of The Apache Software Foundation.
             </div>
         </div><!-- container -->
     </body>

Modified: directory/site/trunk/templates/header.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/header.html?rev=1834807&r1=1834806&r2=1834807&view=diff
==============================================================================
--- directory/site/trunk/templates/header.html (original)
+++ directory/site/trunk/templates/header.html Sun Jul  1 21:47:04 2018
@@ -76,11 +76,11 @@
                         {% endif %}
                     </a>
                     &nbsp;|&nbsp;
-                    <a href="{{base}}escimo">
-                        {% if isDirEscimo %}
-                        <STRONG>eSCIMo</STRONG>
+                    <a href="{{base}}scimple">
+                        {% if isDirScimple %}
+                        <STRONG>SCIMple</STRONG>
                         {% else %}
-                        eSCIMo
+                        SCIMple
                         {% endif %}
                     </a>
                     &nbsp;|&nbsp;

Modified: directory/site/trunk/templates/navigation.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/navigation.html?rev=1834807&r1=1834806&r2=1834807&view=diff
==============================================================================
--- directory/site/trunk/templates/navigation.html (original)
+++ directory/site/trunk/templates/navigation.html Sun Jul  1 21:47:04 2018
@@ -15,7 +15,7 @@
         <li><a href="{{base}}api/downloads.html">LDAP API {{version_api}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="{{base}}mavibot/downloads.html">Mavibot {{version_mavibot}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
         <li><a href="{{base}}fortress/downloads.html">Fortress {{version_fortress}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li-->
-        <!-- <li><a href="{{base}}escimo/downloads.html">eSCIMo {{version_escimo}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li> -->
+        <<li><a href="{{base}}scimple/downloads.html">SCIMple {{version_scimple}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>>
         <li><a href="{{base}}kerby/downloads.html">Kerby {{version_kerby}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
     </ul>
     <h5>Sub-Projects</h5>
@@ -24,7 +24,7 @@
         <li><a href="{{base}}studio/">Apache Directory Studio</a></li>
         <li><a href="{{base}}api/">Apache LDAP API</a></li>
         <li><a href="{{base}}mavibot/">Apache Mavibot</a></li>
-        <li><a href="{{base}}escimo/">Apache eSCIMo</a></li>
+        <li><a href="{{base}}scimple/">Apache SCIMple</a></li>
         <li><a href="{{base}}fortress/">Apache Fortress</a></li>
         <li><a href="{{base}}kerby/">Apache Kerby</a></li>
     </ul>

Added: directory/site/trunk/templates/scimple/index.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/scimple/index.html?rev=1834807&view=auto
==============================================================================
--- directory/site/trunk/templates/scimple/index.html (added)
+++ directory/site/trunk/templates/scimple/index.html Sun Jul  1 21:47:04 2018
@@ -0,0 +1,8 @@
+{% extends "scimple/page.html" %}
+
+{% block content %}
+    {{content|markdown}}
+    {% block news %}
+        <div class="news">{% filter markdown %}{% include "../content/scimple/news.mdtext" %}{% endfilter %}</div>
+    {% endblock %}
+{% endblock %}
\ No newline at end of file

Added: directory/site/trunk/templates/scimple/page.html
URL: http://svn.apache.org/viewvc/directory/site/trunk/templates/scimple/page.html?rev=1834807&view=auto
==============================================================================
--- directory/site/trunk/templates/scimple/page.html (added)
+++ directory/site/trunk/templates/scimple/page.html Sun Jul  1 21:47:04 2018
@@ -0,0 +1,97 @@
+{% extends "header.html" %}
+    {% block css %}
+	    <link href="{{base}}css/common.css" rel="stylesheet" type="text/css">
+	    <link href="{{base}}css/brown.css" rel="stylesheet" type="text/css">
+    {% endblock %}
+
+    {% block favicon %}
+        <link rel="shortcut icon" href="{{base}}images/api-icon_16x16.png">
+    {% endblock %}
+
+    {% block project-navigation %}
+    <!--ul>
+      <li>
+        <a href="http://bit.ly/1n9YlQT" target="_blank">
+          <img src="{{base}}images/ApacheConBudapest.png" width="125" height="125" alt="I'm Speaking at ApacheCon Europe 2014! Join me!" title="I'm Speaking at ApacheCon Europe 2014! Join me!" border="0" style="margin-bottom:-3px;"/>
+        </a>
+      </li>
+    </ul-->
+    <h5>SCIMple 1.0</h5>
+    <ul>
+        <li><a href="{{base}}scimple/">Home</a></li>
+        <li><a href="{{base}}scimple/news.html">News</a></li>
+    </ul>    
+    <!--<h5>Downloads</h5>
+    <ul>
+	    <li><a href="{{base}}scimple/downloads.html">Version {{version_scimple}}</a>&nbsp;&nbsp;<IMG src="{{base}}images/new_badge.gif" alt="" style="margin-bottom:-3px;" border="0"></li>
+        <li><a href="{{base}}scimple/download-old-versions.html">Older versions</a></li>
+    </ul>-->
+    <h5>Documentation</h5>
+    <ul>
+	    <li><a href="{{base}}scimple/five-minutes-tutorial.html">Five minutes tutorial</a></li>
+	    <li><a href="{{base}}scimple/user-guide.html">User Guide</a></li>
+        <li><a href="{{base}}scimple/gen-docs/latest/apidocs/">JavaDocs</a></li>
+        <li><a href="{{base}}scimple/gen-docs/latest/xref/">Cross-Reference</a></li>
+        <!--li><a href="{{base}}scimple/gen-docs/latest/">Generated Reports</a></li-->
+        <li><a href="{{base}}scimple/developer-guide.html">Developer Guide</a></li>
+    </ul>
+    {% endblock %}
+{% endextends %}
+
+{% if headers.navprev or headers.navup or headers.navnext %}
+    <div class="nav">
+        <div class="nav_prev">
+        {% if headers.navprev %}
+            <a href="{{ headers.navprev }}">{{ headers.navprevtext }}</a>
+		{% else %}
+			&nbsp;
+        {% endif %}
+        </div>
+        <div class="nav_up">
+        {% if headers.navup %}
+            <a href="{{ headers.navup }}">{{ headers.navuptext }}</a>
+		{% else %}
+			&nbsp;
+        {% endif %}
+        </div>
+        <div class="nav_next">
+        {% if headers.navnext %}
+            <a href="{{ headers.navnext }}">{{ headers.navnexttext }}</a>
+		{% else %}
+			&nbsp;
+        {% endif %}
+        </div>
+        <div class="clearfix"></div>
+    </div>
+{% endif %}
+
+{% block content %}{{ content|markdown }}{% endblock %}
+
+{% if headers.navprev or headers.navup or headers.navnext %}
+    <div class="nav">
+        <div class="nav_prev">
+        {% if headers.navprev %}
+            <a href="{{ headers.navprev }}">{{ headers.navprevtext }}</a>
+		{% else %}
+			&nbsp;
+        {% endif %}
+        </div>
+        <div class="nav_up">
+        {% if headers.navup %}
+            <a href="{{ headers.navup }}">{{ headers.navuptext }}</a>
+		{% else %}
+			&nbsp;
+        {% endif %}
+        </div>
+        <div class="nav_next">
+        {% if headers.navnext %}
+            <a href="{{ headers.navnext }}">{{ headers.navnexttext }}</a>
+		{% else %}
+			&nbsp;
+        {% endif %}
+        </div>
+        <div class="clearfix"></div>
+    </div>
+{% endif %}
+
+{% include "footer.html" %}
\ No newline at end of file