ave-cms-team/comment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

причесываем + обновляем вывод таймера

Browse Source
This commit is contained in:
Repellent
2026-01-24 17:28:59 +05:00
parent c6939375ca
commit 92cdd9e5e3
5 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/comment.js
View File

@@ -50,17 +50,23 @@ function initCommentTimers() {
return;
}
// Форматируем вывод 00:00
var minutes = Math.floor(timeLeft / 60);
var seconds = timeLeft % 60;
$timer.text(minutes + ':' + (seconds < 10 ? '0' : '') + seconds);
var hours = Math.floor(timeLeft / 3600);
var minutes = Math.floor((timeLeft % 3600) / 60);
var seconds = timeLeft % 60;
var timerText = '';
if (hours > 0) {
timerText += hours + ' ' + COMMENT_PUB_TIMER_HOUR + ' ';
}
// Добавляем (minutes < 10 ? '0' : '') перед минутами
timerText += (minutes < 10 ? '0' : '') + minutes + ' ' + COMMENT_PUB_TIMER_MIN + ' ' + (seconds < 10 ? '0' : '') + seconds + ' ' + COMMENT_PUB_TIMER_SEC;
$timer.text(timerText);
$timer.attr('data-left', timeLeft);
}, 1000);
$timer.data('interval-id', countdown);
});
}
});
}
/* Limit Plugin */
$.fn.extend({

9
lang/ru.txt
View File

@@ -126,6 +126,11 @@ COMMENT_HIDDEN_BY_MODERATOR = "Комментарий скрыт модерат
COMMENT_TEXT_DEL_BY_ADMIN = "Комментарий удален администратором."
COMMENT_TEXT_DEL_BY_AUTHOR = "Комментарий удален автором."
COMMENT_STATUS_DELETED = "Удалено"
COMMENT_PUB_TIMER_HOUR = "ч"
COMMENT_PUB_TIMER_MIN = "мин"
COMMENT_PUB_TIMER_SEC = "сек"
COMMENT_PUB_TIMER_TXT_A = "У вас осталось &nbsp;"
COMMENT_PUB_TIMER_TXT_B = "&nbsp;, чтобы изменить или удалить комментарий."
@@ -213,8 +218,8 @@ COMMENT_SETTING_ERROR = "Ошибка связи с сервером"
COMMENT_SETTING_SAVE = "Сохранение..."
COMMENT_SET_TAG_TITEL = "Системные теги модуля"
COMMENT_SET_MAIN_TAG = "Основной тег (выводит форму и комментарии):"
COMMENT_SET_ADDIT_TAG = "Доп. тег (выводит X последних комментариев):"
COMMENT_SET_ADDIT_TAG_NUM = "(X - число выводимых комментариев)"
COMMENT_SET_ADDIT_TAG = "Доп. тег (выводит виджет последние комментарии):"
COMMENT_SET_ADDIT_TAG_NUM = "(X-кол-во комментариев, Y-кол-во символов в тексте)"
COMMENT_SET_COPY = "Скопировать в буфер обмена"
COMMENT_SET_GEN = "Общие настройки"
COMMENT_TEXT_DEL_BY_ADMIN = "Комментарий удален администратором."

2
templates/admin_settings.tpl
View File

@@ -49,7 +49,7 @@
<td>{#COMMENT_SET_ADDIT_TAG#}</td>
<td>
<div class="pr12" style="display: table;">
<input id="addit_tag" type="text" value="[mod_comment:X]" readonly size="20" style="width: 104px;" />
<input id="addit_tag" type="text" value="[mod_comment:X:Y]" readonly size="32" style="width: 114px;" />
<a style="text-align: center; padding: 5px 3px 4px 3px;" class="whiteBtn copyBtn topDir" href="javascript:void(0);" data-clipboard-action="copy" data-clipboard-target="#addit_tag" title="{#COMMENT_SET_COPY#}">
<img style="margin-top: -3px; position: relative; top: 4px; padding: 0 3px;" class="clippy" src="{$ABS_PATH}admin/templates/images/clippy.svg" width="13"></a>
<span style="color: #888; font-size: 11px; margin-left: 5px;">{#COMMENT_SET_ADDIT_TAG_NUM#}</span>

3
templates/comments_tree.tpl
View File

@@ -303,6 +303,9 @@
var COMMENT_JS_SEC_CODE_WRONG = '{#COMMENT_JS_SEC_CODE_WRONG#}';
var COMMENT_JS_ERR_SRV = '{#COMMENT_JS_ERR_SRV#}';
var COMMENT_WAITING_MODERATION = '{#COMMENT_WAITING_MODERATION#}';
var COMMENT_PUB_TIMER_HOUR = '{#COMMENT_PUB_TIMER_HOUR#}';
var COMMENT_PUB_TIMER_MIN = '{#COMMENT_PUB_TIMER_MIN#}';
var COMMENT_PUB_TIMER_SEC = '{#COMMENT_PUB_TIMER_SEC#}';
var REQ_F1 = '{$comment_req_f1}';
var REQ_F2 = '{$comment_req_f2}';

17
templates/comments_tree_sub.tpl
View File

@@ -210,10 +210,19 @@
{* 3. Таймер редактирования *}
{if $c.can_edit && isset($c.edit_time_left) && $c.edit_time_left > 0}
<div class="text-muted small d-flex align-items-center" id="timer_container_{$c.Id}">
<i class="bi bi-hourglass-split text-primary me-1"></i>
<span id="timer_{$c.Id}" data-left="{$c.edit_time_left}" class="timer-count fw-bold">
{math equation="floor(x/60)" x=$c.edit_time_left}:{if ($c.edit_time_left%60) < 10}0{/if}{math equation="x%60" x=$c.edit_time_left}
</span>
<i class="bi bi-hourglass-split text-primary me-1"></i> {#COMMENT_PUB_TIMER_TXT_A#}
<span id="timer_{$c.Id}" data-left="{$c.edit_time_left}" class="timer-count fw-bold">
{math equation="floor(x/3600)" x=$c.edit_time_left assign="h"}
{math equation="floor((x%3600)/60)" x=$c.edit_time_left assign="m"}
{math equation="x%60" x=$c.edit_time_left assign="s"}
{if $h > 0}{$h} {#COMMENT_PUB_TIMER_HOUR#} {/if}
{* Теперь минуты тоже с ведущим нулем *}
{if $m < 10}0{/if}{$m} {#COMMENT_PUB_TIMER_MIN#}
{if $s < 10}0{/if}{$s} {#COMMENT_PUB_TIMER_SEC#}
</span>{#COMMENT_PUB_TIMER_TXT_B#}
</div>
{/if}
{/if}