浏览代码

Merge pull request #27046 from overleaf/rh-header-footer

Header and footer changes

GitOrigin-RevId: 963b07e6240401b6fc87ace7328b6f5a2046dc6c
roo hutton 1 年之前
父节点
当前提交
caedd0f850

+ 20 - 16
services/web/app/views/layout/fat-footer-website-redesign.pug

@@ -13,15 +13,26 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 				ul.list-unstyled
 					li
 						a(href='/about') #{translate('footer_about_us')}
-					li
-						a(href='/about/values') #{translate('our_values')}
 					li
 						a(href='https://digitalscience.pinpointhq.com/') #{translate('careers')}
-					li
-						a(href='/for/press') !{translate('press_and_awards')}
 					li
 						a(href='/blog') #{translate('blog')}
 
+			.footer-section
+				h2.footer-section-heading #{translate('solutions')}
+
+				ul.list-unstyled
+					li
+						a(href='/for/enterprises') #{translate('for_business')}
+					li
+						a(href='/for/universities') #{translate('for_universities')}
+					li
+						a(href='/for/government') #{translate('for_government')}
+					li
+						a(href='/for/publishers') #{translate('for_publishers')}
+					li
+						a(href='/about/customer-stories') #{translate('customer_stories')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('learn')}
 
@@ -40,24 +51,19 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 						a(href='/learn/latex/Tables') #{translate('how_to_create_tables')}
 
 			.footer-section
-				h2.footer-section-heading !{translate('footer_plans_and_pricing')}
+				h2.footer-section-heading !{translate('pricing')}
 
 				ul.list-unstyled
 					li
-						a(href='/learn/how-to/Overleaf_premium_features') #{translate('premium_features')}
-					li
-						a(href='/user/subscription/plans?itm_referrer=footer-for-indv-groups') !{translate('for_individuals_and_groups')}
-					li
-						a(href='/for/enterprises') #{translate('for_business')}
+						a(href='/user/subscription/plans?itm_referrer=footer-for-indv') #{translate('for_individuals')}
 					li
-						a(href='/for/universities') #{translate('for_universities')}
+						a(
+							href='/user/subscription/plans?plan=group&itm_referrer=footer-for-groups'
+						) !{translate('for_groups_and_organizations')}
 					li
 						a(
-							data-ol-for-students-link
 							href='/user/subscription/plans?itm_referrer=footer-for-students#student-annual'
 						) #{translate('for_students')}
-					li
-						a(href='/for/government') #{translate('for_government')}
 
 			.footer-section
 				h2.footer-section-heading #{translate('get_involved')}
@@ -73,8 +79,6 @@ footer.fat-footer.hidden-print.website-redesign-fat-footer
 				h2.footer-section-heading #{translate('help')}
 
 				ul.list-unstyled
-					li
-						a(href='/about/why-latex') #{translate('why_latex')}
 					li
 						a(href='/learn') #{translate('Documentation')} 
 					li

+ 20 - 16
services/web/app/views/layout/fat-footer.pug

@@ -13,15 +13,26 @@ footer.fat-footer.hidden-print
 				ul.list-unstyled
 					li
 						a(href='/about') #{translate('footer_about_us')}
-					li
-						a(href='/about/values') #{translate('our_values')}
 					li
 						a(href='https://digitalscience.pinpointhq.com/') #{translate('careers')}
-					li
-						a(href='/for/press') !{translate('press_and_awards')}
 					li
 						a(href='/blog') #{translate('blog')}
 
+			.footer-section
+				h2.footer-section-heading #{translate('solutions')}
+
+				ul.list-unstyled
+					li
+						a(href='/for/enterprises') #{translate('for_business')}
+					li
+						a(href='/for/universities') #{translate('for_universities')}
+					li
+						a(href='/for/government') #{translate('for_government')}
+					li
+						a(href='/for/publishers') #{translate('for_publishers')}
+					li
+						a(href='/about/customer-stories') #{translate('customer_stories')}
+
 			.footer-section
 				h2.footer-section-heading #{translate('learn')}
 
@@ -40,24 +51,19 @@ footer.fat-footer.hidden-print
 						a(href='/learn/latex/Tables') #{translate('how_to_create_tables')}
 
 			.footer-section
-				h2.footer-section-heading !{translate('footer_plans_and_pricing')}
+				h2.footer-section-heading !{translate('pricing')}
 
 				ul.list-unstyled
 					li
