From cc501cf3baaa1a7300a3e188cdda31f470190a04 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Thu, 20 Jan 2022 22:44:45 +0200 Subject: [PATCH 1/5] Microblog: Display a checkbox for posting a comment on behalf of a group in feeds --- Web/Presenters/templates/components/post/microblogpost.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index b25b7c5f..2e35c0f0 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -129,7 +129,8 @@ {/foreach}
{var commentsURL = "/al_comments/create/posts/" . $post->getId()} - {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post} + {var club = is_null($club) ? ($post->getTargetWall() < 0 ? (new openvk\Web\Models\Repositories\Clubs)->get(abs($post->getTargetWall())) : NULL) : $club} + {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post, club => $club}
{/if} From 4281ec4f80b6d94267f5ec80b6485acfe76039ed Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Fri, 21 Jan 2022 13:47:08 +0300 Subject: [PATCH 2/5] Markdown: Removed Safe Mode It's not necessary at this point anyway. --- Web/Presenters/SupportPresenter.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php index d644deb1..8a48a0db 100644 --- a/Web/Presenters/SupportPresenter.php +++ b/Web/Presenters/SupportPresenter.php @@ -222,7 +222,6 @@ final class SupportPresenter extends OpenVKPresenter $content = implode($lines); $parser = new Parsedown(); - $parser->setSafeMode(true); $this->template->heading = $heading; $this->template->content = $parser->text($content); } From 8c29138755ee446fbb3135627aa0a5c93441008d Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Fri, 21 Jan 2022 18:15:12 +0200 Subject: [PATCH 3/5] OpenVK Modern: Support displaying instance name in header bar --- themepacks/openvk_modern/res/5.png | Bin 0 -> 1475 bytes themepacks/openvk_modern/stylesheet.css | 7 +++++++ 2 files changed, 7 insertions(+) create mode 100644 themepacks/openvk_modern/res/5.png diff --git a/themepacks/openvk_modern/res/5.png b/themepacks/openvk_modern/res/5.png new file mode 100644 index 0000000000000000000000000000000000000000..abacbfdefbe78456158250f27dd44b468216a1d5 GIT binary patch literal 1475 zcmV;!1w8tRP)EX>4Tx04R}tkv&MmP!xqvQ>7x64ptCx$WV2$AXdatt5Adrp;lE=M<*vm7b)?+q|hSP3y=44-aUu+?gNB+nQ2zn1fc1* znM%aPOm4+%q(M0l9K3HU-#5abrFVHWr1gg&2(y>I7}=S+E{60Rx~x@DdLE#>69;I zJXSexan{OJ*1RWwVKAq!EOVXKFcMhA5+sOFP(=x4*oe}ulVTx7=kX5yA=fXFOCeVY zj2sK7K!fc1!T;d*Y^{83(n|`)f$kT_`4|BLyFjDnIN!&P(>MYA&%l-5@>lA>%qQu! zmKHezLfgQ_bxTwBfXf|V@X3%(*_HgXgnS-&KcjET0{yo@@0vHa<~dFufHci2c>^3A z0;2`WUhnYkp7y!@+tZxi53E>nzP3{pZU6uP24YJ`L;yShJODhOjE;){000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2j&445C$<#%-HS#000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}000A;NklSjS*g@TBn zTUK@d&6%saD#LUVKT2M8iVL>dBuj6;xd2r>>q#vuqY4)G17jGZQm7#|;p z!{LA|%P1%)$oQd(qTv4i9-&YOi;Ig{b^Pe)2rVrwq+mYGICi@o!C(+wU0twRt&k)M zf*@r4kt7LLs})YC6Tx5*jg5_@gjS8y(9i&n$MgR?Ac}Ci-EcS@q=pua6&0bTrUv!(^-u__V)IWOeR(F&CN|zRaJd{9~~Vk&zK*-Jzi&RqXBU z4R?2Uq=24`qbLe9US3|#jMvuIGUJbrkEDQ}j1!B+m~o@gm{B|Nc$^f_lW`0N12g{d zk=ecXT)x5}exPxRi;KBibQZiMnAZ-WQR4`Lz>J@tpEKjf$H&aL#bO}^^tP+2uC7+a zR#sM+by?RjWLZXOX(=h7H{(oBPBNFOnVFf-t$Hez!p_bPuCA_Bbyamybb9=N-#biX4s zWE|dZ2>=cc51IK6i?XsZ`2BuLiuGcgNF>57D=8_#`uaNjem^QIDwuUlCKJ3~FLrl# zVYAt|ZGCm8hsd)W$L)4wd3ibQvSqW`u)V$gto!mF>L>}ijzey&O zn3$M=!C-*PoH9-IX002ovPDHLkV1g}~q|pEX literal 0 HcmV?d00001 diff --git a/themepacks/openvk_modern/stylesheet.css b/themepacks/openvk_modern/stylesheet.css index 17b41f0a..a05746b2 100644 --- a/themepacks/openvk_modern/stylesheet.css +++ b/themepacks/openvk_modern/stylesheet.css @@ -15,6 +15,13 @@ body { background-position-x: 1px; } +.home_button_custom { + background: url("/themepack/openvk_modern/0.0.1.0/resource/5.png") no-repeat; + background-position-y: 0px; + background-position-x: 1px; + text-shadow: none; +} + .header_navigation .link { background: unset; } From 26f3f8c77a14b22259eb50aa7c48e4a373e198c1 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Fri, 21 Jan 2022 18:38:41 +0200 Subject: [PATCH 4/5] Admin: Display instance name in header --- Web/Presenters/templates/Admin/@layout.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Web/Presenters/templates/Admin/@layout.xml b/Web/Presenters/templates/Admin/@layout.xml index 3186353d..15eca673 100644 --- a/Web/Presenters/templates/Admin/@layout.xml +++ b/Web/Presenters/templates/Admin/@layout.xml @@ -6,7 +6,7 @@ {var css = file_get_contents(OPENVK_ROOT . "/Web/static/js/node_modules/@atlassian/aui/dist/aui/aui-prototyping.css")} {str_replace("fonts/", "/assets/packages/static/openvk/js/node_modules/@atlassian/aui/dist/aui/fonts/", $css)|noescape} - {include title} + {include title} - Админ-панель {=OPENVK_ROOT_CONF['openvk']['appearance']['name']}
@@ -16,7 +16,7 @@

- OVK + {=OPENVK_ROOT_CONF['openvk']['appearance']['name']}

From 2636d0ff780490415f0eafb73dfb6aa3610e045e Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Fri, 21 Jan 2022 18:45:27 +0200 Subject: [PATCH 5/5] Admin: Display more information in footer --- Web/Presenters/templates/Admin/@layout.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Web/Presenters/templates/Admin/@layout.xml b/Web/Presenters/templates/Admin/@layout.xml index 15eca673..ec8a213c 100644 --- a/Web/Presenters/templates/Admin/@layout.xml +++ b/Web/Presenters/templates/Admin/@layout.xml @@ -163,9 +163,7 @@