Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2022-10-17 10:30:13 +0300
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>2022-10-24 11:21:09 +0300
commit74628a2f35d20728110f2ad329aef1ded0a08bd4 (patch)
treea14e69815edd2895bbae576aa8980bcb89bbb49d
parentbe1ef4296feb806070f5d050cc4e05bc28417706 (diff)
Rename personal Groupware settings section to "Availability"backport/34626/stable25
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
-rw-r--r--apps/dav/img/LICENSES.md6
-rw-r--r--apps/dav/img/schedule.svg1
-rw-r--r--apps/dav/lib/Settings/AvailabilitySettings.php2
-rw-r--r--apps/settings/appinfo/info.xml2
-rw-r--r--apps/settings/composer/composer/autoload_classmap.php2
-rw-r--r--apps/settings/composer/composer/autoload_static.php2
-rw-r--r--apps/settings/lib/Sections/Personal/Availability.php (renamed from apps/settings/lib/Sections/Personal/Groupware.php)8
7 files changed, 15 insertions, 8 deletions
diff --git a/apps/dav/img/LICENSES.md b/apps/dav/img/LICENSES.md
new file mode 100644
index 00000000000..a1b776c0500
--- /dev/null
+++ b/apps/dav/img/LICENSES.md
@@ -0,0 +1,6 @@
+# Licenses
+
+## schedule.svg
+- Created by: Google
+- License: Apache License, Version 2.0
+- Link: https://fonts.google.com/icons?selected=Material%20Icons%3Aschedule%3A
diff --git a/apps/dav/img/schedule.svg b/apps/dav/img/schedule.svg
new file mode 100644
index 00000000000..0d632671fb1
--- /dev/null
+++ b/apps/dav/img/schedule.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/><path d="M12.5 7H11v6l5.25 3.15.75-1.23-4.5-2.67z"/></svg> \ No newline at end of file
diff --git a/apps/dav/lib/Settings/AvailabilitySettings.php b/apps/dav/lib/Settings/AvailabilitySettings.php
index d2b75ba4866..54df6b88d55 100644
--- a/apps/dav/lib/Settings/AvailabilitySettings.php
+++ b/apps/dav/lib/Settings/AvailabilitySettings.php
@@ -59,7 +59,7 @@ class AvailabilitySettings implements ISettings {
}
public function getSection(): string {
- return 'groupware';
+ return 'availability';
}
public function getPriority(): int {
diff --git a/apps/settings/appinfo/info.xml b/apps/settings/appinfo/info.xml
index f030c1e5c50..816b685499d 100644
--- a/apps/settings/appinfo/info.xml
+++ b/apps/settings/appinfo/info.xml
@@ -37,7 +37,7 @@
<personal>OCA\Settings\Settings\Personal\Security\Password</personal>
<personal>OCA\Settings\Settings\Personal\Security\TwoFactor</personal>
<personal>OCA\Settings\Settings\Personal\Security\WebAuthn</personal>
- <personal-section>OCA\Settings\Sections\Personal\Groupware</personal-section>
+ <personal-section>OCA\Settings\Sections\Personal\Availability</personal-section>
<personal-section>OCA\Settings\Sections\Personal\PersonalInfo</personal-section>
<personal-section>OCA\Settings\Sections\Personal\Security</personal-section>
<personal-section>OCA\Settings\Sections\Personal\SyncClients</personal-section>
diff --git a/apps/settings/composer/composer/autoload_classmap.php b/apps/settings/composer/composer/autoload_classmap.php
index baac88ea8c7..6ebb4e1e067 100644
--- a/apps/settings/composer/composer/autoload_classmap.php
+++ b/apps/settings/composer/composer/autoload_classmap.php
@@ -48,7 +48,7 @@ return array(
'OCA\\Settings\\Sections\\Admin\\Security' => $baseDir . '/../lib/Sections/Admin/Security.php',
'OCA\\Settings\\Sections\\Admin\\Server' => $baseDir . '/../lib/Sections/Admin/Server.php',
'OCA\\Settings\\Sections\\Admin\\Sharing' => $baseDir . '/../lib/Sections/Admin/Sharing.php',
- 'OCA\\Settings\\Sections\\Personal\\Groupware' => $baseDir . '/../lib/Sections/Personal/Groupware.php',
+ 'OCA\\Settings\\Sections\\Personal\\Availability' => $baseDir . '/../lib/Sections/Personal/Availability.php',
'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => $baseDir . '/../lib/Sections/Personal/PersonalInfo.php',
'OCA\\Settings\\Sections\\Personal\\Security' => $baseDir . '/../lib/Sections/Personal/Security.php',
'OCA\\Settings\\Sections\\Personal\\SyncClients' => $baseDir . '/../lib/Sections/Personal/SyncClients.php',
diff --git a/apps/settings/composer/composer/autoload_static.php b/apps/settings/composer/composer/autoload_static.php
index b8aec66c25b..19858569961 100644
--- a/apps/settings/composer/composer/autoload_static.php
+++ b/apps/settings/composer/composer/autoload_static.php
@@ -63,7 +63,7 @@ class ComposerStaticInitSettings
'OCA\\Settings\\Sections\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Sections/Admin/Security.php',
'OCA\\Settings\\Sections\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Sections/Admin/Server.php',
'OCA\\Settings\\Sections\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Sections/Admin/Sharing.php',
- 'OCA\\Settings\\Sections\\Personal\\Groupware' => __DIR__ . '/..' . '/../lib/Sections/Personal/Groupware.php',
+ 'OCA\\Settings\\Sections\\Personal\\Availability' => __DIR__ . '/..' . '/../lib/Sections/Personal/Availability.php',
'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Sections/Personal/PersonalInfo.php',
'OCA\\Settings\\Sections\\Personal\\Security' => __DIR__ . '/..' . '/../lib/Sections/Personal/Security.php',
'OCA\\Settings\\Sections\\Personal\\SyncClients' => __DIR__ . '/..' . '/../lib/Sections/Personal/SyncClients.php',
diff --git a/apps/settings/lib/Sections/Personal/Groupware.php b/apps/settings/lib/Sections/Personal/Availability.php
index 4c64e06cb3a..c23b2c0a822 100644
--- a/apps/settings/lib/Sections/Personal/Groupware.php
+++ b/apps/settings/lib/Sections/Personal/Availability.php
@@ -27,7 +27,7 @@ use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Settings\IIconSection;
-class Groupware implements IIconSection {
+class Availability implements IIconSection {
/** @var IL10N */
private $l;
@@ -41,15 +41,15 @@ class Groupware implements IIconSection {
}
public function getIcon(): string {
- return $this->urlGenerator->imagePath('core', 'places/contacts.svg');
+ return $this->urlGenerator->imagePath('dav', 'schedule.svg');
}
public function getID(): string {
- return 'groupware';
+ return 'availability';
}
public function getName(): string {
- return $this->l->t('Groupware');
+ return $this->l->t('Availability');
}
public function getPriority(): int {