From b38445b17ad52e948c645ca8b98b06b0d18aa583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= <skjnldsv@protonmail.com> Date: Tue, 2 Apr 2019 11:33:20 +0200 Subject: [PATCH] Show comments and restore in popover menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> --- apps/comments/js/comments.js | Bin 71363 -> 71561 bytes apps/comments/js/comments.js.map | Bin 197090 -> 197699 bytes apps/comments/src/filesplugin.js | 14 ++++++++++++-- apps/files/css/files.scss | 23 ++++++++++------------- apps/systemtags/js/systemtags.js | Bin 17165 -> 17159 bytes apps/systemtags/js/systemtags.js.map | Bin 63931 -> 63924 bytes apps/systemtags/src/filesplugin.js | 2 +- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/apps/comments/js/comments.js b/apps/comments/js/comments.js index e9d75bb98351cccfa68eb53150d3664e112d4237..72bf0458f99440fbf20651b63cffc30f05ff0007 100644 GIT binary patch delta 925 zcmZWnT}TvB6z01AYnq@drRDDAZZq!Pbyu@u*D1p%4eTKT$t)J<t~21w*6d7Ly8b*= zWNE>zhww#+f{^~W5EPY$L4?V!NKxUF^pX%p5n)7h#&)6T<?x;FocYdo&zafVndk3j z-kZ)XSH+G_Y>FBm*e!%2rq*RBQOzN-H@PlEU+0#v!u)n*Q#(}JT`+=F_OW0Fm8w2P zlStoz2yX}>vPbm0-70&sVcCXEHd*r1RxI-dCPGLjhN*)ZohmzOlX#gG+K*=!sUnvi z#9@=J)>X2bl?Wk|HhH{ArJCm$YuI|;BBrZafJk78s*Xv>i<}|ITb+%7&pCGio_5v) z{^|?>c5%1BVS?L<AX%-epw8+BK<}%&>C@_pb@XFBZed?s6Pf=T*__2SavqaDs;Py( zm6}5!o%S>cc)F^L-q>70x8NM8C$OD{aLYOmHdz9@EYIJ(2cg*F+Xwi9&+<6y8wK1} zD+0b)dk%1VKn>IUS6gXb|4$U9*#oDMLPrLgAdU~)sW_O=mIv$zh3Q({OUH)Gfja9+ z?~W%zzY^hz+f97c5v2#xlVRNv6_1DY7-`WAp3v5ztwT8A7ede&g*yqUi)cL86;)ND z88HrX0f$C<9Vr6xepAy)Sc?BmLthl93c+Yxh^Lf{f0Ua4h;l+4tBOj3T)4;817GSA z(SzQ=4nJ19qFQrLI2H?X7WAg3(hq}2=;!M>HbvCHwHMaWH{?JXy*4z1bb5HW9_eg+ zxX=T8o|tOSFE@EZR$>CSqVJ?adPVCE63c&ZW@C<uO)O!VexG>=E5HBD&LS_a*wQpZ zb1$t!&An=dSUewrcqh4uU7DZEu*o7UKUqQhlBGzdW653+$XXbMczK}?hR-f^Sbta5 zA~>P@7q{g}V!uK9jG#(;7q^#5J}c==`8r_|{gfy%wz!rFLq?X$+4HxLZAfAxOKn9+ ZX33Rb83l3&>2$kedlgY;?>?>YzX5vrROJ8w delta 758 zcmZXSOH30{6ozw|3do~Els2JYXGU5(Wjefq8p;5M6)bc?Fqn#@ai+|e&Q!|`4~rER zhJbG5#)XeWHev*gCf8^*!9rN5Ay`2$(a6S~n23>RqG91Fp({6kzH`paIsdu$jy|%? zKeRkfWZO+K(8+6}?x{M$`9r3D#!w?Vt&k7dE`(RJ3rSv12cpb?iMw-$kx9Ph&Z2#$ zpz4y`e>~(dIKSK=R=V9LnaTe`A&pEFZc%$AkHO2FKPnq$6uRN*qSKV(kw~8HT&C3& z+4LZm*YHMl37ITG2x+*f+=oo8mv@oc{iCTw!r20eBrjo&o`BfO_#tj(>VZd?!@voq z26&UH0(P<Y!C{g;gdo_cc3`Hg7U)x1H-1^>*rvbRT1tMpZdv{}QoM_;XUjGG!dn67 z*1he}I_)VAoNyN5yTuM%%4b16$=k4>Z`sa+O_JnYDbK%rZBT3xjsjm1QXc1pG2mkr zBJkCU5#aOyFVQQnw`PXau-wyysn{0M#|JN<2#yUlfiiKLd>*tRq~gtsK2Rop8=vg8 z?rn}}nyecv$7`x4*RjEH7*Aa~l@sA&y}>B0iV<8e<U=}c7^0z1*U&5qVtTj+({VdF zJN(-Vc7qQ(a_pMNP}CldPpQzW%6+0P_rdeOdwRJb%j7j)fxDlXdk*JqucxSVio9BQ zliKy#Vl(LKVu;c>9?!kEllHd@8A!s+QWa?1QXj0murvmGV!0Zcj4lUKkMm>Rna^=M z-y;ma2N$j!*sX{$L+&@~Of0S(EK-D2(7EI7yeUTqM1>5j{IS5un>U<f{Nob}DOkNn nlkPRank9*`a3m<<#z_Zx_H8XAR|?3TZg)?kDoW(e_jS)d%c2<W diff --git a/apps/comments/js/comments.js.map b/apps/comments/js/comments.js.map index 919d91a14bb69aac5248d6f4521256ba77bb2c1e..c001c0ec465e262325bf5c5e5f7dfbc1408dcc4e 100644 GIT binary patch delta 18320 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 AJ^%m! delta 17546 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 EJ4T2mz5oCK diff --git a/apps/comments/src/filesplugin.js b/apps/comments/src/filesplugin.js index 939edc8c695..2073be09b69 100644 --- a/apps/comments/src/filesplugin.js +++ b/apps/comments/src/filesplugin.js @@ -29,7 +29,7 @@ */ OCA.Comments.FilesPlugin = { ignoreLists: [ - 'files_trashbin', + 'trashbin', 'files.public' ], @@ -79,8 +79,18 @@ // register "comment" action for reading comments fileList.fileActions.registerAction({ name: 'Comment', - displayName: t('comments', 'Comment'), + displayName: function(context) { + if (context && context.$file) { + var unread = parseInt(context.$file.data('comments-unread'), 10) + if (unread >= 0) { + return n('comments', '1 new comment', '{unread} new comments', unread, { unread: unread }) + } + } + return t('comments', 'Comment') + }, mime: 'all', + order: -140, + iconClass: 'icon-comment', permissions: OC.PERMISSION_READ, type: OCA.Files.FileActions.TYPE_INLINE, render: function(actionSpec, isDefault, context) { diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 440f505edec..04987f8839e 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -920,19 +920,8 @@ table.dragshadow td.size { align-items: center; justify-content: center; - &.action.action-share.permanent { - display: none; - } - - /* In "Deleted files", do not show "Restore" text next to icon as there is no space */ - &.action-restore.permanent span { - &:not(.icon) { - display: none; - } - } - - /* If there is a comment, show it instead of the share icon */ - &.action-comment ~ .action-share { + // hide all actions in grid view that are not the menu + &:not(.action-menu) { display: none; } } @@ -949,6 +938,14 @@ table.dragshadow td.size { border-radius: 50%; } } + // force show the sharing entry in the dropdown menu + .action-restore-container.hidden { + display: block !important; + } + // force show the sharing entry in the dropdown menu + .action-comment-container.hidden { + display: block !important; + } } form { diff --git a/apps/systemtags/js/systemtags.js b/apps/systemtags/js/systemtags.js index 3b6c96483744aea5f1e9739310645e2dd71cb6d4..c5a1d736956c53ffbe1d5ccb11fe6375dfac1e75 100644 GIT binary patch delta 13 UcmeBeV{C6@-0(|klQgde045d$=>Px# delta 21 ccmZo~W9)5X-0(|^EiE%AwK#tBFDYIP0ABA1TL1t6 diff --git a/apps/systemtags/js/systemtags.js.map b/apps/systemtags/js/systemtags.js.map index bc8398e1abecc0e634c6e0951578f0229c109850..d378c1de8c827e6d547e5af367acb70d2b0a4338 100644 GIT binary patch delta 21 dcmdn}nR&}+<_*_%7{fQ;)R~#ExuVxO2LO5*3V#3q delta 29 lcmdn;nR)kT<_*_%m@=I<-_V(vz?PPolUf|Vxv<wc2LRIy4MYF{ diff --git a/apps/systemtags/src/filesplugin.js b/apps/systemtags/src/filesplugin.js index fc2a227b5be..7cf39e9dfd8 100644 --- a/apps/systemtags/src/filesplugin.js +++ b/apps/systemtags/src/filesplugin.js @@ -22,7 +22,7 @@ */ OCA.SystemTags.FilesPlugin = { ignoreLists: [ - 'files_trashbin', + 'trashbin', 'files.public' ], -- GitLab