Merge pull request #2597 from kabum/lesslog

Make it possible to show less log entries again

3 files changed, 24 insertions, 10 deletions

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 09b8ec1ab44..81117f9e827 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -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];
@@ -36,15 +45,15 @@ OC.Log={
 			var levelTd=$('<td/>');
 			levelTd.text(OC.Log.levels[entry.level]);
 			row.append(levelTd);
-			
+
 			var appTd=$('<td/>');
 			appTd.text(entry.app);
 			row.append(appTd);
-			
+
 			var messageTd=$('<td/>');
 			messageTd.text(entry.message);
 			row.append(messageTd);
-			
+
 			var timeTd=$('<td/>');
 			timeTd.text(formatDate(entry.time*1000));
 			row.append(timeTd);
@@ -58,4 +67,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..9d7a5d9a4cf 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -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>