more fixes for Personal and Tipsy
This commit is contained in:
parent
df532e3f82
commit
7bb261f810
|
@ -1,5 +1,5 @@
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
$('#openidform input').blur(function(event){
|
$('#openidform #identity').blur(function(event){
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
var post = $( "#openidform" ).serialize();
|
var post = $( "#openidform" ).serialize();
|
||||||
$.post( 'ajax/openid.php', post, function(data){
|
$.post( 'ajax/openid.php', post, function(data){
|
||||||
|
@ -9,4 +9,12 @@ $(document).ready(function(){
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// reset value when edited, workaround because of .select() not working with disabled inputs
|
||||||
|
$('#openid').focus(function(event){
|
||||||
|
openidValue = $('#openid').val();
|
||||||
|
});
|
||||||
|
$('#openid').blur(function(event){
|
||||||
|
$('#openid').val(openidValue);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
<form id="openidform">
|
<form id="openidform">
|
||||||
<fieldset class="personalblock">
|
<fieldset class="personalblock">
|
||||||
<p><strong>OpenID</strong>
|
<label for="openid"><strong>OpenID</strong></label>
|
||||||
<a href="<?php echo ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/?'; echo OC_User::getUser(); ?>" title="OpenID">
|
<input type="text" id="openid" value="<?php echo ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/?'; echo OC_User::getUser(); ?>" title="you can authenticate to other sites with this address" />
|
||||||
<?php echo ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/?'; echo OC_User::getUser(); ?></p>
|
|
||||||
</a>
|
|
||||||
<label for="identity">Authorized</label>
|
<label for="identity">Authorized</label>
|
||||||
<input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="OpenID provider" title="Wordpress, Identi.ca, Launchpad, …" />
|
<input type="text" name="identity" id="identity" value="<?php echo $_['identity']; ?>" placeholder="OpenID provider" title="Wordpress, Identi.ca, Launchpad, …" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
|
@ -299,15 +299,21 @@ $(document).ready(function(){
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// all the tipsy stuff needs to be here (in reverse order) to work
|
||||||
|
$('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true});
|
||||||
|
$('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true});
|
||||||
$('.remove .action').tipsy({gravity:'se', fade:true, live:true});
|
$('.remove .action').tipsy({gravity:'se', fade:true, live:true});
|
||||||
$('.date .action').tipsy({gravity:'se', fade:true, live:true});
|
$('.date .action').tipsy({gravity:'se', fade:true, live:true});
|
||||||
$('.action').tipsy({gravity:'s', fade:true, live:true});
|
$('.action').tipsy({gravity:'s', fade:true, live:true});
|
||||||
$('.selectedActions a.delete').tipsy({gravity: 'ne', fade:true, live:true});
|
$('.selectedActions a.delete').tipsy({gravity: 'ne', fade:true, live:true});
|
||||||
$('.selectedActions a').tipsy({gravity:'n', fade:true, live:true});
|
$('.selectedActions a').tipsy({gravity:'n', fade:true, live:true});
|
||||||
$('input').each(function(i,input) {
|
$('.file_upload_button_wrapper').tipsy({gravity:'e', fade:true});
|
||||||
if($(input).attr('title')) {
|
$('td.filesize').tipsy({gravity:'s', fade:true, live:true});
|
||||||
$(input).tipsy({gravity:'w', fade:true});
|
$('td .modified').tipsy({gravity:'s', fade:true, live:true});
|
||||||
}
|
|
||||||
|
$('input').tipsy({gravity:'w', fade:true});
|
||||||
|
$('input[type=text]').focus(function(){
|
||||||
|
this.select();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -31,9 +31,9 @@
|
||||||
<header><div id="header">
|
<header><div id="header">
|
||||||
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
|
<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
|
||||||
<form class="searchbox" action="#" method="post">
|
<form class="searchbox" action="#" method="post">
|
||||||
<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" autocomplete="off" />
|
<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" autocomplete="off" />
|
||||||
</form>
|
</form>
|
||||||
<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="<?php echo $l->t('Log out');?>"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
|
<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
|
||||||
</div></header>
|
</div></header>
|
||||||
|
|
||||||
<nav><div id="navigation">
|
<nav><div id="navigation">
|
||||||
|
|
|
@ -18,10 +18,6 @@ $(document).ready(function() {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.file_upload_button_wrapper').tipsy({gravity:'e', fade:true});
|
|
||||||
$('td.filesize').tipsy({gravity:'s', fade:true, live:true});
|
|
||||||
$('td .modified').tipsy({gravity:'s', fade:true, live:true});
|
|
||||||
|
|
||||||
// Sets the file-action buttons behaviour :
|
// Sets the file-action buttons behaviour :
|
||||||
$('tr').live('mouseenter',function(event) {
|
$('tr').live('mouseenter',function(event) {
|
||||||
FileActions.display($(this).children('td.filename'));
|
FileActions.display($(this).children('td.filename'));
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
input#openid, input#webdav { width:20em; }
|
||||||
|
|
||||||
/* PERSONAL */
|
/* PERSONAL */
|
||||||
#passworderror { display:none; }
|
#passworderror { display:none; }
|
||||||
#passwordchanged { display:none; }
|
#passwordchanged { display:none; }
|
||||||
|
|
|
@ -32,4 +32,12 @@ $(document).ready(function(){
|
||||||
});
|
});
|
||||||
return false;
|
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);
|
||||||
|
});
|
||||||
} );
|
} );
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<div id="quota" class="personalblock"><div style="width:<?php echo $_['usage_relative'] ?>%;">
|
<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');?> <strong><?php echo $_['total_space'];?></strong></p>
|
||||||
</div></div>
|
</div></div>
|
||||||
|
|
||||||
<form id="passwordform">
|
<form id="passwordform">
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
<form>
|
<form>
|
||||||
<fieldset class="personalblock">
|
<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'>
|
<select id="languageinput" name='lang'>
|
||||||
<?php foreach($_['languages'] as $language):?>
|
<?php foreach($_['languages'] as $language):?>
|
||||||
<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
|
<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
|
||||||
|
@ -26,9 +26,8 @@
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<p class="personalblock">
|
<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">
|
<label for="webdav"><strong>WebDAV</strong></label>
|
||||||
<?php echo ((isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/files/webdav.php'; ?>
|
<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" />
|
||||||
</a>
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<?php foreach($_['forms'] as $form){
|
<?php foreach($_['forms'] as $form){
|
||||||
|
|
Loading…
Reference in New Issue