From 2d69825b04541eaf9645ab017acb71876c2e64a3 Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Mon, 27 Sep 2021 12:00:14 +0200 Subject: [PATCH] related to #1465 added memories case --- admin/themes/default/js/history.js | 8 ++++++-- admin/themes/default/template/history.tpl | 5 +++++ language/en_UK/admin.lang.php | 3 ++- language/fr_FR/admin.lang.php | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/admin/themes/default/js/history.js b/admin/themes/default/js/history.js index 7502c3bbe..fc8a45e3c 100644 --- a/admin/themes/default/js/history.js +++ b/admin/themes/default/js/history.js @@ -127,6 +127,7 @@ function fillSummaryResult(summary) { $(".user-dot").attr("title", user_dot_title).addClass("tiptip"); var tmp = 0; + $(".user-dot").hide(); //sorted for (const [key, value] of Object.entries(summary.SORTED_MEMBERS)) { if (tmp < 5) { @@ -144,7 +145,6 @@ function fillSummaryResult(summary) { } }) $(".user-list").append(new_user_item); - $(".user-dot").hide(); tmp++; } else { $(".user-dot").show(); @@ -210,7 +210,7 @@ function lineConstructor(line, id, imageDisplay) { "line-icon icon-folder-open icon-yellow", "line-icon icon-tags icon-blue", "line-icon icon-star icon-green", - "line-icon icon-wrench", + "line-icon icon-clock icon-yellow", "line-icon icon-dice-solid icon-purple", "line-icon icon-search icon-purple", "line-icon icon-fire icon-red", @@ -315,6 +315,10 @@ function lineConstructor(line, id, imageDisplay) { newLine.find(".type-id").remove(); } break; + case "memories-1-year-ago": + newLine.find(".type-name").html(str_memories); + newLine.find(".type-id").remove(); + break; default: break; } diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl index 883ee47da..c64e34953 100644 --- a/admin/themes/default/template/history.tpl +++ b/admin/themes/default/template/history.tpl @@ -40,6 +40,7 @@ const str_list = "{'Random photo'|translate}"; const str_favorites = "{'Your favorites'|translate}"; const str_recent_cats = "{'Recent albums'|translate}"; const str_recent_pics = "{'Recent photos'|translate}"; +const str_memories = "{'Memories'|translate}"; const unit_MB = "{"%s MB"|@translate}"; {/footer_script} @@ -674,4 +675,8 @@ jQuery(document).ready( function() { margin: 0 15px 0 0; } +.user-list { + margin-right: 10px; +} + \ No newline at end of file diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 3fbd4d56f..7d94a5715 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1263,4 +1263,5 @@ $lang['Tag name'] = 'Tag name'; $lang['Visited'] = 'Visited'; $lang['Downloaded'] = 'Downloaded'; $lang['Personnalized filters'] = 'Personnalized filters'; -$lang['Object'] = 'Object'; \ No newline at end of file +$lang['Object'] = 'Object'; +$lang['Memories'] = 'Souvenirs'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 4d0a3fc9c..b1c312170 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1265,4 +1265,5 @@ $lang['Tag name'] = 'Nom du tag'; $lang['Visited'] = 'Visité'; $lang['Downloaded'] = 'Téléchargé'; $lang['Personnalized filters'] = 'Filtres personnalisés'; -$lang['Object'] = 'Objet'; \ No newline at end of file +$lang['Object'] = 'Objet'; +$lang['Memories'] = 'Souvenirs';