From 2b145f6e6b3d026ba7cfd97d99bda4bacd8aec9a Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Thu, 26 Jul 2012 08:12:29 -0500
Subject: [PATCH] consolidated buttons on site

---
 VERSION                                    |  2 +-
 applications/admin/views/default/site.html | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index 930ddc4b..42a2f86f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-26 07:49:09) dev
+Version 2.00.0 (2012-07-26 08:12:26) dev
diff --git a/applications/admin/views/default/site.html b/applications/admin/views/default/site.html
index 0f73cefc..fd809416 100644
--- a/applications/admin/views/default/site.html
+++ b/applications/admin/views/default/site.html
@@ -148,13 +148,11 @@
     </div>
     <!-- DEPLOY ON GAE -->
     <div class="box">
-      <h3>{{=T("Deploy on Google App Engine")}}</h3>
-      <p>{{=button(URL('gae','deploy'), T('Deploy'))}}</p>
-    </div><br/>
-    <!-- DEPLOY ON OPENSHIFT -->
-    <div class="box">
-      <h3>{{=T("Deploy to OpenShift")}}</h3>
-      <p>{{=button(URL('openshift','deploy'),T('Deploy'))}}</p>
+      <h3>{{=T("Deploy")}}</h3>
+      <p>
+	{{=button(URL('gae','deploy'), T('Deploy on Google App Engine'))}}
+	{{=button(URL('openshift','deploy'),T('Deploy to OpenShift'))}}
+      </p>
     </div><br/>
     {{if TWITTER_HASH:}}
     <div class="box">