diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-14 16:12:27 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-14 16:12:31 +0200 |
| commit | 7bb261f81014b3f0abb2677f22289e6906ced749 (patch) | |
| tree | 5f310d1adb00c9d778ca60422c976c301e7cd992 /settings | |
| parent | df532e3f823375e059defff4e5e3fee2af6c8054 (diff) | |
| download | nextcloud-server-7bb261f81014b3f0abb2677f22289e6906ced749.tar.gz nextcloud-server-7bb261f81014b3f0abb2677f22289e6906ced749.zip | |
more fixes for Personal and Tipsy
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 2 | ||||
| -rw-r--r-- | settings/js/personal.js | 8 | ||||
| -rw-r--r-- | settings/templates/personal.php | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index c73e08437c1..c8163ff2f82 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -1,3 +1,5 @@ +input#openid, input#webdav { width:20em; } + /* PERSONAL */ #passworderror { display:none; } #passwordchanged { display:none; } diff --git a/settings/js/personal.js b/settings/js/personal.js index f6b7eeb7584..d16917d5393 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -32,4 +32,12 @@ $(document).ready(function(){ }); return false; }); + + // reset value when edited, workaround because of .select() not working with disabled inputs + $('#webdav').focus(function(event){ + openidValue = $('#webdav').val(); + }); + $('#webdav').blur(function(event){ + $('#webdav').val(openidValue); + }); } ); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 8a6439f9722..95df4d8c712 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -1,5 +1,5 @@ -<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> +<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');?> <strong><?php echo $_['total_space'];?></strong></p> </div></div> <form id="passwordform"> @@ -15,7 +15,7 @@ <form> <fieldset class="personalblock"> - <strong><label for="languageinput"><?php echo $l->t('Language');?></label></strong> + <label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label> <select id="languageinput" name='lang'> <?php foreach($_['languages'] as $language):?> <option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option> @@ -26,9 +26,8 @@ </form> <p class="personalblock"> - <strong>WebDAV</strong> <a href="<?php echo ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?>" title="webdav"> - <?php echo ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?> - </a> + <label for="webdav"><strong>WebDAV</strong></label> + <input id="webdav" type="text" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?>" title="use this address to connect to your ownCloud in your file manager" /> </p> <?php foreach($_['forms'] as $form){ |