mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-19 16:03:14 +00:00
display time on dialog
This commit is contained in:
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||
/******/ if (__webpack_require__.nc) {
|
||||
/******/ script.setAttribute("nonce", __webpack_require__.nc);
|
||||
/******/ }
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=26";
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=27";
|
||||
/******/ var timeout = setTimeout(onScriptComplete, 120000);
|
||||
/******/ script.onerror = script.onload = onScriptComplete;
|
||||
/******/ function onScriptComplete() {
|
||||
|
@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||
/******/ if (__webpack_require__.nc) {
|
||||
/******/ script.setAttribute("nonce", __webpack_require__.nc);
|
||||
/******/ }
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=26";
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=27";
|
||||
/******/ var timeout = setTimeout(onScriptComplete, 120000);
|
||||
/******/ script.onerror = script.onload = onScriptComplete;
|
||||
/******/ function onScriptComplete() {
|
||||
|
2
Phraseanet-production-client/dist/commons.js
vendored
2
Phraseanet-production-client/dist/commons.js
vendored
@@ -91,7 +91,7 @@
|
||||
/******/ if (__webpack_require__.nc) {
|
||||
/******/ script.setAttribute("nonce", __webpack_require__.nc);
|
||||
/******/ }
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=26";
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=27";
|
||||
/******/ var timeout = setTimeout(onScriptComplete, 120000);
|
||||
/******/ script.onerror = script.onload = onScriptComplete;
|
||||
/******/ function onScriptComplete() {
|
||||
|
@@ -91,7 +91,7 @@
|
||||
/******/ if (__webpack_require__.nc) {
|
||||
/******/ script.setAttribute("nonce", __webpack_require__.nc);
|
||||
/******/ }
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=26";
|
||||
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=27";
|
||||
/******/ var timeout = setTimeout(onScriptComplete, 120000);
|
||||
/******/ script.onerror = script.onload = onScriptComplete;
|
||||
/******/ function onScriptComplete() {
|
||||
|
@@ -19323,7 +19323,9 @@ var notifyLayout = function notifyLayout(services) {
|
||||
markNotificationRead(event.data['id'], $z);
|
||||
});
|
||||
date_cont.append($z);
|
||||
// do not display date in the dialog content beacause it's already grouped by date
|
||||
(0, _jquery2.default)(".time", $z).hide();
|
||||
(0, _jquery2.default)(".time-in-dialog", $z).show();
|
||||
};
|
||||
|
||||
for (i in notifications) {
|
||||
|
@@ -19323,7 +19323,9 @@ var notifyLayout = function notifyLayout(services) {
|
||||
markNotificationRead(event.data['id'], $z);
|
||||
});
|
||||
date_cont.append($z);
|
||||
// do not display date in the dialog content beacause it's already grouped by date
|
||||
(0, _jquery2.default)(".time", $z).hide();
|
||||
(0, _jquery2.default)(".time-in-dialog", $z).show();
|
||||
};
|
||||
|
||||
for (i in notifications) {
|
||||
|
@@ -182,6 +182,7 @@ const notifyLayout = (services) => {
|
||||
date_cont.append($z);
|
||||
// do not display date in the dialog content beacause it's already grouped by date
|
||||
$(".time", $z).hide();
|
||||
$(".time-in-dialog", $z).show();
|
||||
}
|
||||
|
||||
// handle "show more" button
|
||||
|
@@ -8,6 +8,7 @@
|
||||
<td class="{{notification['class']}}">
|
||||
{{notification['text'] | raw}}
|
||||
<span class="time">{{notification['created_on']}}</span>
|
||||
<span class="time-in-dialog" style="color: #666666;display: none;" >{{notification['time']}}</span>
|
||||
</td>
|
||||
<td style="width:25px; vertical-align: bottom;">
|
||||
<span class="icon_read" title="{{ 'notification::read:tooltip' | trans }}"></span>
|
||||
|
Reference in New Issue
Block a user