diff options
| -rw-r--r-- | settings/css/settings.css | 4 | ||||
| -rw-r--r-- | settings/personal.php | 5 | ||||
| -rw-r--r-- | settings/templates/personal.php | 8 | ||||
| -rw-r--r-- | tests/lib/util.php | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 367ec9c59b8..ff6bf3d0c50 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -14,6 +14,10 @@ input#openid, input#webdav { width:20em; } } /* Sync clients */ +.clientsbox { + padding-top: 30px; + margin-top: -30px; +} .clientsbox h2 { font-size: 20px; margin: 35px 0 10px; diff --git a/settings/personal.php b/settings/personal.php index 7239df365f5..1249fb8a40f 100644 --- a/settings/personal.php +++ b/settings/personal.php @@ -108,8 +108,9 @@ $tmpl->assign('groups', $groups2); // add hardcoded forms from the template $l = OC_L10N::get('settings'); -$formsAndMore = array(); -$formsAndMore[]= array( 'anchor' => 'passwordform', 'section-name' => $l->t('Personal Info') ); +$formsAndMore = []; +$formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')]; +$formsAndMore[]= ['anchor' => 'passwordform', 'section-name' => $l->t('Personal info')]; $forms=OC_App::getForms('personal'); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index cb153447b96..1d5bf1fc54f 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -21,7 +21,7 @@ <div id="app-content"> -<div class="clientsbox center"> +<div id="clientsbox" 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')); ?>" @@ -94,7 +94,7 @@ if($_['displayNameChangeSupported']) { ?> <form id="displaynameform" class="section"> <h2> - <label for="displayName"><?php echo $l->t('Full Name');?></label> + <label for="displayName"><?php echo $l->t('Full name');?></label> </h2> <input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" @@ -106,7 +106,7 @@ if($_['displayNameChangeSupported']) { } else { ?> <div class="section"> - <h2><?php echo $l->t('Full Name');?></h2> + <h2><?php echo $l->t('Full name');?></h2> <span><?php if(isset($_['displayName'][0])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span> </div> <?php @@ -236,7 +236,7 @@ if($_['passwordChangeSupported']) { </table> <form class="uploadButton" method="post" action="<?php p(\OC_Helper::linkToRoute('settings_cert_post')); ?>" target="certUploadFrame"> <input type="file" id="rootcert_import" name="rootcert_import" class="hidden"> - <input type="button" id="rootcert_import_button" value="<?php p($l->t('Import Root Certificate')); ?>"/> + <input type="button" id="rootcert_import_button" value="<?php p($l->t('Import root certificate')); ?>"/> </form> </div> diff --git a/tests/lib/util.php b/tests/lib/util.php index a852eee8ad6..4082c28f050 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -52,13 +52,11 @@ class Test_Util extends \Test\TestCase { OC_Util::formatDate(1350129205, false, 'Mordor/Barad-dûr'); } - public function formatDateWithTZFromSessionData() - { + public function formatDateWithTZFromSessionData() { return array( array(3, 'October 13, 2012 at 2:53:25 PM GMT+3'), array(15, 'October 13, 2012 at 11:53:25 AM GMT+0'), array(-13, 'October 13, 2012 at 11:53:25 AM GMT+0'), - array(3.5, 'October 13, 2012 at 3:23:25 PM GMT+3:30'), array(9.5, 'October 13, 2012 at 9:23:25 PM GMT+9:30'), array(-4.5, 'October 13, 2012 at 7:23:25 AM GMT-4:30'), array(15.5, 'October 13, 2012 at 11:53:25 AM GMT+0'), |