From 5709786d5b63d8df8b5097f0c10e8d692cf46e26 Mon Sep 17 00:00:00 2001
From: philmcmahon <philip.mcmahon@theguardian.com>
Date: Fri, 17 Jan 2025 13:56:17 +0000
Subject: [PATCH] Use help text for eol date

---
 app/views/editBaseImage.scala.html | 10 +---------
 app/views/newBaseImage.scala.html  | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/views/editBaseImage.scala.html b/app/views/editBaseImage.scala.html
index e45deaa6..6c3835ef 100644
--- a/app/views/editBaseImage.scala.html
+++ b/app/views/editBaseImage.scala.html
@@ -11,15 +11,7 @@
     @b3.text( form("amiId"), Symbol("_label") -> "AMI ID", Symbol("placeholder") -> "ami-a1b2c3d4" )
     @b3.select( form("linuxDist"), models.LinuxDist.all.toList.map{ case (k,v) => k -> v.name }, Symbol("_label") -> "Linux Distribution" )
     @b3.textarea( form("description"), Symbol("_label") -> "Description" )
-    <div class="row">
-      <div class="col-md-1"></div>
-      <div class="col-md-6">
-        @b3.date(form("eolDate"), Symbol("_label")-> "End of Life Date")
-      </div>
-      <div class="col-md-3">
-        <p>(Find Ubuntu support info <a href="https://wiki.ubuntu.com/Releases" target="_blank">here</a>)</p>
-      </div>
-    </div>
+    @b3.date(form("eolDate"), Symbol("_label")-> "End of Life Date", Symbol("_help") -> """Find Ubuntu support info <a href="https://wiki.ubuntu.com/Releases" target="_blank">here</a>""")
     @b3.checkbox(form("requiresXLargeBuilder"), Symbol("_label") -> "Requires XLarge builder instance", Symbol("_help") -> "XLarge instances are 8x more expensive than normal AMIgo builders. Avoid where possible.")
     <div class="form-group">
       <label class="control-label col-md-2" for="builtin-roles">Builtin roles</label>
diff --git a/app/views/newBaseImage.scala.html b/app/views/newBaseImage.scala.html
index 7d19de19..fc7874b8 100644
--- a/app/views/newBaseImage.scala.html
+++ b/app/views/newBaseImage.scala.html
@@ -11,15 +11,7 @@
     @b3.text( form("amiId"), Symbol("_label") -> "AMI ID", Symbol("placeholder") -> "ami-a1b2c3d4" )
     @b3.select( form("linuxDist"), models.LinuxDist.all.toList.map{ case (k,v) => k -> v.name }, Symbol("_label") -> "Linux Distribution" )
     @b3.textarea( form("description"), Symbol("_label") -> "Description" )
-    <div class="row">
-      <div class="col-md-1"></div>
-      <div class="col-md-6">
-      @b3.date(form("eolDate"), Symbol("_label")-> "End of Life Date")
-      </div>
-      <div class="col-md-3">
-        <p>(Find Ubuntu support info <a href="https://wiki.ubuntu.com/Releases" target="_blank">here</a>)</p>
-      </div>
-    </div>
+    @b3.date(form("eolDate"), Symbol("_label")-> "End of Life Date", Symbol("_help") -> """Find Ubuntu support info <a href="https://wiki.ubuntu.com/Releases" target="_blank">here</a>""")
     @b3.checkbox(form("requiresXLargeBuilder"), Symbol("_label") -> "Requires XLarge builder instance", Symbol("_help") -> "XLarge instances are 8x more expensive than normal AMIgo builders. Avoid where possible.")
     <div class="form-group">
       <label class="control-label col-md-2" for="builtin-roles">Builtin roles</label>