carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fdsfsd

master
Aevann1 2021-10-08 15:18:04 +02:00
parent e42bdd5782
commit 8aa3de5546
23 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/templates/authforms.html
View File

@ -14,10 +14,10 @@
{% if v %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=20">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=20">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=60">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=60">{% endif %}
{% else %}
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
{% endif %}
</head>

2
files/templates/award_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/award_modal.js?v=10"></script>
<script src="/assets/js/award_modal.js?v=50"></script>
<div class="modal fade" id="awardModal" tabindex="-1" role="dialog" aria-labelledby="awardModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered" role="document">

2
files/templates/changelog.html
View File

@ -3,7 +3,7 @@
{% block pagetitle %}Changelog{% endblock %}
{% block desktopBanner %}
<script src="/assets/js/changelog.js?v=10"></script>
<script src="/assets/js/changelog.js?v=50"></script>
<div class="row" style="overflow: visible;padding-top:5px;">
<div class="col">

4
files/templates/comments.html
View File

@ -33,14 +33,14 @@
{% if v %}
{% include "award_modal.html" %}
<script src="/assets/js/comments_v.js?v=26"></script>
<script src="/assets/js/comments_v.js?v=50"></script>
{% endif %}
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
{% if v and v.admin_level == 6 %}
<script src="/assets/js/comments_admin.js?v=10"></script>
<script src="/assets/js/comments_admin.js?v=50"></script>
{% endif %}
<script>

10
files/templates/default.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<script src="/assets/js/lozad.js?v=11"></script>
<script src="/assets/js/lozad.js?v=50"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
@ -69,7 +69,7 @@
{% if v %}
<script>function formkey() {return '{{v.formkey}}';}</script>
<script src="/assets/js/default.js?v=11"></script>
<script src="/assets/js/default.js?v=50"></script>
{% endif %}
@ -249,10 +249,10 @@
{% block stylesheets %}
{% if v %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=20">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=20">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=60">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=60">{% endif %}
{% else %}
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
{% endif %}
{% endblock %}

2
files/templates/emoji_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/emoji_modal.js?v=13"></script>
<script src="/assets/js/emoji_modal.js?v=50"></script>
<style>
a.emojitab {

11
files/templates/expanded_image_modal.html
View File

@ -1,13 +1,8 @@
<script>
function expandDesktopImage(image) {
var linkText = document.getElementById("desktop-expanded-image-link");
var imgLink = document.getElementById("desktop-expanded-image-wrap-link");
linkText.href = image;
imgLink.href=image;
linkText.textContent = 'View original';
document.getElementById("desktop-expanded-image").src = image.replace("200w_d.webp", "giphy.webp");
document.getElementById("desktop-expanded-image-link").href = image;
document.getElementById("desktop-expanded-image-wrap-link").href=image;
};
</script>

2
files/templates/gif_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/gif_modal.js?v=20"></script>
<script src="/assets/js/gif_modal.js?v=50"></script>
<div class="modal fade" id="gifModal" tabindex="-1" role="dialog" aria-labelledby="gifModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-5" role="document">

2
files/templates/header.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/header.js?v=10"></script>
<script src="/assets/js/header.js?v=50"></script>
<nav class="shadow shadow-md fixed-top">
{% if "rdrama" in request.host %}

6
files/templates/log.html
View File

@ -16,10 +16,10 @@
</script>
{% if v %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=20">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=20">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=60">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=60">{% endif %}
{% else %}
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
{% endif %}
<div class="row justify-content-around">

2
files/templates/login.html
View File

@ -15,7 +15,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
<link href="/assets/css/fa.css" rel="stylesheet">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
</head>

2
files/templates/login_2fa.html
View File

@ -13,7 +13,7 @@
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
</head>

2
files/templates/mobile_navigation_bar.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/mobile_navigation_bar.js?v=10"></script>
<script src="/assets/js/mobile_navigation_bar.js?v=50"></script>
<style>
.btn-dead:hover, .active.btn-dead:hover, .active.btn-dead {

2
files/templates/report_post_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/report_post_modal.js?v=10"></script>
<script src="/assets/js/report_post_modal.js?v=50"></script>
<div class="modal fade" id="reportPostModal" tabindex="-1" role="dialog" aria-labelledby="reportPostModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">

4
files/templates/settings.html
View File

@ -66,8 +66,8 @@
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=20">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=20">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=60">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=60">{% endif %}
<link href="/assets/css/fa.css" rel="stylesheet">
</head>

4
files/templates/settings2.html
View File

@ -39,9 +39,9 @@
{% if v %}
<link id="css-link" rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=20">
<link id="css-link" rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=60">
{% else %}
<link id="css-link" rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link id="css-link" rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
{% endif %}
<link href="/assets/css/fa.css" rel="stylesheet">

2
files/templates/settings_profile.html
View File

@ -6,7 +6,7 @@
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}
<script src="/assets/js/settings_profile.js?v=10"></script>
<script src="/assets/js/settings_profile.js?v=50"></script>
<div id="posts" class="row">

4
files/templates/sign_up.html
View File

@ -4,7 +4,7 @@
<head>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="/assets/js/signup.js?v=10"></script>
<script src="/assets/js/signup.js?v=50"></script>
{% if hcaptcha %}
<script src="https://hcaptcha.com/1/api.js"></script>
@ -35,7 +35,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
</head>

2
files/templates/sign_up_failed_ref.html
View File

@ -30,7 +30,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
</head>

8
files/templates/submission.html
View File

@ -14,7 +14,7 @@
{% block title %}
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
<script src="/assets/js/new_comments_count.js?v=10"></script>
<script src="/assets/js/new_comments_count.js?v=50"></script>
{% if v and v.id == p.author_id %}
<script>
@ -53,7 +53,7 @@
</script>
{% if v %}
<script src="/assets/js/comments_v.js?v=26"></script>
<script src="/assets/js/comments_v.js?v=50"></script>
{% include "award_modal.html" %}
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}
@ -65,7 +65,7 @@
{% endif %}
{% if p.award_count("shit") %}
<script src="/assets/js/bug-min.js?v=10"></script>
<script src="/assets/js/bug-min.js?v=50"></script>
{% 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 %}
<script>
@ -81,7 +81,7 @@
{% if p.award_count("fireflies") %}
<script src="/assets/js/fireflies.js?v=10"></script>
<script src="/assets/js/fireflies.js?v=50"></script>
{% 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 %}
<script>

2
files/templates/submission_listing.html
View File

@ -4,7 +4,7 @@
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
<script src="/assets/js/new_comments_count.js?v=10"></script>
<script src="/assets/js/new_comments_count.js?v=50"></script>
<script>
function expandText(id) {

8
files/templates/submit.html
View File

@ -4,7 +4,7 @@
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script src="/assets/js/submit.js?v=10"></script>
<script src="/assets/js/submit.js?v=50"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@ -24,10 +24,10 @@
{% block stylesheets %}
{% if v %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=20">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=20">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=60">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=60">{% endif %}
{% else %}
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
{% endif %}
{% endblock %}

8
files/templates/userpage.html
View File

@ -3,10 +3,10 @@
{% if u and u.profilecss %}
{% block stylesheets %}
{% if v %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=20">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=20">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}_{{v.themecolor}}.css?v=60">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=60">{% endif %}
{% else %}
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=20">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=60">
{% endif %}
{% if u and u.profilecss %}
<link rel="stylesheet" href="/@{{u.username}}/profilecss">
@ -25,7 +25,7 @@
}
</style>
<script src="/assets/js/userpage.js?v=10"></script>
<script src="/assets/js/userpage.js?v=50"></script>
<title>{{u.username}}'s profile - {{'SITE_NAME' | app_config}}</title>
{% if u.is_private %}
<meta name="robots" content="noindex">