-
+
- {if $post->getRepostCount() > 0}{$post->getRepostCount()}{/if}
+ {if $post->getRepostCount() > 0}{$post->getRepostCount()}{/if}
{if !($forceNoLike ?? false)}
diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml
index 66903cca..c893e289 100644
--- a/Web/Presenters/templates/components/post/oldpost.xml
+++ b/Web/Presenters/templates/components/post/oldpost.xml
@@ -111,10 +111,10 @@
|
{/if}
-
+
{_share}
{if $post->getRepostCount() > 0}
- ({$post->getRepostCount()})
+ ({$post->getRepostCount()})
{/if}
diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js
index 8cb6ecb5..ded00fbb 100644
--- a/Web/static/js/openvk.cls.js
+++ b/Web/static/js/openvk.cls.js
@@ -1,3 +1,4 @@
+
function expand_wall_textarea(id) {
var el = document.getElementById('post-buttons'+id);
var wi = document.getElementById('wall-post-input'+id);
@@ -65,7 +66,6 @@ function toggleMenu(id) {
});
}
}
-
document.addEventListener("DOMContentLoaded", function() { //BEGIN
u("#_photoDelete").on("click", function(e) {
@@ -88,7 +88,6 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN
return e.preventDefault();
});
-
/* @rem-pai why this func wasn't named as "#_deleteDialog"? It looks universal IMO */
u("#_noteDelete").on("click", function(e) {
@@ -170,28 +169,72 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN
}); //END ONREADY DECLS
-function repostPost(id, hash) {
- uRepostMsgTxt = tr('your_comment') + ":
";
-
- MessageBox(tr('share'), uRepostMsgTxt, [tr('send'), tr('cancel')], [
- (function() {
- text = document.querySelector("#uRepostMsgInput_"+id).value;
- hash = encodeURIComponent(hash);
- xhr = new XMLHttpRequest();
- xhr.open("POST", "/wall"+id+"/repost?hash="+hash, true);
- xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
- xhr.onload = (function() {
+async function repostPost(id, hash) {
+ uRepostMsgTxt = `
+
${tr('auditory')}:
+
${tr("in_wall")}
+
${tr("in_group")}
+
+
${tr('your_comment')}:
+
+
+
+
+
+
`;
+ let clubs = [];
+ repostsCount = document.getElementById("repostsCount"+id)
+ prevVal = repostsCount != null ? Number(repostsCount.innerHTML) : 0;
+
+ MessageBox(tr('share'), uRepostMsgTxt, [tr('send'), tr('cancel')], [
+ (function() {
+ text = document.querySelector("#uRepostMsgInput_"+id).value;
+ type = "user";
+ radios = document.querySelectorAll('input[name="type"]')
+ for(const r of radios)
+ {
+ if(r.checked)
+ {
+ type = r.value;
+ break;
+ }
+ }
+ groupId = document.querySelector("#groupId").value;
+ asGroup = asgroup.checked == true ? 1 : 0;
+ signed = signed.checked == true ? 1 : 0;
+ hash = encodeURIComponent(hash);
+
+ xhr = new XMLHttpRequest();
+ xhr.open("POST", "/wall"+id+"/repost?hash="+hash, true);
+ xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+ xhr.onload = (function() {
if(xhr.responseText.indexOf("wall_owner") === -1)
- MessageBox(tr('error'), tr('error_repost_fail'), [tr('ok')], [Function.noop]);
- else {
- let jsonR = JSON.parse(xhr.responseText);
+ MessageBox(tr('error'), tr('error_repost_fail'), [tr('ok')], [Function.noop]);
+ else {
+ let jsonR = JSON.parse(xhr.responseText);
NewNotification(tr('information_-1'), tr('shared_succ'), null, () => {window.location.href = "/wall" + jsonR.wall_owner});
- }
- });
- xhr.send('text=' + encodeURI(text));
- }),
- Function.noop
- ]);
+ repostsCount != null ?
+ repostsCount.innerHTML = prevVal+1 :
+ document.getElementById("reposts"+id).insertAdjacentHTML("beforeend", "(
1)") //для старого вида постов
+ }
+ });
+ xhr.send('text='+encodeURI(text) + '&type='+type + '&groupId='+groupId + "&asGroup="+asGroup + "&signed="+signed);
+ }),
+ Function.noop
+ ]);
+
+ try
+ {
+ clubs = await API.Groups.getWriteableClubs();
+ for(const el of clubs) {
+ document.getElementById("groupId").insertAdjacentHTML("beforeend", `
`)
+ }
+
+ } catch(rejection) {
+ console.error(rejection)
+ document.getElementById("group").setAttribute("disabled", "disabled")
+ }
}
function setClubAdminComment(clubId, adminId, hash) {
@@ -535,4 +578,4 @@ $(document).on("scroll", () => {
$(".floating_sidebar")[0].classList.remove("hide_anim");
}, 250);
}
-})
+})
\ No newline at end of file
diff --git a/locales/en.strings b/locales/en.strings
index 8e32ea66..c70bc259 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -175,6 +175,9 @@
"pinned" = "pinned";
"comments_tip" = "Be first, who leaves a comment at this post!";
"your_comment" = "Your comment";
+"auditory" = "Auditory";
+"in_wall" = "to user's wall";
+"in_group" = "to group";
"shown" = "Shown";
"x_out_of" = "$1 of";
"wall_zero" = "no posts";
diff --git a/locales/ru.strings b/locales/ru.strings
index 567cdc2f..6c62de66 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -157,6 +157,9 @@
"pinned" = "закреплено";
"comments_tip" = "Будьте первым, кто оставит комментарий!";
"your_comment" = "Ваш комментарий";
+"auditory" = "Аудитория";
+"in_wall" = "на стену";
+"in_group" = "в группу";
"shown" = "Показано";
"x_out_of" = "$1 из";
"wall_zero" = "нет записей";