diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-04-09 12:12:53 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-04-09 12:12:53 +0200 |
| commit | c840c182526b9f178d312bf8519a8179ad5e968c (patch) | |
| tree | e44cc49d90bae4b55e9c32a6751432ad13496d0f | |
| parent | dbbb2546e00e7fe0937fb336320c4ee676e08e79 (diff) | |
| parent | 65dc958418a2e54b3a9cc591fd109308b9fd8397 (diff) | |
| download | nextcloud-server-c840c182526b9f178d312bf8519a8179ad5e968c.tar.gz nextcloud-server-c840c182526b9f178d312bf8519a8179ad5e968c.zip | |
Merge pull request #15499 from owncloud/admin-hints
add admin documentation hints to Federated Cloud Sharing and cron
| -rw-r--r-- | apps/files_sharing/js/settings-admin.js | 1 | ||||
| -rw-r--r-- | apps/files_sharing/templates/settings-admin.php | 3 | ||||
| -rw-r--r-- | core/js/backgroundjobs.js | 2 | ||||
| -rw-r--r-- | settings/css/settings.css | 8 | ||||
| -rw-r--r-- | settings/templates/admin.php | 4 |
5 files changed, 18 insertions, 0 deletions
diff --git a/apps/files_sharing/js/settings-admin.js b/apps/files_sharing/js/settings-admin.js index 257c864b04f..95578bff548 100644 --- a/apps/files_sharing/js/settings-admin.js +++ b/apps/files_sharing/js/settings-admin.js @@ -8,4 +8,5 @@ $(document).ready(function() { OC.AppConfig.setValue('files_sharing', $(this).attr('name'), value); }); + $('.section .icon-info').tipsy({gravity: 'w'}); }); diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php index bd803517597..376f2b71aee 100644 --- a/apps/files_sharing/templates/settings-admin.php +++ b/apps/files_sharing/templates/settings-admin.php @@ -4,6 +4,9 @@ ?> <div id="fileSharingSettings"> <h3><?php p($l->t('Federated Cloud Sharing'));?></h3> + <a target="_blank" class="icon-info svg" + title="<?php p($l->t('Open documentation'));?>" + href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a> <p> <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" diff --git a/core/js/backgroundjobs.js b/core/js/backgroundjobs.js index 4a558a66b4b..c3100792e9e 100644 --- a/core/js/backgroundjobs.js +++ b/core/js/backgroundjobs.js @@ -22,4 +22,6 @@ // start worker once page has loaded $(document).ready(function(){ $.get( OC.webroot+'/cron.php' ); + + $('.section .icon-info').tipsy({gravity: 'w'}); }); diff --git a/settings/css/settings.css b/settings/css/settings.css index 426fdbb8b94..747e370617e 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -350,6 +350,7 @@ table.grid td.date{ margin: 10px 0; color: #ce3702; } + #shareAPI p { padding-bottom: 0.8em; } #shareAPI input#shareapiExpireAfterNDays {width: 25px;} #shareAPI .indent { @@ -358,6 +359,13 @@ table.grid td.date{ #shareAPI .double-indent { padding-left: 56px; } +#fileSharingSettings h3 { + display: inline-block; +} + +.icon-info { + padding: 11px 20px; +} .mail_settings p label:first-child { display: inline-block; diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 1b8ab0e3819..4bc497df764 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -269,6 +269,10 @@ if ($_['cronErrors']) { endif; ?> </p> <?php endif; ?> + <a target="_blank" class="icon-info svg" + title="<?php p($l->t('Open documentation'));?>" + href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a> + <p> <input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") { |