-						a(href='/learn/how-to/Overleaf_premium_features') #{translate('premium_features')}
-					li
-						a(href='/user/subscription/plans?itm_referrer=footer-for-indv-groups') !{translate('for_individuals_and_groups')}
-					li
-						a(href='/for/enterprises') #{translate('for_enterprise')}
+						a(href='/user/subscription/plans?itm_referrer=footer-for-indv') #{translate('for_individuals')}
 					li
-						a(href='/for/universities') #{translate('for_universities')}
+						a(
+							href='/user/subscription/plans?plan=group&itm_referrer=footer-for-groups'
+						) !{translate('for_groups_and_organizations')}
 					li
 						a(
-							data-ol-for-students-link
 							href='/user/subscription/plans?itm_referrer=footer-for-students#student-annual'
 						) #{translate('for_students')}
-					li
-						a(href='/for/government') #{translate('for_government')}
 
 			.footer-section
 				h2.footer-section-heading #{translate('get_involved')}
@@ -73,8 +79,6 @@ footer.fat-footer.hidden-print
 				h2.footer-section-heading #{translate('help')}
 
 				ul.list-unstyled
-					li
-						a(href='/about/why-latex') #{translate('why_latex')}
 					li
 						a(href='/learn') #{translate('Documentation')} 
 					li

+ 7 - 7
services/web/frontend/extracted-translations.json

@@ -11,7 +11,8 @@
   "Get Involved": "",
   "Help": "",
   "Learn": "",
-  "Plans and Pricing": "",
+  "Pricing": "",
+  "Solutions": "",
   "a_custom_size_has_been_used_in_the_latex_code": "",
   "a_fatal_compile_error_that_completely_blocks_compilation": "",
   "a_file_with_that_name_already_exists_and_will_be_overriden": "",
@@ -357,6 +358,7 @@
   "currently_subscribed_to_plan": "",
   "custom": "",
   "custom_borders": "",
+  "customer_stories": "",
   "customize_your_group_subscription": "",
   "customizing_figures": "",
   "customizing_tables": "",
@@ -601,10 +603,12 @@
   "footer_contact_us": "",
   "footer_navigation": "",
   "footnotes": "",
-  "for_enterprise": "",
+  "for_business": "",
   "for_government": "",
-  "for_individuals_and_groups": "",
+  "for_groups_and_organizations": "",
+  "for_individuals": "",
   "for_more_information_see_managed_accounts_section": "",
+  "for_publishers": "",
   "for_students": "",
   "for_universities": "",
   "format": "",
@@ -1167,7 +1171,6 @@
   "other_logs_and_files": "",
   "other_output_files": "",
   "our_team_will_get_back_to_you_shortly": "",
-  "our_values": "",
   "out_of_sync": "",
   "out_of_sync_detail": "",
   "output_file": "",
@@ -1273,10 +1276,8 @@
   "postal_code": "",
   "premium": "",
   "premium_feature": "",
-  "premium_features": "",
   "premium_plan_label": "",
   "presentation_mode": "",
-  "press_and_awards": "",
   "previous_page": "",
   "price": "",
   "primarily_work_study_question": "",
@@ -2089,7 +2090,6 @@
   "what_should_we_call_you": "",
   "whats_different_in_the_new_editor": "",
   "when_you_tick_the_include_caption_box": "",
-  "why_latex": "",
   "why_might_this_happen": "",
   "why_not_pause_instead": "",
   "wide": "",

+ 1 - 1
services/web/frontend/js/features/project-list/components/sidebar/sidebar-ds-nav.tsx

