From f2a21398d791beda3e1de0a5c4c12a141e70c795 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> Date: Sun, 14 Aug 2011 11:09:51 +0200 Subject: [PATCH] more info in personal, WebDAV, OpenID --- apps/user_openid/templates/settings.php | 9 +++--- core/js/js.js | 1 + settings/templates/personal.php | 41 +++++++++++++++---------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php index fff1eff09e..add3345f7b 100644 --- a/apps/user_openid/templates/settings.php +++ b/apps/user_openid/templates/settings.php @@ -1,6 +1,7 @@ <form id="openidform"> - <fieldset> - <legend><?php echo $l->t( 'OpenID' );?></legend> - <input type="text" name='identity' id='identity' value="<?php echo $_['identity']; ?>" placeholder="OpenID for <?php echo OC_User::getUser();?>" /> + <fieldset class="personalblock"> + <p><strong>OpenID</strong> <?php echo ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].$WEBROOT.'/?'; echo OC_User::getUser(); ?></p> + <label for="identity">Authorized</label> + <input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="OpenID provider" title="Wordpress, Identi.ca, Launchpad, …" /> </fieldset> -</form> \ No newline at end of file +</form> diff --git a/core/js/js.js b/core/js/js.js index 63c88bb4ad..cddf95a843 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -302,6 +302,7 @@ $(document).ready(function(){ if($('.action').attr('title')) $('.action').tipsy({gravity:'s', fade:true, live:true}); $('.selectedActions a').tipsy({gravity:'n', fade:true, live:true}); $('.selectedActions a.delete').tipsy({gravity: 'ne', fade:true, live:true}); + $('input#identity').tipsy({gravity:'w', fade:true}); }); if (!Array.prototype.map){ diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 6ea60e54c5..02f66c9a13 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -1,27 +1,34 @@ <div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'] ?>%;"> - <p><?php echo $l->t( 'You use' );?> <strong><?php echo $_['usage'] ?></strong> <?php echo $l->t( 'of the available' );?> <?php echo $_['total_space'] ?></p> + <p><?php echo $l->t('You use');?> <strong><?php echo $_['usage'] ?></strong> <?php echo $l->t('of the available');?> <?php echo $_['total_space'] ?></p> </div></div> <form id="passwordform"> <fieldset class="personalblock"> - <div id="passwordchanged"><?php echo $l->t( 'Your password got changed');?></div> + <div id="passwordchanged"><?php echo $l->t('Your password got changed');?></div> <div id="passworderror"></div> - <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t( 'Current password' );?>" /> - <input type="password" id="pass2" name="password" placeholder="<?php echo $l->t( 'New password' );?>" data-typetoggle="#show" /> - <input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t( 'show' );?></label> - <input id="passwordbutton" type="submit" value="<?php echo $l->t( 'Change password' );?>" /> + <input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" /> + <input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" /> + <input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label> + <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> </fieldset> </form> -<div class="personalblock"> - <label for="languageinput"><?php echo $l->t( 'Language' );?></label> - <select id="languageinput" name='lang'> - <?php foreach($_['languages'] as $language):?> - <option value='<?php echo $language;?>'><?php echo $language;?></option> - <?php endforeach;?> - </select> +<form> + <fieldset class="personalblock"> + <strong><label for="languageinput"><?php echo $l->t('Language');?></label></strong> + <select id="languageinput" name='lang'> + <?php foreach($_['languages'] as $language):?> + <option value="<?php echo $language;?>"><?php echo $language;?></option> + <?php endforeach;?> + </select> + <a href="https://www.transifex.net/projects/p/owncloud/"><?php echo $l->t('Help translating');?></a> + </fieldset> +</form> + +<p class="personalblock"> + <strong>WebDAV</strong> <?php echo ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].$WEBROOT.'/files/webdav.php'; ?> +</p> - <?php foreach($_['forms'] as $form){ - echo $form; - };?> -</div> +<?php foreach($_['forms'] as $form){ + echo $form; +};?> -- GitLab