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

fsd

master
Aevann1 2022-02-02 01:19:41 +02:00
parent da3db3d54a
commit 578614196b
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/helpers/const.py
View File

@ -476,6 +476,14 @@ AWARDS = {
"color": "text-lightgreen", "color": "text-lightgreen",
"price": 10000 "price": 10000
}, },
"nword": {
"kind": "nword",
"title": "Nword Pass",
"description": "Gives the recipient the ability to speak that which must not be spoken",
"icon": "fas fa-edit",
"color": "text-success",
"price": 10000
},
"fish": { "fish": {
"kind": "fish", "kind": "fish",
"title": "Fish", "title": "Fish",
@ -508,14 +516,6 @@ AWARDS = {
"color": "text-gold", "color": "text-gold",
"price": 50000 "price": 50000
}, },
"nword": {
"kind": "nword",
"title": "Nword Pass",
"description": "Gives the recipient the ability to speak that which must not be spoken",
"icon": "fas fa-edit",
"color": "text-success",
"price": 10000
},
} }
AWARDS2 = deepcopy(AWARDS) AWARDS2 = deepcopy(AWARDS)

4
files/routes/comments.py
View File

@ -780,7 +780,7 @@ def edit_comment(cid, v):
is_bot=True, is_bot=True,
body_html=body_jannied_html, body_html=body_jannied_html,
top_comment_id=c.top_comment_id, top_comment_id=c.top_comment_id,
ghost=c.post.ghost ghost=c.ghost
) )
g.db.add(c_jannied) g.db.add(c_jannied)
@ -803,7 +803,7 @@ def edit_comment(cid, v):
is_bot=True, is_bot=True,
body_html=no_pass_phrase, body_html=no_pass_phrase,
top_comment_id=c.top_comment_id, top_comment_id=c.top_comment_id,
ghost=c.post.ghost ghost=c.ghost
) )
g.db.add(c_jannied) g.db.add(c_jannied)

4
files/templates/authforms.html
View File

@ -15,7 +15,7 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -39,7 +39,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
{% endif %} {% endif %}
</head> </head>

4
files/templates/default.html
View File

@ -7,7 +7,7 @@
<script src="/static/assets/js/bootstrap.js?a=220"></script> <script src="/static/assets/js/bootstrap.js?a=220"></script>
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104">
<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
@ -32,7 +32,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
{% endif %} {% endif %}
<meta charset="utf-8"> <meta charset="utf-8">

8
files/templates/home.html
View File

@ -43,8 +43,8 @@
<div class="text-small font-weight-bold mr-2">‎</div> <div class="text-small font-weight-bold mr-2">‎</div>
{% if request.path == '/' and v.paid_dues %} {% if request.path == '/' and v.paid_dues %}
{% if ccmode=="true"%}<a class="btn btn-secondary text-primary" href="?sort={{sort}}&t={{t}}&ccmode=false"><i class="fas fa-angry mr-2"></i>COUNTRY CLUB MODE: ACTIVATED</a>{% endif %} {% if ccmode=="true"%}<a class="btn btn-secondary text-primary text-small-m" href="?sort={{sort}}&t={{t}}&ccmode=false"><i class="fas fa-angry mr-2"></i>CC Mode: Activated</a>{% endif %}
{% if ccmode=="false" or not ccmode %}<a class="btn btn-secondary text-primary" href="?sort={{sort}}&t={{t}}&ccmode=true"><i class="fas fa-angry mr-2"></i>CC Mode</a>{% endif %} {% if ccmode=="false" or not ccmode %}<a class="btn btn-secondary text-primary text-small-m" href="?sort={{sort}}&t={{t}}&ccmode=true"><i class="fas fa-angry mr-2"></i>CC Mode</a>{% endif %}
<div class="text-small font-weight-bold ml-3 mr-2">‎</div> <div class="text-small font-weight-bold ml-3 mr-2">‎</div>
{% endif %} {% endif %}
@ -155,14 +155,14 @@
<ul class="pagination pagination-sm mb-0"> <ul class="pagination pagination-sm mb-0">
{% if page>1 %} {% if page>1 %}
<li class="page-item"> <li class="page-item">
<small><a class="page-link" href="?sort={{sort}}&page={{page-1}}&t={{t}}{% if only %}&only={{only}}{% endif %}" tabindex="-1">Prev</a></small> <small><a class="page-link" href="?sort={{sort}}&page={{page-1}}&t={{t}}{% if ccmode %}&ccmode={{ccmode}}{% endif %}" tabindex="-1">Prev</a></small>
</li> </li>
{% else %} {% else %}
<li class="page-item disabled"><span class="page-link">Prev</span></li> <li class="page-item disabled"><span class="page-link">Prev</span></li>
{% endif %} {% endif %}
{% if next_exists %} {% if next_exists %}
<li class="page-item"> <li class="page-item">
<small><a class="page-link" href="?sort={{sort}}&page={{page+1}}&t={{t}}{% if only %}&only={{only}}{% endif %}">Next</a></small> <small><a class="page-link" href="?sort={{sort}}&page={{page+1}}&t={{t}}{% if ccmode %}&ccmode={{ccmode}}{% endif %}">Next</a></small>
</li> </li>
{% else %} {% else %}
<li class="page-item disabled"><span class="page-link">Next</span></li> <li class="page-item disabled"><span class="page-link">Next</span></li>

4
files/templates/log.html
View File

@ -6,7 +6,7 @@
{% block content %} {% block content %}
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -30,7 +30,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
{% endif %} {% endif %}
<div class="row justify-content-around"> <div class="row justify-content-around">

2
files/templates/login.html
View File

@ -18,7 +18,7 @@
{% endblock %} {% endblock %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104">
<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
</head> </head>

2
files/templates/login_2fa.html
View File

@ -14,7 +14,7 @@
<title>2-Step Login - {{SITE_NAME}}</title> <title>2-Step Login - {{SITE_NAME}}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
</head> </head>

2
files/templates/settings.html
View File

@ -34,7 +34,7 @@
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {

4
files/templates/settings2.html
View File

@ -39,10 +39,10 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14">
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
{% endif %} {% endif %}
</head> </head>

2
files/templates/sign_up.html
View File

@ -31,7 +31,7 @@
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
</head> </head>

2
files/templates/sign_up_failed_ref.html
View File

@ -32,7 +32,7 @@
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
</head> </head>

4
files/templates/submit.html
View File

@ -26,7 +26,7 @@
{% block stylesheets %} {% block stylesheets %}
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=14">
{% if v.agendaposter %} {% if v.agendaposter %}
<style> <style>
html { html {
@ -50,7 +50,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style> <style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
<link rel="stylesheet" href="/static/assets/css/main.css?a=103"> <link rel="stylesheet" href="/static/assets/css/main.css?a=104">
<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14"> <link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=14">
{% endif %} {% endif %}
{% endblock %} {% endblock %}