collapse actions summary list in filter tree if 'toggle rule display' is disabled, remove label-specific icon display, simplify markup

8 files changed, 118 insertions, 36 deletions

diff --git a/themes/compact.css b/themes/compact.css
index 3ee5a4a90..3ac7090d6 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
   font-family: monospace;
   word-break: break-all;
 }
+body.ttrss_prefs ul.actions_summary {
+  float: right;
+  margin-right: 16px;
+  margin-top: 0;
+  list-style-type: none;
+  text-align: right;
+}
 body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
 body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
   background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
 body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
   display: none;
 }
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
+  display: inline;
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
+  content: ", ";
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
+  content: " ";
+}
 body.ttrss_utility.sanity_failed {
   background: #900;
 }
@@ -1964,11 +1980,6 @@ body.ttrss_utility.share_popup .content {
 .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   color: white;
 }
-.flat .dijitTree .labelParam {
-  float: right;
-  margin-right: 16px;
-  text-align: right;
-}
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
 }
diff --git a/themes/compact_night.css b/themes/compact_night.css
index c62554e29..4ad5e217a 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
   font-family: monospace;
   word-break: break-all;
 }
+body.ttrss_prefs ul.actions_summary {
+  float: right;
+  margin-right: 16px;
+  margin-top: 0;
+  list-style-type: none;
+  text-align: right;
+}
 body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
 body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
   background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
 body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
   display: none;
 }
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
+  display: inline;
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
+  content: ", ";
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
+  content: " ";
+}
 .flat {
   /*#feedTree {
 		.dijitTreeContent .dijitInline {
@@ -1866,11 +1882,6 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
 .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   color: white;
 }
-.flat .dijitTree .labelParam {
-  float: right;
-  margin-right: 16px;
-  text-align: right;
-}
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
 }
diff --git a/themes/light-high-contrast.css b/themes/light-high-contrast.css
index 830b57f72..5c7d1f58f 100644
--- a/themes/light-high-contrast.css
+++ b/themes/light-high-contrast.css
@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
   font-family: monospace;
   word-break: break-all;
 }
+body.ttrss_prefs ul.actions_summary {
+  float: right;
+  margin-right: 16px;
+  margin-top: 0;
+  list-style-type: none;
+  text-align: right;
+}
 body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
 body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
   background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
 body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
   display: none;
 }
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
+  display: inline;
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
+  content: ", ";
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
+  content: " ";
+}
 body.ttrss_utility.sanity_failed {
   background: #900;
 }
@@ -1964,11 +1980,6 @@ body.ttrss_utility.share_popup .content {
 .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   color: white;
 }
-.flat .dijitTree .labelParam {
-  float: right;
-  margin-right: 16px;
-  text-align: right;
-}
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
 }
diff --git a/themes/light.css b/themes/light.css
index 33d137423..a65d521ec 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -1716,6 +1716,13 @@ body.ttrss_prefs .phpinfo td.v {
   font-family: monospace;
   word-break: break-all;
 }
+body.ttrss_prefs ul.actions_summary {
+  float: right;
+  margin-right: 16px;
+  margin-top: 0;
+  list-style-type: none;
+  text-align: right;
+}
 body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
 body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
   background: #ffc0c0;
@@ -1753,6 +1760,15 @@ body.ttrss_utility fieldset > label.checkbox {
 body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
   display: none;
 }
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
+  display: inline;
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
+  content: ", ";
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
+  content: " ";
+}
 body.ttrss_utility.sanity_failed {
   background: #900;
 }
@@ -1964,11 +1980,6 @@ body.ttrss_utility.share_popup .content {
 .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   color: white;
 }
-.flat .dijitTree .labelParam {
-  float: right;
-  margin-right: 16px;
-  text-align: right;
-}
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
 }
diff --git a/themes/light/dijit_basic.less b/themes/light/dijit_basic.less
index fcdde88eb..caf1c5379 100644
--- a/themes/light/dijit_basic.less
+++ b/themes/light/dijit_basic.less
@@ -148,12 +148,6 @@
 			top : -2px;
 		}*/
 
-		.labelParam {
-			float: right;
-			margin-right: 16px;
-			text-align: right;
-		}
-
 		.dijitTreeRow.filterDisabled {
 			opacity : 0.5;
 
diff --git a/themes/light/prefs.less b/themes/light/prefs.less
index 849855796..b26ff646c 100644
--- a/themes/light/prefs.less
+++ b/themes/light/prefs.less
@@ -268,6 +268,15 @@ body.ttrss_prefs {
 			word-break : break-all;
 		}
 	}
+
+	ul.actions_summary {
+		float : right;
+		margin-right : 16px;
+		margin-top : 0;
+		list-style-type : none;
+		text-align : right;
+	}
+
 }
 
 body.ttrss_prefs,
@@ -315,4 +324,17 @@ body.ttrss_prefs[hide-filter-rules="true"] {
 	ul.filterRules {
 		display : none;
 	}
+
+	ul.actions_summary li {
+		display : inline;
+	}
+
+	ul.actions_summary li:after {
+		content: ", ";
+	}
+
+	ul.actions_summary li:last-child:after {
+		content: " ";
+	}
+
 }
diff --git a/themes/night.css b/themes/night.css
index 81a1b444b..14bde744a 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -1717,6 +1717,13 @@ body.ttrss_prefs .phpinfo td.v {
   font-family: monospace;
   word-break: break-all;
 }
+body.ttrss_prefs ul.actions_summary {
+  float: right;
+  margin-right: 16px;
+  margin-top: 0;
+  list-style-type: none;
+  text-align: right;
+}
 body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
 body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
   background: #ffc0c0;
@@ -1754,6 +1761,15 @@ body.ttrss_utility fieldset > label.checkbox {
 body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
   display: none;
 }
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
+  display: inline;
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
+  content: ", ";
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
+  content: " ";
+}
 .flat {
   /*#feedTree {
 		.dijitTreeContent .dijitInline {
@@ -1867,11 +1883,6 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
 .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   color: white;
 }
-.flat .dijitTree .labelParam {
-  float: right;
-  margin-right: 16px;
-  text-align: right;
-}
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
 }
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 16de963a3..23c0da5f9 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -1717,6 +1717,13 @@ body.ttrss_prefs .phpinfo td.v {
   font-family: monospace;
   word-break: break-all;
 }
+body.ttrss_prefs ul.actions_summary {
+  float: right;
+  margin-right: 16px;
+  margin-top: 0;
+  list-style-type: none;
+  text-align: right;
+}
 body.ttrss_prefs #filterNewRuleDlg .dijitValidationTextAreaError,
 body.ttrss_main #filterNewRuleDlg .dijitValidationTextAreaError {
   background: #ffc0c0;
@@ -1754,6 +1761,15 @@ body.ttrss_utility fieldset > label.checkbox {
 body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
   display: none;
 }
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li {
+  display: inline;
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:after {
+  content: ", ";
+}
+body.ttrss_prefs[hide-filter-rules="true"] ul.actions_summary li:last-child:after {
+  content: " ";
+}
 .flat {
   /*#feedTree {
 		.dijitTreeContent .dijitInline {
@@ -1867,11 +1883,6 @@ body.ttrss_prefs[hide-filter-rules="true"] ul.filterRules {
 .flat .dijitTree .dijitTreeNode .dijitTreeRow.dijitTreeRowSelected {
   color: white;
 }
-.flat .dijitTree .labelParam {
-  float: right;
-  margin-right: 16px;
-  text-align: right;
-}
 .flat .dijitTree .dijitTreeRow.filterDisabled {
   opacity: 0.5;
 }