myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject [myfaces-tobago] branch master updated: TOBAGO-1794: Deploy different versions of Tobago demo in the VM * minor text changes
Date Mon, 18 Sep 2017 19:51:30 GMT
This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new ae37287  TOBAGO-1794: Deploy different versions of Tobago demo in the VM * minor
text changes
ae37287 is described below

commit ae37287cd543b273fd7a8a518413cb922404ffb7
Author: Udo Schnurpfeil <lofwyr@apache.org>
AuthorDate: Mon Sep 18 21:51:23 2017 +0200

    TOBAGO-1794: Deploy different versions of Tobago demo in the VM
    * minor text changes
---
 .../src/main/tobago-vm/docker/apache-proxy/index.html     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
index 155d0b9..dde1bf2 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
@@ -43,10 +43,10 @@
 
     <div class="masthead-followup row m-0 border border-white">
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled">
-        <h3 class="na">n/a</h3>
+        <h3 class="na">Tobago 4 is not yet released.</h3>
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled">
-        <h3 class="na">n/a</h3>
+        <h3 class="na">No active voting.</h3>
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
         <h3>Tobago 4</h3>
@@ -90,11 +90,14 @@
         <a class="btn btn-success" href="/demo-2-release/">Demo</a>
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled">
+        <h3 class="na">No active voting.</h3>
+<!--
         <h3>Tobago 2</h3>
         <h5>2.1.1 (unreleased)</h5>
         <p>Voting in progress.</p>
         <hr class="half-rule">
         <a class="btn btn-warning" aria-disabled="true" href="/demo-2-staging/">Demo</a>
+-->
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
         <h3>Tobago 3</h3>
@@ -114,10 +117,10 @@
         <a class="btn btn-secondary" href="/demo-1-5-release/">Demo</a>
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled">
-        <h3 class="na">n/a</h3>
+        <h3 class="na"></h3>
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled">
-        <h3 class="na">n/a</h3>
+        <h3 class="na"></h3>
       </div>
     </div>
 
@@ -130,10 +133,10 @@
         <a class="btn btn-secondary" href="/demo-1-0-release/">Demo</a>
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled">
-        <h3 class="na">n/a</h3>
+        <h3 class="na"></h3>
       </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled">
-        <h3 class="na">n/a</h3>
+        <h3 class="na"></h3>
       </div>
     </div>
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <commits@myfaces.apache.org>'].

Mime
View raw message