From a265791d3893b87c04accce4997832be352e520e Mon Sep 17 00:00:00 2001 From: Kunal Jaykam <50500283+kunaljaykam@users.noreply.github.com> Date: Mon, 20 Mar 2023 21:47:46 +0530 Subject: [PATCH] SAK-48635 Replace B-3 'Hidden' Classes with B-5 Classes (#11349) --- .../src/webapp/vm/user/chef_users_list.vm | 12 ++--- .../vm/announcement/chef_announcements.vm | 36 +++++++-------- .../src/webapp/js/studentViewSubmission.js | 4 +- .../webapp/vm/assignment/assignment_macros.vm | 8 ++-- ...nts_instructor_list_deleted_assignments.vm | 6 +-- .../chef_assignments_list_assignments.vm | 26 +++++------ .../chef_assignments_student_estimate.vm | 4 +- .../chef_calendar-customize_fields.vm | 2 +- .../vm/content/chef_resources_reorder.vm | 4 +- .../webapp/vm/content/sakai_resources_list.vm | 44 +++++++++---------- .../src/webapp/vm/macros/content_macros.vm | 4 +- .../main/webapp/WEB-INF/templates/index.html | 2 +- .../default/src/sass/base/_defaults.scss | 7 +++ .../src/webapp/content/templates/compose.html | 36 +++++++-------- .../src/webapp/jsp/privateMsg/pvtMsg.jsp | 12 ++--- .../src/webapp/podcasts/podMain.jsp | 2 +- .../webapp/vm/presence/chef_presence-List.vm | 4 +- .../webapp/content/templates/validate.html | 6 +-- .../tool/src/webapp/WEB-INF/vm/edit.vm | 4 +- .../webapp/jsf/author/authorIndex_content.jsp | 16 +++---- .../src/webapp/jsf/author/authorSettings.jsp | 2 +- .../src/webapp/jsf/author/editAssessment.jsp | 6 +-- .../webapp/jsf/author/item/itemHeadings.jsp | 2 +- .../webapp/jsf/author/publishedSettings.jsp | 2 +- .../webapp/jsf/delivery/deliverAssessment.jsp | 2 +- .../src/webapp/jsf/questionpool/poolList.jsp | 2 +- .../jsf/select/selectIndex_review_table.jsp | 8 ++-- .../src/webapp/jsf/shared/removeMedia.jsp | 2 +- .../resources/static/js/initDatePicker.js | 4 +- .../src/webapp/vm/sitesetup/chef_site-list.vm | 16 +++---- .../chef_site-siteInfo-manageOverview.vm | 8 ++-- .../syllabus-app/src/webapp/syllabus/main.jsp | 6 +-- .../src/webapp/usermembership/sitelist.jsp | 10 ++--- .../src/webapp/usermembership/userlist.jsp | 10 ++--- 34 files changed, 163 insertions(+), 156 deletions(-) diff --git a/admin-tools/src/webapp/vm/user/chef_users_list.vm b/admin-tools/src/webapp/vm/user/chef_users_list.vm index cff9845dc2ab..2d141ea70eac 100644 --- a/admin-tools/src/webapp/vm/user/chef_users_list.vm +++ b/admin-tools/src/webapp/vm/user/chef_users_list.vm @@ -81,9 +81,9 @@ $tlang.getString("useconrem.useid") $tlang.getString("useconrem.nam") $tlang.getString("useconrem.ema") - $tlang.getString("usecre.typ") - $tlang.getString("usecre.status") - $tlang.getString("useconrem.useuid") + $tlang.getString("usecre.typ") + $tlang.getString("usecre.status") + $tlang.getString("useconrem.useuid") #foreach ($user in $users) @@ -98,9 +98,9 @@ $formattedText.escapeHtml($user.SortName) $formattedText.escapeHtml($user.Email) - $formattedText.escapeHtml($user.Type) - #if($!user.Properties.getProperty("disabled")) $tlang.getString("disabled") #else $tlang.getString("enabled") #end - $formattedText.escapeHtml($user.Id) + $formattedText.escapeHtml($user.Type) + #if($!user.Properties.getProperty("disabled")) $tlang.getString("disabled") #else $tlang.getString("enabled") #end + $formattedText.escapeHtml($user.Id) #end diff --git a/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements.vm b/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements.vm index 75013724526d..ac5e9675d0d8 100644 --- a/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements.vm +++ b/announcement/announcement-tool/tool/src/webapp/vm/announcement/chef_announcements.vm @@ -183,7 +183,7 @@ #end #end - + #if (!$currentSortedBy.equals("from")) $tlang.getString('gen.from') #else @@ -208,7 +208,7 @@ #end #if ($SiteColumnFlag > 0) ## (there are anns from other sites so show what site they are from) - + #if (!$currentSortedBy.equals("channel")) $tlang.getString('gen.site') #else @@ -221,7 +221,7 @@ #end #if ($toolId.equals("sakai.announcements")) - + #if (!$currentSortedBy.equals("releasedate")) $tlang.getString("gen.releasedate") #else @@ -232,7 +232,7 @@ #end #end - + #if (!$currentSortedBy.equals("retractdate")) $tlang.getString("gen.retractdate") #else @@ -281,7 +281,7 @@ #end - + $formattedText.escapeHtml($ann_item.AuthorDisplayName) #if ($toolId.equals("sakai.announcements")) @@ -290,19 +290,19 @@ #end #if ($SiteColumnFlag > 0) - + $formattedText.escapeHtml($ann_item.channelDisplayName) #end #if ($toolId.equals("sakai.announcements")) - + #if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("releaseDate")) $ann_item_props.getTimeProperty("releaseDate").toStringLocalFull() #else   #end - + #if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("retractDate")) $ann_item_props.getTimeProperty("retractDate").toStringLocalFull() #else @@ -457,7 +457,7 @@ #end #end - + #if (!$currentSortedBy.equals("from")) $tlang.getString('gen.from') #else @@ -481,7 +481,7 @@ #if ($EnableItemCheckBoxes) #if ($SiteColumnFlag > 0) ## (there are anns from other sites so show what site they are from) - + #if (!$currentSortedBy.equals("channel")) $tlang.getString("gen.site") #else @@ -494,7 +494,7 @@ #end #end - + #if (!$currentSortedBy.equals("for")) $tlang.getString("gen.visible") #else @@ -505,7 +505,7 @@ #end #end - + #if (!$currentSortedBy.equals("releasedate")) $tlang.getString("gen.releasedate") #else @@ -516,7 +516,7 @@ #end #end - + #if (!$currentSortedBy.equals("retractdate")) $tlang.getString("gen.retractdate") #else @@ -576,7 +576,7 @@ #end - + $formattedText.escapeHtml($ann_item.Header.From.DisplayName) @@ -588,23 +588,23 @@ #if ($EnableItemCheckBoxes) #if ($SiteColumnFlag > 0) - + $formattedText.escapeHtml($ann_item.channelDisplayName) #end #end - + $formattedText.escapeHtml($!ann_item.getRange()) - + #if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("releaseDate")) $ann_item_props.getTimeProperty("releaseDate").toStringLocalFull() #else   #end - + #if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("retractDate")) $ann_item_props.getTimeProperty("retractDate").toStringLocalFull() #else diff --git a/assignment/tool/src/webapp/js/studentViewSubmission.js b/assignment/tool/src/webapp/js/studentViewSubmission.js index fbc92a953b8f..534344a49760 100644 --- a/assignment/tool/src/webapp/js/studentViewSubmission.js +++ b/assignment/tool/src/webapp/js/studentViewSubmission.js @@ -141,7 +141,7 @@ ASN.tsAddHandleAjaxError = function (xhr, messagesParam) { button.disabled = false; const alertTsheetAddRecord = document.getElementById("alertTsheetAddRecord"); - alertTsheetAddRecord.classList.remove("hidden"); + alertTsheetAddRecord.classList.remove("d-none"); // Object.keys(window.i18nWlogTab).find((key) => key.includes('ts.add.err.permission')) let messageArray = []; for (const [index, key] of Object.entries(messages)) { @@ -167,7 +167,7 @@ ASN.tsRemoveHandleAjaxError = function (xhr, messagesParam) { button.disabled = false; const alertTsheetDelRecord = document.getElementById("alertTsheetDelRecord"); - alertTsheetDelRecord.classList.remove("hidden"); + alertTsheetDelRecord.classList.remove("d-none"); // Object.keys(window.i18nWlogTab).find((key) => key.includes('ts.add.err.permission')) let messageArray = []; for (const [index, key] of Object.entries(messages)) { diff --git a/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm b/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm index 37d8c33f6c8b..9394f484a2b3 100644 --- a/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm +++ b/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm @@ -194,12 +194,12 @@
  • #if( $current == "Assignment" ) $!tlang.getString( "ts.tab.assignment" ) -
  • #if( $current == "timeSheet" ) $!tlang.getString( "ts.tab.timesheet" ) -
    • #if($showWebdavLink) -
  • #if("webdav" == $current) $tlang.getString("dav.webdav") @@ -37,7 +37,7 @@
    • #end #if($showDropboxOptions) -
  • #if("dropboxUploadMultiple" == $current) $tlang.getString("multiple.file.upload") diff --git a/emailtemplateservice/tool/src/main/webapp/WEB-INF/templates/index.html b/emailtemplateservice/tool/src/main/webapp/WEB-INF/templates/index.html index edbd9f2ee466..bd1b63ec9ae5 100644 --- a/emailtemplateservice/tool/src/main/webapp/WEB-INF/templates/index.html +++ b/emailtemplateservice/tool/src/main/webapp/WEB-INF/templates/index.html @@ -33,7 +33,7 @@ var banner = document.getElementById("banner"); document.addEventListener("DOMContentLoaded", function () { window.setTimeout(function () { - banner.classList.add("hidden") + banner.classList.add("d-none") }, 5000); }); /*]]>*/ diff --git a/library/src/skins/default/src/sass/base/_defaults.scss b/library/src/skins/default/src/sass/base/_defaults.scss index f26d61a7b6a6..922d7498df73 100644 --- a/library/src/skins/default/src/sass/base/_defaults.scss +++ b/library/src/skins/default/src/sass/base/_defaults.scss @@ -334,4 +334,11 @@ button.icon-button { .accordion-collapse { background-color: var(--sakai-background-color-1); +} + +// Changed hidden class in Bootstrap 5 to d-none. +// I updated all instances, but may have missed some. +// Adding this to ensure all hidden classes are hidden. +.hidden { + display: none !important; } \ No newline at end of file diff --git a/mailsender/tool/src/webapp/content/templates/compose.html b/mailsender/tool/src/webapp/content/templates/compose.html index d3411837aa24..136e79299a96 100644 --- a/mailsender/tool/src/webapp/content/templates/compose.html +++ b/mailsender/tool/src/webapp/content/templates/compose.html @@ -47,7 +47,7 @@

    Compose

    • -