Gojara

- changed rr.summary.title to Gojara in plugin.xml so that Settings will always be named Gojara-Settings even if name of actual jar is different - made time differences in spectrum2 stats + login time iff prettier git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13725 b35dd754-fafc-0310-a699-88a17e54d16e

Gojara
- changed rr.summary.title to Gojara in plugin.xml so that Settings will always be named Gojara-Settings even if name of actual jar is different - made time differences in spectrum2 stats + login time iff prettier git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13725 b35dd754-fafc-0310-a699-88a17e54d16e
715c4505 · Axel Brand · daeva · 00068bfc · 715c4505 · 715c4505
Commit 715c4505 authored Aug 01, 2013 by Axel Brand Committed by daeva Aug 01, 2013
4 changed files
--- a/src/plugins/gojara/plugin.xml
+++ b/src/plugins/gojara/plugin.xml
@@ -20,8 +20,8 @@
 	<adminconsole>
 		<tab id="tab-server">
 			<sidebar id="sidebar-server-settings">
-				<item id="remoteRoster" name="${rr.summary.title}" url="rr-main.jsp"
-					description="${rr.summary.title}" />
+				<item id="remoteRoster" name="Gojara Settings" url="rr-main.jsp"
+					description="Manage GoJara Settings" />
 			</sidebar>
 		</tab>
 		<tab id="tab-server">

--- a/src/plugins/gojara/src/java/org/jivesoftware/openfire/plugin/gojara/sessions/GojaraAdminManager.java
+++ b/src/plugins/gojara/src/java/org/jivesoftware/openfire/plugin/gojara/sessions/GojaraAdminManager.java
@@ -222,7 +222,13 @@ public class GojaraAdminManager {
 					long diffMinutes = time / 60 % 60;
 					long diffHours = time / (60 * 60) % 24;
 					long diffDays = time / (24 * 60 * 60);
-					return "" + diffSeconds + " Sec " + diffMinutes + " Min " + diffHours + " Hours " + diffDays + " Days";
+					
+					String seconds = diffSeconds == 0 ? "" : (diffSeconds + " Sec");
+					String minutes = diffMinutes == 0 ? "" : (diffMinutes + " Min ");
+					String hours = diffHours == 0 ? "" : (diffHours + " Hours ");
+					String days = diffDays == 0 ? "" : (diffDays + " Days ");
+					
+					return days + hours + minutes + seconds;
 				}
 			} else if (stat.equals("messages_from_xmpp")) {
 				if (gatewayStatisticsMap.get(gateway).get("messages_from_xmpp") != null)

--- a/src/plugins/gojara/src/java/org/jivesoftware/openfire/plugin/gojara/utils/JspHelper.java
+++ b/src/plugins/gojara/src/java/org/jivesoftware/openfire/plugin/gojara/utils/JspHelper.java
@@ -75,6 +75,12 @@ public class JspHelper {
 		long diffHours = diff / (60 * 60 * 1000) % 24;
 		long diffDays = diff / (24 * 60 * 60 * 1000);
 		
-		return "" + diffSeconds + " Seconds " + diffMinutes + " Minutes " + diffHours + " Hours " + diffDays + " Days ago";
+		String seconds = diffSeconds == 0 ? "" : (diffSeconds + " Sec");
+		String minutes = diffMinutes == 0 ? "" : (diffMinutes + " Min ");
+		String hours = diffHours == 0 ? "" : (diffHours + " Hours ");
+		String days = diffDays == 0 ? "" : (diffDays + " Days ");
+		
+		return days + hours + minutes + seconds + " ago";
+
 	}
 }
--- a/src/plugins/gojara/src/web/rr-main.jsp
+++ b/src/plugins/gojara/src/web/rr-main.jsp
@@ -67,7 +67,7 @@

 <html>
 <head>
-<title><fmt:message key="rr.summary.title" /></title>
+<title>Gojara Settings</title>
 <link href="./css/rr.css" rel="stylesheet" type="text/css">
 <script src="./js/http.js" type="text/javascript"></script>
 <script src="./js/jquery.js" type="text/javascript"></script>