diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-22 17:12:17 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-22 17:12:17 +0200 |
| commit | a77d468d3568055ee85dd9508a2f009cb5da650f (patch) | |
| tree | bf76ca296b9589693f9ac522cca1eff94f4eb60f /core | |
| parent | 620610a3a7ac57fc43dc232bca9b74ac709f1ca5 (diff) | |
| parent | dd871098c5f598326a1bc03f8b7bed0d2184e798 (diff) | |
| download | nextcloud-server-a77d468d3568055ee85dd9508a2f009cb5da650f.tar.gz nextcloud-server-a77d468d3568055ee85dd9508a2f009cb5da650f.zip | |
Merge pull request #10584 from owncloud/simple-wizard-trusted-domains
Add a trusted domain wizard
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 4 | ||||
| -rw-r--r-- | core/templates/untrustedDomain.php | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index f1ce49cfe20..292fb83a056 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -611,6 +611,10 @@ label.infield { margin-left: -200px !important; } +.error-wide .button { + color: black !important; +} + /* Fixes for log in page, TODO should be removed some time */ #body-login .update, #body-login .error { diff --git a/core/templates/untrustedDomain.php b/core/templates/untrustedDomain.php new file mode 100644 index 00000000000..b661834318d --- /dev/null +++ b/core/templates/untrustedDomain.php @@ -0,0 +1,19 @@ +<?php /** @var $_ array */ ?> + +<ul class="error-wide"> + <li class='error'> + <?php p($l->t('You are accessing the server from an untrusted domain.')); ?><br/> + + <p class='hint'> + <?php p($l->t('Please contact your administrator. If you are an administrator of this instance, configure the "trusted_domain" setting in config/config.php. An example configuration is provided in config/config.sample.php.')); ?> + <br/> + <?php p($l->t('Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.')); ?> + <br/><br/> + <p style="text-align:center;"> + <a href="<?php print_unescaped(OC_Helper::makeURLAbsolute(\OCP\Util::linkToRoute('settings_admin'))); ?>?trustDomain=<?php p($_['domain']); ?>" class="button"> + <?php p($l->t('Add "%s" as trusted domain', array($_['domain']))); ?> + </a> + </p> + </p> + </li> +</ul> |