diff --git a/files/templates/authforms.html b/files/templates/authforms.html index e6782bad23..a82204a286 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -19,7 +19,7 @@ - @@ -124,4 +124,4 @@ - \ No newline at end of file + - - - {% include "bootstrap.html" %} - - {% if v and v.agendaposter %} - - - - - {% endif %} - - - {% if v %} - - - - {% endif %} - - - - - - - - - {% block title %} - {{'SITE_NAME' | app_config}} - - - - - - - - - - - - - - - - - - {% endblock %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% block stylesheets %} - - {% if v %} - - {% if v.agendaposter %}{% elif v.css %}{% endif %} - {% else %} - - {% endif %} - - {% endblock %} - - - - - {% block fixedMobileBarJS %} - {% endblock %} - - {% if v %} - - - {% endif %} - - - - - - - -{% include "header.html" %} - - - -{% block mobileUserBanner %} -{% endblock %} - -{% block mobileBanner %} -{% endblock %} - -{% block postNav %} -{% endblock %} - -
-
- -
- - {% block desktopUserBanner %} - {% endblock %} - - {% block desktopBanner %} - {% endblock %} - - {% block PseudoSubmitForm %} - {% endblock %} - - {% block searchText %} - {% endblock %} - - {% block content %} - {% endblock %} - - {% block pagenav %} - {% endblock %} - -
- -
-
- -{% block mobilenavbar %} -{% include "mobile_navigation_bar.html" %} -{% endblock %} - -{% block actionsModal %} -{% endblock %} - -{% block reportCommentModal %} -{% endblock %} - -{% block GIFtoast %} -{% endblock %} - -{% block GIFpicker %} -{% endblock %} - - - - - - - - - - -{% if v %} -{% include "award_modal.html" %} -{% include "flag_post_modal.html" %} -{% include "flag_comment_modal.html" %} -{% include "gif_modal.html" %} -{% include "delete_comment_modal.html" %} -{% include "delete_post_modal.html" %} -{% endif %} - -{% include "expanded_image_modal.html" %} - - - - - - - - - - - - - -{% if request.path=='/' and g.system and g.timestamp>session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %} - -
-
-
-{% endif %} - - - - + + + + {% include "bootstrap.html" %} + + {% if v and v.agendaposter %} + + + + + {% endif %} + + + {% if v %} + + + + {% endif %} + + + + + + + + + {% block title %} + {{'SITE_NAME' | app_config}} + + + + + + + + + + + + + + + + + + {% endblock %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% block stylesheets %} + + {% if v %} + + {% if v.agendaposter %}{% elif v.css %}{% endif %} + {% else %} + + {% endif %} + + {% endblock %} + + + + + {% block fixedMobileBarJS %} + {% endblock %} + + {% if v %} + + + {% endif %} + + + + + + + +{% include "header.html" %} + + + +{% block mobileUserBanner %} +{% endblock %} + +{% block mobileBanner %} +{% endblock %} + +{% block postNav %} +{% endblock %} + +
+
+ +
+ + {% block desktopUserBanner %} + {% endblock %} + + {% block desktopBanner %} + {% endblock %} + + {% block PseudoSubmitForm %} + {% endblock %} + + {% block searchText %} + {% endblock %} + + {% block content %} + {% endblock %} + + {% block pagenav %} + {% endblock %} + +
+ +
+
+ +{% block mobilenavbar %} +{% include "mobile_navigation_bar.html" %} +{% endblock %} + +{% block actionsModal %} +{% endblock %} + +{% block reportCommentModal %} +{% endblock %} + +{% block GIFtoast %} +{% endblock %} + +{% block GIFpicker %} +{% endblock %} + + + + + + + + + + +{% if v %} +{% include "award_modal.html" %} +{% include "flag_post_modal.html" %} +{% include "flag_comment_modal.html" %} +{% include "gif_modal.html" %} +{% include "delete_comment_modal.html" %} +{% include "delete_post_modal.html" %} +{% endif %} + +{% include "expanded_image_modal.html" %} + + + + + + + + + + + + + +{% if request.path=='/' and g.system and g.timestamp>session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %} + +
+
+
+{% endif %} + + + + \ No newline at end of file diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 60be522e4d..d6b82383fb 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -1,150 +1,150 @@ -{% extends "default.html" %} -{% block title %} -{{'SITE_NAME' | app_config}} - Formatting - -{% endblock %} - -{% block content %} -
-
-
-
-{% filter markdown %} -# Formatting - -On {{'SITE_NAME' | app_config}}, you can use Markdown formatting. - - -## Inline formatting - -{% endfilter %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDisplays as
Italics*text*text
Bold**text**text
Code`text`text
Strikethrough~~text~~text
Links[{{'SITE_NAME' | app_config}}]({{request.host_url}}){{'SITE_NAME' | app_config}}
Emojis:marseylove:
- -{% filter markdown %} - -## Block formatting - -These Markdown tags format an entire paragraph of text at a time. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Use three backticks above and below.
-Or, indent the lines with four spaces.
-
- - -
NameTypeDisplays as
Blockquote> text
text
Headers 1-6# Header 1
## Header 2
### Header 3
#### Header 4
##### Header 5
###### Header 6

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6
Ordered list1. First thing
2. Second thing
  1. First thing
  2. Second thing
