MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity
MarseyWorld/files/templates/settings.html

267 lines
11 KiB
HTML
Raw Normal View History

Add assetcache.asset_siteimg, has_logo. Commit began by changing the duplicated SITE_NAME conditional in the header to use a `has_logo` param, much like the recent `has_sidebar`. From there, a need to include site-specific assets in assetcache was revealed, adding the `asset_siteimg(...)` macro. This was applied quite broadly, though not comprehensively.
2022-07-01 05:55:53 +00:00
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
templates: Fix improper plurals, create helpers. Previously, the three instances of 'Report[s]' and one instance of 'Coin[s]' in the UI templates were always pluralized, even when they referred to a singular instance. This has been corrected by creating a `plural` helper macro. Additionally, this was used as impetus to create `utils/helpers.html` to eventually move more recurring template logic into macros.
2022-06-07 09:26:22 +00:00
{%- import 'util/helpers.html' as help -%}
mn
2022-05-04 23:09:46 +00:00
<!DOCTYPE html>
<html lang="en">
<head>
make bootstrap work on localhost
2022-09-08 17:12:46 +00:00
<script defer src="{{asset('js/bootstrap.js')}}"></script>
re-move bootstrap.js back to the top of documents to fix broken shit
2022-08-06 01:20:25 +00:00
stop using app.config for our own stuff
2022-06-24 15:08:57 +00:00
<meta name="description" content="{{DESCRIPTION}}">
mn
2022-05-04 23:09:46 +00:00
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="author" content="">
Add assetcache.asset_siteimg, has_logo. Commit began by changing the duplicated SITE_NAME conditional in the header to use a `has_logo` param, much like the recent `has_sidebar`. From there, a need to include site-specific assets in assetcache was revealed, adding the `asset_siteimg(...)` macro. This was applied quite broadly, though not comprehensively.
2022-07-01 05:55:53 +00:00
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}">
mn
2022-05-04 23:09:46 +00:00
<title>{% block pagetitle %}Settings - {{SITE_NAME}}{% endblock %}</title>
<meta property="og:type" content="article">
<meta property="og:title" content="{{SITE_NAME}}">
replace "request.host" with "SITE"
2022-07-13 18:14:37 +00:00
<meta property="og:site_name" content="{{SITE}}">
Add assetcache.asset_siteimg, has_logo. Commit began by changing the duplicated SITE_NAME conditional in the header to use a `has_logo` param, much like the recent `has_sidebar`. From there, a need to include site-specific assets in assetcache was revealed, adding the `asset_siteimg(...)` macro. This was applied quite broadly, though not comprehensively.
2022-07-01 05:55:53 +00:00
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}">
useless commit but just in case
2022-09-10 01:54:03 +00:00
<meta property="og:url" content="{{SITE_FULL}}">
stop using app.config for our own stuff
2022-06-24 15:08:57 +00:00
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
mn
2022-05-04 23:09:46 +00:00
<meta property="og:author" name="author" content="{{SITE_FULL}}">
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:site" content="{{SITE_FULL}}">
<meta name="twitter:title" content="{{SITE_NAME}}">
<meta name="twitter:creator" content="{{SITE_FULL}}">
stop using app.config for our own stuff
2022-06-24 15:08:57 +00:00
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
Add assetcache.asset_siteimg, has_logo. Commit began by changing the duplicated SITE_NAME conditional in the header to use a `has_logo` param, much like the recent `has_sidebar`. From there, a need to include site-specific assets in assetcache was revealed, adding the `asset_siteimg(...)` macro. This was applied quite broadly, though not comprehensively.
2022-07-01 05:55:53 +00:00
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}">
useless commit but just in case
2022-09-10 01:54:03 +00:00
<meta name="twitter:url" content="{{SITE_FULL}}">
mn
2022-05-04 23:09:46 +00:00
<style>:root{--primary:#{{v.themecolor}}}</style>
Templates: create assetcache template. For too long, we've Replace-All'd to increment site asset version numbers. This is a task that has an obvious solution using the templating engine. As such, we now have templates/util/assetcache.html which contains a dict of version numbers and a macro to generate the versioned name of an asset. Going forward, it is recommended that all future replace-all uses are used as opportunities to switch to the macro. Do remember to import the macro in all top-level templates, if not already present. Recommended form: {%- from 'util/assetcache.html' import asset -%} Then add a key to CACHE_VER in util/assetcache.html. Then replace the asset path in templates eg: {{asset('css/main.css')}} For all future versions of those assets, one can simply increment the value in util/assetcache.html instead. This will greatly reduce git spam touching unrelated files and generally be clearer and easier.
2022-05-27 02:47:32 +00:00
<link rel="stylesheet" href="{{asset('css/main.css')}}">
assetcache: Add theme CSS support; bust recent.
2022-05-30 05:50:52 +00:00
<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
mn
2022-05-04 23:09:46 +00:00
{% if v.agendaposter %}
<style>
html {
cache-bust all previously broken images
2022-06-22 15:59:47 +00:00
cursor:url('/i/dildo.webp?v=2000'), auto;
mn
2022-05-04 23:09:46 +00:00
}
</style>
{% elif v.css and not request.path.startswith('/settings/css') %}
1 less request, 1 less transaction, 1 less query
2022-07-01 21:10:48 +00:00
<style>
{{v.css | safe}}
</style>
mn
2022-05-04 23:09:46 +00:00
{% endif %}
add house awards
2022-08-27 02:57:19 +00:00
{% if v.earlylife %}
<style>
.nav-item .text-small.font-weight-bold::before {
content: "((("
}
.nav-item .text-small.font-weight-bold::after {
content: ")))"
}
</style>
{% endif %}
mn
2022-05-04 23:09:46 +00:00
</head>
<body id="settings" {% if SITE_NAME == 'rDrama' and v and (v.is_banned or v.agendaposter) %}style="overflow-x: hidden;background:url(/assets/images/backgrounds/anime/1.webp?v=3) center center fixed; background-color: var(--background)"{% elif v and v.background %}style="overflow-x: hidden;background:url(/assets/images/backgrounds/{{v.background}}?v=3) center center fixed; background-color: var(--background){% if 'anime' not in v.background %};background-size: cover{% endif %}"{% endif %}>
{% include "header.html" %}
<div class="container">
<div class="row justify-content-around">
<div class="col h-100">
{% if error %}
<div class="alert alert-danger alert-dismissible fade show my-3" role="alert">
<i class="fas fa-exclamation-circle my-auto"></i>
<span>
{{error}}
</span>
<button class="close" data-bs-dismiss="alert" aria-label="Close">
revert icon change
2022-09-08 17:24:00 +00:00
<span aria-hidden="true"><i class="far fa-times"></i></span>
mn
2022-05-04 23:09:46 +00:00
</button>
</div>
{% endif %}
{% if msg %}
<div class="alert alert-success alert-dismissible fade show my-3" role="alert">
<i class="fas fa-check-circle my-auto" aria-hidden="true"></i>
<span>
{{msg}}
</span>
<button class="close" data-bs-dismiss="alert" aria-label="Close">
revert icon change
2022-09-08 17:24:00 +00:00
<span aria-hidden="true"><i class="far fa-times"></i></span>
mn
2022-05-04 23:09:46 +00:00
</button>
</div>
{% endif %}
<div class="mt-3">
<h1 class="d-none d-md-block">Settings</h1>
<h2 class="h3 mt-5 d-md-none">Settings</h2>
</div>
<div class="flex-row bg-white box-shadow-bottom sticky d-none d-sm-flex mt-3 mb-3 mb-sm-5">
<ul class="nav settings-nav">
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/profile' %} active{% endif %}" href="/settings/profile">Profile</a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/content' %} active{% endif %}" href="/settings/content">Content</a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/css' %} active{% endif %}" href="/settings/css">Custom CSS</a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/profilecss' %} active{% endif %}" href="/settings/profilecss">Profile CSS</a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/security' %} active{% endif %}" href="/settings/security">Security</a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/blocks' %} active{% endif %}" href="/settings/blocks">Block users</a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/apps' %} active{% endif %}" href="/settings/apps">Apps</a>
</li>
</ul>
</div>
<div class="flex-row bg-white box-shadow-bottom sticky justify-content-center d-flex d-sm-none mt-3 mb-3 mb-sm-5">
<ul class="nav settings-nav">
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/profile' %} active{% endif %} navsettings" href="/settings/profile"><i class="fas fa-cog text-base mr-0"></i></a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/content' %} active{% endif %} navsettings" href="/settings/content"><i class="fas fa-filter text-base mr-0"></i></a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/css' %} active{% endif %} navsettings" href="/settings/css"><i class="fas fa-palette text-base mr-0"></i></a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/profilecss' %} active{% endif %} navsettings" href="/settings/profilecss"><i class="fas fa-palette text-base mr-0"></i></a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/security' %} active{% endif %} navsettings" href="/settings/security"><i class="fas fa-lock-alt text-base mr-0"></i></a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/blocks' %} active{% endif %} navsettings" href="/settings/blocks"><i class="fas fa-user-minus text-base mr-0"></i></a>
</li>
<li class="nav-item">
<a class="nav-link{% if request.path=='/settings/apps' %} active{% endif %} navsettings" href="/settings/apps"><i class="fas fa-code text-base mr-0"></i></a>
</li>
</ul>
</div>
{% block content %}
{% endblock %}
</div>
</div>
</div>
casino + style shit
2022-09-04 23:15:37 +00:00
{% if request.path == '/settings/security' %}
mn
2022-05-04 23:09:46 +00:00
<div class="modal fade" id="2faModal" tabindex="-1" role="dialog" aria-labelledby="2faModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">{% if mfa_secret %}Setup two-step login{% elif mfa_secret and not v.email %}Email required for two-step login{% else %}Disable two-step login{% endif %}</h5>
<button class="close" data-bs-dismiss="modal" aria-label="Close">
revert icon change
2022-09-08 17:24:00 +00:00
<span aria-hidden="true"><i class="far fa-times"></i></span>
mn
2022-05-04 23:09:46 +00:00
</button>
</div>
{% if mfa_secret %}
<div>
<form action="/settings/security" method="post">
<input type="hidden" name="formkey" value="{{v.formkey}}">
<input type="hidden" name="2fa_secret" value="{{mfa_secret}}">
<div class="modal-body">
<p>
<span class="font-weight-bold">Step 1:</span> Scan this barcode (or enter the code) using a two-factor authentication app such as Google Authenticator or Authy.
</p>
<div class="text-center mb-3">
<img alt="two-factor QR code" loading="lazy" class="img-fluid" width=175 src="/2faqr/{{mfa_secret}}">
<pre></pre>
<div class="text-small text-muted">Or enter this code: {{mfa_secret}}</div>
</div>
<p>
<span class="font-weight-bold">Step 2:</span> Enter the six-digit code generated in the authenticator app and your {{SITE_NAME}} account password.
</p>
<label for="2fa_input">6-digit code</label>
<input autocomplete="off" type="text" class="form-control mb-2" id="2fa_input" name="2fa_token" placeholder="# # # # # #" required>
<label for="2fa_input_password">Password</label>
<input autocomplete="off" type="password" class="form-control mb-2" id="2fa_input_password" name="password" oninput="document.getElementById('enable2faButton').disabled=false" required>
</div>
<div class="modal-footer">
<button class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
add timer to re-enable form buttons after 1 second
2022-06-24 02:53:31 +00:00
<input autocomplete="off" id="enable2faButton" class="btn btn-primary" type="submit" onclick="disable(this)" value="Enable 2-step login" disabled>
mn
2022-05-04 23:09:46 +00:00
</div>
</form>
</div>
{% else %}
<div>
<form action="/settings/security" method="post">
<input type="hidden" name="formkey" value="{{v.formkey}}">
<input type="hidden" name="2fa_secret" value="{{mfa_secret}}">
<div class="modal-body">
<div class="alert alert-warning" role="alert">
<i class="fas fa-info-circle"></i>
To disable two-step login, please enter your {{SITE_NAME}} account password and the 6-digit code generated in your authentication app. If you no longer have your two-step device, <a href="/lost_2fa">click here</a>.
</div>
<label for="2fa_input_password">Password</label>
<input autocomplete="off" type="password" class="form-control mb-2" id="2fa_input_password" name="password" required>
<label for="2fa_input">6-digit code</label>
<input autocomplete="off" type="text" class="form-control mb-2" id="2fa_input" name="2fa_remove" placeholder="# # # # # #" oninput="document.getElementById('disable2faButton').disabled=false" required>
</div>
<div class="modal-footer">
<button class="btn btn-link text-muted" data-bs-dismiss="modal">Cancel</button>
add timer to re-enable form buttons after 1 second
2022-06-24 02:53:31 +00:00
<input autocomplete="off" id="disable2faButton" class="btn btn-primary" type="submit" onclick="disable(this)" value="Disable 2-step login" disabled>
mn
2022-05-04 23:09:46 +00:00
</div>
</form>
</div>
{% endif %}
</div>
</div>
</div>
{% endif %}
{% block clipboard %}
<div class="toast clipboard" id="toast-success" role="alert" aria-live="assertive" aria-atomic="true" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
<div class="toast-body text-center">
<i class="fas fa-check-circle text-success mr-2"></i>Link copied to clipboard
</div>
</div>
{% endblock %}
<div class="toast" id="toast-post-success" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" aria-live="assertive" aria-atomic="true" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
<div class="toast-body bg-success text-center text-white">
<i class="fas fa-comment-alt-smile mr-2"></i><span id="toast-post-success-text">Action successful!</span>
</div>
</div>
<div class="toast" id="toast-post-error" style="position: fixed; bottom: 1.5rem; margin: 0 auto; left: 0; right: 0; width: 275px; z-index: 1000" role="alert" aria-live="assertive" aria-atomic="true" data-bs-animation="true" data-bs-autohide="true" data-bs-delay="5000">
<div class="toast-body bg-danger text-center text-white">
<i class="fas fa-exclamation-circle mr-2"></i><span id="toast-post-error-text">Error, please try again later.</span>
</div>
</div>
{% block onload %}{% endblock %}
Fix Thin badge popover sizing; expand assetcache.
2022-09-23 22:38:10 +00:00
<script defer src="{{asset('js/clipboard.js')}}"></script>
mn
2022-05-04 23:09:46 +00:00
</body>
fdfd
2021-08-22 17:00:07 +00:00
</html>