Skip to content

[stable25] Show full date after headings like "Today" as a hidden-visually span #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pytal merged 1 commit into from
Jan 31, 2023
Merged

[stable25] Show full date after headings like "Today" as a hidden-visually span #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/activity-adminSettings.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-adminSettings.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-dashboard.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-dashboard.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-personalSettings.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-personalSettings.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-sidebar.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-sidebar.js.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ $(function(){
}

var content = '<div class="section activity-section group" data-date="' + escapeHTML(dayOfYear) + '">' + "\n"
+' <h2 aria-label="' + escapeHTML(dateOfDay) + '" title="' + escapeHTML(dateOfDay) + '">' + escapeHTML(displayDate) + '</h2>' + "\n"
+' <h2 title="' + escapeHTML(dateOfDay) + '">' + escapeHTML(displayDate) + '</h2>' + "\n"
+' <span class="hidden-visually">' + escapeHTML(dateOfDay) + '</span>' + "\n"
+' <div class="boxcontainer">' + "\n"
+' </div>' + "\n"
+'</div>';
Expand Down Expand Up @@ -243,8 +244,11 @@ $(function(){
+ ((activity.link) ? ' </a>' + "\n" : '')
+ ' </div>' + "\n"

+' <span class="activitytime live-relative-timestamp" data-timestamp="' + activity.timestamp + '" aria-label="' + escapeHTML(OC.Util.formatDate(activity.timestamp)) + '"'
+ 'title="' + escapeHTML(OC.Util.formatDate(activity.timestamp)) + '">' + "\n"
+' <span class="hidden-visually">' + "\n"
+ ' ' + escapeHTML(OC.Util.formatDate(activity.timestamp)) + "\n"
+' </span>' + "\n"

+' <span class="activitytime live-relative-timestamp" data-timestamp="' + activity.timestamp + '" title="' + escapeHTML(OC.Util.formatDate(activity.timestamp)) + '">' + "\n"
+ ' ' + escapeHTML(OC.Util.relativeModifiedDate(activity.timestamp)) + "\n"
+' </span>' + "\n";

Expand Down
4 changes: 2 additions & 2 deletions src/components/Activity.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<RichText class="activity-entry__content__subject" :text="subjectText" :arguments="subjectArguments" />
<RichText class="activity-entry__content__message" :text="messageText" :arguments="messageArguments" />
</div>

<span :title="activity.formattedDate" :aria-label="activity.formattedDate" class="activity-entry__date">{{ dateFromNow }}</span>
<span class="hidden-visually">{{ activity.formattedDate }}</span>
<span :title="activity.formattedDate" class="activity-entry__date">{{ dateFromNow }}</span>
</li>
</template>

Expand Down
18 changes: 9 additions & 9 deletions src/tests/__snapshots__/Activity.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exports[`Display correct information for changes 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 10:51 AM" aria-label="April 29, 2021 10:51 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 10:51 AM</span> <span title="April 29, 2021 10:51 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -37,7 +37,7 @@ exports[`Display correct information for comments 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f="">A comment</div>
</div>
</div> <span title="April 29, 2021 11:04 AM" aria-label="April 29, 2021 11:04 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 11:04 AM</span> <span title="April 29, 2021 11:04 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -58,7 +58,7 @@ exports[`Display correct information for creations 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 10:49 AM" aria-label="April 29, 2021 10:49 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 10:49 AM</span> <span title="April 29, 2021 10:49 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -79,7 +79,7 @@ exports[`Display correct information for favorites 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 10:52 AM" aria-label="April 29, 2021 10:52 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 10:52 AM</span> <span title="April 29, 2021 10:52 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -100,7 +100,7 @@ exports[`Display correct information for moves 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 10:49 AM" aria-label="April 29, 2021 10:49 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 10:49 AM</span> <span title="April 29, 2021 10:49 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -121,7 +121,7 @@ exports[`Display correct information for renames 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 11:12 AM" aria-label="April 29, 2021 11:12 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 11:12 AM</span> <span title="April 29, 2021 11:12 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -142,7 +142,7 @@ exports[`Display correct information for shares 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 10:49 AM" aria-label="April 29, 2021 10:49 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 10:49 AM</span> <span title="April 29, 2021 10:49 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -163,7 +163,7 @@ exports[`Display correct information for tags 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 10:50 AM" aria-label="April 29, 2021 10:50 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 10:50 AM</span> <span title="April 29, 2021 10:50 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;
Expand All @@ -184,7 +184,7 @@ exports[`Display correct information for unfavorites 1`] = `
<div data-v-a8ade67f="" class="activity-entry__content__message rich-text--wrapper">
<div data-v-a8ade67f=""></div>
</div>
</div> <span title="April 29, 2021 10:52 AM" aria-label="April 29, 2021 10:52 AM" class="activity-entry__date">11 days ago</span>
</div> <span class="hidden-visually">April 29, 2021 10:52 AM</span> <span title="April 29, 2021 10:52 AM" class="activity-entry__date">11 days ago</span>
</li>
</div>
`;