Skip to content

fixes #17: Replace CalendarJS with browser-native datepicker #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guusdk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixes #17: Replace CalendarJS with browser-native datepicker #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ <h1>

<p><b>1.2.7</b> -- To De Determined</p>
<ul>
<li>[<a href='https://github.com/igniterealtime/openfire-sip-plugin/issues/17'>Issue #17</a>] - Replace CalendarJS library.</li>
</ul>

<p><b>1.2.{2,6}</b> -- December 4, 2020</p>
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<description>Provides support for SIP account management</description>
<author>Ignite Realtime</author>
<version>${project.version}</version>
<date>12/17/2020</date>
<date>2022-03-04</date>
<databaseKey>sip</databaseKey>
<databaseVersion>2</databaseVersion>
<minServerVersion>4.0.0</minServerVersion>
Expand Down
1 change: 0 additions & 1 deletion src/i18n/sip_i18n.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ archive.search.daterange.tooltip = Enter specific date ranges to search between.
archive.search.daterange.start = Start:
archive.search.daterange.end = End:
archive.search.daterange.any = Any
archive.search.daterange.format = Use mm/dd/yy
archive.search.daterange.error = The end time must be after the start time.
archive.settings.any = Any
cancel = Cancel
Expand Down
1 change: 0 additions & 1 deletion src/i18n/sip_i18n_cs_CZ.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ archive.search.daterange.tooltip = Zadejte specifický rozsah datumů, mezi kter
archive.search.daterange.start = Začátek:
archive.search.daterange.end = Konec:
archive.search.daterange.any = Kdykoli
archive.search.daterange.format = Použijte mm/dd/yy
archive.search.daterange.error = Koncové datum musí být po počátečním čase.
archive.settings.any = Jakýkoli
cancel = Zrušit
Expand Down
1 change: 0 additions & 1 deletion src/i18n/sip_i18n_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ archive.search.daterange.tooltip = Ingrese un rango de fechas específico para b
archive.search.daterange.start = Inicio:
archive.search.daterange.end = Fin:
archive.search.daterange.any = Cualquiera
archive.search.daterange.format = Formato mm/dd/yy
archive.search.daterange.error = La fecha de fin debe ser posterior a la de inicio.
archive.settings.any = Cualquiera
cancel = Cancelar
Expand Down
1 change: 0 additions & 1 deletion src/i18n/sip_i18n_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ archive.search.daterange=Dates:
archive.search.daterange.any=N'importe
archive.search.daterange.end=Fin:
archive.search.daterange.error=L'heure de fin doit etre après l'heure de départ.
archive.search.daterange.format=Utilisez mm/jj/aa
archive.search.daterange.start=Départ:
archive.search.daterange.tooltip=Veuillez entrer les dates ente lequelles vous souhaitez rechercher. Vous pouvez choisir une date de départ et/ou une date de fin.
archive.settings.any=N'importe
Expand Down
1 change: 0 additions & 1 deletion src/i18n/sip_i18n_pt_BR.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ archive.search.daterange.tooltip = Insira intervalo de datas específico para pe
archive.search.daterange.start = Início:
archive.search.daterange.end = Final:
archive.search.daterange.any = Qualquer
archive.search.daterange.format = Utilize mm/dd/aa
archive.search.daterange.error = A hora final deve ser após a hora inicial
archive.settings.any = Qualquer
cancel = Cancelar
Expand Down
1 change: 0 additions & 1 deletion src/i18n/sip_i18n_ru_RU.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ archive.search.daterange.tooltip = Введите определенные ди
archive.search.daterange.start = Начало:
archive.search.daterange.end = Конец:
archive.search.daterange.any = Любая
archive.search.daterange.format = Используйте мм/дд/гг
archive.search.daterange.error = Время окончания должно быть после времени начала.
archive.settings.any = Любая
cancel = Отмена
Expand Down
1 change: 0 additions & 1 deletion src/i18n/sip_i18n_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ archive.search.daterange.tooltip = 输入一个指定的日期用于搜索。您
archive.search.daterange.start = 开始:
archive.search.daterange.end = 结束:
archive.search.daterange.any = 任何一项
archive.search.daterange.format = 使用 mm/dd/yy
archive.search.daterange.error = 结束时间必须在开始时间之后。
archive.settings.any = 任何一项
cancel = 取消
Expand Down
Binary file removed src/web/images/icon_calendarpicker.gif
View file
Open in desktop
Binary file not shown.
Binary file added src/web/images/icon_daterange.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 18 additions & 34 deletions src/web/sipark-log-summary.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<script src="/js/scriptaculous.js" type="text/javascript"></script>
<script type="text/javascript" language="javascript" src="/js/tooltips/domLib.js"></script>
<script type="text/javascript" language="javascript" src="/js/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>
<script type="text/javascript" src="/js/jscalendar/i18n.jsp"></script>
<script type="text/javascript" src="/js/jscalendar/calendar-setup.js"></script>
<style type="text/css">
.jive-current {
font-weight: bold;
Expand Down Expand Up @@ -183,7 +179,13 @@
}

if (startDate != null && startDate.length() > 0) {
DateFormat formatter = new SimpleDateFormat("MM/dd/yy");
DateFormat formatter;
if (startDate.contains("/")) {
// This was used by the old calendarjs code. Retain it to not break old links/bookmarks, etc.
formatter = new SimpleDateFormat("MM/dd/yy");
} else {
formatter = new SimpleDateFormat("yyyy-MM-dd");
}
try {
fromDate = formatter.parse(startDate);
}
Expand All @@ -194,12 +196,18 @@
}

if (endDate != null && endDate.length() > 0) {
DateFormat formatter = new SimpleDateFormat("MM/dd/yy");
DateFormat formatter;
if (endDate.contains("/")) {
// This was used by the old calendarjs code. Retain it to not break old links/bookmarks, etc.
formatter = new SimpleDateFormat("MM/dd/yy");
} else {
formatter = new SimpleDateFormat("yyyy-MM-dd");
}
try {
Date date = formatter.parse(endDate);
// The user has chosen an end date and expects that any conversation
// that falls on that day will be included in the search results. For
// example, say the user choose 6/17/2006 as an end date. If a conversation
// example, say the user choose 2006-06-17 as an end date. If a conversation
// occurs at 5:33 PM that day, it should be included in the results. In
// order to make this possible, we need to make the end date one millisecond
// before the next day starts.
Expand Down Expand Up @@ -268,7 +276,7 @@
<td>
<table>
<tr>
<td colspan="3">
<td colspan="2">
<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',
Expand All @@ -279,25 +287,17 @@
<tr valign="top">
<td><fmt:message key="archive.search.daterange.start" /></td>
<td>
<input type="text" id="startDate" name="startDate" size="13"
<input type="date" id="startDate" name="startDate" size="13"
value="<%= startDate != null ? startDate :
LocaleUtils.getLocalizedString("archive.search.daterange.any", "sip")%>" class="textfield"/><br/>
<span class="jive-description"><fmt:message key="archive.search.daterange.format" /></span>
</td>
<td>
<img src="images/icon_calendarpicker.gif" vspace="3" id="startDateTrigger">
</td>
</tr>
<tr valign="top">
<td><fmt:message key="archive.search.daterange.end" /></td>
<td>
<input type="text" id="endDate" name="endDate" size="13"
<input type="date" id="endDate" name="endDate" size="13"
value="<%= endDate != null ? endDate :
LocaleUtils.getLocalizedString("archive.search.daterange.any", "sip") %>" class="textfield"/><br/>
<span class="jive-description"><fmt:message key="archive.search.daterange.format" /></span>
</td>
<td>
<img src="images/icon_calendarpicker.gif" vspace="3" id="endDateTrigger">
</td>
</tr>
</table>
Expand Down Expand Up @@ -530,22 +530,6 @@
startDateField.value = "<fmt:message key="archive.search.daterange.any" />";
}
}

Calendar.setup(
{
inputField : "startDate", // ID of the input field
ifFormat : "%m/%d/%y", // the date format
button : "startDateTrigger", // ID of the button
onUpdate : catcalc
});

Calendar.setup(
{
inputField : "endDate", // ID of the input field
ifFormat : "%m/%d/%y", // the date format
button : "endDateTrigger", // ID of the button
onUpdate : catcalc
});
</script>
</body>
</html>