@@ -33,7 +33,7 @@ function SidebarDsNav() {
   const sendMB = useSendProjectListMB()
   const { sessionUser, showSubscriptionLink, items } = getMeta('ol-navbar')
   const helpItem = items.find(
-    item => item.text === 'help'
+    item => item.text === 'help_and_resources'
   ) as NavbarDropdownItemData
   const { containerRef, scrolledUp, scrolledDown } = useScrolled()
   return (

+ 15 - 11
services/web/frontend/js/features/ui/components/bootstrap-5/footer/fat-footer.tsx

@@ -21,12 +21,20 @@ function FatFooter() {
       title: t('About'),
       links: [
         { href: '/about', label: t('footer_about_us') },
-        { href: '/about/values', label: t('our_values') },
         { href: 'https://digitalscience.pinpointhq.com/', label: t('careers') },
-        { href: '/for/press', label: t('press_and_awards') },
         { href: '/blog', label: t('blog') },
       ],
     },
+    {
+      title: t('Solutions'),
+      links: [
+        { href: '/for/enterprises', label: t('for_business') },
+        { href: '/for/universities', label: t('for_universities') },
+        { href: '/for/government', label: t('for_government') },
+        { href: '/for/publishers', label: t('for_publishers') },
+        { href: '/about/customer-stories', label: t('customer_stories') },
+      ],
+    },
     {
       title: t('Learn'),
       links: [
@@ -45,23 +53,20 @@ function FatFooter() {
       ],
     },
     {
-      title: t('Plans and Pricing'),
+      title: t('Pricing'),
       links: [
         {
-          href: '/learn/how-to/Overleaf_premium_features',
-          label: t('premium_features'),
+          href: '/user/subscription/plans?itm_referrer=footer-for-indv',
+          label: t('for_individuals'),
         },
         {
-          href: '/user/subscription/plans?itm_referrer=footer-for-indv-groups',
-          label: t('for_individuals_and_groups'),
+          href: '/user/subscription/plans?plan=group&itm_referrer=footer-for-groups',
+          label: t('for_groups_and_organizations'),
         },
-        { href: '/for/enterprises', label: t('for_enterprise') },
-        { href: '/for/universities', label: t('for_universities') },
         {
           href: '/user/subscription/plans?itm_referrer=footer-for-students#student-annual',
           label: t('for_students'),
         },
-        { href: '/for/government', label: t('for_government') },
       ],
     },
     {
@@ -77,7 +82,6 @@ function FatFooter() {
     {
       title: t('Help'),
       links: [
-        { href: '/about/why-latex', label: t('why_latex') },
         { href: '/learn', label: t('Documentation') },
         { href: '/contact', label: t('footer_contact_us') },
         { href: 'https://status.overleaf.com/', label: t('website_status') },

+ 2 - 2
services/web/frontend/stylesheets/bootstrap-5/components/footer.scss

@@ -354,12 +354,12 @@ footer.site-footer {
     }
 
     .fat-footer-sections {
-      grid-template-columns: repeat(6, 1fr);
+      grid-template-columns: repeat(7, 1fr);
       grid-template-rows: auto;
     }
 
     .footer-section:last-of-type {
-      grid-column: 6;
+      grid-column: 7;
     }
   }
 }

+ 2 - 2
services/web/frontend/stylesheets/components/footer.less

@@ -279,12 +279,12 @@ footer.site-footer {
     }
 
     .fat-footer-sections {
-      grid-template-columns: repeat(6, 1fr);
+      grid-template-columns: repeat(7, 1fr);
       grid-template-rows: auto;
     }
 
     .footer-section:last-of-type {
-      grid-column: 6;
+      grid-column: 7;
     }
   }
 }

+ 10 - 10
services/web/locales/en.json

@@ -475,6 +475,7 @@
   "custom": "Custom",
   "custom_borders": "Custom borders",
   "customer_resource_portal": "Customer resource portal",
+  "customer_stories": "Customer stories",
   "customize": "Customize",
   "customize_your_group_subscription": "Customize your group subscription",
   "customizing_figures": "Customizing figures",
@@ -736,7 +737,6 @@
   "featured": "Featured",
   "featured_latex_templates": "Featured LaTeX Templates",
   "features": "Features",
-  "features_and_benefits": "Features & Benefits",
   "features_like_track_changes": "Features like real-time track changes",
   "february": "February",
   "figure": "Figure",
@@ -783,12 +783,11 @@
   "footer_about_us": "About us",
   "footer_contact_us": "Contact us",
   "footer_navigation": "Footer navigation",
-  "footer_plans_and_pricing": "Plans & pricing",
   "footnotes": "Footnotes",
   "for_business": "For business",
-  "for_enterprise": "For enterprise",
   "for_government": "For government",
-  "for_individuals_and_groups": "For individuals & groups",
+  "for_groups_and_organizations": "For groups and organizations",
+  "for_individuals": "For individuals",
   "for_large_institutions_and_organizations_need_sitewide_on_premise": "For large institutions and organizations that need site-wide access or an on-premises solution.",
   "for_more_information_see_managed_accounts_section": "For more information, see the \"Managed Accounts\" section in <0>our terms of use</0>, which you agree to by clicking Accept invitation.",
   "for_publishers": "For publishers",
@@ -943,7 +942,9 @@
   "have_more_days_to_try": "Have another <strong>__days__ days</strong> on your trial!",
   "headers": "Headers",
   "help": "Help",
+  "help_and_resources": "Help & resources",
   "help_articles_matching": "Help articles matching your subject",
+  "help_guides": "Help guides",
   "help_improve_overleaf_fill_out_this_survey": "If you would like to help us improve Overleaf, please take a moment to fill out <0>this survey</0>.",
   "help_improve_screen_reader_fill_out_this_survey": "Help us improve your experience using a screen reader with __appName__ by filling out this quick survey.",
   "help_shape_the_future_of_overleaf": "Help shape the future of Overleaf",
@@ -1135,7 +1136,7 @@
   "italics": "Italics",
   "ja": "Japanese",
   "january": "January",
-  "join_beta_program": "Join beta program",
+  "join_beta_program": "Join the beta program",
   "join_labs": "Join Labs",
   "join_now": "Join now",
   "join_overleaf_labs": "Join Overleaf Labs",
@@ -1182,7 +1183,7 @@
   "latex_articles_page_title": "Articles - Papers, Presentations, Reports and more",
   "latex_examples": "LaTeX examples",
   "latex_examples_page_title": "Examples - Equations, Formatting, TikZ, Packages and More",
-  "latex_in_thirty_minutes": "LaTeX in 30 minutes",
+  "latex_in_thirty_minutes": "Learn LaTeX in 30 minutes",
   "latex_places_figures_according_to_a_special_algorithm": "LaTeX places figures according to a special algorithm. You can use something called ‘placement parameters’ to influence the positioning of the figure. <0>Find out how</>",
   "latex_places_tables_according_to_a_special_algorithm": "LaTeX places tables according to a special algorithm. You can use “placement parameters” to influence the position of the table. <0>This article</0> explains how to do this.",
   "latex_templates": "LaTeX Templates",
@@ -1534,7 +1535,6 @@
   "other_sessions": "Other Sessions",
   "other_ways_to_log_in": "Other ways to log in",
   "our_team_will_get_back_to_you_shortly": "Our team will get back to you shortly.",
-  "our_values": "Our values",
   "out_of_sync": "Out of sync",
   "out_of_sync_detail": "Sorry, this file has gone out of sync and we need to do a full refresh.<0 /><1>Please see this help guide for more information</1>",
   "output_file": "Output file",
@@ -1635,7 +1635,6 @@
   "plan": "Plan",
   "plan_tooltip": "You’re on the __plan__ plan. Click to find out how to make the most of your Overleaf premium features.",
   "planned_maintenance": "Planned Maintenance",
-  "plans_amper_pricing": "Plans & Pricing",
   "plans_and_pricing": "Plans and Pricing",
   "plans_and_pricing_lowercase": "plans and pricing",
   "please_ask_the_project_owner_to_upgrade_more_collaborators": "Please ask the project owner to upgrade their plan to allow more collaborators.",
@@ -1680,13 +1679,12 @@
   "postal_code": "Postal code",
   "premium": "Premium",
   "premium_feature": "Premium feature",
-  "premium_features": "Premium features",
   "premium_plan_label": "You’re using <b>Overleaf Premium</b>",
   "presentation": "Presentation",
   "presentation_mode": "Presentation mode",
-  "press_and_awards": "Press & awards",
   "previous_page": "Previous page",
   "price": "Price",
+  "pricing": "Pricing",
   "primarily_work_study_question": "Where do you primarily work or study?",
   "primarily_work_study_question_company": "Company",
   "primarily_work_study_question_government": "Government",
@@ -1708,6 +1706,7 @@
   "processing": "processing",
   "processing_uppercase": "Processing",
   "processing_your_request": "Please wait while we process your request.",
+  "product": "Product",
   "professional": "Professional",
   "progress_bar_percentage": "Progress bar from 0 to 100%",
   "project": "project",
@@ -2069,6 +2068,7 @@
   "six_per_project": "6 per project",
   "skip": "Skip",
   "skip_to_content": "Skip to content",
+  "solutions": "Solutions",
   "something_not_right": "Something’s not right",
   "something_went_wrong": "Something went wrong",
   "something_went_wrong_canceling_your_subscription": "Something went wrong canceling your subscription. Please contact Support.",