From 2e0d27c4f037d19aa6282e35fbe902ccae60c039 Mon Sep 17 00:00:00 2001 From: rimu <3310831+rimu@users.noreply.github.com> Date: Fri, 17 May 2024 21:27:45 +1200 Subject: [PATCH] rebrand remote follow #186 --- app/admin/forms.py | 16 +++++----- app/community/forms.py | 8 ++--- app/static/images/fediverse_logo.svg | 17 ++++++++++ ..._redirect.html => fediverse_redirect.html} | 8 ++--- app/templates/user/show_profile.html | 2 +- app/user/forms.py | 19 +++++++++--- app/user/routes.py | 31 +++++++++++++------ 7 files changed, 70 insertions(+), 31 deletions(-) create mode 100644 app/static/images/fediverse_logo.svg rename app/templates/user/{mastodon_redirect.html => fediverse_redirect.html} (87%) diff --git a/app/admin/forms.py b/app/admin/forms.py index 6c34c071..c371616c 100644 --- a/app/admin/forms.py +++ b/app/admin/forms.py @@ -32,11 +32,11 @@ class SiteMiscForm(FlaskForm): community_creation_admin_only = BooleanField(_l('Only admins can create new local communities')) reports_email_admins = BooleanField(_l('Notify admins about reports, not just moderators')) types = [('Open', _l('Open')), ('RequireApplication', _l('Require application')), ('Closed', _l('Closed'))] - registration_mode = SelectField(_l('Registration mode'), choices=types, default=1, coerce=str) + registration_mode = SelectField(_l('Registration mode'), choices=types, default=1, coerce=str, render_kw={'class': 'form-select'}) application_question = TextAreaField(_l('Question to ask people applying for an account')) auto_decline_referrers = TextAreaField(_l('Block registrations from these referrers (one per line)')) log_activitypub_json = BooleanField(_l('Log ActivityPub JSON for debugging')) - default_theme = SelectField(_l('Default theme'), coerce=str) + default_theme = SelectField(_l('Default theme'), coerce=str, render_kw={'class': 'form-select'}) submit = SubmitField(_l('Save')) @@ -78,12 +78,12 @@ class EditCommunityForm(FlaskForm): (1825, _l('5 years')), (3650, _l('10 years')), ] - content_retention = SelectField(_l('Retain content'), choices=options, default=1, coerce=int) - topic = SelectField(_l('Topic'), coerce=int, validators=[Optional()]) + content_retention = SelectField(_l('Retain content'), choices=options, default=1, coerce=int, render_kw={'class': 'form-select'}) + topic = SelectField(_l('Topic'), coerce=int, validators=[Optional()], render_kw={'class': 'form-select'}) layouts = [('', _l('List')), ('masonry', _l('Masonry')), ('masonry_wide', _l('Wide masonry'))] - default_layout = SelectField(_l('Layout'), coerce=str, choices=layouts, validators=[Optional()]) + default_layout = SelectField(_l('Layout'), coerce=str, choices=layouts, validators=[Optional()], render_kw={'class': 'form-select'}) posting_warning = StringField(_l('Posting warning'), validators=[Optional(), Length(min=3, max=512)]) languages = SelectMultipleField(_l('Languages'), coerce=int, validators=[Optional()], render_kw={'class': 'form-select'}) ignore_remote_language = BooleanField(_l('Override remote language setting')) @@ -105,7 +105,7 @@ class EditCommunityForm(FlaskForm): class EditTopicForm(FlaskForm): name = StringField(_l('Name'), validators=[DataRequired()]) machine_name = StringField(_l('Url'), validators=[DataRequired()]) - parent_id = SelectField(_l('Parent topic'), coerce=int, validators=[Optional()]) + parent_id = SelectField(_l('Parent topic'), coerce=int, validators=[Optional()], render_kw={'class': 'form-select'}) submit = SubmitField(_l('Save')) @@ -131,7 +131,7 @@ class AddUserForm(FlaskForm): (3, _l('Staff')), (4, _l('Admin')), ] - role = SelectField(_l('Role'), choices=role_options, default=2, coerce=int) + role = SelectField(_l('Role'), choices=role_options, default=2, coerce=int, render_kw={'class': 'form-select'}) submit = SubmitField(_l('Save')) def validate_email(self, email): @@ -181,7 +181,7 @@ class EditUserForm(FlaskForm): (3, _l('Staff')), (4, _l('Admin')), ] - role = SelectField(_l('Role'), choices=role_options, default=2, coerce=int) + role = SelectField(_l('Role'), choices=role_options, default=2, coerce=int, render_kw={'class': 'form-select'}) remove_avatar = BooleanField(_l('Remove avatar')) remove_banner = BooleanField(_l('Remove banner')) submit = SubmitField(_l('Save')) diff --git a/app/community/forms.py b/app/community/forms.py index 2a2283a8..048afd10 100644 --- a/app/community/forms.py +++ b/app/community/forms.py @@ -54,12 +54,12 @@ class EditCommunityForm(FlaskForm): local_only = BooleanField(_l('Only accept posts from current instance')) restricted_to_mods = BooleanField(_l('Only moderators can post')) new_mods_wanted = BooleanField(_l('New moderators wanted')) - topic = SelectField(_l('Topic'), coerce=int, validators=[Optional()]) + topic = SelectField(_l('Topic'), coerce=int, validators=[Optional()], render_kw={'class': 'form-select'}) languages = SelectMultipleField(_l('Languages'), coerce=int, validators=[Optional()], render_kw={'class': 'form-select'}) layouts = [('', _l('List')), ('masonry', _l('Masonry')), ('masonry_wide', _l('Wide masonry'))] - default_layout = SelectField(_l('Layout'), coerce=str, choices=layouts, validators=[Optional()]) + default_layout = SelectField(_l('Layout'), coerce=str, choices=layouts, validators=[Optional()], render_kw={'class': 'form-select'}) submit = SubmitField(_l('Save')) @@ -191,7 +191,7 @@ class CreatePollForm(FlaskForm): communities = SelectField(_l('Community'), validators=[DataRequired()], coerce=int, render_kw={'class': 'form-select'}) poll_title = StringField(_l('Title'), validators=[DataRequired(), Length(min=3, max=255)]) poll_body = TextAreaField(_l('Body'), validators=[Optional(), Length(min=3, max=5000)], render_kw={'rows': 5}) - mode = SelectField(_('Mode'), validators=[DataRequired()], choices=[('single', _l('Single choice')), ('multiple', _l('Multiple choices'))]) + mode = SelectField(_('Mode'), validators=[DataRequired()], choices=[('single', _l('Single choice')), ('multiple', _l('Multiple choices'))], render_kw={'class': 'form-select'}) finish_choices=[ ('30m', _l('30 minutes')), ('1h', _l('1 hour')), @@ -201,7 +201,7 @@ class CreatePollForm(FlaskForm): ('3d', _l('3 days')), ('7d', _l('7 days')), ] - finish_in = SelectField(_('End voting in'), validators=[DataRequired()], choices=finish_choices) + finish_in = SelectField(_('End voting in'), validators=[DataRequired()], choices=finish_choices, render_kw={'class': 'form-select'}) local_only = BooleanField(_l('Accept votes from this instance only')) choice_1 = StringField('Choice') # intentionally left out of internationalization (no _l()) as this label is not used choice_2 = StringField('Choice') diff --git a/app/static/images/fediverse_logo.svg b/app/static/images/fediverse_logo.svg new file mode 100644 index 00000000..5f04313a --- /dev/null +++ b/app/static/images/fediverse_logo.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/templates/user/mastodon_redirect.html b/app/templates/user/fediverse_redirect.html similarity index 87% rename from app/templates/user/mastodon_redirect.html rename to app/templates/user/fediverse_redirect.html index 5b6d5d10..ea450d39 100644 --- a/app/templates/user/mastodon_redirect.html +++ b/app/templates/user/fediverse_redirect.html @@ -14,11 +14,11 @@
  1. {{ _('Home') }}
  2. {{ user.display_name() }}
    3. -
  3. {{ _('Follow on Mastodon') }}
    4. +
  4. {{ _('Follow on remote instance') }}
-

{{ _('Follow on Mastodon') }}

-

{{ _('We are about to send you to your mastodon instance where you will then need to click the "Follow" button.') }}

+

{{ _('Follow on remote instance') }}

+

{{ _('We are about to send you to your instance where you will then need to click the "Follow" button.') }}

{{ render_form(form) }} {% if send_to %} @@ -26,7 +26,7 @@