Skip to content

Commit

Permalink
SAK-50289 Resources display columns controls not hiding whole columns (…
Browse files Browse the repository at this point in the history 
…sakaiproject#12731)
  • Loading branch information
@hornersa
hornersa authored Jul 16, 2024
1 parent aa8e776 commit 7cf918d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions content/content-tool/tool/src/webapp/js/content.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ var setupColumnToggle = function(){
// hides columns and sets the checkbox values
$.each(data, function(key, value){
if (value === 'false' || value === false) {
$('.' + key).hide();
$('.' + key).removeClass('d-md-table-cell').addClass('d-none');
$('#' + key + 'Tog').find('input').attr('checked', false);
}
else {
Expand Down Expand Up @@ -415,10 +415,10 @@ var setupColumnToggle = function(){
var target = $(this).closest('span').attr('id').replace('Tog', '');
e.stopPropagation();
if ($(this).prop('checked') === true) {
$('.' + target).show();
$('.' + target).removeClass('d-none').addClass('d-md-table-cell');
}
else {
$('.' + target).hide();
$('.' + target).removeClass('d-md-table-cell').addClass('d-none');
}
massageColWidths();
});
Expand Down
20 changes: 10 additions & 10 deletions content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
#end
</div>
#end
<div class="col-xs-12 col-lg-6 col-md-4 col-sm-4 col-xs-4 btn-group-sm form-inline" style="text-align: right;padding-right:0">
<div class="col-xs-12 col-lg-6 col-md-4 col-sm-4 col-xs-4 btn-group-sm form-inline d-flex" style="text-align: right;padding-right:0">
#if($showHotDropboxWidget)
<label for="dropboxHighlight">
<small>$clang.getString("dropbox_highlight")</small>
Expand All @@ -210,7 +210,7 @@
</select>
#end
#if (!$dropboxMode)
<div id="content-display-columns-dropdown" class="d-none d-sm-block dropdown">
<div id="content-display-columns-dropdown" class="d-none d-sm-block dropdown flex-row-reverse">
<button style="margin:0" type="button"
class="btn btn-link btn-default btn-sm resources-dropdown colPicker"
aria-expanded="false"
Expand All @@ -220,8 +220,8 @@
</button>
<ul class="dropdown-menu" id="columnTog">
<li>
<span class="dropdown-item" id="accessTog">
<input type="checkbox" id="accessCol" checked="checked" /><label for="accessCol">&nbsp;&nbsp;$clang.getString("gen.access")</label>
<span class="dropdown-item" id="contentAccessTog">
<input type="checkbox" id="contentAccessCol" checked="checked" /><label for="contentAccessCol">&nbsp;&nbsp;$clang.getString("gen.access")</label>
</span>
</li>
<li>
Expand All @@ -239,7 +239,7 @@
<input type="checkbox" id="sizeCol" checked="checked"/><label for="sizeCol">&nbsp;&nbsp;$clang.getString("gen.size")</label>
</span>
</li>
<li><button class="active dropdown-item" id="saveCols">$clang.getString("gen.save")</button></li>
<li><button class="active btn-primary m-2 ms-3" id="saveCols">$clang.getString("gen.save")</button></li>
</ul>
</div>
#end
Expand Down Expand Up @@ -293,7 +293,7 @@
<th id="actions2" class="actions2" scope="col">
##$tlang.getString("gen.actions")
</th>
<th id="access" class="access" scope="col">
<th id="access" class="contentAccess" scope="col">
$clang.getString("gen.access")
</th>
<th id="creator" class="creator" scope="col">
Expand Down Expand Up @@ -520,7 +520,7 @@
</div>
</td>
#if($item.depth > 0)
<td headers="access" class="d-none d-md-table-cell access" title="$item.getLongAccessLabel()#if(!$item.isAvailable()) $clang.getString('access.hidden')#end">
<td headers="access" class="d-none d-md-table-cell contentAccess" title="$item.getLongAccessLabel()#if(!$item.isAvailable()) $clang.getString('access.hidden')#end">
<span class="resource-access">$item.getShortAccessLabel()#if(!$item.isAvailable()) $clang.getString('access.hidden')#end</span>
</td>
<td headers="creator" class="creator d-none d-md-table-cell">
Expand All @@ -533,7 +533,7 @@
<span class="resource-size">$item.size</span>
</td>
#else
<td class="access d-none d-md-table-cell" title="#if(!$item.isAvailable()) $clang.getString('access.hidden')#end">
<td class="contentAccess d-none d-md-table-cell" title="#if(!$item.isAvailable()) $clang.getString('access.hidden')#end">
<span class="resource-access">#if(!$item.isAvailable()) $clang.getString('access.hidden')#end</span>
</td>
<td class="creator d-none d-md-table-cell">
Expand Down Expand Up @@ -739,7 +739,7 @@
<td headers="actions2" class="attach"></td>
<td headers="actions3" class="attach"></td>
#if($item.depth > 0)
<td class="access d-none d-md-table-cell" headers="access" title="$item.getShortAccessLabel()">
<td class="contentAccess d-none d-md-table-cell" headers="access" title="$item.getShortAccessLabel()">
<span class="resource-access">$item.getShortAccessLabel()#if(!$item.isAvailable()) $clang.getString('access.hidden')#end</span>
</td>
<td class="creator d-none d-md-table-cell" headers="creator">
Expand All @@ -752,7 +752,7 @@
<span class="resource-size">$item.size</span>
</td>
#else
<td class="access d-none d-md-table-cell" headers="access">
<td class="contentAccess d-none d-md-table-cell" headers="access">
<span class="resource-access">#if(!$item.isAvailable()) $clang.getString('access.hidden')#end</span>
</td>
<td class="creator d-none d-md-table-cell" headers="creator">
Expand Down

0 comments on commit 7cf918d

Please sign in to comment.