Skip to content

Commit

Permalink
SAK-48635 Replace B-3 'Hidden' Classes with B-5 Classes (sakaiproject…
Browse files Browse the repository at this point in the history
  • Loading branch information
kunaljaykam authored Mar 20, 2023
1 parent 35bff95 commit a265791
Show file tree
Hide file tree
Showing 34 changed files with 163 additions and 156 deletions.
12 changes: 6 additions & 6 deletions admin-tools/src/webapp/vm/user/chef_users_list.vm
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
<th id="Eid">$tlang.getString("useconrem.useid")</th>
<th id="Name">$tlang.getString("useconrem.nam")</th>
<th id="Email">$tlang.getString("useconrem.ema")</th>
<th id="Type" class="hidden-xs">$tlang.getString("usecre.typ")</th>
<th id="Status" class="hidden-xs">$tlang.getString("usecre.status")</th>
<th id="Id" class="hidden-xs">$tlang.getString("useconrem.useuid")</th>
<th id="Type" class="d-none d-sm-table-cell">$tlang.getString("usecre.typ")</th>
<th id="Status" class="d-none d-sm-table-cell">$tlang.getString("usecre.status")</th>
<th id="Id" class="d-none d-sm-table-cell">$tlang.getString("useconrem.useuid")</th>
</tr>
#foreach ($user in $users)
<tr>
Expand All @@ -98,9 +98,9 @@
</td>
<td headers="Name">$formattedText.escapeHtml($user.SortName)</td>
<td headers="Email">$formattedText.escapeHtml($user.Email)</td>
<td headers="Type" class="hidden-xs">$formattedText.escapeHtml($user.Type)</td>
<td headers="Status" class="hidden-xs">#if($!user.Properties.getProperty("disabled")) $tlang.getString("disabled") #else $tlang.getString("enabled") #end</td>
<td headers="Id" class="hidden-xs">$formattedText.escapeHtml($user.Id)
<td headers="Type" class="d-none d-sm-table-cell">$formattedText.escapeHtml($user.Type)</td>
<td headers="Status" class="d-none d-sm-table-cell">#if($!user.Properties.getProperty("disabled")) $tlang.getString("disabled") #else $tlang.getString("enabled") #end</td>
<td headers="Id" class="d-none d-sm-table-cell">$formattedText.escapeHtml($user.Id)
</td>
</tr>
#end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
#end
#end
</th>
<th id="author" scope="col" class="hidden-xs">
<th id="author" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("from"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbyfrom")';return false;" title ="$tlang.getString('gen.sortbyauth')">$tlang.getString('gen.from')</a>
#else
Expand All @@ -208,7 +208,7 @@
</th>
#end
#if ($SiteColumnFlag > 0) ## (there are anns from other sites so show what site they are from)
<th id="anncSite" scope="col" class="hidden-xs">
<th id="anncSite" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("channel"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbychannel")';return false;" title ="$tlang.getString('gen.sortchannel')">$tlang.getString('gen.site')</a>
#else
Expand All @@ -221,7 +221,7 @@
</th>
#end
#if ($toolId.equals("sakai.announcements"))
<th id="releaseDate" scope="col" class="hidden-xs">
<th id="releaseDate" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("releasedate"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbyreleasedate")';return false;" title="$tlang.getString('gen.sortbyreleasedate')">$tlang.getString("gen.releasedate")</a>
#else
Expand All @@ -232,7 +232,7 @@
#end
#end
</th>
<th id="retractDate" scope="col" class="hidden-xs">
<th id="retractDate" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("retractdate"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbyretractdate")';return false;" title="$tlang.getString('gen.sortbyretractdate')">$tlang.getString("gen.retractdate")</a>
#else
Expand Down Expand Up @@ -281,7 +281,7 @@
#end
</strong>
</th>
<td headers="author" class="hidden-xs">
<td headers="author" class="d-none d-sm-table-cell">
$formattedText.escapeHtml($ann_item.AuthorDisplayName)
</td>
#if ($toolId.equals("sakai.announcements"))
Expand All @@ -290,19 +290,19 @@
</td>
#end
#if ($SiteColumnFlag > 0)
<td headers="anncSite" class="hidden-xs">
<td headers="anncSite" class="d-none d-sm-table-cell">
$formattedText.escapeHtml($ann_item.channelDisplayName)
</td>
#end
#if ($toolId.equals("sakai.announcements"))
<td headers="releaseDate" class="hidden-xs">
<td headers="releaseDate" class="d-none d-sm-table-cell">
#if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("releaseDate"))
$ann_item_props.getTimeProperty("releaseDate").toStringLocalFull()
#else
&nbsp;
#end
</td>
<td headers="retractDate" class="hidden-xs">
<td headers="retractDate" class="d-none d-sm-table-cell">
#if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("retractDate"))
$ann_item_props.getTimeProperty("retractDate").toStringLocalFull()
#else
Expand Down Expand Up @@ -457,7 +457,7 @@
#end
#end
</th>
<th id="author" scope="col" class="hidden-xs">
<th id="author" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("from"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbyfrom")';return false;" title ="$tlang.getString('gen.sortbyauth')">$tlang.getString('gen.from')</a>
#else
Expand All @@ -481,7 +481,7 @@
</th>
#if ($EnableItemCheckBoxes)
#if ($SiteColumnFlag > 0) ## (there are anns from other sites so show what site they are from)
<th id="Site" scope="col" class="hidden-xs">
<th id="Site" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("channel"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbychannel")';return false;" title ="$tlang.getString("gen.sortchannel")">$tlang.getString("gen.site")</a>
#else
Expand All @@ -494,7 +494,7 @@
</th>
#end
#end
<th id="anncSite" scope="col" class="hidden-xs">
<th id="anncSite" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("for"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbyfor")';return false;" title="$tlang.getString('gen.sortbyfor')">$tlang.getString("gen.visible")</a>
#else
Expand All @@ -505,7 +505,7 @@
#end
#end
</th>
<th id="releaseDate" scope="col" class="hidden-xs">
<th id="releaseDate" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("releasedate"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbyreleasedate")';return false;" title="$tlang.getString('gen.sortbyreleasedate')">$tlang.getString("gen.releasedate")</a>
#else
Expand All @@ -516,7 +516,7 @@
#end
#end
</th>
<th id="retractDate" scope="col" class="hidden-xs">
<th id="retractDate" scope="col" class="d-none d-sm-table-cell">
#if (!$currentSortedBy.equals("retractdate"))
<a href="#" onclick="location='#toolLink("AnnouncementAction" "doSortbyretractdate")';return false;" title="$tlang.getString('gen.sortbyretractdate')">$tlang.getString("gen.retractdate")</a>
#else
Expand Down Expand Up @@ -576,7 +576,7 @@
#end

</td>
<td headers="author" class="hidden-xs">
<td headers="author" class="d-none d-sm-table-cell">
$formattedText.escapeHtml($ann_item.Header.From.DisplayName)
</td>
<td headers="date">
Expand All @@ -588,23 +588,23 @@
</td>
#if ($EnableItemCheckBoxes)
#if ($SiteColumnFlag > 0)
<td headers="channel" class="hidden-xs">
<td headers="channel" class="d-none d-sm-table-cell">
$formattedText.escapeHtml($ann_item.channelDisplayName)
</td>
#end
#end
<td class="hidden-xs">
<td class="d-none d-sm-table-cell">
$formattedText.escapeHtml($!ann_item.getRange())
</td>

<td headers="releaseDate" class="hidden-xs">
<td headers="releaseDate" class="d-none d-sm-table-cell">
#if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("releaseDate"))
$ann_item_props.getTimeProperty("releaseDate").toStringLocalFull()
#else
&nbsp;
#end
</td>
<td headers="retractDate" class="hidden-xs">
<td headers="retractDate" class="d-none d-sm-table-cell">
#if (!$ann_item_props.isEmpty() && $ann_item_props.getProperty("retractDate"))
$ann_item_props.getTimeProperty("retractDate").toStringLocalFull()
#else
Expand Down
4 changes: 2 additions & 2 deletions assignment/tool/src/webapp/js/studentViewSubmission.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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)) {
Expand Down
8 changes: 4 additions & 4 deletions assignment/tool/src/webapp/vm/assignment/assignment_macros.vm
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,12 @@
<li class="firstToolBarItem">
#if( $current == "Assignment" )
<span id="tabAssignmentCurrent" class="current">$!tlang.getString( "ts.tab.assignment" )</span>
<span id="tabAssignmentRef" class="hidden">
<span id="tabAssignmentRef" class="d-none">
<a href="javascript:void(0)" title="$!tlang.getString( "ts.tab.assignment" )" onclick="ASN.switchTimesheetTab( 'tabAssignment' ); return false;">
$!tlang.getString( "ts.tab.assignment" ) </a>
</span>
#else
<span id="tabAssignmentCurrent" class="current hidden">$!tlang.getString( "ts.tab.assignment" )</span>
<span id="tabAssignmentCurrent" class="current d-none">$!tlang.getString( "ts.tab.assignment" )</span>
<span id="tabAssignmentRef" class="">
<a href="javascript:void(0)" title="$!tlang.getString( "ts.tab.assignment" )" onclick="ASN.switchTimesheetTab( 'tabAssignment' ); return false;">
$!tlang.getString( "ts.tab.assignment" )</a>
Expand All @@ -209,12 +209,12 @@
<li class="firstToolBarItem">
#if( $current == "timeSheet" )
<span id="tabTimeSheetCurrent" class="current">$!tlang.getString( "ts.tab.timesheet" )</span>
<span id="tabTimeSheetRef" class="hidden">
<span id="tabTimeSheetRef" class="d-none">
<a href="javascript:void(0)" title="$!tlang.getString( "ts.tab.timesheet" )" onclick="ASN.switchTimesheetTab( 'tabTimeSheet' ); return false;">
$!tlang.getString( "ts.tab.timesheet" )</a>
</span>
#else
<span id="tabTimeSheetCurrent" class="current hidden">$!tlang.getString( "ts.tab.timesheet" )</span>
<span id="tabTimeSheetCurrent" class="current d-none">$!tlang.getString( "ts.tab.timesheet" )</span>
<span id="tabTimeSheetRef" class="">
<a href="javascript:void(0)""$!tlang.getString( "ts.tab.timesheet" )" onclick="ASN.switchTimesheetTab( 'tabTimeSheet' ); return false;">
$!tlang.getString( "ts.tab.timesheet" )</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</a>
</th>
<th id="softremoveddate">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=softremoveddate")'; return false;" title="$tlang.getString("gen.sorbyremoveddate")" class="hidden-xs">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=softremoveddate")'; return false;" title="$tlang.getString("gen.sorbyremoveddate")" class="d-none d-sm-table-cell">
$tlang.getString("gen.removeddate")
#if ($sortedBy.equals("softremoveddate"))
#if ($sortedAsc.equals("true"))
Expand All @@ -50,7 +50,7 @@
</a>
</th>
<th id="num_submissions" scope="col">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=num_submissions")'; return false;" title="$tlang.getString("gen.sorbynumsub")" class="hidden-xs">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=num_submissions")'; return false;" title="$tlang.getString("gen.sorbynumsub")" class="d-none d-sm-table-cell">
$tlang.getString("gen.subm2")
#if ($sortedBy.equals("num_submissions"))
#if ($sortedAsc.equals("true"))
Expand All @@ -63,7 +63,7 @@
</th>
#if ($!allowRecoverAssignment)
<th id="selectAssignments" scope="col">
<span class="hidden-xs">$tlang.getString("selectAssignments")</span>
<span class="d-none d-sm-table-cell">$tlang.getString("selectAssignments")</span>
</th>
#end
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
</a>
</th>
#if ($!allowGradeSubmission)
<th id="$tlang.getString('gen.visible')" scope="col" class="hidden-xs">
<th id="$tlang.getString('gen.visible')" scope="col" class="d-none d-sm-table-cell">
#if (!$sortedBy.equalsIgnoreCase("$tlang.getString('gen.visible')"))
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=for")'; return false;" title="$tlang.getString('gen.sortbyfor')">$tlang.getString("gen.visible")</a>
#else
Expand All @@ -147,7 +147,7 @@
#end
</a>
</th>
<th id="openDate" scope="col" class="hidden-xs">
<th id="openDate" scope="col" class="d-none d-sm-table-cell">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=opendate")'; return false;" title="$tlang.getString("listassig.sorbyope")">
$tlang.getString("newassig.opedat")
#if ($sortedBy.equals("opendate"))
Expand All @@ -171,7 +171,7 @@
#end
</a>
</th>
<th id="lastModifiedUser" class="hidden-xs">
<th id="lastModifiedUser" class="d-none d-sm-table-cell">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=modifieduser")'; return false;" title="$tlang.getString("gen.sorbymodusr")">
$tlang.getString("gen.mod.user")
#if ($sortedBy.equals("modifieduser"))
Expand All @@ -183,7 +183,7 @@
#end
</a>
</th>
<th id="lastModifiedDate" class="hidden-xs">
<th id="lastModifiedDate" class="d-none d-sm-table-cell">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=modifieddate")'; return false;" title="$tlang.getString("gen.sorbymoddat")">
$tlang.getString("gen.mod.date")
#if ($sortedBy.equals("modifieddate"))
Expand Down Expand Up @@ -216,7 +216,7 @@
#if ($!allowGradeSubmission)
#if ($!view.equals('lisofass1'))
#if ($!showNumSubmissionColumn)
<th id="num_submissions" scope="col" class="hidden-xs">
<th id="num_submissions" scope="col" class="d-none d-sm-table-cell">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=num_submissions")'; return false;" title="$tlang.getString("listassig.sorbynum1")">$tlang.getString("gen.in")</a>
#if ($sortedBy.equals("num_submissions"))
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=num_submissions")'; return false;" title="$tlang.getString("listassig.sorbynum1")">
Expand All @@ -243,7 +243,7 @@
#end
#end
#if ($withGrade && $!allowGradeSubmission)
<th id="maxgrade" scope="col" class="hidden-xs">
<th id="maxgrade" scope="col" class="d-none d-sm-table-cell">
<a href="javascript:void(0)" onclick="location='#toolLinkParam("$action" "doSort" "criteria=max_grade")'; return false;" title="$tlang.getString("gen.sorbymax")">
$tlang.getString("gen.sca")
#if ($sortedBy.equals("max_grade"))
Expand All @@ -258,7 +258,7 @@
#end
#if ($!allowRemoveAssignment && $!view.equals('lisofass1'))
<th id="remove" scope="col">
<span class="hidden-xs">$tlang.getString("gen.remove.q")</span>
<span class="d-none d-sm-table-cell">$tlang.getString("gen.remove.q")</span>
</th>
#end
</tr>
Expand Down Expand Up @@ -496,7 +496,7 @@
#end
</td>
#if ($!allowGradeSubmission)
<td headers="for" class="hidden-xs">
<td headers="for" class="d-none d-sm-table-cell">
#if($assignment.TypeOfAccess == "SITE")
$tlang.getString("gen.viewallgroupssections")
#else
Expand Down Expand Up @@ -534,7 +534,7 @@
#end
#end
</td>
<td headers="openDate" class="hidden-xs">
<td headers="openDate" class="d-none d-sm-table-cell">
$!service.getUsersLocalDateTimeString($!assignment.OpenDate)
</td>
<td headers="dueDate">
Expand All @@ -543,12 +543,12 @@
<span class="highlight">$!service.getUsersLocalDateTimeString($!assignment.DueDate)</span>
#end
</td>
<td headers="lastModifiedUser" class="hidden-xs">
<td headers="lastModifiedUser" class="d-none d-sm-table-cell">
#if ($!assignment.Modifier)
<span>$!userDirectoryService.getUser($!assignment.Modifier).getDisplayName()</span>
#end
</td>
<td headers="lastModifiedDate" class="hidden-xs">
<td headers="lastModifiedDate" class="d-none d-sm-table-cell">
<span>$!service.getUsersLocalDateTimeString($!assignment.DateModified)</span>
</td>
#if ($!isTimesheet)
Expand Down Expand Up @@ -581,7 +581,7 @@
#if ($!allowGradeSubmission)
#if ($!view.equals('lisofass1'))
#if ($!showNumSubmissionColumn)
<td headers="num_submissions" class="specialLink hidden-xs">
<td headers="num_submissions" class="specialLink d-none d-sm-table-cell">
## not show the link for draft assignment
#if (!$assignment.Draft && $!service.allowGradeSubmission($assignmentReference))
#set($ungradedNumber = $!service.countSubmissions($assignmentReference, false))
Expand All @@ -597,7 +597,7 @@
#end
#end
#if ($withGrade && $!allowGradeSubmission)
<td headers="maxgrade" class="hidden-xs">
<td headers="maxgrade" class="d-none d-sm-table-cell">
#set ($gradeScale = $assignment.TypeOfGrade.ordinal())
#if ($gradeScale == 0)
## Grade type not set
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
window.i18nWlogTab['ts.add.err.submitter']=" $tlang.getString('ts.add.err.submitter')";
</script>

<div id="StudentTimesheetCurrent" class="hidden">
<div id="StudentTimesheetCurrent" class="d-none">
<h4>$!tlang.getString("ts.title.timesheet")</h4>
<hr>
##Checks for Timesheet records
##BOOTSTRAP (red)
<div id="alertTsheetDelRecord" class="sak-banner-error hidden" role="alert"></div>
<div id="alertTsheetDelRecord" class="sak-banner-error d-none" role="alert"></div>

#if ($!isAnyRegTimeSheet)
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</table>
<div class="act">
<input id="removeFieldButton" type="button" value="$tlang.getString('cust.rem.btn')" accesskey="d" />
<input id="removeFieldSubmission" type="submit" name="eventSubmit_doDeletefield" class="hidden" />
<input id="removeFieldSubmission" type="submit" name="eventSubmit_doDeletefield" class="d-none" />
</div >
<div class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" id="confirmation-modal">
<div class="modal-dialog modal-md">
Expand Down
Loading

0 comments on commit a265791

Please sign in to comment.