From 1347bb2be27360c799d327f12ab60347ee991cb9 Mon Sep 17 00:00:00 2001 From: lalka2016 <99399973+lalka2016@users.noreply.github.com> Date: Sat, 8 Jul 2023 19:36:52 +0300 Subject: [PATCH 1/2] Mobile theme: fixes --- res/menu_icons.png | Bin 5270 -> 5335 bytes res/note.png | Bin 0 -> 228 bytes res/ovk_attach.png | Bin 3047 -> 3617 bytes res/podrobnee.js | 80 +++++++++++++-- res/youtube_video.png | Bin 0 -> 1924 bytes stylesheet.css | 181 ++++++++++++++++++++++++---------- tpl/@layout.xml | 6 ++ tpl/Group/Edit.xml | 120 ++++++++++++++++++++++ tpl/Group/EditBackdrop.xml | 32 ++++++ tpl/Group/Followers.xml | 53 ++++++++++ tpl/Group/View.xml | 79 ++++++++++++--- tpl/Notes/Create.xml | 58 +++++++++++ tpl/Notes/Edit.xml | 48 +++++++++ tpl/Notes/List.xml | 107 ++++++++++++++++++++ tpl/Notes/PreView.xml | 37 +++++++ tpl/Notes/View.xml | 79 +++++++++++++++ tpl/Search/Index.xml | 129 +++++++++++++++++++++--- tpl/Topics/Board.xml | 56 +++++++++++ tpl/Topics/Create.xml | 73 ++++++++++++++ tpl/Topics/Edit.xml | 55 +++++++++++ tpl/Topics/Topic.xml | 29 ++++++ tpl/User/View.xml | 69 ++++++++++++- tpl/components/attachment.xml | 19 +++- tpl/components/comment.xml | 2 +- tpl/components/post.xml | 119 +++++++++++----------- tpl/components/textArea.xml | 13 ++- tpl/components/video.xml | 41 ++++++++ 27 files changed, 1327 insertions(+), 158 deletions(-) create mode 100644 res/note.png create mode 100644 res/youtube_video.png create mode 100644 tpl/Group/Edit.xml create mode 100644 tpl/Group/EditBackdrop.xml create mode 100644 tpl/Group/Followers.xml create mode 100644 tpl/Notes/Create.xml create mode 100644 tpl/Notes/Edit.xml create mode 100644 tpl/Notes/List.xml create mode 100644 tpl/Notes/PreView.xml create mode 100644 tpl/Notes/View.xml create mode 100644 tpl/Topics/Board.xml create mode 100644 tpl/Topics/Create.xml create mode 100644 tpl/Topics/Edit.xml create mode 100644 tpl/Topics/Topic.xml create mode 100644 tpl/components/video.xml diff --git a/res/menu_icons.png b/res/menu_icons.png index 6faf986fe90926231920104741dd1da5abd7f7c5..b798a89d3a41669575fb54dc48eee4473c062751 100755 GIT binary patch delta 4622 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 Eg6JHBjQ{`u delta 4557 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 diff --git a/res/note.png b/res/note.png new file mode 100644 index 0000000000000000000000000000000000000000..c9e3efdb8dabd9b7403338dd973cbbe0b00d15e4 GIT binary patch literal 228 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 + ${tr('your_comment')}: +
+ + + + `) + + repSubmit.onclick = () => { + text = document.querySelector("#uRepostMsgInput_"+postId).value; + type = "wall"; + + let xhr = new XMLHttpRequest() + xhr.open("POST", "/wall"+postId+"/repost?hash="+encodeURIComponent(hash), true); + xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); + xhr.onload = (function() { + if(xhr.responseText.indexOf("wall_owner") === -1) { + el.innerHTML = "can't repost" + } else { + let jsonR = JSON.parse(xhr.responseText); + location.href = "/wall" + jsonR.wall_owner + } + }); + + xhr.send('text='+encodeURI(text) + '&type='+type); + } + } else { + document.getElementById("post"+postId+"_actions").innerHTML = "" + } +} + +if(document.querySelector("#_noteDelete") != null) { + document.querySelector("#_noteDelete").addEventListener("click", (e) => { + let link = e.currentTarget.href + let hash = document.querySelector("meta[name=csrf]").getAttribute("value") + let id = e.currentTarget.dataset.id + + let xhr = new XMLHttpRequest() + xhr.open("POST", link) + xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); + + xhr.onload = () => { + location.href = "/notes"+id + } + + xhr.send('hash='+encodeURIComponent(hash)); + + e.preventDefault() + }) +} \ No newline at end of file diff --git a/res/youtube_video.png b/res/youtube_video.png new file mode 100644 index 0000000000000000000000000000000000000000..e080d89e72c30571e5f39ec2eb9864f95152e875 GIT binary patch literal 1924 zcmV-~2YdL5P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2N_93K~#8N?VW8* zQ&$*(K`0**1{<*9vNnKDFxw=ISy-kNkraVZ1S3->n*C7{4Z&XqH8DnGVjyaQA2CKo z!bjMQsZd#ANM#U^;LyQitNDne%Dg7`R+>ij}YeVxTZnV}z z(^Qt>iopS)etv!rbvoSxdi}D8&;gu`84PaO3in<_+h!??%%<1?&OQE6NM_PwDuhgJ z8IB=})@DM;I)mXDjQ8GD2uoLvgQP7zrb0~H3~n*rdnN%HOb9ZV5M(eR$Y4T{!Gs`# z2|)%bAyTQ-UnY|U&`YNTm5|WTP@mG$($wPO;?I12eaY^#(}6B!Eddk?#m6^p+(^&N z%zU4Qod&dHNKjCa@5z%VJ!x3*pc3Ng>1lR?>FVn05*HV@;`;UL8M}Ay zc8c9-R6>XVOTc*Ib>P4OSxrq%;>wjPeP~#apiNnph>VQK zH>*Dn%+Orra(RSCquG>`lOv{K-hoO8q@XvRIr;nh`y4xVY{TWtm*Yc1LcD31HwYqS zSwbq6hN#u*jD7p|eK_Cx1|xzMLRh+VsYiZ({ugz1bsJZ&Ui}sgqXw0b#Y}q_LqtSG z@Rci9(vKcJ`iV#+Lj6yO>ciP{^$oJ!cI?;@4O8SV*RNk6NWTYS$%KOm z`5(xc%a$!$A~hO~A~iMjJsP$fsD!-9_Pf0a4i5G^d-m+cOP4Nv4%1~18n!v8Zh#{O z(ZxU}9f^sF;f;-ro1&wm{b<;xu#~k(Mn^{<7Zw)Y?Ck8+(U47HLKeu}+}yM3>gt~O z`1q@^vLB>jn}bS-NF+k}^vJz?_eQd_vsHO{c|YrPx_RGqWeZRV!FIAYF){Jv)TvXg zFm9;Z+uO-|uIvs=Sr&Ny{JBeWbMsvgp*(&1^j&hz71(-+!@J1P(9rmvJ$uwSIXSJ+ zo~B{WKqbVHTPHI!Gf&IP$~t8-Sxs$i?FbEX4og`;S6A0ydV2cRLx&Fi3S!J&xyLn5 zEo5wLY~t|Y!y1J`(b(75_n3wq3MwI7eZ}Azpi-%N$(o|Hv{XyOC_p8IY~<0V-RSS{ z|7-j9?br71-Fs_%e0-LM(cm;GYjSe(NpW#;8%$+?Xl-pBrD1dkUI3ls7cP*WnR7afvl@v+@-1yT z46#`3#g|P$TLTl7Z%B=*hd8SYQ&11;&Il8N3?>8_Ob9ZV5M(eR$Y4T{!Gs`#2|)%E zf(#}E8B7Q=m=I(zA;>Tl!n?;V1%&b5n+oCNd)N$%7+=$2D#R&|Op$P()@DNP(3-(L zztGxD$So)=ZE?>ylnz7FM2J?aB@ZiqXSiZ;$oFvXXK35S?D2n{PWQkMfTmOYW*`EZ zK*lxN)?=EoUQiCD$ zAcef_aSfCxDC9NVB%N96RgC!|i$1c>Aj=9elkG4aGZ?6GarqYjpZXjgxHxkF0000< KMNUMnLSTY#B8(OQ literal 0 HcmV?d00001 diff --git a/stylesheet.css b/stylesheet.css index 1cd6edf..36fb5bb 100755 --- a/stylesheet.css +++ b/stylesheet.css @@ -50,7 +50,7 @@ input, button { -webkit-appearance: button;} background-color: #f7f7f7; margin: 0 auto; font-family: tahoma, verdana, arial, sans-serif; - max-width: 580px; + max-width: 580px; } .app_layer{ @@ -137,7 +137,7 @@ input, button { -webkit-appearance: button;} margin: 0.5em -12px; } -.button, .fileInput, input[type=submit], input[type=reset] { +.button, .fileInput, input[type=submit], input[type=button], input[type=reset] { display: inline-block; border: none; border-radius: 3px; @@ -357,15 +357,15 @@ input, button { -webkit-appearance: button;} outline: none; cursor: pointer; vertical-align: middle; - margin-top: 0%; + margin-top: 0%; } .formInput > input[type=checkbox]{ - background-image: url("data:image/gif;base64,R0lGODlhDwA4ALMAAP//////AP8A//8AAAD//wD/AAAA/wAAADtZd8XKzuHh4crKysHBwba2tv///wAAACH5BAEAAA4ALAAAAAAPADgAAASzcMlJqVsg653X5SDgYeE2luaHdup6rmKLvq5c0rMdjlUvXb6eDoRAkFBF4yqZOBKLi2aJSUNomE1VEoCNkRLJYiLB+oLF5LJmjBinnOO0BncDBi2NvH6/dzQUgIGCgA1+g4cKhX+IgoqMjYaPhJGSjpKJlI+WlZmMm5qdiIp8pHl+paShh0WLj0mtiEywg0kMCbOBTAyUCLlolkkKWJiLZ8PEgGxogZtsY5CwcYOfnqeofREAOw=="); + background-image: url("data:image/gif;base64,R0lGODlhDwA4ALMAAP//////AP8A//8AAAD//wD/AAAA/wAAADtZd8XKzuHh4crKysHBwba2tv///wAAACH5BAEAAA4ALAAAAAAPADgAAASzcMlJqVsg653X5SDgYeE2luaHdup6rmKLvq5c0rMdjlUvXb6eDoRAkFBF4yqZOBKLi2aJSUNomE1VEoCNkRLJYiLB+oLF5LJmjBinnOO0BncDBi2NvH6/dzQUgIGCgA1+g4cKhX+IgoqMjYaPhJGSjpKJlI+WlZmMm5qdiIp8pHl+paShh0WLj0mtiEywg0kMCbOBTAyUCLlolkkKWJiLZ8PEgGxogZtsY5CwcYOfnqeofREAOw=="); } .formInput > input[type=radio]{ - background-image: url("/themepack/mobile_ovk/0.0.1.0/resource/radio.png"); + background-image: url("/themepack/mobile_ovk/0.0.1.0/resource/radio.png"); } .formInput > input[type=checkbox]:hover, .formInput > input[type=radio]:hover { @@ -443,6 +443,12 @@ input, button { -webkit-appearance: button;} color: #9a6d6d; } +.alert.yellow { + border-color:#D4BC4C; + background-color:#F9F6E7; +} + + .alert.inline { background-color: #fff; text-align: center; @@ -451,8 +457,8 @@ input, button { -webkit-appearance: button;} .tabs { margin-top: 11px; padding-bottom: 11px; - overflow-x: scroll; - white-space: nowrap; + overflow-x: scroll; + white-space: nowrap; } .tabs > .selector > .tab-select { @@ -758,24 +764,24 @@ img.rounded, .post > .author > .ava { /* папапепе гемабоди) */ .navigation { - pointer-events:none !important; - position: fixed; - width: 866px; - } - .app, - h2 { - min-width:864px; - max-width:45%; - border-right:none; - border-bottom:0px solid #dee5eb - } - .menuovk { - background:#fff; - width:288px !important; - display:block !important; - top: 48px; - position: absolute; - } + pointer-events:none !important; + position: fixed; + width: 866px; + } + .app, + h2 { + min-width:864px; + max-width:45%; + border-right:none; + border-bottom:0px solid #dee5eb + } + .menuovk { + background:#fff; + width:288px !important; + display:block !important; + top: 48px; + position: absolute; + } .profile_menu_arrow{ position: inherit; @@ -792,7 +798,7 @@ img.rounded, .post > .author > .ava { z-index:1337; right: 0; top: 0; - pointer-events: all !important; + pointer-events: all !important; } .head_now{ @@ -862,9 +868,9 @@ img.rounded, .post > .author > .ava { .menunameava .pr_ovk_page .status { color: #797979; font-size: 14px; - overflow: hidden; - max-width:200px; - text-overflow: ellipsis; + overflow: hidden; + max-width:200px; + text-overflow: ellipsis; } /* Подписывайтесь на мой YouTube: youtube.com/DanielM */ @@ -1047,7 +1053,7 @@ img.rounded, .post > .author > .ava { .content_post { padding: 12px; padding-top: 2px; - background: #fff; + background: #fff; } .post { margin-top: 10px; @@ -1119,19 +1125,19 @@ img.rounded, .post > .author > .ava { margin-top: 19px; font-weight: bold; margin-left: 5px; - text-overflow:ellipsis; - white-space:nowrap; - overflow:hidden; - max-width: 55%; + text-overflow:ellipsis; + white-space:nowrap; + overflow:hidden; + max-width: 55%; } .video_desc{ - text-overflow:ellipsis; - white-space:nowrap; - overflow:hidden; - max-width: 55%; - display: block; - max-height: 75px; + text-overflow:ellipsis; + white-space:nowrap; + overflow:hidden; + max-width: 55%; + display: block; + max-height: 75px; } .profile_link_form { @@ -1506,6 +1512,10 @@ h4 { background-position: 0px -332px; } +#notfg{ + background-position: 0px -392px; +} + .element.prmenu.gray a { font-size: 16px; font-weight: normal; @@ -1735,7 +1745,7 @@ input[type~="search"]{ background: #fff; } -.attach_menu_ph{ +.attach_menu_ph { text-align:left; background-color: transparent; display: block; @@ -1750,6 +1760,19 @@ input[type~="search"]{ padding: 0px; } +.attach_menu_video { + background-color: transparent; + display: block; + float: right; + position: inherit; + background-image: url('/themepack/mobile_ovk/0.0.1.0/resource/ovk_attach.png'); + width: 32px; + height: 32px; + background-position: -350px 50%; + background-repeat: no-repeat; + margin: -12px 0px 0px 0px; + padding: 0px; +} .avatar-list-item { padding: 4px 0; @@ -1864,7 +1887,7 @@ input[type~="search"]{ font-weight: bold; border: 1px solid #d7cf9e; border-bottom: 0; - font-size: 14px; + font-size: 14px; } #faqcontent { @@ -1872,19 +1895,19 @@ input[type~="search"]{ margin: 0 5px 10px; padding: 5px 5px 5px 10px; border: 1px solid #ddd; - font-size: 12px; + font-size: 12px; } .s_text{ - font-size: 14px; - margin: 3px; + font-size: 14px; + margin: 3px; } .s_post-author{ - font-size: 14px; + font-size: 14px; } .knowledgeBaseArticle{ - padding: 5px; + padding: 5px; } .alert.fake { @@ -1902,7 +1925,7 @@ input[type~="search"]{ padding: 8px; transition: .1s filter ease-in; border: 1px solid #e3e3e3; - margin-bottom: 10px; + margin-bottom: 10px; } .poll-embed { @@ -1916,8 +1939,8 @@ input[type~="search"]{ .poll-meta .nobold { font-style: oblique; - font-size: 12px; - color: gray; + font-size: 12px; + color: gray; } .poll-result-barspace { @@ -1967,7 +1990,7 @@ a.poll-retract-vote { } label, .poll > input[type=checkbox]{ - background-color: transparent; + background-color: transparent; border: none; border-radius: 0; -moz-appearance: none; @@ -1977,11 +2000,11 @@ label, .poll > input[type=checkbox]{ outline: none; cursor: pointer; vertical-align: middle; - margin-top: 0%; + margin-top: 0%; } .poll-option{ - padding: 5px; + padding: 5px; } .completeness-gauge { @@ -2018,6 +2041,19 @@ label, .poll > input[type=checkbox]{ margin-left: 5px; } +.youtube_video_block { + margin-bottom: 10px; + position: relative; +} + +.youtube_button { + z-index: 555; + position: absolute; + margin: auto; + position: absolute; + top: 0; left: 0; bottom: 0; right: 0; +} + /* IE 10+ styles only for necrobrowsers */ @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { .navigation { @@ -2048,3 +2084,42 @@ label, .poll > input[type=checkbox]{ margin-top: 45px; } } + +.note_attachment { + background-color: #E6E6E6; + margin-bottom: 5px; + padding-top: 5px; + padding-bottom: 5px; + display: flex; +} + +.note_icon { + max-width: 30px; + margin-left: 10px; +} + +.note_name { + margin-left: 5px; + color: #636466; + font-family: tahoma, verdana, arial, sans-serif; +} + +.note_attachment:hover { + background-color: #ecebeb; +} + +.note_attachment:active { + background-color: #cecece; +} + +.mobile_repost { + background:#E6E6E6; + color: #636466; + font-size: 18px; + width: 300px; + padding: 5px; +} + +.note_title a { + font-size: 20px; +} \ No newline at end of file diff --git a/tpl/@layout.xml b/tpl/@layout.xml index 4282aff..046b5a3 100755 --- a/tpl/@layout.xml +++ b/tpl/@layout.xml @@ -14,6 +14,9 @@ + + {script "js/l10n.js"} + {ifset headIncludes}{include headIncludes}{/ifset} @@ -85,6 +88,9 @@
  • {_mobile_videos}
    • +
  • +
    {_mobile_notes}
    +
    • diff --git a/tpl/Group/Edit.xml b/tpl/Group/Edit.xml new file mode 100644 index 0000000..dfe3c94 --- /dev/null +++ b/tpl/Group/Edit.xml @@ -0,0 +1,120 @@ +{extends "../@layout.xml"} +{block title}{_edit_group}{/block} + +{block titleHeader} + {$club->getName()} » {_edit_group} +{/block} + +{block body} +
    + +
    + + {_backdrop_short} + +
    +
    + + {_followers} + +
    +
    + +
    +

    {_main_information}

    +
    + +
    + {_name}: + +
    +
    + {_description}: + +
    +
    + {_page_address}: + +
    +
    + {_website}: + +
    +
    + {_avatar}: + +
    +
    +
    + {_wall}:
    +
    {_group_allow_post_for_everyone}
    +
    {_group_hide_from_global_feed}
    +
    +
    + {_discussions}:
    +
    {_everyone_can_create_topics}
    +
    {_display_list_of_topics_above_wall}
    +
    +
    + {_group_administrators_list}:
    + {var $areAllAdminsHidden = $club->getManagersCount(true) == 0} +
    {_group_display_only_creator}
    +
    {_group_display_all_administrators}
    +
    {_group_dont_display_administrators_list}

    +
    + +
    + + + + + + {_delete_group} + +
    + +
    + + + + + + + + + + + + +
    +
    +{/block} diff --git a/tpl/Group/EditBackdrop.xml b/tpl/Group/EditBackdrop.xml new file mode 100644 index 0000000..52de044 --- /dev/null +++ b/tpl/Group/EditBackdrop.xml @@ -0,0 +1,32 @@ +{extends "../@layout.xml"} +{var $backdrops = $club->getBackDropPictureURLs()} + +{block title}{$club->getName()} | {_backdrop}{/block} + +{block titleHeader} +{$club->getName()} » {_backdrop} +{/block} + +{block body} +
    +
    + + {_main} + +
    + +
    + + {_followers} + +
    +
    + +
    + can't +
    +{/block} diff --git a/tpl/Group/Followers.xml b/tpl/Group/Followers.xml new file mode 100644 index 0000000..7032576 --- /dev/null +++ b/tpl/Group/Followers.xml @@ -0,0 +1,53 @@ +{extends "../@listView.xml"} +{var $Manager = openvk\Web\Models\Entities\Manager::class} +{var $iterator = $onlyShowManagers ? $managers : $followers} +{var $count = $paginatorConf->count} +{var $page = $paginatorConf->page} +{var $perPage = 6} + +{block title}{_followers} {$club->getCanonicalName()}{/block} + +{block titleHeader} + {$club->getCanonicalName()} + » {_followers} + {_all_followers} + {_only_administrators} +{/block} + +{* BEGIN ELEMENTS DESCRIPTION *} + +{block tabs} + {if $club->canBeModifiedBy($thisUser)} +
    + + {_main} + +
    +
    + + {_backdrop_short} + +
    + + {/if} +{/block} + +{block link|strip|stripHtml} + /id{$x instanceof $Manager ? $x->getUserId() : $x->getId()} +{/block} + +{block preview} + {$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()} +{/block} + +{block name} + {$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()} +{/block} + +{block description} + +{/block} \ No newline at end of file diff --git a/tpl/Group/View.xml b/tpl/Group/View.xml index 5541f92..8b25402 100755 --- a/tpl/Group/View.xml +++ b/tpl/Group/View.xml @@ -44,6 +44,7 @@ {/block} {block body} + {if method_exists($club, "isDeleted") && $club->isDeleted()}
    @@ -56,6 +57,52 @@
    + {ifset $thisUser} + {if method_exists($club, "isDeleted") && $club->isDeleted() && $thisUser->getId() == $club->getOwner()->getId() && !$club->isBanned()} +
    + + +
    + {/if} + + {if $club->getSubscriptionStatus($thisUser) == false} + {else} +
    + + + + +
    + {/if} + {/ifset} + + {if !$club->isBanned()} +

    {_group_was_deleted}

    + {else} +

    {_group_was_blocked}

    +

    {_ban_reason_g}: {$club->getBanReason()}

    + {/if} +
    + + + {else} + +
    +
    +
    +
    + +
    + +
    +

    {$club->getName()}

    +
    +
    + + {if isset($thisUser) && $club->canBeModifiedBy($thisUser)} + + {/if} + {ifset $thisUser} {if $club->getSubscriptionStatus($thisUser) == false}
    @@ -101,19 +148,19 @@
    -->
    -
    +
    {_information}
    -
    +
    - - + + - - + + - - -
    Описаниe:
    {_description}: {$club->getDescription()}
    Сайт:
    {_website}: {$club->getWebsite()} @@ -132,16 +179,22 @@
    {presenter "openvk!Wall->wallEmbedded", -$club->getId()} - + {/if} + {/block} diff --git a/tpl/Notes/Create.xml b/tpl/Notes/Create.xml new file mode 100644 index 0000000..3e0b78c --- /dev/null +++ b/tpl/Notes/Create.xml @@ -0,0 +1,58 @@ +{extends "../@layout.xml"} + +{block title}{_create_note}{/block} + +{block titleHeader} + {_create_note} +{/block} + +{block body} + + +

    + +
    + +

    Кое-что из (X)HTML поддерживается.

    + + + + {_note_preview} + + + {script "js/node_modules/monaco-editor/min/vs/loader.js"} + {script "js/node_modules/requirejs/bin/r.js"} + +{/block} diff --git a/tpl/Notes/Edit.xml b/tpl/Notes/Edit.xml new file mode 100644 index 0000000..7e66ae7 --- /dev/null +++ b/tpl/Notes/Edit.xml @@ -0,0 +1,48 @@ +{extends "../@layout.xml"} + +{block title}{_edit_note}{/block} + +{block titleHeader} + {var $author = $note->getOwner()} + {$author->getCanonicalName()} + » + {_notes} + » + {$note->getName()} +{/block} + +{block body} +
    + +

    + +
    + +

    Кое-что из (X)HTML поддерживается.

    + + + + +
    + + {script "js/node_modules/monaco-editor/min/vs/loader.js"} + {script "js/node_modules/requirejs/bin/r.js"} + +{/block} diff --git a/tpl/Notes/List.xml b/tpl/Notes/List.xml new file mode 100644 index 0000000..56955b1 --- /dev/null +++ b/tpl/Notes/List.xml @@ -0,0 +1,107 @@ +{extends "../@layout.xml"} +{var $iterator = iterator_to_array($notes)} +{var $page = $paginatorConf->page} + +{block title}{_notes}{/block} + +{block titleHeader} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + {_my_notes} + {else} + + {$owner->getCanonicalName()} + » + {_notes} + {/if} +{/block} + +{block actions} + +{/block} + +{* BEGIN ELEMENTS DESCRIPTION *} + +{block body} + + +
    +
    +
    + {tr("notes_list", $count)} + + + + + + +
    +
    +
    + {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} + {if sizeof($data) > 0} + +
    +
    +
    +
    +
    + {$dat->getName()} +
    +
    +
    + {$dat->getPublicationTime()} + ({_edited} {$dat->getEditTime()}) +
    +
    +
    + {$dat->getText(750)|noescape} +
    +
    +
    + + + +
    +
    +
    +
    + + {else} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + +

    {_welcome}

    {_notes_start_screen}
    + + {else} + {ifset customErrorMessage} + {include ../customErrorMessage} + {else} + {include ../components/nothing.xml} + {/ifset} + {/if} + {/if} +
    +{/block} \ No newline at end of file diff --git a/tpl/Notes/PreView.xml b/tpl/Notes/PreView.xml new file mode 100644 index 0000000..4f80214 --- /dev/null +++ b/tpl/Notes/PreView.xml @@ -0,0 +1,37 @@ +{extends "../@layout.xml"} + +{block title} + {$title} +{/block} + +{block header} + {$title} +{/block} + +{block content} + + + {$html|noescape} +{/block} diff --git a/tpl/Notes/View.xml b/tpl/Notes/View.xml new file mode 100644 index 0000000..5bba736 --- /dev/null +++ b/tpl/Notes/View.xml @@ -0,0 +1,79 @@ +{extends "../@layout.xml"} + +{block title}{$note->getName()}{/block} + +{block titleHeader} + {var $author = $note->getOwner()} + {$author->getCanonicalName()} + » + {_notes} + » + {$note->getName()} +{/block} + +{block body} + {var $author = $note->getOwner()} + + + + +
    +
    + + + + + + + +
    +
    +
    + {include "../components/comments.xml", + comments => $comments, + count => $cCount, + page => $cPage, + model => "notes", + parent => $note, + showTitle => false} +
    +{/block} \ No newline at end of file diff --git a/tpl/Search/Index.xml b/tpl/Search/Index.xml index d6e31e8..45f9fda 100755 --- a/tpl/Search/Index.xml +++ b/tpl/Search/Index.xml @@ -1,4 +1,4 @@ -{extends "../@listView.xml"} +{extends "../@layout.xml"} {block title} {if $type === "users"} @@ -8,8 +8,8 @@ {/if} {/block} -{block header} - +{block titleHeader} + {_header_search} {/block} @@ -19,18 +19,35 @@ {block tabs} -
    - - {_users} - -
    -
    - - {_groups} - + -
    +
    @@ -39,6 +56,92 @@
    {/block} +{block body} + {include tabs} +

    + {tr("results", $count)} +

    +
    + + {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} +
    + {if sizeof($data) > 0} + {if $type == "users" || $type == "groups" || $type == "apps"} +
    + + + + + + + + +
    + + {include preview, x => $dat} + + + {ifset infotable} + {include infotable, x => $dat} + {else} + + + {include name, x => $dat} + + +
    + {include description, x => $dat} + {/ifset} +     		+ {include actions, x => $dat} +
    +
    + {elseif $type == "posts"} +
    + {if $dat->getTargetWall() < 0 && $dat->getWallOwner()->isHideFromGlobalFeedEnabled()} + {_dont_need_to_see_post} + {else} + {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true} + {/if} +
    + {elseif $type == "comments"} +
    + {if $dat->getTarget()->isDeleted()} + {_dont_need_to_see_comment} + {else} + {include "../components/comment.xml", comment => $dat, linkW => true} + {/if} +
    + {elseif $type == "videos"} + {foreach $data as $dat} +
    + {if $dat->getOwner()->isDeleted()} + {_dont_need_to_see_video} + {else} + {include "../components/video.xml", video => $dat} + {/if} +
    + {/foreach} + {elseif $type == "audios"} + хуй + {/if} + {include "../components/paginator.xml", conf => (object) [ + "page" => $page, + "count" => $count, + "amount" => sizeof($data), + "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, + "atBottom" => false, + ]} + {else} + {ifset customErrorMessage} + {include customErrorMessage} + {else} + {include "../components/nothing.xml"} + {/ifset} + {/if} +
    +{/block} + {block link|strip|stripHtml} {$x->getURL()} {/block} diff --git a/tpl/Topics/Board.xml b/tpl/Topics/Board.xml new file mode 100644 index 0000000..26870c5 --- /dev/null +++ b/tpl/Topics/Board.xml @@ -0,0 +1,56 @@ +{extends "../@listView.xml"} +{var $iterator = iterator_to_array($topics)} +{var $page = $paginatorConf->page} + +{block title}{_discussions} {$club->getCanonicalName()}{/block} + +{block titleHeader} + {$club->getCanonicalName()} » {_discussions} + + +{/block} + +{block tabs} +

    + {tr("results", $count)} +

    +{/block} + +{block actions} + +{/block} + +{* BEGIN ELEMENTS DESCRIPTION *} + +{block link|strip|stripHtml} + /topic{$x->getPrettyId()} +{/block} + +{block preview} + +{/block} + +{block name} + {$x->getTitle()} +
    +{/block} + +{block description} +
    + {tr("messages", $x->getCommentsCount())} +
    + {var $lastComment = $x->getLastComment()} +
    +
    + + + +
    +
    + {$lastComment->getOwner()->getCanonicalName()} +
    {_replied} {$lastComment->getPublicationTime()}
    +
    +
    +{/block} diff --git a/tpl/Topics/Create.xml b/tpl/Topics/Create.xml new file mode 100644 index 0000000..84b17f2 --- /dev/null +++ b/tpl/Topics/Create.xml @@ -0,0 +1,73 @@ +{extends "../@layout.xml"} +{block title}{_new_topic}{/block} + +{block titleHeader} + {$club->getCanonicalName()} + » + {_discussions} + » + {_new_topic} +{/block} + +{block body} + + + + + + + + + + + + + + + + +
    + {_title} + + +
    + {_text} + + +
    + +
    +
    + + +
    +
    +
    + + + + +
    + + + + + + + {if $graffiti} + {script "js/node_modules/react/dist/react-with-addons.min.js"} + {script "js/node_modules/react-dom/dist/react-dom.min.js"} + {script "js/vnd_literallycanvas.js"} + {css "js/node_modules/literallycanvas/lib/css/literallycanvas.css"} + {/if} +{/block} diff --git a/tpl/Topics/Edit.xml b/tpl/Topics/Edit.xml new file mode 100644 index 0000000..3036d5a --- /dev/null +++ b/tpl/Topics/Edit.xml @@ -0,0 +1,55 @@ +{extends "../@layout.xml"} +{block title}{_edit_topic} "{$topic->getTitle()}"{/block} + +{block titleHeader} + {$club->getCanonicalName()} + » + {_discussions} + » + {_edit_topic} +{/block} + +{block body} +
    + {$topic->getTitle()} +
    + {$topic->getOwner()->getCanonicalName()} +
    + +
    + + + + + + + + + + + + + + + +
    + {_title} + + +
    + {_topic_settings} + + {if $topic->getClub()->canBeModifiedBy($thisUser)} + {_pin_topic}
    + {/if} + {_close_topic} +
    + {_delete_topic} + + + +
    + + +
    +{/block} diff --git a/tpl/Topics/Topic.xml b/tpl/Topics/Topic.xml new file mode 100644 index 0000000..e83e239 --- /dev/null +++ b/tpl/Topics/Topic.xml @@ -0,0 +1,29 @@ +{extends "../@layout.xml"} +{block title}{_view_topic} "{$topic->getTitle()}"{/block} + +{block titleHeader} + {$club->getCanonicalName()} + » + {_discussions} + » + {_view_topic} + + +{/block} + +{block body} +
    + {$topic->getTitle()} +
    + {$topic->getOwner()->getCanonicalName()} +
    + {_created} {$topic->getPublicationTime()} +
    +
    +
    +

    {tr("topic_messages_count", $count)}

    + {include "../components/comments.xml", comments => $comments, count => $count, page => $page, model => "topics", club => $club, readOnly => $topic->isClosed(), showTitle => false, parent => $topic} +
    +{/block} diff --git a/tpl/User/View.xml b/tpl/User/View.xml index 3cdd812..fe121fd 100755 --- a/tpl/User/View.xml +++ b/tpl/User/View.xml @@ -48,11 +48,72 @@ {block body} {if !$user->isBanned()} - {if !$user->getPrivacyPermission('page.read', $thisUser ?? NULL)} -
    - {_forbidden}
    - {_forbidden_comment} + {if method_exists($user, "canBeViewedBy") && !$user->canBeViewedBy($thisUser ?? NULL)} +
    {strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}
    +
    +
    +
    +
    + {$user->getCanonicalName()} +
    + +
    +

    {$user->getFullName()}

    + + {if !is_null($user->getStatus())} + {$user->getStatus()} + {/if} +
    + + {if $user->isOnline()} + {_online} + {else} + {_was_online} {$user->getOnline()} + {/if} + +
    +
    +
    + {ifset $thisUser} + {var subStatus = $user->getSubscriptionStatus($thisUser)} + {if $subStatus === 0} +
    + + + + +
    + {elseif $subStatus === 1} +
    + + + + +
    + {elseif $subStatus === 2} +
    + + + + +
    + {/if} + {/ifset} +
    + {var $m = $user->isFemale() ? "f" : "m"} + {tr("limited_access_to_page_$m", $user->getFirstName())}
    + + {if isset($thisUser)} + {if $subStatus != 2} + {_you_can_add} + {tr("add_to_friends_$m")} + {/if} + {/if} +
    +
    + {else}
    {strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}
    diff --git a/tpl/components/attachment.xml b/tpl/components/attachment.xml index cbf2c33..365530f 100755 --- a/tpl/components/attachment.xml +++ b/tpl/components/attachment.xml @@ -10,7 +10,17 @@ {/if} {elseif $attachment instanceof \openvk\Web\Models\Entities\Video} - + {if $attachment->getType() === 0} + + {else} + {* Не будем загружать страницу плеером ютуба *} + +
    + + +
    +     + {/if} {elseif $attachment instanceof \openvk\Web\Models\Entities\Post} {php $GLOBALS["_nesAttGloCou"] = (isset($GLOBALS["_nesAttGloCou"]) ? $GLOBALS["_nesAttGloCou"] : 0) + 1} {if $GLOBALS["_nesAttGloCou"] > 2} @@ -18,6 +28,13 @@ {else} {include "post.xml", post => $attachment, compact => true} {/if} +{elseif $attachment instanceof \openvk\Web\Models\Entities\Note} + +
    + + {_note} "{$attachment->getName()}" +
    +     {elseif $attachment instanceof \openvk\Web\Models\Entities\Poll} {presenter "openvk!Poll->view", $attachment->getId()} {else} diff --git a/tpl/components/comment.xml b/tpl/components/comment.xml index 7f4ba55..9974d07 100755 --- a/tpl/components/comment.xml +++ b/tpl/components/comment.xml @@ -52,7 +52,7 @@
    {$author->getCanonicalName()}
    - +
    {$comment->getText()|noescape} diff --git a/tpl/components/post.xml b/tpl/components/post.xml index c2bb3f6..6e20bd6 100755 --- a/tpl/components/post.xml +++ b/tpl/components/post.xml @@ -1,73 +1,70 @@ {var author = $post->getOwner()} -
    -
    - -
    - {$author->getCanonicalName()}
    - -
    -
    - -
    -

    {$post->getText()|noescape}

    -
    +
    +
    + +
    + {$author->getCanonicalName()}
    + +
    +
    + +
    +

    {$post->getText()|noescape}

    +
    -
    -
    -
    - {include "attachment.xml", attachment => $attachment} -
    -
    -
    +
    +
    +
    + {include "attachment.xml", attachment => $attachment} +
    +
    +
    -
    - - - -
    +
    + + - {if !($forceNoCommentsLink ?? false)} - - {if $post->getCommentsCount() > 0} - {$post->getCommentsCount()} - {else} - 0 - {/if} - - {/if} - - {if !($forceNoShareLink ?? false)} - - {/if} +
    -
    + {if !($forceNoCommentsLink ?? false)} + + {if $post->getCommentsCount() > 0} + {$post->getCommentsCount()} + {else} + 0 + {/if} + + {/if} + {if true} + - {if (isset($thisUser))} -
    +
    - {if !($forceNoLike ?? false)} - {var liked = $post->hasLikeFrom($thisUser)} - - - - {/if} +
    + {/if} -
    - {/if} +
    + {if (isset($thisUser))} +
    + {if !($forceNoLike ?? false)} + {var liked = $post->hasLikeFrom($thisUser)} + + -
    + + {/if} + +
    + {/if} +
    +
    diff --git a/tpl/components/textArea.xml b/tpl/components/textArea.xml index 37fce0c..a555199 100755 --- a/tpl/components/textArea.xml +++ b/tpl/components/textArea.xml @@ -5,14 +5,21 @@
    - +
    + + +
    +
    -
    -     +
    + + +
    +
    diff --git a/tpl/components/video.xml b/tpl/components/video.xml new file mode 100644 index 0000000..dbf7fc7 --- /dev/null +++ b/tpl/components/video.xml @@ -0,0 +1,41 @@ +{if $video->canBeViewedBy($thisUser ?? NULL)} + + + + + + + + +
    +
    + + + +
    +     		+ {ifset infotable} + {include infotable, x => $dat} + {else} + + + {$video->getName()} + + +
    +

    + {$video->getDescription() ?? ""} +

    + {_video_uploaded} {$video->getPublicationTime()}
    + +

    + {_view_video} + {if $video->getCommentsCount() > 0}| {_comments} ({$video->getCommentsCount()}){/if} +

    + {/ifset} +
    + +{else} + {_no_access_abstract} +{/if} \ No newline at end of file From 5019cfbc881cc434add14b59b9a1536948e84785 Mon Sep 17 00:00:00 2001 From: lalka2016 <99399973+lalka2016@users.noreply.github.com> Date: Wed, 16 Aug 2023 15:19:12 +0300 Subject: [PATCH 2/2] something --- tpl/Group/Edit.xml | 33 ------------------- tpl/Group/View.xml | 44 ------------------------- tpl/Notes/List.xml | 40 +---------------------- tpl/Search/Index.xml | 16 +++------ tpl/User/View.xml | 70 ---------------------------------------- tpl/components/video.xml | 8 +---- 6 files changed, 6 insertions(+), 205 deletions(-) diff --git a/tpl/Group/Edit.xml b/tpl/Group/Edit.xml index dfe3c94..6944a43 100644 --- a/tpl/Group/Edit.xml +++ b/tpl/Group/Edit.xml @@ -71,39 +71,6 @@
    {_group_dont_display_administrators_list}

    -
    - -
    		- - - {_delete_group} - -
    -
    diff --git a/tpl/Group/View.xml b/tpl/Group/View.xml index 8b25402..8449572 100755 --- a/tpl/Group/View.xml +++ b/tpl/Group/View.xml @@ -44,49 +44,6 @@ {/block} {block body} - {if method_exists($club, "isDeleted") && $club->isDeleted()} -
    -
    -
    -
    - -
    - -
    -

    {$club->getName()}

    -
    -
    - - {ifset $thisUser} - {if method_exists($club, "isDeleted") && $club->isDeleted() && $thisUser->getId() == $club->getOwner()->getId() && !$club->isBanned()} -
    - - -
    - {/if} - - {if $club->getSubscriptionStatus($thisUser) == false} - {else} -
    - - - - -
    - {/if} - {/ifset} - - {if !$club->isBanned()} -

    {_group_was_deleted}

    - {else} -

    {_group_was_blocked}

    -

    {_ban_reason_g}: {$club->getBanReason()}

    - {/if} -
    -
    - - {else} -
    @@ -195,6 +152,5 @@ {presenter "openvk!Wall->wallEmbedded", -$club->getId()}
    - {/if} {/block} diff --git a/tpl/Notes/List.xml b/tpl/Notes/List.xml index 56955b1..1e18367 100644 --- a/tpl/Notes/List.xml +++ b/tpl/Notes/List.xml @@ -22,36 +22,10 @@ {* BEGIN ELEMENTS DESCRIPTION *} {block body} -
    - {tr("notes_list", $count)} @@ -59,34 +33,22 @@
    -
    {var $data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} {if sizeof($data) > 0}
    -
    +
    {$dat->getName()}
    -
    - {$dat->getPublicationTime()} - ({_edited} {$dat->getEditTime()}) -
    {$dat->getText(750)|noescape}
    -
    -
    - - - -
    -
    diff --git a/tpl/Search/Index.xml b/tpl/Search/Index.xml index 45f9fda..a1d4516 100755 --- a/tpl/Search/Index.xml +++ b/tpl/Search/Index.xml @@ -99,31 +99,23 @@ {elseif $type == "posts"}
    {if $dat->getTargetWall() < 0 && $dat->getWallOwner()->isHideFromGlobalFeedEnabled()} - {_dont_need_to_see_post} + brbrevht {else} {include "../components/post.xml", post => $dat, commentSection => true, onWallOf => true} {/if}
    {elseif $type == "comments"}
    - {if $dat->getTarget()->isDeleted()} - {_dont_need_to_see_comment} - {else} - {include "../components/comment.xml", comment => $dat, linkW => true} - {/if} + {include "../components/comment.xml", comment => $dat, linkW => true}
    {elseif $type == "videos"} {foreach $data as $dat}
    - {if $dat->getOwner()->isDeleted()} - {_dont_need_to_see_video} - {else} - {include "../components/video.xml", video => $dat} - {/if} + {include "../components/video.xml", video => $dat}
    {/foreach} {elseif $type == "audios"} - хуй + privet {/if} {include "../components/paginator.xml", conf => (object) [ "page" => $page, diff --git a/tpl/User/View.xml b/tpl/User/View.xml index fe121fd..7043136 100755 --- a/tpl/User/View.xml +++ b/tpl/User/View.xml @@ -48,74 +48,6 @@ {block body} {if !$user->isBanned()} - {if method_exists($user, "canBeViewedBy") && !$user->canBeViewedBy($thisUser ?? NULL)} -
    {strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}
    -
    -
    -
    -
    - {$user->getCanonicalName()} -
    - -
    -

    {$user->getFullName()}

    - - {if !is_null($user->getStatus())} - {$user->getStatus()} - {/if} -
    - - {if $user->isOnline()} - {_online} - {else} - {_was_online} {$user->getOnline()} - {/if} - -
    -
    -
    - {ifset $thisUser} - {var subStatus = $user->getSubscriptionStatus($thisUser)} - {if $subStatus === 0} -
    - - - - -
    - {elseif $subStatus === 1} -
    - - - - -
    - {elseif $subStatus === 2} -
    - - - - -
    - {/if} - {/ifset} -
    - {var $m = $user->isFemale() ? "f" : "m"} - {tr("limited_access_to_page_$m", $user->getFirstName())}
    - - {if isset($thisUser)} - {if $subStatus != 2} - {_you_can_add} - {tr("add_to_friends_$m")} - {/if} - {/if} -
    -
    -
    - - {else} -
    {strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}
    @@ -455,8 +387,6 @@ {presenter "openvk!Wall->wallEmbedded", $user->getId()}
    - {/if} - {else} {* isBanned() *} {include "banned.xml"} {/if} diff --git a/tpl/components/video.xml b/tpl/components/video.xml index dbf7fc7..752191a 100644 --- a/tpl/components/video.xml +++ b/tpl/components/video.xml @@ -1,5 +1,3 @@ -{if $video->canBeViewedBy($thisUser ?? NULL)} - @@ -34,8 +32,4 @@ -
    - -{else} - {_no_access_abstract} -{/if} \ No newline at end of file +
    \ No newline at end of file