Browse Source

filter test results: remove table bloat

Andrew Dolgov 1 year ago
parent
commit
8c49689fda

+ 6 - 39
classes/pref/filters.php

@@ -146,48 +146,16 @@ class Pref_Filters extends Handler_Protected {
 
 				$content_preview = $line["content_preview"];
 
-				$tmp = "<tr style='margin-top : 5px'>";
-
-				#$tmp .= "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
-				#	checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
-
-				$id = $line['id'];
-				$tmp .= "<td width='5%' align='center'><img style='cursor : pointer' title='".__("Preview article")."'
-					src='images/information.png' onclick='popupOpenArticle($id)'></td><td>";
-
-				/*foreach ($filter['rules'] as $rule) {
-					$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
-
-					$line["title"] = preg_replace("/($reg_exp)/i",
-						"<span class=\"highlight\">$1</span>", $line["title"]);
-
-					$content_preview = preg_replace("/($reg_exp)/i",
-						"<span class=\"highlight\">$1</span>", $content_preview);
-				}*/
-
-				$tmp .= "<strong>" . $line["title"] . "</strong><br/>";
-				$tmp .= $line['feed_title'] . ", " . mb_substr($line["date_entered"], 0, 16);
-				$tmp .= "<div class='insensitive'>" . $content_preview . "</div>";
-				$tmp .= "</td></tr>";
+				$tmp = "<li><span class='title'>" . $line["title"] . "</span><br/>" .
+					"<span class='feed'>" . $line['feed_title'] . "</span>, <span class='date'>" . mb_substr($line["date_entered"], 0, 16) . "</span>" .
+					"<div class='preview insensitive'>" . $content_preview . "</div>" .
+					"</li>";
 
 				array_push($rv, $tmp);
 
-				/*array_push($rv, array("title" => $line["title"],
-					"content" => $content_preview,
-					"date" => $line["date_entered"],
-					"feed" => $line["feed_title"])); */
-
 			}
 		}
 
-			//$offset += $limit;
-		//}
-
-		/*if ($found == 0) {
-			print "<tr><td align='center'>" .
-				__("No recent articles matching this filter have been found.");
-		}*/
-
 		print json_encode($rv);
 	}
 
@@ -199,9 +167,8 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<div><img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'>&nbsp;<span id='prefFilterProgressMsg'>Looking for articles...</span></div>";
 
-		print "<br/><div class='panel panel-scrollable'>";
-		print "<table width='100%' id='prefFilterTestResultList'>";
-		print "</table></div>";
+		print "<ul class='panel panel-scrollable list list-unstyled' id='prefFilterTestResultList'>";
+		print "</ul>";
 
 		print "<div style='text-align : center'>";
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('filterTestDlg').hide()\">".

+ 9 - 0
css/default.css

@@ -1042,6 +1042,15 @@ body.ttrss_main ul.list-unstyled {
 body.ttrss_main .text-center {
   text-align: center;
 }
+body.ttrss_main #prefFilterTestResultList .preview {
+  margin: 8px;
+}
+body.ttrss_main #prefFilterTestResultList .title {
+  font-weight: bold;
+}
+body.ttrss_main #prefFilterTestResultList .feed {
+  color: #257aa7;
+}
 ::selection {
   background: #257aa7;
   color: #ffffff;

File diff suppressed because it is too large
+ 1 - 1
css/default.css.map


+ 14 - 0
css/tt-rss.less

@@ -1246,6 +1246,20 @@ body.ttrss_main {
 		text-align : center;
 	}
 
+	#prefFilterTestResultList {
+		.preview {
+			margin : 8px;
+		}
+
+		.title {
+			font-weight: bold;
+		}
+
+		.feed {
+			color : @color-accent;
+		}
+	}
+
 }
 
 ::selection {

BIN
images/tag.png


+ 2 - 1
js/CommonFilters.js

@@ -218,7 +218,8 @@ define(["dojo/_base/declare"], function (declare) {
 									Element.hide("prefFilterLoadingIndicator");
 
 									if (test_dlg.results == 0) {
-										$("prefFilterTestResultList").innerHTML = "<tr><td align='center'>No recent articles matching this filter have been found.</td></tr>";
+										$("prefFilterTestResultList").innerHTML = `<tr><td align='center'>
+											${__('No recent articles matching this filter have been found.')}</td></tr>`;
 										$("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
 									} else {
 										$("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")

+ 9 - 0
themes/night.css

@@ -1043,6 +1043,15 @@ body.ttrss_main ul.list-unstyled {
 body.ttrss_main .text-center {
   text-align: center;
 }
+body.ttrss_main #prefFilterTestResultList .preview {
+  margin: 8px;
+}
+body.ttrss_main #prefFilterTestResultList .title {
+  font-weight: bold;
+}
+body.ttrss_main #prefFilterTestResultList .feed {
+  color: #b87d2c;
+}
 ::selection {
   background: #b87d2c;
   color: #333333;

File diff suppressed because it is too large
+ 1 - 1
themes/night.css.map


+ 9 - 0
themes/night_blue.css

@@ -1043,6 +1043,15 @@ body.ttrss_main ul.list-unstyled {
 body.ttrss_main .text-center {
   text-align: center;
 }
+body.ttrss_main #prefFilterTestResultList .preview {
+  margin: 8px;
+}
+body.ttrss_main #prefFilterTestResultList .title {
+  font-weight: bold;
+}
+body.ttrss_main #prefFilterTestResultList .feed {
+  color: #257aa7;
+}
 ::selection {
   background: #257aa7;
   color: #333333;

File diff suppressed because it is too large
+ 1 - 1
themes/night_blue.css.map