Merge pull request #2597 from kabum/lesslog

Make it possible to show less log entries again
This commit is contained in:
Bernhard Posselt 2013-03-29 07:22:43 -07:00
commit 8ed9be5408
3 changed files with 24 additions and 10 deletions

View File

@ -79,6 +79,7 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
/* LOG */
#log { white-space:normal; }
#lessLog { display:none; }
/* ADMIN */
span.securitywarning {color:#C33; font-weight:bold; }

View File

@ -1,5 +1,6 @@
/**
* Copyright (c) 2012, Robin Appelman <icewind1991@gmail.com>
* Copyright (c) 2013, Morris Jobke <morris.jobke@gmail.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
@ -16,19 +17,27 @@ OC.Log={
levels:['Debug','Info','Warning','Error','Fatal'],
loaded:3,//are initially loaded
getMore:function(count){
if(!count){
count=10;
}
count = count || 10;
$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
if(result.status=='success'){
OC.Log.addEntries(result.data);
$('html, body').animate({scrollTop: $(document).height()}, 800);
if(!result.remain){
$('#moreLog').css('display', 'none');
$('#moreLog').hide();
}
$('#lessLog').show();
}
});
},
showLess:function(count){
count = count || 10;
//calculate remaining items - at least 3
OC.Log.loaded = Math.max(3,OC.Log.loaded-count);
$('#moreLog').show();
// remove all non-remaining items
$('#log tr').slice(OC.Log.loaded).remove();
if(OC.Log.loaded <= 3)
$('#lessLog').hide();
},
addEntries:function(entries){
for(var i=0;i<entries.length;i++){
var entry=entries[i];
@ -58,4 +67,7 @@ $(document).ready(function(){
$('#moreLog').click(function(){
OC.Log.getMore();
})
$('#lessLog').click(function(){
OC.Log.showLess();
})
});

View File

@ -201,7 +201,7 @@ if (!$_['internetconnectionworking']) {
<?php endif;
endfor;?>
</select>
<table id='log'>
<table id="log">
<?php foreach ($_['entries'] as $entry): ?>
<tr>
<td>
@ -220,7 +220,8 @@ endfor;?>
<?php endforeach;?>
</table>
<?php if ($_['entriesremain']): ?>
<input id='moreLog' type='button' value='<?php p($l->t('More'));?>...'>
<input id="moreLog" type="button" value="<?php p($l->t('More'));?>...">
<input id="lessLog" type="button" value="<?php p($l->t('Less'));?>...">
<?php endif; ?>
</fieldset>