diff options
| author | Young Gyu Park <younggyu@google.com> | 2018-01-16 15:19:02 +0900 |
|---|---|---|
| committer | Young Gyu Park <younggyu@google.com> | 2018-01-18 11:50:21 +0900 |
| commit | 418ee179c09a0889947d322203e7eb201685a1c0 (patch) | |
| tree | d3cffcb921d554d437dbdc0b994f3ff9d4859b9a /src/main/webapp | |
| parent | 500da93c10b43000b8ac4a40faa7293d82673a3a (diff) | |
| download | dashboard-418ee179c09a0889947d322203e7eb201685a1c0.tar.gz | |
Remove notice section on All Test Tab on dashboard main pageandroid-wear-8.0.0_r1
Test: Tested with browser dashboard's main page
Bug: 72010417
Change-Id: If74ad7410dce47e4a95d70e4df0943d9d976ed79
Diffstat (limited to 'src/main/webapp')
| -rw-r--r-- | src/main/webapp/WEB-INF/jsp/dashboard_main.jsp | 102 |
1 files changed, 52 insertions, 50 deletions
diff --git a/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp b/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp index af28e69..2d7b73c 100644 --- a/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp +++ b/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp @@ -212,58 +212,60 @@ </script> <div class='container wide'> - <ul id="guide_collapsible" class="collapsible" data-collapsible="accordion"> - <li> - <div class="collapsible-header"> - <i class="material-icons">library_books</i> - Notice - <span class="new badge right" style="position: inherit;">1</span> - </div> - <div class="collapsible-body"> - <div class='row'> - <div class='col s12' style="margin: 15px 0px 0px 30px;"> - <c:choose> - <c:when test="${fn:endsWith(serverName, 'googleplex.com')}"> - <c:set var="dataVersion" scope="page" value="new"/> - <c:choose> - <c:when test="${fn:startsWith(serverName, 'android-vts-internal')}"> - <c:set var="dataLink" scope="page" value="https://android-vts.appspot.com"/> - </c:when> - <c:when test="${fn:startsWith(serverName, 'android-vts-staging')}"> - <c:set var="dataLink" scope="page" value="https://android-vts-staging.appspot.com"/> - </c:when> - <c:otherwise> - <c:set var="dataLink" scope="page" value="https://android-vts-staging.appspot.com"/> - </c:otherwise> - </c:choose> - </c:when> - <c:when test="${fn:endsWith(serverName, 'appspot.com')}"> - <c:set var="dataVersion" scope="page" value="previous"/> - <c:choose> - <c:when test="${fn:startsWith(serverName, 'android-vts-staging')}"> - <c:set var="dataLink" scope="page" value="https://android-vts-staging.googleplex.com"/> - </c:when> - <c:when test="${fn:startsWith(serverName, 'android-vts')}"> - <c:set var="dataLink" scope="page" value="https://android-vts-internal.googleplex.com"/> - </c:when> - <c:otherwise> - <c:set var="dataLink" scope="page" value="https://android-vts-staging.googleplex.com"/> - </c:otherwise> - </c:choose> - </c:when> - <c:otherwise> - <c:set var="dataVersion" scope="page" value="local dev"/> - <c:set var="dataLink" scope="page" value="http://localhost"/> - </c:otherwise> - </c:choose> - Recently, we launched new appspot servers for dashboard. Thus you will have two diffrent versions of server for each staging and production data. - <br/> - If you want to find the <c:out value = "${dataVersion}"/> test data, please visit the next url <a href="<c:out value = "${dataLink}"/>"><c:out value = "${dataLink}"/></a>. + <c:if test="${!showAll}"> + <ul id="guide_collapsible" class="collapsible" data-collapsible="accordion"> + <li> + <div class="collapsible-header"> + <i class="material-icons">library_books</i> + Notice + <span class="new badge right" style="position: inherit;">1</span> + </div> + <div class="collapsible-body"> + <div class='row'> + <div class='col s12' style="margin: 15px 0px 0px 30px;"> + <c:choose> + <c:when test="${fn:endsWith(serverName, 'googleplex.com')}"> + <c:set var="dataVersion" scope="page" value="new"/> + <c:choose> + <c:when test="${fn:startsWith(serverName, 'android-vts-internal')}"> + <c:set var="dataLink" scope="page" value="https://android-vts.appspot.com"/> + </c:when> + <c:when test="${fn:startsWith(serverName, 'android-vts-staging')}"> + <c:set var="dataLink" scope="page" value="https://android-vts-staging.appspot.com"/> + </c:when> + <c:otherwise> + <c:set var="dataLink" scope="page" value="https://android-vts-staging.appspot.com"/> + </c:otherwise> + </c:choose> + </c:when> + <c:when test="${fn:endsWith(serverName, 'appspot.com')}"> + <c:set var="dataVersion" scope="page" value="previous"/> + <c:choose> + <c:when test="${fn:startsWith(serverName, 'android-vts-staging')}"> + <c:set var="dataLink" scope="page" value="https://android-vts-staging.googleplex.com"/> + </c:when> + <c:when test="${fn:startsWith(serverName, 'android-vts')}"> + <c:set var="dataLink" scope="page" value="https://android-vts-internal.googleplex.com"/> + </c:when> + <c:otherwise> + <c:set var="dataLink" scope="page" value="https://android-vts-staging.googleplex.com"/> + </c:otherwise> + </c:choose> + </c:when> + <c:otherwise> + <c:set var="dataVersion" scope="page" value="local dev"/> + <c:set var="dataLink" scope="page" value="http://localhost"/> + </c:otherwise> + </c:choose> + Recently, we launched new appspot servers for dashboard. Thus you will have two diffrent versions of server for each staging and production data. + <br/> + If you want to find the <c:out value = "${dataVersion}"/> test data, please visit the next url <a href="<c:out value = "${dataLink}"/>"><c:out value = "${dataLink}"/></a>. + </div> </div> </div> - </div> - </li> - </ul> + </li> + </ul> + </c:if> <c:choose> <c:when test='${not empty error}'> |