From bb7c101d3a64d7611a5981723c08f3b722b70810 Mon Sep 17 00:00:00 2001
From: Martin Wasley <martin@queens-park.com>
Date: Wed, 13 May 2020 12:39:32 +0100
Subject: [PATCH 1/2] Update text in Aliases to be more intuitive

Change text and add help.
---
 .../mvc/app/views/OPNsense/Firewall/alias.volt      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
index 32189c272..402585815 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
@@ -613,8 +613,8 @@
                                 <tr id="row_alias.updatefreq">
                                     <td>
                                         <div class="control-label" id="control_label_alias.updatefreq">
-                                            <i class="fa fa-info-circle text-muted"></i>
-                                            <b>{{lang._('Expiration')}}</b>
+                                            <a id="help_for_alias.frequency" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a>
+                                            <b>{{lang._('Refresh Frequency')}}</b>
                                         </div>
                                     </td>
                                     <td>
@@ -633,10 +633,13 @@
                                                 </tr>
                                             </tbody>
                                         </table>
+                                        <div class="hidden" data-for="help_for_alias.frequency">
+                                                               <small>
+                                                {{lang._('The frequency that the list will be refreshed, in days + hours, so 1 day and 8 hours means the alias will be refreshed after 32 hours. ')}}
+                                            </small>
+                                        </div>
                                     </td>
-                                    <td>
-                                        <span class="help-block" id="help_block_alias.updatefreq"></span>
-                                    </td>
+                                                                      
                                 </tr>
                                 <tr id="row_alias.content">
                                     <td>

From cfa0b713cdaabe7ca704e491f16fe3ddb79d6646 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 14 May 2020 14:14:34 +0200
Subject: [PATCH 2/2] Firewall/alias: keep help_block_alias for
 https://github.com/opnsense/core/pull/4111

---
 src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
index 402585815..dc20d7039 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
@@ -634,12 +634,14 @@
                                             </tbody>
                                         </table>
                                         <div class="hidden" data-for="help_for_alias.frequency">
-                                                               <small>
+                                            <small>
                                                 {{lang._('The frequency that the list will be refreshed, in days + hours, so 1 day and 8 hours means the alias will be refreshed after 32 hours. ')}}
                                             </small>
                                         </div>
                                     </td>
-                                                                      
+                                    <td>
+                                        <span class="help-block" id="help_block_alias.updatefreq"></span>
+                                    </td>
                                 </tr>
                                 <tr id="row_alias.content">
                                     <td>