From e28a754b5549556c8955b7cef5f951618d174233 Mon Sep 17 00:00:00 2001 From: M Fahru Date: Tue, 16 Jul 2024 16:33:20 +0700 Subject: [PATCH] Merge pull request #19289 from overleaf/mf-complete-all-desktop-plans-table [web] Complete all new plans page feature table for desktop view GitOrigin-RevId: a8eee5af8f60717b6794382b89543445c56cbf82 --- .../stylesheets/app/plans/plans-new-design.less | 6 ++++-- services/web/locales/en.json | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/services/web/frontend/stylesheets/app/plans/plans-new-design.less b/services/web/frontend/stylesheets/app/plans/plans-new-design.less index 54daf2385a..b5b3a6f91c 100644 --- a/services/web/frontend/stylesheets/app/plans/plans-new-design.less +++ b/services/web/frontend/stylesheets/app/plans/plans-new-design.less @@ -323,6 +323,8 @@ } .plans-new-table-group { + margin-top: @spacing-11 + @highlighted-heading-height; + .plans-new-table-header-grid-container { min-height: 85px; } @@ -406,13 +408,13 @@ line-height: var(--line-height-02); } - .plans-new-table-button { + .plans-new-table-cta { margin-top: auto; } } .plans-new-table-body:last-of-type { - .plans-new-table-feature-row { + .plans-new-table-feature-row:last-of-type { .plans-new-table-feature-td.plans-new-table-highlighted-cell { border-bottom: var(--border-width-base) solid var(--green-50); } diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 6a9af6d826..faac208994 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -87,7 +87,9 @@ "address_second_line_optional": "Address second line (optional)", "adjust_column_width": "Adjust column width", "admin": "admin", + "admin_panel": "Admin panel", "admin_user_created_message": "Created admin user, Log in here to continue", + "administration_and_security": "Administration and security", "advanced_reference_search": "Advanced <0>reference search", "advanced_search": "Advanced Search", "aggregate_changed": "Changed", @@ -160,6 +162,7 @@ "autocomplete": "Autocomplete", "autocomplete_references": "Reference Autocomplete (inside a \\cite{} block)", "automatic_user_registration": "automatic user registration", + "automatic_user_registration_uppercase": "Automatic user registration", "back": "Back", "back_to_account_settings": "Back to account settings", "back_to_configuration": "Back to configuration", @@ -383,6 +386,7 @@ "custom_borders": "Custom borders", "custom_resource_portal": "Custom resource portal", "custom_resource_portal_info": "You can have your own custom portal page on Overleaf. This is a great place for your users to find out more about Overleaf, access templates, FAQs and Help resources, and sign up to Overleaf.", + "customer_resource_portal": "Customer resource portal", "customize": "Customize", "customize_your_group_subscription": "Customize your group subscription", "customize_your_plan": "Customize your plan", @@ -795,6 +799,7 @@ "group_members_and_collaborators_get_access_to_info": "These features are available to group members and their collaborators (other Overleaf users invited to projects owned a group member).", "group_members_get_access_to": "Group members get access to", "group_members_get_access_to_info": "These features are available only to group members (subscribers).", + "group_plan_admins_can_easily_add_and_remove_users_from_a_group": "Group plan admins can easily add and remove users from a group. For site-wide plans, users are automatically upgraded when they register or add their email address to Overleaf (domain-based enrollment or SSO).", "group_plan_tooltip": "You are on the __plan__ plan as a member of a group subscription. Click to find out how to make the most of your Overleaf premium features.", "group_plan_with_name_tooltip": "You are on the __plan__ plan as a member of a group subscription, __groupName__. Click to find out how to make the most of your Overleaf premium features.", "group_plans": "Group Plans", @@ -1147,11 +1152,13 @@ "manage_sessions": "Manage Your Sessions", "manage_subscription": "Manage Subscription", "managed": "Managed", + "managed_user_accounts": "Managed user accounts", "managed_user_invite_has_been_sent_to_email": "Managed User invite has been sent to <0>__email__", "managed_users": "Managed Users", "managed_users_accounts": "Managed user accounts", "managed_users_accounts_plan_info": "Managed Users gives you more control over your group’s use of Overleaf. It ensures tighter management of user access and deletion and allows you to keep control of projects when someone leaves the group.", "managed_users_explanation": "Managed Users ensures you stay in control of your organization’s projects and who owns them. <0>Read more about Managed Users.", + "managed_users_gives_gives_you_more_control_over_your_group": "Managed Users gives you more control over your group’s use of __appName__. It ensures tighter management of user access and deletion and allows you to keep control of your projects when someone leaves the group.", "managed_users_is_enabled": "Managed Users is enabled", "managed_users_terms": "To use the Managed Users feature, you must agree to the latest version of our customer terms at <0>__link__ on behalf of your organization by selecting \"I agree\" below. These terms will then apply to your organization’s use of Overleaf in place of any previously agreed Overleaf terms. The exception to this is where we have a signed agreement in place with you, in which case that signed agreement will continue to govern. Please keep a copy for your records.", "managers_cannot_remove_admin": "Admins cannot be removed", @@ -1788,8 +1795,10 @@ "sign_up": "Sign up", "single_sign_on_sso": "Single Sign-On (SSO)", "site_description": "An online LaTeX editor that’s easy to use. No installation, real-time collaboration, version control, hundreds of LaTeX templates, and more.", + "site_wide_option_available": "Site-wide option available", "sitewide_option_available": "Site-wide option available", "sitewide_option_available_info": "Users are automatically upgraded when they register or add their email address to Overleaf (domain-based enrollment or SSO).", + "six_per_project": "6 per project", "skip": "Skip", "skip_to_content": "Skip to content", "something_not_right": "Something’s not right", @@ -2195,6 +2204,7 @@ "used_latex_response_occasionally": "Yes, occasionally", "used_latex_response_often": "Yes, very often", "used_when_referring_to_the_figure_elsewhere_in_the_document": "Used when referring to the figure elsewhere in the document", + "user_administration": "User administration", "user_already_added": "User already added", "user_deletion_error": "Sorry, something went wrong deleting your account. Please try again in a minute.", "user_deletion_password_reset_tip": "If you cannot remember your password, or if you are using Single-Sign-On with another provider to sign in (such as ORCID or Google), please <0>reset your password and try again.", @@ -2203,6 +2213,7 @@ "user_last_name_attribute": "User last name attribute", "user_management": "User management", "user_management_info": "Group plan admins have access to an admin panel where users can be added and removed easily. For site-wide plans, users are automatically upgraded when they register or add their email address to Overleaf (domain-based enrollment or SSO).", + "user_metrics": "User metrics", "user_not_found": "User not found", "user_sessions": "User Sessions", "user_wants_you_to_see_project": "__username__ would like you to join __projectname__",