summaryrefslogtreecommitdiffstats
path: root/settings/templates
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-02-03 12:48:17 +0100
committerVincent Petry <pvince81@owncloud.com>2014-09-23 11:16:14 +0200
commite65ceb08fc4a56d0fb9e4be5d51ba04168cbb59a (patch)
tree72f9a407f9f0a653ad534a1aec4df76837d15ef8 /settings/templates
parentfc42a64e6c848adc21bb069da01398f7d39fcc4a (diff)
downloadnextcloud-server-e65ceb08fc4a56d0fb9e4be5d51ba04168cbb59a.tar.gz
nextcloud-server-e65ceb08fc4a56d0fb9e4be5d51ba04168cbb59a.zip
Moved WebDAV and internet checks to client side JS
- Added setup checks in JavaScript - Moved isWebDAVWorking to JS using SetupChecks - Moved internet connection checks to an ajax call that goes through the server
Diffstat (limited to 'settings/templates')
-rw-r--r--settings/templates/admin.php41
1 files changed, 11 insertions, 30 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9ceebad4ee1..1209cf86d8d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -72,21 +72,6 @@ if (!$_['htaccessworking']) {
<?php
}
-// is WebDAV working ?
-if (!$_['isWebDavWorking']) {
- ?>
-<div class="section">
- <h2><?php p($l->t('Setup Warning'));?></h2>
-
- <span class="securitywarning">
- <?php p($l->t('Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.')); ?>
- <?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', link_to_docs('admin-install'))); ?>
- </span>
-
-</div>
-<?php
-}
-
// Are doc blocks accessible?
if (!$_['isAnnotationsWorking']) {
?>
@@ -183,20 +168,6 @@ if (!$_['isLocaleWorking']) {
<?php
}
-// is internet connection working ?
-if ($_['internetconnectionworking'] === false) {
- ?>
- <div class="section">
- <h2><?php p($l->t('Internet connection not working'));?></h2>
-
- <span class="connectionwarning">
- <?php p($l->t('This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps donĀ“t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')); ?>
- </span>
-
- </div>
-<?php
-}
-
if ($_['suggestedOverwriteWebroot']) {
?>
<div class="section">
@@ -210,7 +181,17 @@ if ($_['suggestedOverwriteWebroot']) {
<?php
}
?>
-
+<div id="postsetupchecks" class="section">
+ <h2><?php p($l->t('Connectivity checks'));?></h2>
+ <div class="loading"></div>
+ <div class="success hidden"><?php p($l->t('No problems found'));?></div>
+ <div class="errors hidden"></div>
+ <div class="hint hidden">
+ <span class="setupwarning"><?php
+ print_unescaped($l->t('Please double check the <a href=\'%s\'>installation guides</a>.', \OC_Helper::linkToDocs('admin-install')));
+ ?></span>
+ </div>
+</div>
<?php foreach ($_['forms'] as $form) {
print_unescaped($form);
}