Commit 83f9bcd3 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Rebecca Blundell

Bug 1765276: Restoring changes lost after merging conflicts

behatnotneeded

Change-Id: Ib6ded49bf88640ff1d4c8e26c047d9eee3f612b2
parent ad0303f2
$j('#instconf_select_container input[type="radio"][value="0"]').click(function() {
$j('#instconf_select_container input[type="radio"][value="0"]').on("click", function() {
$j('#instconf_images_header').addClass('d-none');
$j('#instconf_images_container').addClass('d-none');
$j('#instconf_external_header').addClass('d-none');
......@@ -8,7 +8,7 @@ $j('#instconf_select_container input[type="radio"][value="0"]').click(function()
$j('#instconf_folder_header').removeClass('d-none');
$j('#instconf_folder_container').removeClass('d-none');
});
$j('#instconf_select_container input[type="radio"][value="1"]').click(function() {
$j('#instconf_select_container input[type="radio"][value="1"]').on("click", function() {
$j('#instconf_folder_header').addClass('d-none');
$j('#instconf_folder_container').addClass('d-none');
$j('#instconf_external_header').addClass('d-none');
......@@ -18,7 +18,7 @@ $j('#instconf_select_container input[type="radio"][value="1"]').click(function()
$j('#instconf_images_header').removeClass('d-none');
$j('#instconf_images_container').removeClass('d-none');
});
$j('#instconf_select_container input[type="radio"][value="2"]').click(function() {
$j('#instconf_select_container input[type="radio"][value="2"]').on("click", function() {
$j('#instconf_images_header').addClass('d-none');
$j('#instconf_images_container').addClass('d-none');
$j('#instconf_folder_header').addClass('d-none');
......
......@@ -56,7 +56,7 @@ See https://github.com/adobe-type-tools/cmap-resources
<div id="sidebarContainer">
<div id="toolbarSidebar">
<div class="splitToolbarButton toggled">
<button id="viewcard card-body" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
<button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
<span data-l10n-id="thumbs_label">Thumbnails</span>
</button>
<button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline">
......
......@@ -4,7 +4,7 @@
{/if}
{if $wallposts}
{foreach from=$wallposts item=wallpost}
<div class="card {if $wallpost->private}card bg-warning{else}card{/if} wallpost">
<div class="card {if $wallpost->private} bg-warning{/if} wallpost">
<h4 class="card-header has-link">
<a href="{$wallpost->profileurl}" class="userinfo has-user-icon">
<span class="user-icon left">
......
......@@ -791,3 +791,8 @@ a[type="submit"],
#webservices_token_generate_submit {
width: auto;
}
// Backup for libraries that still need hidden class instead of bootstrap 4s new .d-none
.hidden {
display: none;
}
......@@ -105,7 +105,7 @@
{/if}
<div class="card close-site {if $closed}card bg-success {else}card bg-danger {/if}">
<div class="card close-site {if $closed}bg-success {else}bg-danger {/if}">
{if $closed}
<h3 class="card-header">{str tag=reopensite section=admin} <span class="icon icon-lock float-right" role="presentation" aria-hidden="true"></span></h3>
<div class="card-body">
......
{include file="header.tpl"}
{$form|safe}
{if $groups}
<div class="card view-container">
<h2 class="card-header">{str tag=Results}</h2>
<div id="findgroups" class="list-group">
{$groupresults|safe}
</div>
</div>
{$pagination|safe}
{if $pagination_js}
<script>
{$pagination_js|safe}
</script>
{/if}
{else}
<p class="no-results">
{str tag="nogroupsfound" section="group"}
</p>
{/if}
{include file="footer.tpl"}
{include file="header.tpl"}
{if $cancreate}
<div class="btn-top-right btn-group btn-group-top">
<a href="{$WWWROOT}group/edit.php" class="btn btn-secondary creategroup">
<span class="icon icon-lg icon-plus left" role="presentation" aria-hidden="true"></span>
{str tag="creategroup" section="group"}
</a>
</div>
{/if}
{$form|safe}
{if $groups}
<div class="card view-container">
<h2 class="card-header">{str tag=Results}</h2>
<div id="mygroups" class="list-group">
{foreach from=$groups item=group}
{include file="group/group.tpl" group=$group returnto='mygroups'}
{/foreach}
</div>
</div>
{$pagination|safe}
{if $pagination_js}
<script>
{$pagination_js|safe}
</script>
{/if}
{else}
<p class="no-results">
{str tag="trysearchingforgroups" section="group" args=$searchingforgroups}
</p>
{/if}
{include file="footer.tpl"}
......@@ -10,7 +10,7 @@
<span class="btn-title">{str tag=editcontent1 section=view}</span>
</a>
{if $edittitle || $viewtype == 'share'}
{if !$accesssuspended && ($edittitle || $viewtype == 'share')}
<a class="btn btn-secondary editviews editshare {if $selected == 'share'}active{/if}" href="{$WWWROOT}view/accessurl.php?id={$viewid}{if $collectionid}&collection={$collectionid}{/if}" title="{str tag=shareview1 section=view}">
<span class="icon icon-lg icon-unlock-alt" aria-hidden="true" role="presentation"></span>
<span class="btn-title">{str tag=shareview1 section=view}</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment