From 40cf236d20c39e2eca4445cb6beed21234147887 Mon Sep 17 00:00:00 2001
From: Christoph Schaefer <christoph.schaefer@nextcloud.com>
Date: Fri, 11 Sep 2026 16:41:28 +0200
Subject: [PATCH] chore(AIO-interface): Address review feedback on the office
 suite rename

Switching the card header to flex-start aligned the titles but also moved
the checkmark on the Collabora and ONLYOFFICE cards, which the change was
not meant to touch. Pin the checkmark back to centre so only the
Euro-Office card is affected.

Record where the 44px reservation comes from. It is the sum of three other
declarations in the same file, one of them added alongside it, so the next
person changing the title size has no way to know it needs updating.

The QA checklist still told testers to look for "EuroOffice", which is no
longer a label anywhere in the interface. The readme listed two office
entries in a row with nothing telling them apart.

Fix the pre-existing "additioinal" typo, which sits on a line this branch
already rewrites.

Assisted-by: ClaudeCode:claude-opus-5
Signed-off-by: Christoph Schaefer <christoph.schaefer@nextcloud.com>
---
 php/public/style.css                            | 6 ++++--
 php/templates/includes/optional-containers.twig | 2 +-
 readme.md                                       | 2 +-
 tests/QA/002-new-instance.md                    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/php/public/style.css b/php/public/style.css
index 5b56c1cb..7cfc86fe 100644
--- a/php/public/style.css
+++ b/php/public/style.css
@@ -702,8 +702,9 @@ body.modal-open {
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
-    /* Reserve the vendor-line slot so cards with and without one keep their
-       titles, checkmarks and feature lists on the same baseline. */
+    /* Reserve the vendor-line slot so a card without one keeps its title and
+       feature list level with the cards that have one.
+       44px = 24px title height + 4px vendor-line margin + 16px vendor line. */
     min-height: 44px;
     margin-bottom: 16px;
 }
@@ -726,6 +727,7 @@ body.modal-open {
 
 .office-checkmark {
     flex-shrink: 0;
+    align-self: center;
     display: none;
 }
 
diff --git a/php/templates/includes/optional-containers.twig b/php/templates/includes/optional-containers.twig
index 44717693..539f6f68 100644
--- a/php/templates/includes/optional-containers.twig
+++ b/php/templates/includes/optional-containers.twig
@@ -302,7 +302,7 @@
         </form>
         <p>You need to make sure that the options that you enter are valid. An example is <strong>--o:net.content_security_policy=frame-ancestors *.example.com:*;</strong>.</p>
     {% else %}
-        <p>The additioinal options for Collabora Online are currently set to <strong>{{ collabora_additional_options }}</strong>. You can reset them again by clicking on the button below.</p>
+        <p>The additional options for Collabora Online are currently set to <strong>{{ collabora_additional_options }}</strong>. You can reset them again by clicking on the button below.</p>
         <form method="POST" action="api/configuration" class="xhr">
             <input type="hidden" name="delete_collabora_additional_options" value="yes"/>
             <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
diff --git a/readme.md b/readme.md
index 47453602..7651e3ed 100644
--- a/readme.md
+++ b/readme.md
@@ -11,7 +11,7 @@ Included are:
 - Redis & APCU for performant caching
 - PostgreSQL as database
 - Collabora Online (optional)
-- Nextcloud Office (optional)
+- Nextcloud Office (optional, based on Euro-Office)
 - High performance backend for Nextcloud Talk and TURN-server (optional)
 - Nextcloud Talk Recording-server (optional)
 - Backup solution (optional, based on [BorgBackup](https://github.com/borgbackup/borg#what-is-borgbackup))
diff --git a/tests/QA/002-new-instance.md b/tests/QA/002-new-instance.md
index 40a84248..a8237d53 100644
--- a/tests/QA/002-new-instance.md
+++ b/tests/QA/002-new-instance.md
@@ -23,7 +23,7 @@ For the below to work, it is important that you have a domain that you point ont
 - [ ] Below that you should see a section `Optional addons` which shows a checkbox list with addons that can be enabled or disabled.
     - [ ] Collabora, Imaginary, Talk and Whiteboard should be enabled, the rest disabled
     - [ ] Unchecking/Checking any of these should insert a button that allows to save the set config
-    - [ ] Only one of Collabora, OnlyOffice and EuroOffice should be selectable at the same time
+    - [ ] Only one of Collabora Online, ONLYOFFICE and Nextcloud Office should be selectable at the same time
     - [ ] Recommended is to uncheck all options now
     - [ ] Clicking on the save button should reload the page and activate the new config
 - [ ] Clickig on the `Start containers` button should finally reveal a big spinning wheel that should block all elements on the side of being clicked.