wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apply code review hints

Browse source
This commit is contained in:
Morris Jobke 2013-03-28 15:02:31 +01:00
parent 7c8a0a486b
commit df74c0e43a
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
settings/js/log.js
View file

@ -17,30 +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').css('display', '');
$('#lessLog').show();
}
});
},
showLess:function(count){
count = count || 10;
$('#moreLog').css('display', '');
while(OC.Log.loaded > 3 && count){
$('#log tr').last().remove();
OC.Log.loaded -= 1;
count--;
}
//calculate remaining items - at least 3
OC.Log.loaded = Math.max(3,OC.Log.loaded-count);
$('#moreLog').hide();
// remove all non-remaining items
$('#log tr').slice(OC.Log.loaded).remove();
if(OC.Log.loaded <= 3)
$('#lessLog').css('display', 'none');
$('#lessLog').hide();
},
addEntries:function(entries){
for(var i=0;i<entries.length;i++){
@ -68,6 +65,7 @@ OC.Log={
}
$(document).ready(function(){
$('#lessLog').hide(); // initially hide the less button
$('#moreLog').click(function(){
OC.Log.getMore();
})

6
settings/templates/admin.php
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,8 +220,8 @@ endfor;?>
<?php endforeach;?>
</table>
<?php if ($_['entriesremain']): ?>
<input id='moreLog' type='button' value='<?php p($l->t('More'));?>...'>
<input id='lessLog' type='button' style='display:none' value='<?php p($l->t('Less'));?>...'>
<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>