From 7345fad62bc286de210ca41dbed6c25a0171a95f Mon Sep 17 00:00:00 2001
From: NOYB <Al_Stu@Frontier.com>
Date: Wed, 27 Jan 2016 00:13:55 -0800
Subject: Status - System Logs - Move Raw Mode Row Count JQuery

Move row count JQuery to run only in raw mode.
---
 src/usr/local/www/status_logs.php                | 17 +++++++++--------
 src/usr/local/www/status_logs_filter.php         | 17 +++++++++--------
 src/usr/local/www/status_logs_filter_dynamic.php | 17 +++++++++--------
 src/usr/local/www/status_logs_vpn.php            | 17 +++++++++--------
 4 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php
index 8894b44..fe9cd29 100755
--- a/src/usr/local/www/status_logs.php
+++ b/src/usr/local/www/status_logs.php
@@ -233,6 +233,15 @@ if (!$rawfilter) {
 ?>
 			</tbody>
 		</table>
+
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	$("#count").html(<?=$rows?>);
+});
+//]]>
+</script>
+
 <?php
 	if ($rows == 0) {
 		print_info_box(gettext('No logs to display'));
@@ -251,12 +260,4 @@ if (!$system_logs_manage_log_form_hidden) {
 }
 ?>
 
-<script type="text/javascript">
-//<![CDATA[
-events.push(function() {
-	$("#count").html(<?=$rows?>);
-});
-//]]>
-</script>
-
 <?php include("foot.inc"); ?>
diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index f655a18..e1883d3 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -336,6 +336,15 @@ if (!$rawfilter) {
 ?>
 			</tbody>
 		</table>
+
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	$("#count").html(<?=$rows?>);
+});
+//]]>
+</script>
+
 <?php
 	if ($rows == 0) {
 		print_info_box(gettext('No logs to display'));
@@ -441,13 +450,5 @@ events.push(function() {
 //]]>
 </script>
 
-<script type="text/javascript">
-//<![CDATA[
-events.push(function() {
-	$("#count").html(<?=$rows?>);
-});
-//]]>
-</script>
-
 <?php include("foot.inc");
 ?>
diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php
index 118ff7e..08b86ec 100755
--- a/src/usr/local/www/status_logs_filter_dynamic.php
+++ b/src/usr/local/www/status_logs_filter_dynamic.php
@@ -489,6 +489,15 @@ function toggleListDescriptions() {
 ?>
 				</tbody>
 			</table>
+
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	$("#count").html(<?=count($filterlog);?>);
+});
+//]]>
+</script>
+
 		</div>
 	</div>
 </div>
@@ -523,12 +532,4 @@ events.push(function() {
 //]]>
 </script>
 
-<script type="text/javascript">
-//<![CDATA[
-events.push(function() {
-	$("#count").html(<?=count($filterlog);?>);
-});
-//]]>
-</script>
-
 <?php include("foot.inc");
diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php
index df430d1..30d4e7b 100644
--- a/src/usr/local/www/status_logs_vpn.php
+++ b/src/usr/local/www/status_logs_vpn.php
@@ -261,6 +261,15 @@ if (!$rawfilter) {
 		<pre><?php 
 			$rows = dump_clog_no_table($logfile_path, $nentries, true, array($filtertext));
 		?></pre>
+
+<script type="text/javascript">
+//<![CDATA[
+events.push(function() {
+	$("#count").html(<?=$rows?>);
+});
+//]]>
+</script>
+
 <?php
 	if ($rows == 0) {
 		print_info_box(gettext('No logs to display'));
@@ -516,12 +525,4 @@ function filter_form_vpn() {
 }
 ?>
 
-<script type="text/javascript">
-//<![CDATA[
-events.push(function() {
-	$("#count").html(<?=$rows?>);
-});
-//]]>
-</script>
-
 <?php include("foot.inc"); ?>
-- 
cgit v1.1