From 42818e99dfda76cb7a300dba243fcc4aa21a6e1b Mon Sep 17 00:00:00 2001
From: Young Gyu Park <younggyu@google.com>
Date: Fri, 11 May 2018 16:08:28 +0900
Subject: Fix UI error caused by materializecss version upgrade

Test: go/vts-web-staging/show_plan_release?plan=vts&type=suite&page=1
Bug: 79557513
Change-Id: Ie5f0e5259dda05b1a1ac924f04edb20b6cc7a7e8
---
 src/main/webapp/WEB-INF/datastore-indexes.xml      |  2 +-
 src/main/webapp/WEB-INF/jsp/dashboard_main.jsp     |  2 +-
 src/main/webapp/WEB-INF/jsp/footer.jsp             |  6 +++---
 src/main/webapp/WEB-INF/jsp/show_suite_release.jsp |  6 +++---
 src/main/webapp/css/dashboard_main.css             |  1 -
 src/main/webapp/js/test_results.js                 | 11 +++++++----
 6 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'src/main/webapp')

diff --git a/src/main/webapp/WEB-INF/datastore-indexes.xml b/src/main/webapp/WEB-INF/datastore-indexes.xml
index 3d5a58f..0f9caf1 100644
--- a/src/main/webapp/WEB-INF/datastore-indexes.xml
+++ b/src/main/webapp/WEB-INF/datastore-indexes.xml
@@ -108,7 +108,7 @@
   </datastore-index>
 
   <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual">
-    <property name="groupType" direction="asc"/>
+    <property name="testType" direction="asc"/>
     <property name="suitePlan" direction="asc"/>
     <property name="__key__" direction="desc"/>
   </datastore-index>
diff --git a/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp b/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp
index 2d7b73c..71f6679 100644
--- a/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/dashboard_main.jsp
@@ -305,7 +305,7 @@
                     <span class='entry valign'>${test.name}
                       <c:if test='${test.failCount >= 0 && test.passCount >= 0}'>
                         <c:set var='color' value='${test.failCount > 0 ? "red" : (test.passCount > 0 ? "green" : "grey")}' />
-                        <span class='indicator center ${color}'>
+                        <span class='indicator right center ${color}'>
                           ${test.passCount} / ${test.passCount + test.failCount}
                         </span>
                       </c:if>
diff --git a/src/main/webapp/WEB-INF/jsp/footer.jsp b/src/main/webapp/WEB-INF/jsp/footer.jsp
index ed2d950..b804a21 100644
--- a/src/main/webapp/WEB-INF/jsp/footer.jsp
+++ b/src/main/webapp/WEB-INF/jsp/footer.jsp
@@ -16,9 +16,9 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
-<footer class='page-footer'>
-  <div class='footer-copyright'>
-    <div class='container'>
+<footer class="page-footer" style="height: 70px;">
+  <div class="footer-copyright">
+    <div class="container">
       © 2017 - The Android Open Source Project
     </div>
   </div>
diff --git a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
index b412426..4b8b9e8 100644
--- a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
+++ b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
@@ -99,13 +99,13 @@
             <div class='col s12'>
 
                 <ul class="tabs">
-                    <li class="tab col s6" id="totTabLink">
+                    <li class="tab col s4" id="totTabLink">
                         <a class="${testCategoryType == '1' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=1">TOT</a>
                     </li>
-                    <li class="tab col s6" id="signedTabLink">
+                    <li class="tab col s4" id="signedTabLink">
                         <a class="${testCategoryType == '4' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=4">SIGNED</a>
                     </li>
-                    <li class="tab col s6" id="otaTabLink">
+                    <li class="tab col s4" id="otaTabLink">
                         <a class="${testCategoryType == '2' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&testCategoryType=2">OTA</a>
                     </li>
                 </ul>
diff --git a/src/main/webapp/css/dashboard_main.css b/src/main/webapp/css/dashboard_main.css
index 0976489..e4b4658 100644
--- a/src/main/webapp/css/dashboard_main.css
+++ b/src/main/webapp/css/dashboard_main.css
@@ -58,7 +58,6 @@
     font-size: 12px;
     font-weight: bold;
     padding: 1px 6px;
-    position: absolute;
     right: 0;
     min-width: 40px;
     border-radius: 10px;
diff --git a/src/main/webapp/js/test_results.js b/src/main/webapp/js/test_results.js
index 94960eb..5109d8d 100644
--- a/src/main/webapp/js/test_results.js
+++ b/src/main/webapp/js/test_results.js
@@ -174,9 +174,11 @@
    * @returns The jquery object for the indicator.
    */
   function createClickableIndicator(container, content, classes, click) {
-    var link = $('<a></a>');
-    link.addClass('indicator right center padded hoverable waves-effect');
-    link.addClass(classes)
+    var link = $('<span></span>');
+    link.addClass('indicator badge padded hoverable waves-effect');
+    link.addClass(classes);
+    link.css("color", "white");
+    link.css("margin-left", "1px");
     link.append(content);
     link.appendTo(container);
     link.click(click);
@@ -231,7 +233,8 @@
       span.append(timeString);
       var indicator = $('<span></span>');
       var color = metadata.testRun.failCount > 0 ? 'red' : 'green';
-      indicator.addClass('indicator right center ' + color);
+      indicator.addClass('indicator badge ' + color);
+      indicator.css("color", "white");
       indicator.append(
         metadata.testRun.passCount + '/' +
         (metadata.testRun.passCount + metadata.testRun.failCount));
-- 
cgit v1.2.3