Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve pages when there is no organization or it has been deactivated #30057

Merged
merged 1 commit into from May 13, 2024

Conversation

alya
Copy link
Contributor

@alya alya commented May 10, 2024

This ended up being more tangly than I expected, so I'm putting up this WIP PR, which will require some work to complete.

No organization

PR screenshot

Screenshot 2024-05-10 at 16 15 58@2x

To do:

  • Fill in the URL (e.g., "something.zuplichat.com")
  • For self-hosted organizations, "contact Zulip support" -> "contact this Zulip server's administrators".
  • Fix the CSS so that it looks like the deactivated organization page.

Deactivated organization

PR screenshot

Screenshot 2024-05-10 at 16 20 02@2x

To do:

  • Split the moved organization content into a separate template, so that it can have its own title ("Organization moved"). (Edit: Added an if condition to do it in the same template)
  • For self-hosted organizations, "contact Zulip support" -> "contact this Zulip server's administrators".

@zulipbot
Copy link
Member

Hello @zulip/server-misc members, this pull request was labeled with the "area: portico" label, so you may want to check it out!

@zulipbot zulipbot added size: L and removed size: S labels May 13, 2024
@amanagr amanagr changed the title [WIP] Improve pages when there is no organization or it has been deactivated Improve pages when there is no organization or it has been deactivated May 13, 2024
@amanagr
Copy link
Member

amanagr commented May 13, 2024

Screenshot 2024-05-13 at 9 33 04 AM Screenshot 2024-05-13 at 9 33 15 AM Screenshot 2024-05-13 at 10 15 19 AM Screenshot 2024-05-13 at 10 19 37 AM Screenshot 2024-05-13 at 10 19 49 AM

@amanagr
Copy link
Member

amanagr commented May 13, 2024

@alya updated!

@alya
Copy link
Contributor Author

alya commented May 13, 2024

The screenshots look good to me!

@alya alya added the integration review Added by maintainers when a PR may be ready for integration. label May 13, 2024
@timabbott timabbott merged commit 5aeeafd into zulip:main May 13, 2024
7 checks passed
@timabbott
Copy link
Sponsor Member

Merged, thanks @alya and @amanagr!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: portico integration review Added by maintainers when a PR may be ready for integration. size: L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants