Mirrors/invidious
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update subscribe buttons

Browse Source
This commit is contained in:
Omar Roth 2018-10-19 11:14:26 -05:00
parent 1cfa1f6559
commit 5c87cf1547
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/invidious/helpers/utils.cr
View File

@ -138,6 +138,25 @@ def number_with_separator(number)
number.to_s.reverse.gsub(/(\d{3})(?=\d)/, "\\1,").reverse number.to_s.reverse.gsub(/(\d{3})(?=\d)/, "\\1,").reverse
end end
def number_to_short_text(number)
seperated = number_with_separator(number).gsub(",", ".").split("")
text = seperated.first(2).join
if seperated[2]? && seperated[2] != "."
text += seperated[2]
end
text = text.rchop(".0")
if number / 1000000 != 0
text += "M"
elsif number / 1000 != 0
text += "K"
end
text
end
def arg_array(array, start = 1) def arg_array(array, start = 1)
if array.size == 0 if array.size == 0
args = "NULL" args = "NULL"

8
src/invidious/views/channel.ecr
View File

@ -19,14 +19,14 @@
<p> <p>
<a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary" <a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary"
href="/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>"> href="/subscription_ajax?action_remove_subscriptions=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
<b>Unsubscribe from <%= author %> <%= number_with_separator(sub_count) %></b> <b>Unsubscribe <%= number_to_short_text(sub_count) %></b>
</a> </a>
</p> </p>
<% else %> <% else %>
<p> <p>
<a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary" <a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary"
href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>"> href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= ucid %>&referer=<%= env.get("current_page") %>">
<b>Subscribe to <%= author %> <%= number_with_separator(sub_count) %></b> <b>Subscribe <%= number_to_short_text(sub_count) %></b>
</a> </a>
</p> </p>
<% end %> <% end %>
@ -82,7 +82,7 @@ function subscribe() {
if (xhr.status == 200) { if (xhr.status == 200) {
subscribe_button = document.getElementById("subscribe"); subscribe_button = document.getElementById("subscribe");
subscribe_button.onclick = unsubscribe; subscribe_button.onclick = unsubscribe;
subscribe_button.innerHTML = '<b>Unsubscribe from <%= author %> <%= number_with_separator(sub_count + 1) %></b>' subscribe_button.innerHTML = '<b>Unsubscribe <%= number_to_short_text(sub_count) %></b>'
} }
} }
} }
@ -101,7 +101,7 @@ function unsubscribe() {
if (xhr.status == 200) { if (xhr.status == 200) {
subscribe_button = document.getElementById("subscribe"); subscribe_button = document.getElementById("subscribe");
subscribe_button.onclick = subscribe; subscribe_button.onclick = subscribe;
subscribe_button.innerHTML = '<b>Subscribe to <%= author %> <%= number_with_separator(sub_count) %></b>' subscribe_button.innerHTML = '<b>Subscribe <%= number_to_short_text(sub_count) %></b>'
} }
} }
} }

8
src/invidious/views/watch.ecr
View File

@ -94,14 +94,14 @@
<p> <p>
<a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary" <a id="subscribe" onclick="unsubscribe()" class="pure-button pure-button-primary"
href="/subscription_ajax?action_remove_subscriptions=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>"> href="/subscription_ajax?action_remove_subscriptions=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>">
<b>Unsubscribe from <%= video.author %> <%= video.sub_count_text %></b> <b>Unsubscribe <%= video.sub_count_text %></b>
</a> </a>
</p> </p>
<% else %> <% else %>
<p> <p>
<a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary" <a id="subscribe" onclick="subscribe()" class="pure-button pure-button-primary"
href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>"> href="/subscription_ajax?action_create_subscription_to_channel=1&c=<%= video.ucid %>&referer=<%= env.get("current_page") %>">
<b>Subscribe to <%= video.author %> <%= video.sub_count_text %></b> <b>Subscribe <%= video.sub_count_text %></b>
</a> </a>
</p> </p>
<% end %> <% end %>
@ -170,7 +170,7 @@ function subscribe() {
if (xhr.status == 200) { if (xhr.status == 200) {
subscribe_button = document.getElementById("subscribe"); subscribe_button = document.getElementById("subscribe");
subscribe_button.onclick = unsubscribe; subscribe_button.onclick = unsubscribe;
subscribe_button.innerHTML = '<b>Unsubscribe from <%= video.author %> <%= video.sub_count_text %></b>' subscribe_button.innerHTML = '<b>Unsubscribe <%= video.sub_count_text %></b>'
} }
} }
} }
@ -189,7 +189,7 @@ function unsubscribe() {
if (xhr.status == 200) { if (xhr.status == 200) {
subscribe_button = document.getElementById("subscribe"); subscribe_button = document.getElementById("subscribe");
subscribe_button.onclick = subscribe; subscribe_button.onclick = subscribe;
subscribe_button.innerHTML = '<b>Subscribe to <%= video.author %> <%= video.sub_count_text %></b>' subscribe_button.innerHTML = '<b>Subscribe <%= video.sub_count_text %></b>'
} }
} }
} }