Merge pull request #2597 from kabum/lesslog
Make it possible to show less log entries again
This commit is contained in:
commit
8ed9be5408
|
@ -79,6 +79,7 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
|
||||||
|
|
||||||
/* LOG */
|
/* LOG */
|
||||||
#log { white-space:normal; }
|
#log { white-space:normal; }
|
||||||
|
#lessLog { display:none; }
|
||||||
|
|
||||||
/* ADMIN */
|
/* ADMIN */
|
||||||
span.securitywarning {color:#C33; font-weight:bold; }
|
span.securitywarning {color:#C33; font-weight:bold; }
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/**
|
/**
|
||||||
* Copyright (c) 2012, Robin Appelman <icewind1991@gmail.com>
|
* 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.
|
* This file is licensed under the Affero General Public License version 3 or later.
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
|
@ -16,19 +17,27 @@ OC.Log={
|
||||||
levels:['Debug','Info','Warning','Error','Fatal'],
|
levels:['Debug','Info','Warning','Error','Fatal'],
|
||||||
loaded:3,//are initially loaded
|
loaded:3,//are initially loaded
|
||||||
getMore:function(count){
|
getMore:function(count){
|
||||||
if(!count){
|
count = count || 10;
|
||||||
count=10;
|
|
||||||
}
|
|
||||||
$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
|
$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
|
||||||
if(result.status=='success'){
|
if(result.status=='success'){
|
||||||
OC.Log.addEntries(result.data);
|
OC.Log.addEntries(result.data);
|
||||||
$('html, body').animate({scrollTop: $(document).height()}, 800);
|
|
||||||
if(!result.remain){
|
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){
|
addEntries:function(entries){
|
||||||
for(var i=0;i<entries.length;i++){
|
for(var i=0;i<entries.length;i++){
|
||||||
var entry=entries[i];
|
var entry=entries[i];
|
||||||
|
@ -36,15 +45,15 @@ OC.Log={
|
||||||
var levelTd=$('<td/>');
|
var levelTd=$('<td/>');
|
||||||
levelTd.text(OC.Log.levels[entry.level]);
|
levelTd.text(OC.Log.levels[entry.level]);
|
||||||
row.append(levelTd);
|
row.append(levelTd);
|
||||||
|
|
||||||
var appTd=$('<td/>');
|
var appTd=$('<td/>');
|
||||||
appTd.text(entry.app);
|
appTd.text(entry.app);
|
||||||
row.append(appTd);
|
row.append(appTd);
|
||||||
|
|
||||||
var messageTd=$('<td/>');
|
var messageTd=$('<td/>');
|
||||||
messageTd.text(entry.message);
|
messageTd.text(entry.message);
|
||||||
row.append(messageTd);
|
row.append(messageTd);
|
||||||
|
|
||||||
var timeTd=$('<td/>');
|
var timeTd=$('<td/>');
|
||||||
timeTd.text(formatDate(entry.time*1000));
|
timeTd.text(formatDate(entry.time*1000));
|
||||||
row.append(timeTd);
|
row.append(timeTd);
|
||||||
|
@ -58,4 +67,7 @@ $(document).ready(function(){
|
||||||
$('#moreLog').click(function(){
|
$('#moreLog').click(function(){
|
||||||
OC.Log.getMore();
|
OC.Log.getMore();
|
||||||
})
|
})
|
||||||
|
$('#lessLog').click(function(){
|
||||||
|
OC.Log.showLess();
|
||||||
|
})
|
||||||
});
|
});
|
||||||
|
|
|
@ -201,7 +201,7 @@ if (!$_['internetconnectionworking']) {
|
||||||
<?php endif;
|
<?php endif;
|
||||||
endfor;?>
|
endfor;?>
|
||||||
</select>
|
</select>
|
||||||
<table id='log'>
|
<table id="log">
|
||||||
<?php foreach ($_['entries'] as $entry): ?>
|
<?php foreach ($_['entries'] as $entry): ?>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
|
@ -220,7 +220,8 @@ endfor;?>
|
||||||
<?php endforeach;?>
|
<?php endforeach;?>
|
||||||
</table>
|
</table>
|
||||||
<?php if ($_['entriesremain']): ?>
|
<?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; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
Loading…
Reference in New Issue