diff --git a/files/__main__.py b/files/__main__.py index 56b68dbab..aa5ba92d7 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -102,6 +102,9 @@ def before_request(): url = request.url.replace("http://", "https://", 1) return redirect(url, code=301) + if '; wv) ' in request.headers.get("User-Agent",""): g.webview = True + else: g.webview = False + @app.teardown_appcontext def teardown_request(error): if hasattr(g, 'db') and g.db: diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html index 5b0ea277f..ab0d8aed2 100644 --- a/files/templates/admin/apps.html +++ b/files/templates/admin/apps.html @@ -14,7 +14,7 @@
diff --git a/files/templates/comments.html b/files/templates/comments.html index 8aa066246..c52c0433c 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -57,7 +57,7 @@ coins      - + View @@ -296,7 +296,7 @@ Cancel
- +
{% endif %}
@@ -526,7 +526,7 @@ Cancel
- +
diff --git a/files/templates/contact.html b/files/templates/contact.html index c73cb0573..715f36247 100644 --- a/files/templates/contact.html +++ b/files/templates/contact.html @@ -38,11 +38,11 @@ {% elif v %} -

Please verify your email address in order to ensure we can respond to your message if needed. Then, refresh this page.

+

Please verify your email address in order to ensure we can respond to your message if needed. Then, refresh this page.

{% else %} -

In order to ensure that we can respond to your message, please first sign up or log in and make sure you have verified your email address. Then, refresh this page.

+

In order to ensure that we can respond to your message, please first sign up or log in and make sure you have verified your email address. Then, refresh this page.

{% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 53e944222..33b396b16 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -112,7 +112,7 @@
+ href="/rules" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %}>terms and conditions
{% if hcaptcha %} diff --git a/files/templates/submission.html b/files/templates/submission.html index dd3e80cbb..49424185b 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -481,7 +481,7 @@ Cancel
-
Formatting help
+
Formatting help
{% endif %} @@ -752,7 +752,7 @@ Comment
-
Formatting help
+
Formatting help
{% if not v and not p.is_banned %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 65f8565d9..7cc354c06 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -52,7 +52,7 @@ coins      - + View @@ -137,7 +137,7 @@ {% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %} post thumnail {% elif not p.url %} - + post thumnail {% elif p.is_image %} @@ -196,14 +196,14 @@ @{{p.author.profile_url}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}  {{p.age_string}}   - ({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) + ({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) {% if p.edited_utc %}   Edited {{p.edited_string}} {% endif %}   {{p.views}} views -
+
{% if p.club %}{{cc}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}} @@ -215,7 +215,7 @@ {% endif %}
  • - + {{p.comment_count}} @@ -310,7 +310,7 @@
    • - + {{p.comment_count}} @@ -517,7 +517,7 @@ {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and environ.get('CARD_VIEW') == '1')) %} diff --git a/files/templates/submit.html b/files/templates/submit.html index 38bbb0df6..6731f0fa5 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -147,7 +147,7 @@
      
      -												
      +