Move sync client to the firstrunwizard app
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
parent
c94dbddd12
commit
da6dd4898a
|
@ -822,7 +822,6 @@ return array(
|
||||||
'OC\\Settings\\Personal\\Additional' => $baseDir . '/lib/private/Settings/Personal/Additional.php',
|
'OC\\Settings\\Personal\\Additional' => $baseDir . '/lib/private/Settings/Personal/Additional.php',
|
||||||
'OC\\Settings\\Personal\\PersonalInfo' => $baseDir . '/lib/private/Settings/Personal/PersonalInfo.php',
|
'OC\\Settings\\Personal\\PersonalInfo' => $baseDir . '/lib/private/Settings/Personal/PersonalInfo.php',
|
||||||
'OC\\Settings\\Personal\\Security' => $baseDir . '/lib/private/Settings/Personal/Security.php',
|
'OC\\Settings\\Personal\\Security' => $baseDir . '/lib/private/Settings/Personal/Security.php',
|
||||||
'OC\\Settings\\Personal\\SyncClients' => $baseDir . '/lib/private/Settings/Personal/SyncClients.php',
|
|
||||||
'OC\\Settings\\RemoveOrphaned' => $baseDir . '/lib/private/Settings/RemoveOrphaned.php',
|
'OC\\Settings\\RemoveOrphaned' => $baseDir . '/lib/private/Settings/RemoveOrphaned.php',
|
||||||
'OC\\Settings\\Section' => $baseDir . '/lib/private/Settings/Section.php',
|
'OC\\Settings\\Section' => $baseDir . '/lib/private/Settings/Section.php',
|
||||||
'OC\\Setup' => $baseDir . '/lib/private/Setup.php',
|
'OC\\Setup' => $baseDir . '/lib/private/Setup.php',
|
||||||
|
|
|
@ -852,7 +852,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
|
||||||
'OC\\Settings\\Personal\\Additional' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Additional.php',
|
'OC\\Settings\\Personal\\Additional' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Additional.php',
|
||||||
'OC\\Settings\\Personal\\PersonalInfo' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/PersonalInfo.php',
|
'OC\\Settings\\Personal\\PersonalInfo' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/PersonalInfo.php',
|
||||||
'OC\\Settings\\Personal\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Security.php',
|
'OC\\Settings\\Personal\\Security' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/Security.php',
|
||||||
'OC\\Settings\\Personal\\SyncClients' => __DIR__ . '/../../..' . '/lib/private/Settings/Personal/SyncClients.php',
|
|
||||||
'OC\\Settings\\RemoveOrphaned' => __DIR__ . '/../../..' . '/lib/private/Settings/RemoveOrphaned.php',
|
'OC\\Settings\\RemoveOrphaned' => __DIR__ . '/../../..' . '/lib/private/Settings/RemoveOrphaned.php',
|
||||||
'OC\\Settings\\Section' => __DIR__ . '/../../..' . '/lib/private/Settings/Section.php',
|
'OC\\Settings\\Section' => __DIR__ . '/../../..' . '/lib/private/Settings/Section.php',
|
||||||
'OC\\Setup' => __DIR__ . '/../../..' . '/lib/private/Setup.php',
|
'OC\\Setup' => __DIR__ . '/../../..' . '/lib/private/Setup.php',
|
||||||
|
|
|
@ -423,11 +423,6 @@ class Manager implements IManager {
|
||||||
$form = new Personal\Security();
|
$form = new Personal\Security();
|
||||||
$forms[$form->getPriority()] = [$form];
|
$forms[$form->getPriority()] = [$form];
|
||||||
}
|
}
|
||||||
if($section === 'sync-clients') {
|
|
||||||
/** @var ISettings $form */
|
|
||||||
$form = new Personal\SyncClients($this->config, $this->defaults);
|
|
||||||
$forms[$form->getPriority()] = [$form];
|
|
||||||
}
|
|
||||||
if ($section === 'additional') {
|
if ($section === 'additional') {
|
||||||
/** @var ISettings $form */
|
/** @var ISettings $form */
|
||||||
$form = new Personal\Additional($this->config);
|
$form = new Personal\Additional($this->config);
|
||||||
|
|
|
@ -1,85 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
*
|
|
||||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OC\Settings\Personal;
|
|
||||||
|
|
||||||
|
|
||||||
use OCP\AppFramework\Http\TemplateResponse;
|
|
||||||
use OCP\IConfig;
|
|
||||||
use OCP\Settings\ISettings;
|
|
||||||
|
|
||||||
class SyncClients implements ISettings {
|
|
||||||
|
|
||||||
/** @var IConfig */
|
|
||||||
private $config;
|
|
||||||
/** @var \OC_Defaults */
|
|
||||||
private $defaults;
|
|
||||||
|
|
||||||
public function __construct(IConfig $config, \OC_Defaults $defaults) {
|
|
||||||
$this->config = $config;
|
|
||||||
$this->defaults = $defaults;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return TemplateResponse returns the instance with all parameters set, ready to be rendered
|
|
||||||
* @since 9.1
|
|
||||||
*/
|
|
||||||
public function getForm() {
|
|
||||||
$parameters = [ 'clients' => $this->getClientLinks() ];
|
|
||||||
return new TemplateResponse('settings', 'settings/personal/sync-clients', $parameters);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string the section ID, e.g. 'sharing'
|
|
||||||
* @since 9.1
|
|
||||||
*/
|
|
||||||
public function getSection() {
|
|
||||||
return 'sync-clients';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return int whether the form should be rather on the top or bottom of
|
|
||||||
* the admin section. The forms are arranged in ascending order of the
|
|
||||||
* priority values. It is required to return a value between 0 and 100.
|
|
||||||
*
|
|
||||||
* E.g.: 70
|
|
||||||
* @since 9.1
|
|
||||||
*/
|
|
||||||
public function getPriority() {
|
|
||||||
return 20;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* returns an array containing links to the various clients
|
|
||||||
*
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
private function getClientLinks() {
|
|
||||||
$clients = [
|
|
||||||
'desktop' => $this->config->getSystemValue('customclient_desktop', $this->defaults->getSyncClientUrl()),
|
|
||||||
'android' => $this->config->getSystemValue('customclient_android', $this->defaults->getAndroidClientUrl()),
|
|
||||||
'ios' => $this->config->getSystemValue('customclient_ios', $this->defaults->getiOSClientUrl())
|
|
||||||
];
|
|
||||||
return $clients;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,59 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
*
|
|
||||||
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** @var array $_ */
|
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
||||||
<div id="clientsbox" class="section clientsbox">
|
|
||||||
<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
|
|
||||||
<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
|
|
||||||
<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
|
|
||||||
alt="<?php p($l->t('Desktop client'));?>" />
|
|
||||||
</a>
|
|
||||||
<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
|
|
||||||
<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
|
|
||||||
alt="<?php p($l->t('Android app'));?>" />
|
|
||||||
</a>
|
|
||||||
<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
|
|
||||||
<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
|
|
||||||
alt="<?php p($l->t('iOS app'));?>" />
|
|
||||||
</a>
|
|
||||||
|
|
||||||
<p>
|
|
||||||
<?php print_unescaped(str_replace(
|
|
||||||
[
|
|
||||||
'{contributeopen}',
|
|
||||||
'{linkclose}',
|
|
||||||
],
|
|
||||||
[
|
|
||||||
'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
|
|
||||||
'</a>',
|
|
||||||
],
|
|
||||||
$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
|
|
||||||
<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
|
|
||||||
<?php }?>
|
|
||||||
</div>
|
|
Loading…
Reference in New Issue