From 256ddb720fa93c34faf0deaaa7b86d51a8ac3b9a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 15 Oct 2021 20:08:21 +0200 Subject: [PATCH] fdfs --- files/assets/js/{bug-min.js => bugs.js} | 9 +--- files/assets/js/fireflies.js | 10 ++--- files/assets/js/settings_profile.js | 60 ++++++++++++------------- files/templates/default.html | 6 +-- files/templates/email/2fa_remove.html | 2 - files/templates/settings_profile.html | 2 +- files/templates/submission.html | 4 +- seed-db.sql | 50 ++++++++++----------- 8 files changed, 66 insertions(+), 77 deletions(-) rename files/assets/js/{bug-min.js => bugs.js} (94%) diff --git a/files/assets/js/bug-min.js b/files/assets/js/bugs.js similarity index 94% rename from files/assets/js/bug-min.js rename to files/assets/js/bugs.js index 5e42a52be..a9c4be0a6 100755 --- a/files/assets/js/bug-min.js +++ b/files/assets/js/bugs.js @@ -1,9 +1,4 @@ -/* - Bug.js - https://github.com/Auz/Bug - Released under MIT-style license. - Original Screen Bug http://screen-bug.googlecode.com/git/index.html -*/ -var BugDispatch={options:{minDelay:500,maxDelay:1E4,minBugs:2,maxBugs:20,minSpeed:5,maxSpeed:10,maxLargeTurnDeg:150,maxSmallTurnDeg:10,maxWiggleDeg:5,imageSprite:"fly-sprite.webp",bugWidth:13,bugHeight:14,num_frames:5,zoom:10,canFly:!0,canDie:!0,numDeathTypes:3,monitorMouseMovement:!1,eventDistanceToBug:40,minTimeBetweenMultipy:1E3,mouseOver:"random"},initialize:function(a){this.options=mergeOptions(this.options,a);this.options.minBugs>this.options.maxBugs&&(this.options.minBugs=this.options.maxBugs); +var BugDispatch={options:{minDelay:500,maxDelay:1E4,minBugs:2,maxBugs:20,minSpeed:5,maxSpeed:10,maxLargeTurnDeg:150,maxSmallTurnDeg:10,maxWiggleDeg:5,imageSprite:"fly-sprite.gif",bugWidth:13,bugHeight:14,num_frames:5,zoom:10,canFly:!0,canDie:!0,numDeathTypes:3,monitorMouseMovement:!1,eventDistanceToBug:40,minTimeBetweenMultipy:1E3,mouseOver:"random"},initialize:function(a){this.options=mergeOptions(this.options,a);this.options.minBugs>this.options.maxBugs&&(this.options.minBugs=this.options.maxBugs); this.modes=["multiply","nothing"];this.options.canFly&&this.modes.push("fly","flyoff");this.options.canDie&&this.modes.push("die");-1==this.modes.indexOf(this.options.mouseOver)&&(this.options.mouseOver="random");this.transform=null;this.transforms={Moz:function(a){this.bug.style.MozTransform=a},webkit:function(a){this.bug.style.webkitTransform=a},O:function(a){this.bug.style.OTransform=a},ms:function(a){this.bug.style.msTransform=a},Khtml:function(a){this.bug.style.KhtmlTransform=a},w3c:function(a){this.bug.style.transform= a}};if("transform"in document.documentElement.style)this.transform=this.transforms.w3c;else{var b=["Moz","webkit","O","ms","Khtml"],c=0;for(c=0;cb?d=b:dthis.options.maxBugs&&(this.options.minBugs=this.options.maxBugs); + +var BugDispatch={options:{minDelay:500,maxDelay:1E4,minBugs:2,maxBugs:20,minSpeed:5,maxSpeed:10,maxLargeTurnDeg:150,maxSmallTurnDeg:10,maxWiggleDeg:5,imageSprite:"fireflies.gif",bugWidth:13,bugHeight:14,num_frames:5,zoom:10,canFly:!0,canDie:!0,numDeathTypes:3,monitorMouseMovement:!1,eventDistanceToBug:40,minTimeBetweenMultipy:1E3,mouseOver:"random"},initialize:function(a){this.options=mergeOptions(this.options,a);this.options.minBugs>this.options.maxBugs&&(this.options.minBugs=this.options.maxBugs); this.modes=["multiply","nothing"];this.options.canFly&&this.modes.push("fly","flyoff");this.options.canDie&&this.modes.push("die");-1==this.modes.indexOf(this.options.mouseOver)&&(this.options.mouseOver="random");this.transform=null;this.transforms={Moz:function(a){this.bug.style.MozTransform=a},webkit:function(a){this.bug.style.webkitTransform=a},O:function(a){this.bug.style.OTransform=a},ms:function(a){this.bug.style.msTransform=a},Khtml:function(a){this.bug.style.KhtmlTransform=a},w3c:function(a){this.bug.style.transform= a}};if("transform"in document.documentElement.style)this.transform=this.transforms.w3c;else{var b=["Moz","webkit","O","ms","Khtml"],c=0;for(c=0;cb?d=b:d - var BugDispatch={options:{minDelay:500,maxDelay:1E4,minBugs:2,maxBugs:20,minSpeed:5,maxSpeed:10,maxLargeTurnDeg:150,maxSmallTurnDeg:10,maxWiggleDeg:5,imageSprite:"fly-sprite.webp",bugWidth:13,bugHeight:14,num_frames:5,zoom:10,canFly:!0,canDie:!0,numDeathTypes:3,monitorMouseMovement:!1,eventDistanceToBug:40,minTimeBetweenMultipy:1E3,mouseOver:"random"},initialize:function(a){this.options=mergeOptions(this.options,a);this.options.minBugs>this.options.maxBugs&&(this.options.minBugs=this.options.maxBugs); + var BugDispatch={options:{minDelay:500,maxDelay:1E4,minBugs:2,maxBugs:20,minSpeed:5,maxSpeed:10,maxLargeTurnDeg:150,maxSmallTurnDeg:10,maxWiggleDeg:5,imageSprite:"fly-sprite.gif",bugWidth:13,bugHeight:14,num_frames:5,zoom:10,canFly:!0,canDie:!0,numDeathTypes:3,monitorMouseMovement:!1,eventDistanceToBug:40,minTimeBetweenMultipy:1E3,mouseOver:"random"},initialize:function(a){this.options=mergeOptions(this.options,a);this.options.minBugs>this.options.maxBugs&&(this.options.minBugs=this.options.maxBugs); this.modes=["multiply","nothing"];this.options.canFly&&this.modes.push("fly","flyoff");this.options.canDie&&this.modes.push("die");-1==this.modes.indexOf(this.options.mouseOver)&&(this.options.mouseOver="random");this.transform=null;this.transforms={Moz:function(a){this.bug.style.MozTransform=a},webkit:function(a){this.bug.style.webkitTransform=a},O:function(a){this.bug.style.OTransform=a},ms:function(a){this.bug.style.msTransform=a},Khtml:function(a){this.bug.style.KhtmlTransform=a},w3c:function(a){this.bug.style.transform= a}};if("transform"in document.documentElement.style)this.transform=this.transforms.w3c;else{var b=["Moz","webkit","O","ms","Khtml"],c=0;for(c=0;cb?d=b:d - + {% endif %} diff --git a/files/templates/email/2fa_remove.html b/files/templates/email/2fa_remove.html index 59cc4f66b..8ff0a7c93 100755 --- a/files/templates/email/2fa_remove.html +++ b/files/templates/email/2fa_remove.html @@ -1,7 +1,5 @@ {% extends "email/default.html" %} -{% block image %}verify.webp{% endblock %} - {% block title %}Remove Two-Factor Authentication{% endblock %} {% block preheader %}Remove Two-Factor Authentication.{% endblock %} diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index 5b8266e62..526295e2c 100755 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -6,7 +6,7 @@ {% include "emoji_modal.html" %} {% include "gif_modal.html" %} - +
diff --git a/files/templates/submission.html b/files/templates/submission.html index ca3287d6f..ef1cc7b15 100755 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -65,7 +65,7 @@ {% endif %} {% if p.award_count("shit") %} - + {% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %} {% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %} + {% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %} {% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}