diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 15:15:22 +0400 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 15:15:22 +0400 |
| commit | cabe92ef1240e171a812f5822ac69b4d7742fd71 (patch) | |
| tree | 469e9089107d440da0c12c291abbd626d6d08b33 /settings/templates | |
| parent | 7adfc27cafa6f94962a33c158af9c45e71e012c5 (diff) | |
| parent | d3e2f31adad5eeaf415154dd2fb88cb9fec0b3c1 (diff) | |
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/admin.php | 20 | ||||
| -rw-r--r-- | settings/templates/personal.php | 4 |
2 files changed, 8 insertions, 16 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 2b14c1460d6..e54586b80df 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -90,38 +90,30 @@ if (!$_['internetconnectionworking']) { <fieldset class="personalblock" id="backgroundjobs"> <legend><strong><?php p($l->t('Cron'));?></strong></legend> - <table class="nostyle"> - <tr> - <td> + <p> <input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_ajax">AJAX</label><br/> <em><?php p($l->t("Execute one task with each page loaded")); ?></em> - </td> - </tr> - <tr> - <td> + </p> + <p> <input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] === "webcron") { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_webcron">Webcron</label><br/> <em><?php p($l->t("cron.php is registered at a webcron service to call cron.php once a minute over http.")); ?></em> - </td> - </tr> - <tr> - <td> + </p> + <p> <input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] === "cron") { print_unescaped('checked="checked"'); } ?>> <label for="backgroundjobs_cron">Cron</label><br/> <em><?php p($l->t("Use systems cron service to call the cron.php file once a minute.")); ?></em> - </td> - </tr> - </table> + </p> </fieldset> <fieldset class="personalblock" id="shareAPI"> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 7e926ea42b0..bad88142da9 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -4,7 +4,7 @@ * See the COPYING-README file. */?> -<div class="clientsbox"> +<div class="clientsbox center"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> <a href="<?php p($_['clients']['desktop']); ?>" target="_blank"> <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" /> @@ -16,7 +16,7 @@ <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" /> </a> <?php if(OC_APP::isEnabled('firstrunwizard')) {?> - <center><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></center> + <p class="center"><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p> <?php }?> </div> |