From d3ca97dd2f6a12de191cd8bf178ca9132959c451 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 27 Mar 2013 14:51:30 +0100 Subject: Make it possible to show less log entries again - fix owncloud/core#1593 * show "less" button only if there are more than 3 entries * only "remove" logs till last 3 entries --- settings/js/log.js | 22 +++++++++++++++++++--- settings/templates/admin.php | 1 + 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'settings') diff --git a/settings/js/log.js b/settings/js/log.js index 09b8ec1ab44..fe40f6e5d56 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -26,9 +26,22 @@ OC.Log={ if(!result.remain){ $('#moreLog').css('display', 'none'); } + $('#lessLog').css('display', ''); } }); }, + showLess:function(count){ + count = count || 10; + $('#moreLog').css('display', ''); + $('html, body').animate({scrollTop: $(document).height()}, 800); + while(OC.Log.loaded > 3 && count){ + $('#log tr').last().remove() + OC.Log.loaded -= 1; + count--; + } + if(OC.Log.loaded <= 3) + $('#lessLog').css('display', 'none'); + }, addEntries:function(entries){ for(var i=0;i'); levelTd.text(OC.Log.levels[entry.level]); row.append(levelTd); - + var appTd=$(''); appTd.text(entry.app); row.append(appTd); - + var messageTd=$(''); messageTd.text(entry.message); row.append(messageTd); - + var timeTd=$(''); timeTd.text(formatDate(entry.time*1000)); row.append(timeTd); @@ -58,4 +71,7 @@ $(document).ready(function(){ $('#moreLog').click(function(){ OC.Log.getMore(); }) + $('#lessLog').click(function(){ + OC.Log.showLess(); + }) }); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index dd5e89b8f82..bdf4e676c1c 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -221,6 +221,7 @@ endfor;?> ...'> + ...'> -- cgit v1.2.3 From 97d73d41a82efa19b8966948e8c627b9fd3d5b64 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 27 Mar 2013 15:19:28 +0100 Subject: remove animation --- settings/js/log.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'settings') diff --git a/settings/js/log.js b/settings/js/log.js index fe40f6e5d56..d9a991af011 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -33,9 +33,8 @@ OC.Log={ showLess:function(count){ count = count || 10; $('#moreLog').css('display', ''); - $('html, body').animate({scrollTop: $(document).height()}, 800); while(OC.Log.loaded > 3 && count){ - $('#log tr').last().remove() + $('#log tr').last().remove(); OC.Log.loaded -= 1; count--; } -- cgit v1.2.3 From 7c8a0a486b51f770a5d78c63a5c1026e1dfea27f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 27 Mar 2013 16:53:51 +0100 Subject: add copyright note --- settings/js/log.js | 1 + 1 file changed, 1 insertion(+) (limited to 'settings') diff --git a/settings/js/log.js b/settings/js/log.js index d9a991af011..2e20aba3aa4 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -1,5 +1,6 @@ /** * Copyright (c) 2012, Robin Appelman + * Copyright (c) 2013, Morris Jobke * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file. */ -- cgit v1.2.3 From df74c0e43a1da9ca1565b23fb6a5a8608457f50a Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 28 Mar 2013 15:02:31 +0100 Subject: apply code review hints --- settings/js/log.js | 22 ++++++++++------------ settings/templates/admin.php | 6 +++--- 2 files changed, 13 insertions(+), 15 deletions(-) (limited to 'settings') diff --git a/settings/js/log.js b/settings/js/log.js index 2e20aba3aa4..d91c180a52b 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -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 - +
@@ -220,8 +220,8 @@ endfor;?>
- ...'> - ...'> + + -- cgit v1.2.3 From f19fd3027880d09ab94d34e31f42cc20ada060d7 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 28 Mar 2013 15:43:14 +0100 Subject: convert js call to css rule --- settings/css/settings.css | 1 + settings/js/log.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'settings') diff --git a/settings/css/settings.css b/settings/css/settings.css index 265a29b8f7f..46a0bbe7c32 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -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; } diff --git a/settings/js/log.js b/settings/js/log.js index d91c180a52b..1aced805a49 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -65,7 +65,6 @@ OC.Log={ } $(document).ready(function(){ - $('#lessLog').hide(); // initially hide the less button $('#moreLog').click(function(){ OC.Log.getMore(); }) -- cgit v1.2.3 From 866ca51d834632ace8a049465e7910113620e560 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 28 Mar 2013 16:11:46 +0100 Subject: fix typo and remove animation --- settings/js/log.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'settings') diff --git a/settings/js/log.js b/settings/js/log.js index 1aced805a49..81117f9e827 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -21,7 +21,6 @@ OC.Log={ $.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').hide(); } @@ -33,7 +32,7 @@ OC.Log={ count = count || 10; //calculate remaining items - at least 3 OC.Log.loaded = Math.max(3,OC.Log.loaded-count); - $('#moreLog').hide(); + $('#moreLog').show(); // remove all non-remaining items $('#log tr').slice(OC.Log.loaded).remove(); if(OC.Log.loaded <= 3) -- cgit v1.2.3