From 10d5b48643150c0f1c458279e006d7dec04f0459 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 23 Aug 2012 13:19:19 -0500
Subject: [PATCH] smarter index.html for wiki

---
 VERSION                                       | 2 +-
 applications/welcome/views/default/index.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 26abe865..fd7fc765 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-23 12:44:28) dev
+Version 2.00.0 (2012-08-23 13:19:16) dev
diff --git a/applications/welcome/views/default/index.html b/applications/welcome/views/default/index.html
index 50e64114..6e9ab1ff 100644
--- a/applications/welcome/views/default/index.html
+++ b/applications/welcome/views/default/index.html
@@ -1,4 +1,4 @@
-{{left_sidebar_enabled,right_sidebar_enabled=False,True}}
+{{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
 {{extend 'layout.html'}}
 
 {{if 'message' in globals():}}
@@ -17,6 +17,8 @@
            _href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}</li>
   <li>{{=T('You can modify this application and adapt it to your needs')}}</li>
 </ol>
+{{elif 'content' in globals():}}
+{{=content}}
 {{else:}}
 {{=BEAUTIFY(response._vars)}}
 {{pass}}
@@ -31,4 +33,3 @@
   <li><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
 </ul>
 {{end}}
-