diff --git a/hushline/static/js/directory.js b/hushline/static/js/directory.js index ab40141e..cfa75b92 100644 --- a/hushline/static/js/directory.js +++ b/hushline/static/js/directory.js @@ -102,7 +102,7 @@ document.addEventListener('DOMContentLoaded', function () {
${badgeContainer}
${bioHighlighted ? `

${bioHighlighted}

` : ''}
- Send a Message + Send a Message ${isSessionUser ? `Report Account` : ``}
`; diff --git a/hushline/templates/base.html b/hushline/templates/base.html index a6015921..edb47c2a 100644 --- a/hushline/templates/base.html +++ b/hushline/templates/base.html @@ -1,5 +1,6 @@ + @@ -14,24 +15,30 @@ {% block title %}{% endblock %} - Hushline - - - - - + + + + + + {% with messages = get_flashed_messages() %} - {% if messages %} -
- {% for message in messages %} -
{{ message }}
- {% endfor %} -
- {% endif %} + {% if messages %} +
+ {% for message in messages %} +
{{ message }}
+ {% endfor %} +
+ {% endif %} {% endwith %}
@@ -42,21 +49,23 @@

🤫 Hush Line

Menu ❤️ Donate @@ -76,8 +85,10 @@

🤫 Hush Line

{% block scripts %} @@ -85,4 +96,5 @@

🤫 Hush Line

- + + \ No newline at end of file diff --git a/hushline/templates/confirm_disable_2fa.html b/hushline/templates/confirm_disable_2fa.html index ba1f0987..827a88f3 100644 --- a/hushline/templates/confirm_disable_2fa.html +++ b/hushline/templates/confirm_disable_2fa.html @@ -2,10 +2,10 @@ {% block title %}Settings{% endblock %} {% block content %} -

Disable Two-Factor Authentication

-

Are you sure you want to disable 2FA?

-
- -
- Cancel -{% endblock %} +

Disable Two-Factor Authentication

+

Are you sure you want to disable 2FA?

+
+ +
+Cancel +{% endblock %} \ No newline at end of file diff --git a/hushline/templates/directory.html b/hushline/templates/directory.html index bf71f046..5d4aed78 100644 --- a/hushline/templates/directory.html +++ b/hushline/templates/directory.html @@ -3,15 +3,15 @@ {% block content %}

User Directory

{% if not logged_in %} -

👋 Welcome to Hush Line! Find users who've opted into being listed below.

+

👋 Welcome to Hush Line! Find users who've opted into being listed below.

{% endif %}
@@ -21,73 +21,80 @@

User Directory

{% if not logged_in %} -

⭐️ Verified accounts are offered to journalists, businesses, and other public figures and have manually verified their identities with a member of our staff. Learn more about our verification process.

+

⭐️ Verified accounts are offered to journalists, businesses, and other public figures and + have manually verified their identities with a member of our staff. Learn more about our verification process.

{% endif %}
{% for user in users %} - {% if user.is_verified and user.show_in_directory %} -
-

{{ user.display_name or user.primary_username }}

- {% if user.primary_username %} -

@{{ user.primary_username }}

- {% endif %} - {% if user.is_admin %} -
-

⚙️ Admin

-
- {% endif %} - {% if user.bio %} -

{{ user.bio }}

- {% endif %} - -
+ {% if user.is_verified and user.show_in_directory %} +
+

{{ user.display_name or user.primary_username }}

+ {% if user.primary_username %} +

@{{ user.primary_username }}

{% endif %} + {% if user.is_admin %} +
+

⚙️ Admin

+
+ {% endif %} + {% if user.bio %} +

{{ user.bio }}

+ {% endif %} + +
+ {% endif %} {% else %} -

🙈
Nothing to see here...

+

🙈
Nothing to see here...

{% endfor %}
{% for user in users %} - {% if user.show_in_directory %} -
-

{{ user.display_name or user.primary_username }}

- {% if user.primary_username %} -

@{{ user.primary_username }}

- {% endif %} - {% if user.is_verified or user.is_admin %} -
- {% if user.is_verified %} -

⭐️ Verified

- {% endif %} - {% if user.is_admin %} -

⚙️ Admin

- {% endif %} -
- {% endif %} - {% if user.bio %} -

{{ user.bio }}

- {% endif %} - -
+ {% if user.show_in_directory %} +
+

{{ user.display_name or user.primary_username }}

+ {% if user.primary_username %} +

@{{ user.primary_username }}

+ {% endif %} + {% if user.is_verified or user.is_admin %} +
+ {% if user.is_verified %} +

⭐️ Verified

+ {% endif %} + {% if user.is_admin %} +

⚙️ Admin

+ {% endif %} +
{% endif %} + {% if user.bio %} +

{{ user.bio }}

+ {% endif %} + +
+ {% endif %} {% else %} -

🙈
Nothing to see here...

+

🙈
Nothing to see here...

{% endfor %}
{% endblock %} {% block scripts %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/hushline/templates/inbox.html b/hushline/templates/inbox.html index a64ac642..e745dcfa 100644 --- a/hushline/templates/inbox.html +++ b/hushline/templates/inbox.html @@ -2,35 +2,36 @@ {% block title %}Inbox{% endblock %} {% block content %} - {% if messages %} -

Inbox for {{ user.display_name or user.primary_username }}

- {% for message in messages %} -
- {% if not is_secondary %} - {% if message.secondary_user_id %} - {% set sender_info = secondary_usernames[message.secondary_user_id] %} -

📥 {{ sender_info.display_name or sender_info.username }}

- {% elif secondary_usernames|length > 0 %} -

📥 {{ user.display_name or user.primary_username }}

- {% endif %} - {% endif %} -

{{ message.content }}

-
-
- -
-
- {% endfor %} - {% else %} -
- Empty Inbox -

Nothing to see here...

-

No messages yet.

-
+{% if messages %} +

Inbox for {{ user.display_name or user.primary_username }}

+{% for message in messages %} +
+ {% if not is_secondary %} + {% if message.secondary_user_id %} + {% set sender_info = secondary_usernames[message.secondary_user_id] %} +

📥 {{ sender_info.display_name or sender_info.username }}

+ {% elif secondary_usernames|length > 0 %} +

📥 {{ user.display_name or user.primary_username }}

{% endif %} + {% endif %} +

{{ message.content }}

+
+
+ +
+
+{% endfor %} +{% else %} +
+ Empty Inbox +

Nothing to see here...

+

No messages yet.

+
+{% endif %} {% endblock %} {% block scripts %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/hushline/templates/login.html b/hushline/templates/login.html index 6f7c8416..b5caf917 100644 --- a/hushline/templates/login.html +++ b/hushline/templates/login.html @@ -2,18 +2,18 @@ {% block title %}Login{% endblock %} {% block content %} -

Login

-
- {{ form.hidden_tag() }} -
- {{ form.username.label(for="username") }} - {{ form.username(id="username", required=True) }} -
-
- {{ form.password.label(for="password") }} - {{ form.password(id="password", required=True) }} -
- -
-

Don't have an account? Register here

-{% endblock %} +

Login

+
+ {{ form.hidden_tag() }} +
+ {{ form.username.label(for="username") }} + {{ form.username(id="username", required=True) }} +
+
+ {{ form.password.label(for="password") }} + {{ form.password(id="password", required=True) }} +
+ +
+

Don't have an account? Register here

+{% endblock %} \ No newline at end of file diff --git a/hushline/templates/rate_limit_exceeded.html b/hushline/templates/rate_limit_exceeded.html index 3b69bc8e..25ebb36d 100644 --- a/hushline/templates/rate_limit_exceeded.html +++ b/hushline/templates/rate_limit_exceeded.html @@ -5,7 +5,7 @@ Rate Limit Exceeded

Rate Limit Exceeded

Light pierces shadows,
- Brave voice sparks hope's resurgence,
- New dawn from truth's stand.

+ Brave voice sparks hope's resurgence,
+ New dawn from truth's stand.

-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/hushline/templates/register.html b/hushline/templates/register.html index 0a24b40e..a49adc5f 100644 --- a/hushline/templates/register.html +++ b/hushline/templates/register.html @@ -2,35 +2,35 @@ {% block title %}Register{% endblock %} {% block content %} -

Register

-
- {{ form.hidden_tag() }} -
- {{ form.username.label(for="username") }} - {{ form.username(id="username") }} - {% if form.username.errors %} - {{ form.username.errors[0] }} - {% endif %} -
-
- {{ form.password.label(for="password") }} - {{ form.password(id="password") }} - {% if form.password.errors %} - {% for error in form.password.errors %} - {{ error }} - {% endfor %} - {% endif %} -
- {% if require_invite_code %} -
- {{ form.invite_code.label }} - {{ form.invite_code(size=32) }} - {% for error in form.invite_code.errors %} - {{ error }} - {% endfor %} -
+

Register

+ + {{ form.hidden_tag() }} +
+ {{ form.username.label(for="username") }} + {{ form.username(id="username") }} + {% if form.username.errors %} + {{ form.username.errors[0] }} {% endif %} - - -

Already have an account? Login here

-{% endblock %} +
+
+ {{ form.password.label(for="password") }} + {{ form.password(id="password") }} + {% if form.password.errors %} + {% for error in form.password.errors %} + {{ error }} + {% endfor %} + {% endif %} +
+ {% if require_invite_code %} +
+ {{ form.invite_code.label }} + {{ form.invite_code(size=32) }} + {% for error in form.invite_code.errors %} + {{ error }} + {% endfor %} +
+ {% endif %} + + +

Already have an account? Login here

+{% endblock %} \ No newline at end of file diff --git a/hushline/templates/secondary_user_settings.html b/hushline/templates/secondary_user_settings.html index d0d3e221..4d055809 100644 --- a/hushline/templates/secondary_user_settings.html +++ b/hushline/templates/secondary_user_settings.html @@ -5,7 +5,8 @@

Settings for {{ secondary_username.display_name or secondary_username.userna
- +
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/hushline/templates/settings.html b/hushline/templates/settings.html index ca5bb2d7..01c27522 100644 --- a/hushline/templates/settings.html +++ b/hushline/templates/settings.html @@ -25,11 +25,11 @@

Settings

{% if user.is_admin %} -
  • - -
    • +
  • + +
    • {% endif %} @@ -44,16 +44,16 @@

    Large Organizations

    Update Display Name

    {% if user.is_verified %} -

    ⚠️ Changing your display name will result in losing your verification status.

    +

    ⚠️ Changing your display name will result in losing your verification status.

    {% endif %}
    {{ display_name_form.hidden_tag() }} - + {{ display_name_form.display_name(id='display_name') }} {% if display_name_form.display_name.errors %} - {% for error in display_name_form.display_name.errors %} - {{ error }} - {% endfor %} + {% for error in display_name_form.display_name.errors %} + {{ error }} + {% endfor %} {% endif %}
    @@ -62,7 +62,7 @@

    Public User Directory

    {{ directory_visibility_form.hidden_tag() }}
    - {{ directory_visibility_form.show_in_directory() }} + {{ directory_visibility_form.show_in_directory() }}