jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Winter Sale banner for last day.

Browse Source
This commit is contained in:
evazion
2020-12-31 06:34:51 -06:00
parent d9a8fc99bc
commit 83d6cd5980
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/application_helper.rb
View File

@@ -108,13 +108,17 @@ module ApplicationHelper
tag.time content || datetime, datetime: datetime, title: time.to_formatted_s, **options tag.time content || datetime, datetime: datetime, title: time.to_formatted_s, **options
end end
def humanized_duration(from, to) def humanized_duration(from, to, compact: false)
if to - from > 10.years if to - from > 10.years
duration = "forever" duration = "forever"
else else
duration = distance_of_time_in_words(from, to) duration = distance_of_time_in_words(from, to)
end end
if compact
duration = duration.gsub(/almost|about|over/, "").gsub(/less than a/, "<1").strip
end
datetime = from.iso8601 + "/" + to.iso8601 datetime = from.iso8601 + "/" + to.iso8601
title = "#{from.strftime("%Y-%m-%d %H:%M")} to #{to.strftime("%Y-%m-%d %H:%M")}" title = "#{from.strftime("%Y-%m-%d %H:%M")} to #{to.strftime("%Y-%m-%d %H:%M")}"

4
app/javascript/src/javascripts/common.js
View File

@@ -9,8 +9,8 @@ $(function() {
$("#hide-promotion-notice").on("click.danbooru", function(e) { $("#hide-promotion-notice").on("click.danbooru", function(e) {
$("#promotion-notice").hide(); $("#promotion-notice").hide();
Cookie.put("hide_promotion_notice", "1", 1 * 24 * 60 * 60); Cookie.put("hide_final_promotion_notice", "1", 3 * 60 * 60);
Cookie.put("hide_upgrade_account_notice", "1", 1 * 24 * 60 * 60); Cookie.put("hide_upgrade_account_notice", "1", 7 * 24 * 60 * 60);
e.preventDefault(); e.preventDefault();
}); });

19
app/views/layouts/default.html.erb
View File

@@ -70,21 +70,14 @@
<div id="page"> <div id="page">
<%= render "users/verification_notice" %> <%= render "users/verification_notice" %>
<% if Danbooru.config.is_promotion? && cookies[:hide_promotion_notice].blank? %> <% if Danbooru.config.is_promotion? && cookies[:hide_final_promotion_notice].blank? %>
<div class="notice notice-info notice-large" id="promotion-notice"> <div class="notice notice-info notice-large" id="promotion-notice">
<% if rand <= 0.0025 %> <% file = %w[provgift.png kemogift.png padoru.gif ablobgift.gif].sample %>
<%= tag.img src: "/images/provgift.png", width: 24, height: 24 %> <%= tag.img src: "/images/#{file}", width: 24, height: 24 %>
<% elsif rand <= 0.0025 %>
<%= tag.img src: "/images/kemogift.png", width: 24, height: 24 %>
<% elsif rand <= 0.0025 %>
<%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %>
<% elsif rand <= 0.0025 %>
<%= tag.img src: "/images/ablobgift.gif", width: 24, height: 24 %>
<% else %>
<%= tag.img src: "/images/blobgift.png", width: 24, height: 24 %>
<% end %>
<%= link_to "Danbooru Winter Sale!", forum_topic_path(17832) %> 25% off Gold and unlimited searches for Members! <%= link_to "Danbooru Winter Sale", forum_topic_path(17832) %> ends in
<%= Time.use_zone("UTC") { humanized_duration(Time.zone.parse("2021-01-01"), Time.zone.now, compact: true) } %>!
Get 25% off Gold &amp; Platinum
(<%= link_to "hide", "#", id: "hide-promotion-notice" %>) (<%= link_to "hide", "#", id: "hide-promotion-notice" %>)
</div> </div>
<% end %> <% end %>

6
app/views/user_upgrades/new.html.erb
View File

@@ -19,7 +19,11 @@
<h1>Upgrade Account</h1> <h1>Upgrade Account</h1>
<% if Danbooru.config.is_promotion? %> <% if Danbooru.config.is_promotion? %>
<p><b>Danbooru Winter Sale! Gold and Platinum upgrades are 25% off from now until January 1st.</b></p> <p>
<%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %>
<b>Danbooru Winter Sale! Gold and Platinum upgrades are 25% off. Sale ends in <%= Time.use_zone("UTC") { humanized_duration(Time.zone.parse("2021-01-01"), Time.zone.now, compact: true) } %>.</b>
<%= tag.img src: "/images/padoru.gif", width: 24, height: 24 %>
</p>
<% end %> <% end %>
<p>Upgrading your account gives you exclusive benefits and helps support <p>Upgrading your account gives you exclusive benefits and helps support