diff --git a/integrations/nextcloud/snappymail/README.md b/integrations/nextcloud/snappymail/README.md index 025db1cc9..e1c54477e 100644 --- a/integrations/nextcloud/snappymail/README.md +++ b/integrations/nextcloud/snappymail/README.md @@ -11,17 +11,17 @@ Thank you to all contributors to SnappyMail for nextcloud: ## How to Install -Start within Nextcloud, and click on the "+ Apps" button in the upper-left corner dropdown menu: +Start within Nextcloud, and click on the "+ Apps" button in the upper-right corner dropdown menu: ![Image1](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/help_a1.png) Then, enable the SnappyMail plugin that you will find in the "Social & communication" section: -![Image2](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots//help_a2.png) +![Image2](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/help_a2.png) After a quick wait, SnappyMail is installed. Now you should configure it before use: open the Nextcloud admin panel (upper-right corner dropdown menu) and go to "Additionnal settings". There, click on the "Go to SnappyMail Webmail admin panel" link. -![Image3](https://github.com/pierre-alain-b/rainloop-nextcloud/blob/master/screenshots/help_a3.png) +![Image3](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/nextcloud-admin.png) To enter SnappyMail admin area, the default login is "admin" and the default password will be generated in `[nextcloud-data]/app_snappymail/_data_/_default_/admin_password.txt`. Don't forget to change it once in the admin panel! @@ -34,7 +34,7 @@ From that point, all instance-wide SnappyMail settings can be tweaked as you wis SnappyMail for Nextcloud is highly configurable. But settings are available in multiple places and this can be misleading for first-time users. ### SnappyMail admin settings -SnappyMail admin settings can be reached only by the Nextcloud administrator. Open the Nextcloud admin panel ("Admin" in the upper-right corner dropdown menu) and go to "Additionnal settings". There, click on the "Go to SnappyMail Webmail admin panel" link. Alternatively, you may use the following link: https://path.to.nextcloud/index.php/apps/snappymail/app/?admin. +SnappyMail admin settings can be reached only by the Nextcloud administrator. Open the Nextcloud admin panel ("Admin" in the upper-right corner dropdown menu) and go to "Additionnal settings". There, click on the "Go to SnappyMail Webmail admin panel" link. Alternatively, you may use the following link: https://path.to.nextcloud/index.php/apps/snappymail/run/?admin. SnappyMail admin settings include all settings that will apply to all SnappyMail users (default login rules, branding, management of plugins, security rules and domains). diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud/images/preview.png b/integrations/nextcloud/snappymail/app/themes/Nextcloud/images/preview.png index 4e633cc1f..d1f82db87 100644 Binary files a/integrations/nextcloud/snappymail/app/themes/Nextcloud/images/preview.png and b/integrations/nextcloud/snappymail/app/themes/Nextcloud/images/preview.png differ diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml index 583b1cd80..e648458a6 100644 --- a/integrations/nextcloud/snappymail/appinfo/info.xml +++ b/integrations/nextcloud/snappymail/appinfo/info.xml @@ -61,10 +61,18 @@ There, click on the link to go to the SnappyMail admin panel. xxtea zip --> - + OCA\SnappyMail\Settings\AdminSettings OCA\SnappyMail\Settings\PersonalSettings + + + SnappyMail + snappymail.page.index + logo-white-64x64.png + 4 + + diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php index 9203a62da..c5dae876d 100644 --- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php +++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php @@ -66,19 +66,19 @@ class Application extends App implements IBootstrap if (!\is_dir(\rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/') . '/appdata_snappymail')) { return; } - +/* $container = $this->getContainer(); $container->query('OCP\INavigationManager')->add(function () use ($container) { $urlGenerator = $container->query('OCP\IURLGenerator'); return [ 'id' => 'snappymail', - 'order' => 10, + 'order' => 4, 'href' => $urlGenerator->linkToRoute('snappymail.page.index'), 'icon' => $urlGenerator->imagePath('snappymail', 'logo-white-64x64.png'), 'name' => \OCP\Util::getL10N('snappymail')->t('Email') ]; }); - +*/ $userSession = \OC::$server->getUserSession(); $userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) { $config = \OC::$server->getConfig(); diff --git a/integrations/nextcloud/snappymail/screenshots/help_a1.png b/integrations/nextcloud/snappymail/screenshots/help_a1.png deleted file mode 100644 index bec6cbed3..000000000 Binary files a/integrations/nextcloud/snappymail/screenshots/help_a1.png and /dev/null differ diff --git a/integrations/nextcloud/snappymail/screenshots/help_a2.png b/integrations/nextcloud/snappymail/screenshots/help_a2.png deleted file mode 100644 index 0d7174f5d..000000000 Binary files a/integrations/nextcloud/snappymail/screenshots/help_a2.png and /dev/null differ diff --git a/integrations/nextcloud/snappymail/screenshots/help_a3.png b/integrations/nextcloud/snappymail/screenshots/help_a3.png deleted file mode 100644 index 77415d815..000000000 Binary files a/integrations/nextcloud/snappymail/screenshots/help_a3.png and /dev/null differ diff --git a/integrations/nextcloud/snappymail/screenshots/help_a4.png b/integrations/nextcloud/snappymail/screenshots/help_a4.png deleted file mode 100644 index ff2e62d66..000000000 Binary files a/integrations/nextcloud/snappymail/screenshots/help_a4.png and /dev/null differ