Merge "changelog-webapp: Added find build html/css"
diff --git a/src/cmd/changelog-webapp/static/css/base.css b/src/cmd/changelog-webapp/static/css/base.css
index 1180143..7d763c7 100644
--- a/src/cmd/changelog-webapp/static/css/base.css
+++ b/src/cmd/changelog-webapp/static/css/base.css
@@ -16,6 +16,14 @@
font-size: 18;
}
+h3 {
+ font-size: 16;
+}
+
+p {
+ margin: 8px 0px;
+}
+
p,
p a {
font-size: 16;
@@ -54,7 +62,7 @@
padding-top: 30px;
position: fixed;
top: 0;
- width: 120px;
+ width: 150px;
z-index: 1;
}
@@ -78,7 +86,7 @@
}
.main {
- margin: 30px 25px 0px 155px;
+ margin: 30px 25px 0px 160px;
}
.text-content {
diff --git a/src/cmd/changelog-webapp/static/css/changelog.css b/src/cmd/changelog-webapp/static/css/changelog.css
index 4a7ba7e..5098deb 100644
--- a/src/cmd/changelog-webapp/static/css/changelog.css
+++ b/src/cmd/changelog-webapp/static/css/changelog.css
@@ -11,13 +11,17 @@
}
.changelog-form .text input {
- height: 24px;
+ font-size: 14px;
+ height: 26px;
margin-bottom: 8px;
width: 135px;
}
+.changelog-form .text input.cl-input {
+ width: 350px;
+}
+
.changelog-form .text .submit {
- height: 24px;
width: 59px;
}
@@ -107,4 +111,12 @@
.gob-link {
font-size: 14;
padding-left: 2px;
+}
+
+.locate-build-result {
+ margin: 20px 0px;
+}
+
+.build-info-link {
+ font-size: 15;
}
\ No newline at end of file
diff --git a/src/cmd/changelog-webapp/static/templates/changelog.html b/src/cmd/changelog-webapp/static/templates/changelog.html
index 53751fd..55b3e21 100644
--- a/src/cmd/changelog-webapp/static/templates/changelog.html
+++ b/src/cmd/changelog-webapp/static/templates/changelog.html
@@ -11,7 +11,7 @@
<div class="sidenav">
<a href="/">Home</a>
<a class="active" href="/changelog/">Changelog</a>
- <a href="/locatecl/">Locate CL</a>
+ <a href="/locatebuild/">Locate Build</a>
<a href="/login/">Login</a>
</div>
<div class="main">
diff --git a/src/cmd/changelog-webapp/static/templates/error.html b/src/cmd/changelog-webapp/static/templates/error.html
index b57a938..0940374 100644
--- a/src/cmd/changelog-webapp/static/templates/error.html
+++ b/src/cmd/changelog-webapp/static/templates/error.html
@@ -18,10 +18,10 @@
{{else}}
<a href="/changelog/">Changelog</a>
{{end}}
- {{if (eq .ActivePage "locateCl")}}
- <a class="active" href="/locatecl/">Locate CL</a>
+ {{if (eq .ActivePage "locatebuild")}}
+ <a class="active" href="/locatebuild/">Locate Build</a>
{{else}}
- <a href="/locatecl/">Locate CL</a>
+ <a href="/locatebuild/">Locate Build</a>
{{end}}
<a href="/login/">Login</a>
</div>
diff --git a/src/cmd/changelog-webapp/static/templates/index.html b/src/cmd/changelog-webapp/static/templates/index.html
index 69e5e69..350a422 100644
--- a/src/cmd/changelog-webapp/static/templates/index.html
+++ b/src/cmd/changelog-webapp/static/templates/index.html
@@ -10,7 +10,7 @@
<div class="sidenav">
<a class="active" href="/">Home</a>
<a href="/changelog/">Changelog</a>
- <a href="/locatecl/">Locate CL</a>
+ <a href="/locatebuild/">Locate Build</a>
<a href="/login/">Login</a>
</div>
<div class="main">
diff --git a/src/cmd/changelog-webapp/static/templates/locateBuild.html b/src/cmd/changelog-webapp/static/templates/locateBuild.html
new file mode 100644
index 0000000..c2843f6
--- /dev/null
+++ b/src/cmd/changelog-webapp/static/templates/locateBuild.html
@@ -0,0 +1,57 @@
+<html>
+<head>
+ <meta name="description" content="Google COS build changelog">
+ <link rel="stylesheet" href="/static/css/base.css">
+ <link rel="stylesheet" href="/static/css/changelog.css">
+</head>
+<body>
+ <div class="navbar">
+ <p class="navbar-title">Container Optimized OS</p>
+ </div>
+ <div class="sidenav">
+ <a href="/">Home</a>
+ <a href="/changelog/">Changelog</a>
+ <a class="active" href="/locatebuild/">Locate Build</a>
+ <a href="/login/">Login</a>
+ </div>
+ <div class="main">
+ <h1>Locate Build with CL</h1>
+ <form class="changelog-form" action="/locatebuild">
+ <div class="text">
+ {{if (ne .CL "")}}
+ <input type="text" class="cl-input" name="cl" placeholder="CL-Number or Commit-SHA" value={{.CL}} autocomplete="off">
+ {{else}}
+ <input type="text" class="cl-input" name="cl" placeholder="CL-Number or Commit-SHA" autocomplete="off">
+ {{end}}
+ <input class="submit" type="submit" value="Submit"><br>
+ </div>
+ <div class="radio">
+ {{if .Internal}}
+ <label>
+ <input type="radio" class="internal" name="internal" value="true" checked>
+ Internal
+ </label>
+ <label>
+ <input type="radio" class="external" name="internal" value="false">
+ External
+ </label>
+ {{else}}
+ <label>
+ <input type="radio" class="internal" name="internal" value="true">
+ Internal
+ </label>
+ <label>
+ <input type="radio" class="external" name="internal" value="false" checked>
+ External
+ </label>
+ {{end}}
+ </div>
+ </form>
+ <div class="locate-build-result">
+ {{if (ne .BuildNum "")}}
+ <p><a href={{.GerritLink}} target="_blank">CL {{.CLNum}}</a> landed in build <b>{{.BuildNum}}</b>.</p>
+ {{end}}
+ </div>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/cmd/changelog-webapp/static/templates/promptLogin.html b/src/cmd/changelog-webapp/static/templates/promptLogin.html
index 6091473..ed29b58 100644
--- a/src/cmd/changelog-webapp/static/templates/promptLogin.html
+++ b/src/cmd/changelog-webapp/static/templates/promptLogin.html
@@ -14,10 +14,10 @@
{{else}}
<a href="/changelog/">Changelog</a>
{{end}}
- {{if (eq .ActivePage "locateCl")}}
- <a class="active" href="/locatecl/">Locate CL</a>
+ {{if (eq .ActivePage "locatebuild")}}
+ <a class="active" href="/locatebuild/">Locate Build</a>
{{else}}
- <a href="/locatecl/">Locate CL</a>
+ <a href="/locatebuild/">Locate Build</a>
{{end}}
<a href="/login/">Login</a>
</div>
