From 4067f5f3dd1fe45411774aa43d8d5dd1a67d9188 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Sat, 5 Mar 2022 11:04:00 +0100
Subject: [PATCH] fixes #221: Replace Tooltip JS with some CSS.

---
 changelog.html                                |  5 ++
 plugin.xml                                    |  2 +-
 src/web/archive-conversation-participants.jsp |  2 -
 src/web/archive-search.jsp                    | 71 +++++++++++--------
 4 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/changelog.html b/changelog.html
index 177099e7e..acb198b7f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -44,6 +44,11 @@ <h1>
 Monitoring Plugin Changelog
 </h1>
 
+<p><b>2.3.1</b> -- (tbd)</p>
+<ul>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/125'>Issue #125</a>] - Combining keyword and date range makes search fail</li>
+</ul>
+
 <p><b>2.3.0</b> -- January 19, 2022</p>
 <ul>
     <li>Requires Openfire 4.7.0</li>
diff --git a/plugin.xml b/plugin.xml
index 149a5a73b..2f9fad28a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,7 +6,7 @@
     <description>Monitors conversations and statistics of the server.</description>
     <author>Ignite Realtime</author>
     <version>${project.version}</version>
-    <date>01/19/2022</date>
+    <date>2022-03-05</date>
     <minServerVersion>4.7.0</minServerVersion>
     <minJavaVersion>1.8</minJavaVersion>
     <databaseKey>monitoring</databaseKey>
diff --git a/src/web/archive-conversation-participants.jsp b/src/web/archive-conversation-participants.jsp
index 5160e9183..31f3aea34 100644
--- a/src/web/archive-conversation-participants.jsp
+++ b/src/web/archive-conversation-participants.jsp
@@ -63,8 +63,6 @@
 <meta name="decorator" content="none"/>
 </head>
 <body>
-<script type="text/javascript" language="javascript" src="scripts/tooltips/domTT.js"></script>
-<script type="text/javascript" language="javascript" src="scripts/tooltips/domLib.js"></script>
 <style type="text/css">
 #lightbox{
     top: 20%;
diff --git a/src/web/archive-search.jsp b/src/web/archive-search.jsp
index c64702052..7f4e3b60c 100644
--- a/src/web/archive-search.jsp
+++ b/src/web/archive-search.jsp
@@ -151,8 +151,6 @@
 <meta name="pageID" content="archive-search"/>
 <script src="/js/prototype.js" type="text/javascript"></script>
 <script src="/js/scriptaculous.js" type="text/javascript"></script>
-<script type="text/javascript" language="javascript" src="scripts/tooltips/domLib.js"></script>
-<script type="text/javascript" language="javascript" src="scripts/tooltips/domTT.js"></script>
 
 <style type="text/css">@import url( /js/jscalendar/calendar-win2k-cold-1.css );</style>
 <script type="text/javascript" src="/js/jscalendar/calendar.js"></script>
@@ -312,29 +310,6 @@
         border-width: 0px 0px 1px 0px;
     }
 
-    /* Default DOM Tooltip Style */
-    div.domTT {
-        border: 1px solid #bbb;
-        background-color: #FFFBE2;
-        font-family: Arial, Helvetica sans-serif;
-        font-size: 9px;
-        padding: 5px;
-    }
-
-    div.domTT .caption {
-        font-family: serif;
-        font-size: 12px;
-        font-weight: bold;
-        padding: 1px 2px;
-        color: #FFFFFF;
-    }
-
-    div.domTT .contents {
-        font-size: 12px;
-        font-family: sans-serif;
-        padding: 3px 2px;
-    }
-
     .textfield {
         font-size: 11px;
         font-family: Verdana, Arial, sans-serif;
@@ -362,6 +337,44 @@
     #searchResults p.resultDescription {
         margin: 0px 0px 12px 0px;
     }
+
+    /* --------------------------------------------- */
+    /*  Tooltip styles                               */
+    /* --------------------------------------------- */
+    .openfire-helpicon-with-tooltip {
+        position: relative;
+        display: inline-block;
+    }
+
+    .openfire-helpicon-with-tooltip .helpicon {
+        display: block;
+        float: left;
+        width: 14px;
+        height: 14px;
+        background: transparent url('images/icon_help_14x14.gif') no-repeat;
+    }
+
+    .openfire-helpicon-with-tooltip .tooltiptext {
+        font-family: Arial, Helvetica sans-serif;
+        font-size: small;
+        visibility: hidden;
+        width: 240px;
+        background-color: #FFFBE2;
+        color: black;
+        text-align: center;
+        border: 1px solid #bbb;
+        padding: 5px;
+        position: absolute;
+        z-index: 1;
+        bottom: 125%;
+        left: 50%;
+        margin-left: -120px;
+        white-space: normal;
+    }
+
+    .openfire-helpicon-with-tooltip:hover .tooltiptext {
+        visibility: visible;
+    }
 </style>
 
 <style type="text/css" title="setupStyle" media="screen">
@@ -520,9 +533,7 @@
             <td colspan="3">
                 <img src="images/icon_participants.gif" align="absmiddle" alt="" style="margin-right: 4px;"/>
                 <b><fmt:message key="archive.search.participants" /></b>
-                <a onmouseover="domTT_activate(this, event, 'content',
-                    '<fmt:message key="archive.search.participants.tooltip"/>',
-                    'trail', true, 'direction', 'northeast', 'width', '220');"><img src="images/icon_help_14x14.gif" alt="" vspace="2" align="texttop"/></a>
+                <div class="openfire-helpicon-with-tooltip"><span class="helpicon"></span><span class="tooltiptext"><fmt:message key="archive.search.participants.tooltip"/></span></div>
             </td>
         </tr>
         <tr>
@@ -550,9 +561,7 @@
             <td colspan="3">
                 <img src="images/icon_daterange.gif" align="absmiddle" alt="" style="margin: 0px 4px 0px 2px;"/>
                 <b><fmt:message key="archive.search.daterange" /></b>
-                <a onmouseover="domTT_activate(this, event, 'content',
-                    '<fmt:message key="archive.search.daterange.tooltip"/>',
-                    'trail', true, 'direction', 'northeast', 'width', '220');"><img src="images/icon_help_14x14.gif" vspace="2" align="texttop"/></a>
+                <div class="openfire-helpicon-with-tooltip"><span class="helpicon"></span><span class="tooltiptext"><fmt:message key="archive.search.daterange.tooltip"/></span></div>
             </td>
         </tr>
         <tr valign="top">
