diff options
Diffstat (limited to 'apps/settings/templates')
10 files changed, 45 insertions, 25 deletions
diff --git a/apps/settings/templates/help.php b/apps/settings/templates/help.php index 77a7b5118e5..17356e6ccdf 100644 --- a/apps/settings/templates/help.php +++ b/apps/settings/templates/help.php @@ -3,13 +3,13 @@ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later */ -\OC_Util::addStyle('settings', 'help'); +\OCP\Util::addStyle('settings', 'help'); ?> <?php if ($_['knowledgebaseEmbedded'] === true) : ?> <div id="app-navigation" role="navigation" tabindex="0"> <ul> <li> - <a class="icon-user <?php if ($_['mode'] === 'user') { + <a class="help-list__link icon-user <?php if ($_['mode'] === 'user') { p('active'); } ?>" <?php if ($_['mode'] === 'user') { print_unescaped('aria-current="page"'); @@ -22,7 +22,7 @@ </li> <?php if ($_['admin']) { ?> <li> - <a class="icon-user-admin <?php if ($_['mode'] === 'admin') { + <a class="help-list__link icon-user-admin <?php if ($_['mode'] === 'admin') { p('active'); } ?>" <?php if ($_['mode'] === 'admin') { print_unescaped('aria-current="page"'); @@ -36,14 +36,14 @@ <?php } ?> <li> - <a href="https://docs.nextcloud.com" class="icon-category-office" target="_blank" rel="noreferrer noopener"> + <a href="https://docs.nextcloud.com" class="help-list__link icon-category-office" target="_blank" rel="noreferrer noopener"> <span class="help-list__text"> <?php p($l->t('Documentation')); ?> ↗ </span> </a> </li> <li> - <a href="https://help.nextcloud.com" class="icon-comment" target="_blank" rel="noreferrer noopener"> + <a href="https://help.nextcloud.com" class="help-list__link icon-comment" target="_blank" rel="noreferrer noopener"> <span class="help-list__text"> <?php p($l->t('Forum')); ?> ↗ </span> diff --git a/apps/settings/templates/settings/admin/additional-mail.php b/apps/settings/templates/settings/admin/additional-mail.php index ecc2973f085..6d6c036e813 100644 --- a/apps/settings/templates/settings/admin/additional-mail.php +++ b/apps/settings/templates/settings/admin/additional-mail.php @@ -34,6 +34,13 @@ $mail_sendmailmode = [ ?> <div class="section" id="mail_general_settings"> +<?php if ($_['mail_smtpmode'] === 'null') { ?> + <h2><?php p($l->t('Email server'));?></h2> + + <p> + <?php p($l->t('Mail delivery is disabled by instance config "%s".', ['mail_smtpmode'])); ?> + </p> +<?php } else { ?> <form id="mail_general_settings_form" class="mail_settings"> <h2><?php p($l->t('Email server'));?></h2> <a target="_blank" @@ -143,4 +150,5 @@ $mail_sendmailmode = [ <em><?php p($l->t('Test and verify email settings')); ?></em> <input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t('Send email')); ?>"/> <span id="sendtestmail_msg" class="msg"></span> +<?php } ?> </div> diff --git a/apps/settings/templates/settings/admin/delegation.php b/apps/settings/templates/settings/admin/delegation.php index 80298a66725..757226be676 100644 --- a/apps/settings/templates/settings/admin/delegation.php +++ b/apps/settings/templates/settings/admin/delegation.php @@ -5,7 +5,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -script('settings', 'vue-settings-admin-delegation'); +\OCP\Util::addScript('settings', 'vue-settings-admin-delegation', 'core'); ?> <div id="admin-right-sub-granting"> diff --git a/apps/settings/templates/settings/admin/overview.php b/apps/settings/templates/settings/admin/overview.php index 2f65c161660..c2758305cfc 100644 --- a/apps/settings/templates/settings/admin/overview.php +++ b/apps/settings/templates/settings/admin/overview.php @@ -45,7 +45,7 @@ <ul class="info hidden"></ul> </div> <p id="postsetupchecks-hint" class="hidden"> - <?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?> + <?php print_unescaped($l->t('Please double check the <a target="_blank" rel="noreferrer noopener" href="%1$s">installation guides ↗</a>, and check for any errors or warnings in the <a href="%2$s">log</a>.', [link_to_docs('admin-install'), \OCP\Server::get(\OCP\IURLGenerator::class)->linkToRoute('settings.AdminSettings.index', ['section' => 'logging'])])); ?> </p> <p class="extra-top-margin"> @@ -57,5 +57,5 @@ <div id="version" class="section"> <!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). --> <h2><?php p($l->t('Version'));?></h2> - <p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank">Nextcloud Hub 8</a> (<?php p(OC_Util::getHumanVersion()) ?>)</strong></p> + <p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank">Nextcloud Hub 10</a> (<?php p($_['version']) ?>)</strong></p> </div> diff --git a/apps/settings/templates/settings/empty.php b/apps/settings/templates/settings/empty.php index f7ae4113ac6..ce4477fa9df 100644 --- a/apps/settings/templates/settings/empty.php +++ b/apps/settings/templates/settings/empty.php @@ -1,4 +1,5 @@ <?php + /** * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors * SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php index 27da91152f3..2b3e67aa687 100644 --- a/apps/settings/templates/settings/frame.php +++ b/apps/settings/templates/settings/frame.php @@ -5,10 +5,9 @@ */ style('settings', 'settings'); -script('settings', 'settings'); +\OCP\Util::addScript('settings', 'settings', 'core'); \OCP\Util::addScript('settings', 'legacy-admin'); -script('core', 'setupchecks'); -script('files', 'jquery.fileupload'); +\OCP\Util::addScript('core', 'setupchecks', 'core'); ?> @@ -20,7 +19,7 @@ script('files', 'jquery.fileupload'); <ul> <?php foreach ($_['forms']['personal'] as $form) { if (isset($form['anchor'])) { - $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); + $anchor = \OCP\Server::get(\OCP\IURLGenerator::class)->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]); $class = 'nav-icon-' . $form['anchor']; $sectionName = $form['section-name']; ?> <li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?> data-section-id="<?php print_unescaped($form['anchor']); ?>" data-section-type="personal"> @@ -47,7 +46,7 @@ script('files', 'jquery.fileupload'); <ul> <?php foreach ($_['forms']['admin'] as $form) { if (isset($form['anchor'])) { - $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); + $anchor = \OCP\Server::get(\OCP\IURLGenerator::class)->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); $class = 'nav-icon-' . $form['anchor']; $sectionName = $form['section-name']; ?> <li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?> data-section-id="<?php print_unescaped($form['anchor']); ?>" data-section-type="admin"> @@ -67,6 +66,6 @@ script('files', 'jquery.fileupload'); </ul> </nav> </div> -<div id="app-content" <?php if (!empty($_['activeSectionId'])) { ?> data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" <?php } if (!empty($_['activeSectionType'])) { ?> data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>" <?php } ?>> +<main id="app-content" <?php if (!empty($_['activeSectionId'])) { ?> data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" <?php } if (!empty($_['activeSectionType'])) { ?> data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>" <?php } ?>> <?php print_unescaped($_['content']); ?> -</div> +</main> diff --git a/apps/settings/templates/settings/personal/development.notice.php b/apps/settings/templates/settings/personal/development.notice.php index a758daa16d5..723f954ecc5 100644 --- a/apps/settings/templates/settings/personal/development.notice.php +++ b/apps/settings/templates/settings/personal/development.notice.php @@ -6,7 +6,10 @@ ?> <div class="section development-notice"> <p> - <a href="<?php p($_['reasons-use-nextcloud-pdf-link']); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button icon-file" target="_blank"><?php p($l->t('Reasons to use Nextcloud in your organization'));?></a> + <a href="<?php p($_['reasons-use-nextcloud-pdf-link']); ?>" id="open-reasons-use-nextcloud-pdf" class="link-button" target="_blank"> + <span class="icon-file-text" aria-hidden="true"></span> + <?php p($l->t('Reasons to use Nextcloud in your organization'));?> + </a> </p> <p> <?php print_unescaped(str_replace( @@ -30,43 +33,43 @@ <?php print_unescaped(str_replace( [ '{facebookimage}', - '{twitterimage}', + '{ximage}', '{mastodonimage}', '{rssimage}', '{mailimage}', '{facebookopen}', - '{twitteropen}', + '{xopen}', '{mastodonopen}', '{rssopen}', '{newsletteropen}', '{linkclose}', '{facebooktext}', - '{twittertext}', + '{xtext}', '{mastodontext}', '{rsstext}', '{mailtext}', ], [ '<svg aria-hidden="true" width="50" height="50" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="8" fill="var(--color-text-maxcontrast)"/><path d="m7 5c0-1.1 0.9-2 2-2h1.5v2h-1c-0.27 0-0.5 0.23-0.5 0.5v1h1.5v2h-1.5v4.5h-2v-4.5h-1.5v-2h1.5z" fill="var(--color-main-background)"/></svg>', - '<svg aria-hidden="true" width="50" height="50" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="8" fill="var(--color-text-maxcontrast)"/><path d="m9.784 4c-1.0945 0-1.982 0.89-1.982 1.982 0 0.167 0.026 0.336 0.06 0.474h-0.153c-1.361-0.077-2.577-0.56-3.445-1.512-0.19-0.204-0.368-0.422-0.518-0.654-0.294 0.509-0.325 1.1-0.19 1.648 0.123 0.41 0.34 0.776 0.64 1.05l0.15 0.1364-0.19-0.041c-0.245-0.068-0.49-0.15-0.722-0.245 0.027 0.49 0.218 0.94 0.517 1.294 0.286 0.34 0.667 0.6 1.103 0.722-0.31 0.032-0.6165 0.0236-0.926 0.0135 0.3132 0.763 1.035 1.322 1.8927 1.3897-0.79 0.585-1.77 0.912-2.82 0.912 0.7762 0.477 1.661 0.777 2.628 0.831h0.627c2.982-0.163 5.338-2.63 5.34-5.6526v-0.286c0.11-0.095 0.218-0.19 0.327-0.3 0.259-0.2316 0.49-0.504 0.681-0.79-0.313 0.204-0.681 0.3133-1.09 0.313h-0.014c0.366-0.2453 0.653-0.613 0.8-1.035-0.41 0.212-0.802 0.3433-1.23 0.425-0.46-0.4-0.83-0.675-1.486-0.675z" fill="var(--color-main-background)"/></svg>', + '<svg aria-hidden="true" width="50" height="50" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="8" fill="var(--color-text-maxcontrast)"/><path d="m 3.384891,2.6 c -0.3882,0 -0.61495,0.4362184 -0.39375,0.7558594 L 6.5841098,8.4900156 2.9770785,12.707422 C 2.7436785,12.979821 2.9370285,13.4 3.2958285,13.4 H 3.694266 c 0.176,0 0.3430313,-0.07714 0.4570313,-0.210938 L 7.294266,9.5065156 9.6602817,12.887891 C 9.8762817,13.208984 10.25229,13.4 10.743485,13.4 h 1.900391 c 0.3882,0 0.61575,-0.436688 0.39375,-0.754688 L 9.2466097,7.2195156 12.682547,3.1941408 C 12.881744,2.9601408 12.715528,2.6 12.407473,2.6 h -0.506566 c -0.175,0 -0.34186,0.076453 -0.45586,0.2197656 L 8.5405785,6.2058438 6.3790317,3.1132812 C 6.1568442,2.7913687 5.6965004,2.6 5.3958285,2.6 Z" fill="var(--color-main-background)"/></svg>', '<svg aria-hidden="true" width="50" height="50" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="8" fill="var(--color-text-maxcontrast)"/><path d="m13.183 9.2819c-0.1566 0.80567-1.4026 1.6874-2.8336 1.8583-0.74623 0.08903-1.4809 0.17088-2.2644 0.13494-1.2813-0.05872-2.2923-0.30582-2.2923-0.30582 0 0.12473 0.0077 0.24349 0.02307 0.35456 0.16657 1.2645 1.2538 1.3402 2.2837 1.3755 1.0395 0.03557 1.9651-0.25629 1.9651-0.25629l0.0427 0.93975s-0.72709 0.39044-2.0223 0.46224c-0.71423 0.03926-1.6011-0.01798-2.634-0.29136-2.2402-0.59294-2.6255-2.9809-2.6844-5.4039-0.01797-0.7194-0.00687-1.3977-0.00687-1.9651 0-2.4776 1.6233-3.2038 1.6233-3.2038 0.81852-0.37591 2.223-0.53399 3.6832-0.54593h0.035867c1.4601 0.011937 2.8656 0.17002 3.6841 0.54593 0 0 1.6233 0.72623 1.6233 3.2038 0 0 0.02036 1.828-0.22639 3.0971" fill="var(--color-main-background)" stroke-width=".049227"/><path d="m11.494 6.377v3h-1.1885v-2.9118c0-0.6138-0.25826-0.92535-0.77484-0.92535-0.57116 0-0.85742 0.36957-0.85742 1.1004v1.5938h-1.1815v-1.5938c0-0.73078-0.28632-1.1004-0.85748-1.1004-0.51658 0-0.77484 0.31155-0.77484 0.92535v2.9118h-1.1885v-3c0-0.61313 0.15611-1.1004 0.46969-1.4608 0.32336-0.36047 0.74684-0.54525 1.2725-0.54525 0.6082 0 1.0688 0.23377 1.3733 0.70137l0.29604 0.49627 0.2961-0.49627c0.30447-0.4676 0.76505-0.70137 1.3733-0.70137 0.52563 0 0.9491 0.18479 1.2725 0.54525 0.31352 0.36047 0.46963 0.84769 0.46963 1.4608" fill="var(--color-text-maxcontrast)" stroke-width=".049227"/></svg>', '<svg aria-hidden="true" width="50" height="50" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="8" fill="var(--color-text-maxcontrast)"/><path d="m4.5 3.5v1.7c3.563 0 6.3 2.735 6.3 6.3h1.7c0-4.4-3.58-8-8-8zm0 2.5v1.7c2.326 0 3.774 1.468 3.8 3.8h1.7c0-3-2.492-5.5-5.5-5.5zm1.25 3c-0.69 0-1.25 0.56-1.25 1.25s0.56 1.25 1.25 1.25 1.25-0.56 1.25-1.25-0.56-1.25-1.25-1.25z" fill="var(--color-main-background)"/></svg>', '<svg aria-hidden="true" width="50" height="50" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="8" fill="var(--color-text-maxcontrast)"/><path d="m3.556 4.875c-0.306 0-0.556 0.248-0.556 0.555v5.14c0 0.31 0.25 0.555 0.556 0.555h8.89c0.304 0 0.554-0.245 0.554-0.555v-5.14c0-0.307-0.25-0.555-0.556-0.555zm0.47 0.643 3.8 3.8h0.33l3.82-3.8 0.38 0.38-2.274 2.31 1.82 1.753-0.38 0.38-1.753-1.753-1.267 1.285h-0.8l-1.368-1.283-1.754 1.77-0.38-0.4 1.734-1.76-2.292-2.3z" fill="var(--color-main-background)"/></svg>', '<a target="_blank" aria-label="{facebooktext}" rel="noreferrer noopener" href="https://www.facebook.com/Nextclouders/">', - '<a target="_blank" aria-label="{twittertext}" rel="noreferrer noopener" href="https://twitter.com/nextclouders">', + '<a target="_blank" aria-label="{xtext}" rel="noreferrer noopener" href="https://x.com/nextclouders">', '<a target="_blank" aria-label="{mastodontext}" rel="noreferrer noopener" href="https://mastodon.xyz/@nextcloud">', '<a target="_blank" aria-label="{rsstext}" rel="noreferrer noopener" href="https://nextcloud.com/blog/">', '<a target="_blank" aria-label="{mailtext}" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&id=1">', '</a>', $l->t('Like our Facebook page'), - $l->t('Follow us on Twitter'), + $l->t('Follow us on X'), $l->t('Follow us on Mastodon'), $l->t('Check out our blog'), $l->t('Subscribe to our newsletter'), ], '{facebookopen}{facebookimage}{linkclose} - {twitteropen}{twitterimage}{linkclose} + {xopen}{ximage}{linkclose} {mastodonopen}{mastodonimage}{linkclose} {rssopen}{rssimage}{linkclose} {newsletteropen}{mailimage}{linkclose}' diff --git a/apps/settings/templates/settings/personal/personal.info.php b/apps/settings/templates/settings/personal/personal.info.php index bed6f8aa5f9..38c449a337f 100644 --- a/apps/settings/templates/settings/personal/personal.info.php +++ b/apps/settings/templates/settings/personal/personal.info.php @@ -44,6 +44,9 @@ script('settings', [ <div id="vue-displayname-section"></div> </div> <div class="personal-settings-setting-box"> + <div id="vue-pronouns-section"></div> + </div> + <div class="personal-settings-setting-box"> <div id="vue-email-section"></div> </div> <div class="personal-settings-setting-box"> @@ -62,12 +65,18 @@ script('settings', [ <div id="vue-locale-section"></div> </div> <div class="personal-settings-setting-box"> + <div id="vue-fdow-section"></div> + </div> + <div class="personal-settings-setting-box"> <div id="vue-website-section"></div> </div> <div class="personal-settings-setting-box"> <div id="vue-twitter-section"></div> </div> <div class="personal-settings-setting-box"> + <div id="vue-bluesky-section"></div> + </div> + <div class="personal-settings-setting-box"> <div id="vue-fediverse-section"></div> </div> <?php if ($_['profileEnabledGlobally']) : ?> diff --git a/apps/settings/templates/settings/personal/security/authtokens.php b/apps/settings/templates/settings/personal/security/authtokens.php index 3bc00c80e51..e59266695bf 100644 --- a/apps/settings/templates/settings/personal/security/authtokens.php +++ b/apps/settings/templates/settings/personal/security/authtokens.php @@ -5,7 +5,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -script('settings', 'vue-settings-personal-security'); +\OCP\Util::addScript('settings', 'vue-settings-personal-security', 'core'); ?> diff --git a/apps/settings/templates/settings/personal/security/webauthn.php b/apps/settings/templates/settings/personal/security/webauthn.php index 0bcf063bd96..33611b5399c 100644 --- a/apps/settings/templates/settings/personal/security/webauthn.php +++ b/apps/settings/templates/settings/personal/security/webauthn.php @@ -5,7 +5,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -script('settings', 'vue-settings-personal-webauthn'); +\OCP\Util::addScript('settings', 'vue-settings-personal-webauthn', 'core'); ?> |