Unordered list* First thing
* Second thing
  • First thing
  • Second thing
Code Block```
Use three backticks above and below.
Or, indent the lines with four spaces.
```
-
Spoilers<s> bussy > gussy </s>

bussy > gussy

- - -## Custom Formatting - -We also have some custom hooks for mentioning users and subreddits. Note that these only work if the mentioned user or subreddit actually exists. - -{% endfilter %} - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDisplays as
Username Mention@QuadNarca@QuadNarca
Subreddit Mentionr/{{'SITE_NAME' | app_config}}r/{{'SITE_NAME' | app_config}}
Redditor Mentionu/Bardfinnu/Bardfinn
- -{% include "expanded_image_modal.html" %} -{% include "expanded_video_modal.html" %} - - - -{% endblock %} +{% extends "default.html" %} +{% block title %} +{{'SITE_NAME' | app_config}} - Formatting + +{% endblock %} + +{% block content %} +
+
+
+
+{% filter markdown %} +# Formatting + +On {{'SITE_NAME' | app_config}}, you can use Markdown formatting. + + +## Inline formatting + +{% endfilter %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDisplays as
Italics*text*text
Bold**text**text
Code`text`text
Strikethrough~~text~~text
Links[{{'SITE_NAME' | app_config}}]({{request.host_url}}){{'SITE_NAME' | app_config}}
Emojis:marseylove:
+ +{% filter markdown %} + +## Block formatting + +These Markdown tags format an entire paragraph of text at a time. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Use three backticks above and below.
+Or, indent the lines with four spaces.
+
+ + +
NameTypeDisplays as
Blockquote> text
text
Headers 1-6# Header 1
## Header 2
### Header 3
#### Header 4
##### Header 5
###### Header 6

Header 1

Header 2

Header 3

Header 4

Header 5
Header 6
Ordered list1. First thing
2. Second thing
  1. First thing
  2. Second thing
Unordered list* First thing
* Second thing
  • First thing
  • Second thing
Code Block```
Use three backticks above and below.
Or, indent the lines with four spaces.
```
+
Spoilers<s> bussy > gussy </s>

bussy > gussy

+ + +## Custom Formatting + +We also have some custom hooks for mentioning users and subreddits. Note that these only work if the mentioned user or subreddit actually exists. + +{% endfilter %} + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDisplays as
Username Mention@QuadNarca@QuadNarca
Subreddit Mentionr/{{'SITE_NAME' | app_config}}r/{{'SITE_NAME' | app_config}}
Redditor Mentionu/Bardfinnu/Bardfinn
+ +{% include "expanded_image_modal.html" %} +{% include "expanded_video_modal.html" %} + + + +{% endblock %} \ No newline at end of file diff --git a/files/templates/login.html b/files/templates/login.html index 792ada5d2b..a9f4962903 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -22,7 +22,7 @@ - @@ -130,8 +130,8 @@ {% include "bootstrap.html" %} - + - + \ No newline at end of file diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 60f9eddbca..dd2e83ea7f 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -1,119 +1,119 @@ - - - - - - - - - - - - 2-Step Login - {{'SITE_NAME' | app_config}} - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- -
- -
- - - -
- -

