eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-04 04:56:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #7516 from nextcloud/enh/noid/rename-collabora-to-nextcloud-office
Some checks failed
Codespell / Check spelling (push) Waiting to run
Details
Docker Lint / docker-lint (push) Waiting to run
Details
Lint php / php-lint (push) Waiting to run
Details
Lint php / php-lint-summary (push) Blocked by required conditions
Details
PHP Deprecation Detector / PHP Deprecation Detector (push) Waiting to run
Details
Playwright Tests on push / test (push) Waiting to run
Details
Static analysis / static-psalm-analysis (push) Waiting to run
Details
Twig Lint / twig-lint (push) Waiting to run
Details
Validate community containers / Validate community containers (push) Has been cancelled
Details
Json Validator / Json Validator (push) Has been cancelled
Details
Shellcheck / Check Shell (push) Has been cancelled
Details

Browse source 
aio-interface: rename Collabora everywhere to Nextcloud Office
This commit is contained in:
Simon L. 2026-01-29 16:12:09 +01:00 • committed by GitHub
commit 6b9682936b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
php/templates/includes/optional-containers.twig
View file

@ -228,10 +228,10 @@
{% endif %} {% endif %}
{% if is_collabora_enabled == true and isAnyRunning == false and was_start_button_clicked == true %} {% if is_collabora_enabled == true and isAnyRunning == false and was_start_button_clicked == true %}
<h3>Collabora dictionaries</h3> <h3>Nextcloud Office dictionaries</h3>
{% if collabora_dictionaries == "" %} {% if collabora_dictionaries == "" %}
<p>In order to get the correct dictionaries in Collabora, you may configure the dictionaries below:</p> <p>In order to get the correct dictionaries in Nextcloud Office, you may configure the dictionaries below:</p>
<form method="POST" action="api/configuration" class="xhr"> <form method="POST" action="api/configuration" class="xhr">
<input type="text" name="collabora_dictionaries" placeholder="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru" /> <input type="text" name="collabora_dictionaries" placeholder="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru" />
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}"> <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
@ -240,34 +240,34 @@
</form> </form>
<p>You need to make sure that the dictionaries that you enter are valid. An example is <strong>de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</strong>.</p> <p>You need to make sure that the dictionaries that you enter are valid. An example is <strong>de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</strong>.</p>
{% else %} {% else %}
<p>The dictionaries for Collabora are currently set to <strong>{{ collabora_dictionaries }}</strong>. You can reset them again by clicking on the button below.</p> <p>The dictionaries for Nextcloud Office are currently set to <strong>{{ collabora_dictionaries }}</strong>. You can reset them again by clicking on the button below.</p>
<form method="POST" action="api/configuration" class="xhr"> <form method="POST" action="api/configuration" class="xhr">
<input type="hidden" name="delete_collabora_dictionaries" value="yes"/> <input type="hidden" name="delete_collabora_dictionaries" value="yes"/>
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}"> <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="submit" value="Reset collabora dictionaries" /> <input type="submit" value="Reset Nextcloud Office dictionaries" />
</form> </form>
{% endif %} {% endif %}
<h3>Additional Collabora options</h3> <h3>Additional Nextcloud Office options</h3>
{% if collabora_additional_options == "" %} {% if collabora_additional_options == "" %}
<p>You can configure additional options for collabora below.</p> <p>You can configure additional options for Nextcloud Office below.</p>
<p>(This can be used for configuring the net.content_security_policy and more. Make sure to submit the value!)</p> <p>(This can be used for configuring the net.content_security_policy and more. Make sure to submit the value!)</p>
<form method="POST" action="api/configuration" class="xhr"> <form method="POST" action="api/configuration" class="xhr">
<input type="text" name="collabora_additional_options" /> <input type="text" name="collabora_additional_options" />
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}"> <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="submit" value="Submit additional collabora options" /> <input type="submit" value="Submit additional Nextcloud Office options" />
</form> </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> <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 %} {% else %}
<p>The additioinal options for Collabora are currently set to <strong>{{ collabora_additional_options }}</strong>. You can reset them again by clicking on the button below.</p> <p>The additioinal options for Nextcloud Office 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"> <form method="POST" action="api/configuration" class="xhr">
<input type="hidden" name="delete_collabora_additional_options" value="yes"/> <input type="hidden" name="delete_collabora_additional_options" value="yes"/>
<input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}"> <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
<input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}"> <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
<input type="submit" value="Reset additional collabora options" /> <input type="submit" value="Reset additional Nextcloud Office options" />
</form> </form>
{% endif %} {% endif %}
{% endif %} {% endif %}