diff --git a/Plan/build.gradle b/Plan/build.gradle index e7bb84efe..aab467148 100644 --- a/Plan/build.gradle +++ b/Plan/build.gradle @@ -42,6 +42,7 @@ allprojects { ext.minorVersion = '6' ext.buildVersion = buildVersion ext.fullVersion = project.ext.majorVersion + '.' + project.ext.minorVersion + ' build ' + project.ext.buildVersion + ext.fullVersionFilename = project.ext.majorVersion + '.' + project.ext.minorVersion + '-build-' + project.ext.buildVersion ext.fullVersionSemantic = project.ext.majorVersion + '.' + project.ext.minorVersion + '+build.' + project.ext.buildVersion // Fix for UTF-8 files showing with wrong encoding when compiled on Windows machines. @@ -50,7 +51,7 @@ allprojects { javadoc { options.encoding = 'UTF-8' } } -logger.lifecycle("Building artifact for version $fullVersion / $fullVersionSemantic") +logger.lifecycle("Building artifact for version $fullVersion / $fullVersionFilename / $fullVersionSemantic") subprojects { // Build plugins diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java index 0a7253811..bfc6c932c 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java @@ -124,6 +124,7 @@ public enum HtmlLang implements Lang { TITLE_SERVER("html.label.server", "Server"), // Can cause issue with datatables.js TITLE_MOST_PLAYED_WORLD("html.label.mostPlayedWorld", "Most played World"), TEXT_CLICK_TO_EXPAND("html.text.clickToExpand", "Click to expand"), + TEXT_CLICK_AND_DRAG("html.text.clickAndDrag", "Click and Drag for more"), TITLE_SERVER_PLAYTIME_30("html.label.serverPlaytime30days", "Server Playtime for 30 days"), TITLE_INSIGHTS("html.label.insights30days", "Insights for 30 days"), LABEL_AFK_TIME("html.label.afkTime", "AFK Time"), diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_CN.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_CN.yml index 74887741e..8eea06f69 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_CN.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_CN.yml @@ -824,6 +824,7 @@ html: success: "新用户注册成功！你现在可以登录了。" usernameTip: "用户名最多可以包含 50 个字符。" text: + clickAndDrag: "Click and Drag for more" clickToExpand: "点击展开" comparing15days: "对比 15 天的情况" comparing30daysAgo: "对比 30 天前和现在的情况" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_CS.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_CS.yml index 50ba6ad77..07ec4d378 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_CS.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_CS.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Uživatelské jméno může být dlouhé 50 znaků." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Klikněte pro rozbalení" comparing15days: "Srovnání posledních 15 dní" comparing30daysAgo: "Srovnání posledních 60 dní" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_DE.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_DE.yml index 83a92cd80..da7f69d29 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_DE.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_DE.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Username can be up to 50 characters." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Klicke zum erweitern" comparing15days: "Vergleiche 15 Tage" comparing30daysAgo: "Vergleiche 30 Tage bis Jetzt" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_EN.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_EN.yml index db1514dbb..0bc4cdd00 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_EN.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_EN.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Username can be up to 50 characters." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Click to expand" comparing15days: "Comparing 15 days" comparing30daysAgo: "Comparing 30d ago to Now" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_ES.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_ES.yml index 238992680..51dffb878 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_ES.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_ES.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "El nombre de usuario no puede superar los 50 caracteres." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Haz clic para expandir" comparing15days: "Comparando 15 dias" comparing30daysAgo: "Comparando desde hace 30d hasta ahora" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_FI.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_FI.yml index fd27e8ba9..e682e3858 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_FI.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_FI.yml @@ -824,6 +824,7 @@ html: success: "Käyttäjä rekisteröitiin onnistuneesti! Voit nyt kirjautua." usernameTip: "Käyttäjänimi voi olla enintään 50 merkkiä." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Klikkaa laajentaaksesi" comparing15days: "Verrataan 15 päivää" comparing30daysAgo: "Verrataan 30 päivää sitten nykyhetkeen" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_FR.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_FR.yml index ae95ea55d..8fd745286 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_FR.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_FR.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Le Nom d'Utilisateur peut comporter jusqu'à 50 caractères." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Cliquez pour agrandir" comparing15days: "Comparaison des 15 derniers Jours" comparing30daysAgo: "Comparaison des 60 derniers Jours" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_IT.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_IT.yml index b1c51fa26..9d5387886 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_IT.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_IT.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Username can be up to 50 characters." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Clicca per espendere" comparing15days: "Comparazione di 15 giorni" comparing30daysAgo: "Comparazione di 30g fa a Ora" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_JA.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_JA.yml index 67222ecf0..662c1a71d 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_JA.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_JA.yml @@ -824,6 +824,7 @@ html: success: "新規ユーザー登録が完了しました!ログインできるようになりました。" usernameTip: "ユーザー名は50文字以内で指定します" text: + clickAndDrag: "Click and Drag for more" clickToExpand: "クリックして展開" comparing15days: "直近15日との比較" comparing30daysAgo: "30日前との比較" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_KO.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_KO.yml index 8f87c8144..a5814fac6 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_KO.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_KO.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Username can be up to 50 characters." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "확장하려면 클릭" comparing15days: "지난 15일 비교" comparing30daysAgo: "지난 30일 비교" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_NL.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_NL.yml index 25e3d6817..c9b536760 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_NL.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_NL.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Gebruikersnaam mag maximaal 50 tekens bevatten." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Klik om uit te breiden" comparing15days: "15 dagen vergelijken" comparing30daysAgo: "30 dagen tot nu vergelijken" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_PT_BR.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_PT_BR.yml index 0dddc5182..76cc94ee4 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_PT_BR.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_PT_BR.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Username can be up to 50 characters." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Click to expand" comparing15days: "Comparing 15 days" comparing30daysAgo: "Comparing 30d ago to Now" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_RU.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_RU.yml index 013020967..8b5caf3fd 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_RU.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_RU.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Ник должен быть не длиннее 50 символов." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Нажмите, чтобы развернуть" comparing15days: "Сравнение 15 дней" comparing30daysAgo: "Сравнение 30 дней назад и сейчас" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_TR.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_TR.yml index 3576eaea7..a5944f190 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_TR.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_TR.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "Kullanıcı adı 50 karaktere kadar olabilir." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Genişletmek için tıklayın" comparing15days: "15 gün karşılaştırılıyor" comparing30daysAgo: "30 gün öncesiyle şimdi karşılaştırılıyor." diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_UK.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_UK.yml index 84be2c09a..a289bc38d 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_UK.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_UK.yml @@ -824,6 +824,7 @@ html: success: "Ви успішно зареєстрували нового користувача! Тепер ви можете увійти в систему." usernameTip: "Нікнейм має бути не довшим за 50 символів." text: + clickAndDrag: "Click and Drag for more" clickToExpand: "Натисніть, щоб розгорнути" comparing15days: "Порівняння 15 днів" comparing30daysAgo: "Порівняння 30 днів тому і зараз" diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_ZH_TW.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_ZH_TW.yml index a920d0ec6..e61fe97b0 100644 --- a/Plan/common/src/main/resources/assets/plan/locale/locale_ZH_TW.yml +++ b/Plan/common/src/main/resources/assets/plan/locale/locale_ZH_TW.yml @@ -824,6 +824,7 @@ html: success: "Registered a new user successfully! You can now login." usernameTip: "使用者名稱最多可以包含 50 個字符。" text: + clickAndDrag: "Click and Drag for more" clickToExpand: "點擊展開" comparing15days: "對比 15 天的情況" comparing30daysAgo: "對比 30 天前和現在的情況" diff --git a/Plan/react/dashboard/src/components/calendar/ServerCalendar.js b/Plan/react/dashboard/src/components/calendar/ServerCalendar.js index f7a124dd0..8da2a0c4d 100644 --- a/Plan/react/dashboard/src/components/calendar/ServerCalendar.js +++ b/Plan/react/dashboard/src/components/calendar/ServerCalendar.js @@ -2,10 +2,22 @@ import React from "react"; import FullCalendar from '@fullcalendar/react' import dayGridPlugin from '@fullcalendar/daygrid' import interactionPlugin from '@fullcalendar/interaction' +import {useTranslation} from "react-i18next"; +import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; +import {faHandPointer} from "@fortawesome/free-regular-svg-icons"; const ServerCalendar = ({series, firstDay, onSelect}) => { + const {t} = useTranslation(); + + const explainerStyle = { + position: "absolute", + top: "0.5rem", + right: "1rem" + }; + return (
+

{t('html.text.clickAndDrag')}