Two-step login

- -

To login, please enter the 6-digit verification code generated in your authenticator app.

- - {% if failed %} - - {% endif %} - -
- - - - - - - - - - - - Lost your 2FA device? - - - -
- - -
- -
- -
- -
- -
- -
- -
- - -
- -
- -
-
- - - - + + + + + + + + + + + + 2-Step Login - {{'SITE_NAME' | app_config}} + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ +
+ +
+ + + +
+ +

Two-step login

+ +

To login, please enter the 6-digit verification code generated in your authenticator app.

+ + {% if failed %} + + {% endif %} + +
+ + + + + + + + + + + + Lost your 2FA device? + + + +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+
+ + + + \ No newline at end of file diff --git a/files/templates/settings.html b/files/templates/settings.html index 300cd56c8b..7da6ddec4b 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -254,10 +254,10 @@ - + {% block onload %}{% endblock %} - \ No newline at end of file + - + {% block scripts %} {% endblock %} - \ No newline at end of file + - @@ -225,8 +225,8 @@ - + - + \ No newline at end of file diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 437454ed0b..2ae8171026 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -36,7 +36,7 @@ - @@ -144,8 +144,8 @@ - + - + \ No newline at end of file diff --git a/files/templates/submit.html b/files/templates/submit.html index ffa8eeb2a6..f143bcea03 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -1,466 +1,466 @@ - - - - - {% include "bootstrap.html" %} - - - - - - - - - {% include "emoji_modal.html" %} - {% include "gif_modal.html" %} - - {% block title %} - Create a post - {{'SITE_NAME' | app_config}} - {% endblock %} - - - - - - - - - - {% block stylesheets %} - {% if v %} - - {% if v.agendaposter %}{% elif v.css %}{% endif %} - {% else %} - - {% endif %} - {% endblock %} - - - - - {% if v %} - - - - {% endif %} - - - - - - - {% include "header.html" %} - - {% block form %} - - - -
- -
- -
- -
- -

Create a post

- -

Create a post

- -
- - - - - - - - -
- - - To post an image, use a direct image link such as i.imgur.com -
- -
-
- - - - - - Images uploaded will be public. Optional if you have text. -
-
- - - -
- - - - - -
- - - - -
-
-

- - - -   - - - -   - - - -   - -   - - -

-												
-												

-
-												
- - -
- -
- - -
-
- -
- -
- - - -
-
-
- Cancel -
-
- {% if error %}{{error}}{% endif %} - -
-
-
- -
- - {% endblock %} - - - - - - - - - - - - - - - + + + + + {% include "bootstrap.html" %} + + + + + + + + + {% include "emoji_modal.html" %} + {% include "gif_modal.html" %} + + {% block title %} + Create a post - {{'SITE_NAME' | app_config}} + {% endblock %} + + + + + + + + + + {% block stylesheets %} + {% if v %} + + {% if v.agendaposter %}{% elif v.css %}{% endif %} + {% else %} + + {% endif %} + {% endblock %} + + + + + {% if v %} + + + + {% endif %} + + + + + + + {% include "header.html" %} + + {% block form %} + + + +
+ +
+ +
+ +
+ +

Create a post

+ +

Create a post

+ +
+ + + + + + + + +
+ + + To post an image, use a direct image link such as i.imgur.com +
+ +
+
+ + + + + + Images uploaded will be public. Optional if you have text. +
+
+ + + +
+ + + + + +
+ + + + +
+
+

+ + + +   + + + +   + + + +   + +   + + +

+												
+												

+
+												
+ + +
+ +
+ + +
+
+ +
+ +
+ + + +
+
+
+ Cancel +
+
+ {% if error %}{{error}}{% endif %} + +
+
+
+ +
+ + {% endblock %} + + + + + + + + + + + + + + + \ No newline at end of file