Merge pull request #1071 from nextcloud/fix/1020-List_of_activities_s…

…hould_be_marked_up_as_unordered_list Create an unordered list for the list of activities
nextcloud · Feb 3, 2023 · 756f881 · 756f881
2 parents 33c99a7 + 477ca50
commit 756f881
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/css/style.css b/css/style.css
@@ -1,6 +1,11 @@
 #container h2 {
 	margin-left: 24px;
-	margin-bottom: 16px;
+}
+
+.section-header {
+	display: block;
+	padding: 30px 30px 0 30px;
+	margin-bottom: 0;
 }
 
 .activitysubject {

diff --git a/js/script.js b/js/script.js
@@ -202,12 +202,13 @@ $(function(){
 					}
 				}
 
-				var content = '<div class="section activity-section group" data-date="' + escapeHTML(dayOfYear) + '">' + "\n"
-					+'	<h2 title="' + escapeHTML(dateOfDay) + '">' + escapeHTML(displayDate) + '</h2>' + "\n"
-					+'	<span class="hidden-visually">' + escapeHTML(dateOfDay) + '</span>' + "\n"
-					+'	<div class="boxcontainer">' + "\n"
-					+'	</div>' + "\n"
-					+'</div>';
+				var header = '<h2 class="section-header" title="' + escapeHTML(dateOfDay) + '">' + escapeHTML(displayDate) + '</h2>'
+					+'	<span class="hidden-visually">' + escapeHTML(dateOfDay) + '</span>' + "\n";
+				var content = '<ul class="section activity-section group" data-date="' + escapeHTML(dayOfYear) + '">' + '</ul>';
+				var $header = $(header);
+				this.processElements($header);
+				this.$container.append($header);
+
 				var $content = $(content);
 				this.processElements($content);
 				this.$container.append($content);
@@ -231,7 +232,7 @@ $(function(){
 			var monochromeIcon = activity.type !== 'file_created' && activity.type !== 'file_deleted' && activity.type !== 'favorite' && !activity.icon.endsWith('-color.svg');
 
 			var content = ''
-				+ '<div class="activity box" data-activity-id="' + activity.activity_id + '">' + "\n"
+				+ '<li class="activity box" data-activity-id="' + activity.activity_id + '">' + "\n"
 				+ '	<div class="messagecontainer">' + "\n"
 
 				+ '		<div class="activity-icon' + ((monochromeIcon) ? ' monochrome' : '') +'">'
@@ -270,7 +271,7 @@ $(function(){
 			}
 
 			content += '	</div>' + "\n"
-				+'</div>';
+				+'</li>';
 
 			var $content = $(content);
 			this.processElements($content);